diff --git a/AntimatterAPI b/AntimatterAPI
index 8bccebed3..57f86b110 160000
--- a/AntimatterAPI
+++ b/AntimatterAPI
@@ -1 +1 @@
-Subproject commit 8bccebed39cfd8beded0a069db9dca7bb206004e
+Subproject commit 57f86b110d9d3f1737396f56e8b91eed39debb20
diff --git a/common/src/main/java/muramasa/gregtech/integration/SpaceModRegistrar.java b/common/src/main/java/muramasa/gregtech/integration/SpaceModRegistrar.java
index 883b2dc3e..730fad7cf 100644
--- a/common/src/main/java/muramasa/gregtech/integration/SpaceModRegistrar.java
+++ b/common/src/main/java/muramasa/gregtech/integration/SpaceModRegistrar.java
@@ -34,15 +34,14 @@ public String getId() {
     @Override
     public void onRegistrationEvent(RegistrationEvent event, Side side) {
         if (event == RegistrationEvent.DATA_INIT){
-            AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "moon_sand", Material.NULL, new Texture(getMod(), "block/moon_sand"), SoundType.SAND, false).setState(getSpaceBlock("moon_sand")).setSandLike(true));
-            var moonStone = AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "moon_stone", Material.NULL, new Texture(getMod(), "block/moon_stone"), SoundType.STONE, false).setState(getSpaceBlock("moon_stone")));
-            AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "mars_sand", Material.NULL, new Texture(getMod(), "block/mars_sand"), SoundType.SAND, false).setState(getSpaceBlock("mars_sand")).setSandLike(true));
-            var marsStone = AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "mars_stone", Material.NULL, new Texture(getMod(), "block/mars_stone"), SoundType.STONE, false).setState(getSpaceBlock("mars_stone")));
-            if (AntimatterAPI.isModLoaded("ad_astra")){
-                ORE.replacement(Iron, moonStone, () -> getSpaceBlock("moon_iron_ore").asItem());
-                ORE.replacement(Iron, marsStone, () -> getSpaceBlock("mars_iron_ore").asItem());
-                ORE.replacement(Diamond, marsStone, () -> getSpaceBlock("mars_diamond_ore").asItem());
-            }
+            String block = AntimatterAPI.isModLoaded("ad_astra") ? "block" : "blocks";
+            AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "moon_sand", Material.NULL, new Texture(getMod(), block + "/moon_sand"), SoundType.SAND, false).setState(getSpaceBlock("moon_sand")).setSandLike(true));
+            var moonStone = AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "moon_stone", Material.NULL, new Texture(getMod(), block + "/moon_stone"), SoundType.STONE, false).setState(getSpaceBlock("moon_stone")));
+            AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "mars_sand", Material.NULL, new Texture(getMod(), block + "/mars_sand"), SoundType.SAND, false).setState(getSpaceBlock("mars_sand")).setSandLike(true));
+            var marsStone = AntimatterAPI.register(StoneType.class, new StoneType(GTIRef.ID, "mars_stone", Material.NULL, new Texture(getMod(), block + "/mars_stone"), SoundType.STONE, false).setState(getSpaceBlock("mars_stone")));
+            ORE.replacement(Iron, moonStone, () -> getSpaceBlock("moon_iron_ore").asItem());
+            ORE.replacement(Iron, marsStone, () -> getSpaceBlock("mars_iron_ore").asItem());
+            ORE.replacement(Diamond, marsStone, () -> getSpaceBlock("mars_diamond_ore").asItem());
         }
     }
 
diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/Machines.java b/common/src/main/java/muramasa/gregtech/loader/crafting/Machines.java
index 8f5a5d90c..ee1acc033 100644
--- a/common/src/main/java/muramasa/gregtech/loader/crafting/Machines.java
+++ b/common/src/main/java/muramasa/gregtech/loader/crafting/Machines.java
@@ -458,7 +458,7 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
                             .put('D', DataOrb)
                             .put('M', hull)
                             .put('C', conveyor).build(), "DMC"));
-            add(SUPER_BUFFER, tier, (m, item) -> provider.addItemRecipe(output, "machines", "has_motor", provider.hasSafeItem(motor), item,
+            add(SUPER_BUFFER, tier, (m, item) -> provider.addItemRecipe(output, GTIRef.ID, "super_buffer_" + tier.getId() +"_1", "machines", "has_motor", provider.hasSafeItem(motor), item,
                     ImmutableMap.<Character, Object>builder()
                             .put('D', CircuitDataStorage)
                             .put('M', hull)