diff --git a/AntimatterAPI b/AntimatterAPI
index 32cbdbebc..d469e3ad0 160000
--- a/AntimatterAPI
+++ b/AntimatterAPI
@@ -1 +1 @@
-Subproject commit 32cbdbebc850f06944904de0fff4ce755d236767
+Subproject commit d469e3ad0f1a1f89b920100c8c4b9b188e411577
diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechData.java b/common/src/main/java/muramasa/gregtech/data/GregTechData.java
index 3fec28a6e..5ffec41ce 100644
--- a/common/src/main/java/muramasa/gregtech/data/GregTechData.java
+++ b/common/src/main/java/muramasa/gregtech/data/GregTechData.java
@@ -97,20 +97,7 @@ public static void init(Side side) {
     public static ItemFluidCell CellTin = new ItemFluidCell(GTIRef.ID, Tin, 1000);
     public static ItemFluidCell CellSteel = new ItemFluidCell(GTIRef.ID, Steel, 16000);
     public static ItemFluidCell CellTungstensteel = new ItemFluidCell(GTIRef.ID, TungstenSteel, 64000);
-
-    public static ItemBasic<?> Biochaff = new ItemBasic<>(GTIRef.ID, "biochaff");
-    public static ItemBasic<?> CarbonFibre = new ItemBasic<>(GTIRef.ID, "raw_carbon_fibre");
-    public static ItemBasic<?> CarbonMesh = new ItemBasic<>(GTIRef.ID, "carbon_mesh");
-    public static ItemBasic<?> CoalBall = new ItemBasic<>(GTIRef.ID, "coal_ball");
-    public static ItemBasic<?> CompressedCoalBall = new ItemBasic<>(GTIRef.ID, "compressed_coal_ball");
-    public static ItemBasic<?> CoalChunk = new ItemBasic<>(GTIRef.ID, "coal_chunk");
     public static ItemBasic<?> Scrap = new ItemBasic<>(GTIRef.ID, "scrap");
-    public static ItemBasic<?> DiamondSawBlade = new ItemBasic<>(GTIRef.ID, "diamond_saw_blade");
-    public static ItemBasic<?> DiamondGrindHead = new ItemBasic<>(GTIRef.ID, "diamond_grind_head");
-    public static ItemBasic<?> TungstenGrindHead = new ItemBasic<>(GTIRef.ID, "tungsten_grind_head");
-    public static ItemBasic<?> IridiumAlloyIngot = new ItemBasic<>(GTIRef.ID, "iridium_alloy_ingot").tip("Used to make Iridium Plates");
-    public static ItemBasic<?> IridiumReinforcedPlate = new ItemBasic<>(GTIRef.ID, "iridium_reinforced_plate").tip("GT2s Most Expensive Component");
-    public static ItemBasic<?> IridiumNeutronReflector = new ItemBasic<>(GTIRef.ID, "iridium_neutron_reflector").tip("Indestructible");
     public static ItemBasic<?> QuantumEye = new ItemBasic<>(GTIRef.ID, "quantum_eye").tip("Improved Ender Eye");
     public static ItemBasic<?> QuantumStar = new ItemBasic<>(GTIRef.ID, "quantum_star").tip("Improved Nether Star");
     public static ItemBasic<?> GraviStar = new ItemBasic<>(GTIRef.ID, "gravi_star").tip("Ultimate Nether Star");
@@ -230,43 +217,6 @@ public static void init(Side side) {
     public static ItemBasic<?> SOC = new ItemBasic<>(GTIRef.ID, "soc", "silicon/");
 
     public static ItemBasic<?> BatteryTantalum = new ItemBattery(GTIRef.ID, "tantalum_capacitor", Tier.ULV, 10000, true).tip("Reusable");
-
-    public static ItemBasic<?> EmptyShape = new ItemBasic<>(GTIRef.ID, "empty_shape_plate", "molds/").tip("Raw plate to make Molds and Extruder Shapes");
-    public static ItemBasic<?> MoldPlate = new ItemBasic<>(GTIRef.ID, "mold_plate", "molds/").tip("Mold for making Plates");
-    public static ItemBasic<?> MoldCasing = new ItemBasic<>(GTIRef.ID, "mold_casing", "molds/").tip("Mold for making Item Casings");
-    public static ItemBasic<?> MoldGear = new ItemBasic<>(GTIRef.ID, "mold_gear", "molds/").tip("Mold for making Gears");
-    public static ItemBasic<?> MoldGearSmall = new ItemBasic<>(GTIRef.ID, "mold_small_gear", "molds/").tip("Mold for making Small Gears");
-    public static ItemBasic<?> MoldCoinage = new ItemBasic<>(GTIRef.ID, "mold_coinage", "molds/").tip("Secure Mold for making Coins (Don't lose it!)");
-    public static ItemBasic<?> MoldBottle = new ItemBasic<>(GTIRef.ID, "mold_bottle", "molds/").tip("Mold for making Bottles");
-    public static ItemBasic<?> MoldIngot = new ItemBasic<>(GTIRef.ID, "mold_ingot", "molds/").tip("Mold for making Ingots");
-    public static ItemBasic<?> MoldBall = new ItemBasic<>(GTIRef.ID, "mold_ball", "molds/").tip("Mold for making Balls");
-    public static ItemBasic<?> MoldBlock = new ItemBasic<>(GTIRef.ID, "mold_block", "molds/").tip("Mold for making Blocks");
-    public static ItemBasic<?> MoldNugget = new ItemBasic<>(GTIRef.ID, "mold_nugget", "molds/").tip("Mold for making Nuggets");
-    public static ItemBasic<?> MoldAnvil = new ItemBasic<>(GTIRef.ID, "mold_anvil", "molds/").tip("Mold for making Anvils");
-    public static ItemBasic<?> ShapePlate = new ItemBasic<>(GTIRef.ID, "shape_plate", "molds/").tip("Shape for making Plates");
-    public static ItemBasic<?> ShapeCasing = new ItemBasic<>(GTIRef.ID, "shape_casing", "molds/").tip("Shape for making Item Casings");
-    public static ItemBasic<?> ShapeRod = new ItemBasic<>(GTIRef.ID, "shape_rod", "molds/").tip("Shape for making Rods");
-    public static ItemBasic<?> ShapeBolt = new ItemBasic<>(GTIRef.ID, "shape_bolt", "molds/").tip("Shape for making Bolts");
-    public static ItemBasic<?> ShapeRing = new ItemBasic<>(GTIRef.ID, "shape_ring", "molds/").tip("Shape for making Rings");
-    public static ItemBasic<?> ShapeCell = new ItemBasic<>(GTIRef.ID, "shape_cell", "molds/").tip("Shape for making Cells");
-    public static ItemBasic<?> ShapeIngot = new ItemBasic<>(GTIRef.ID, "shape_ingot", "molds/").tip("Shape for making Ingots");
-    public static ItemBasic<?> ShapeWire = new ItemBasic<>(GTIRef.ID, "shape_wire", "molds/").tip("Shape for making Wires");
-    public static ItemBasic<?> ShapePipeTiny = new ItemBasic<>(GTIRef.ID, "shape_pipe_tiny", "molds/").tip("Shape for making Tiny Pipes");
-    public static ItemBasic<?> ShapePipeSmall = new ItemBasic<>(GTIRef.ID, "shape_pipe_small", "molds/").tip("Shape for making Small Pipes");
-    public static ItemBasic<?> ShapePipeNormal = new ItemBasic<>(GTIRef.ID, "shape_pipe_normal", "molds/").tip("Shape for making Normal Pipes");
-    public static ItemBasic<?> ShapePipeLarge = new ItemBasic<>(GTIRef.ID, "shape_pipe_large", "molds/").tip("Shape for making Large Pipes");
-    public static ItemBasic<?> ShapePipeHuge = new ItemBasic<>(GTIRef.ID, "shape_pipe_huge", "molds/").tip("Shape for making Huge Pipes");
-    public static ItemBasic<?> ShapeBlock = new ItemBasic<>(GTIRef.ID, "shape_block", "molds/").tip("Shape for making Blocks");
-    public static ItemBasic<?> ShapeHeadSword = new ItemBasic<>(GTIRef.ID, "shape_head_sword", "molds/").tip("Shape for making Sword Blades");
-    public static ItemBasic<?> ShapeHeadPickaxe = new ItemBasic<>(GTIRef.ID, "shape_head_pickaxe", "molds/").tip("Shape for making Pickaxe Heads");
-    public static ItemBasic<?> ShapeHeadShovel = new ItemBasic<>(GTIRef.ID, "shape_head_shovel", "molds/").tip("Shape for making Shovel Heads");
-    public static ItemBasic<?> ShapeHeadAxe = new ItemBasic<>(GTIRef.ID, "shape_head_axe", "molds/").tip("Shape for making Axe Heads");
-    public static ItemBasic<?> ShapeHeadHoe = new ItemBasic<>(GTIRef.ID, "shape_head_hoe", "molds/").tip("Shape for making Hoe Heads");
-    public static ItemBasic<?> ShapeHeadHammer = new ItemBasic<>(GTIRef.ID, "shape_head_hammer", "molds/").tip("Shape for making Hammer Heads");
-    public static ItemBasic<?> ShapeHeadFile = new ItemBasic<>(GTIRef.ID, "shape_head_file", "molds/").tip("Shape for making File Heads");
-    public static ItemBasic<?> ShapeHeadSaw = new ItemBasic<>(GTIRef.ID, "shape_head_saw", "molds/").tip("Shape for making Saw Heads");
-    public static ItemBasic<?> ShapeGear = new ItemBasic<>(GTIRef.ID, "shape_gear", "molds/").tip("Shape for making Gears");
-    public static ItemBasic<?> ShapeGearSmall = new ItemBasic<>(GTIRef.ID, "shape_gear_small", "molds/").tip("Shape for making Small Gears");
     public static ItemBasic<?> NuclearWaste = new ItemBasic<>(GTIRef.ID, "nuclear_waste").tip("Common Waste extracted from depleted Fuel");
     public static ItemBasic<?> AlkalineWaste = new ItemBasic<>(GTIRef.ID, "alkaline_waste").tip("Waste containing alkaline metals");
     public static ItemBasic<?> NonmetalWaste = new ItemBasic<>(GTIRef.ID, "nonmetal_waste").tip("Waste containing non-metal substances");
diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java b/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java
index 5c8cc21a5..23f828936 100644
--- a/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java
+++ b/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java
@@ -29,7 +29,7 @@
 import java.util.function.Consumer;
 
 import static com.google.common.collect.ImmutableMap.of;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.CircuitBasic;
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*;
 import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.PLATES_IRON_ALUMINIUM;
 import static muramasa.antimatter.data.AntimatterMaterials.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/AlloyLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/AlloyLoader.java
index a19aaeb15..3672f2b36 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/AlloyLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/AlloyLoader.java
@@ -1,5 +1,6 @@
 package muramasa.gregtech.loader.machines;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.material.Material;
 import muramasa.antimatter.material.MaterialStack;
 import muramasa.antimatter.material.MaterialTags;
@@ -45,32 +46,32 @@ public static void init() {
                 .io(INGOT.get(Rubber, 1)).add("rubber_via_alloy_smelter",20, 10);
         PLATE.all().stream().filter(m -> !m.has(GregTechMaterialTags.NEEDS_BLAST_FURNACE) && m.has(INGOT)).forEach(m ->{
             int euPerTick = m.has(RUBBERTOOLS) ? 8 : 32;
-            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 2), RecipeIngredient.of(GregTechData.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate", m.getMass() * 2, euPerTick);
+            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 2), RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate", m.getMass() * 2, euPerTick);
             if (m.has(RUBBERTOOLS)) {
-                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 2), RecipeIngredient.of(GregTechData.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate_from_dust", m.getMass() * 2, euPerTick);
+                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 2), RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume()).io(PLATE.get(m, 1)).add(m.getId() + "_plate_from_dust", m.getMass() * 2, euPerTick);
             }
         });
         INGOT.all().stream().filter(m -> !m.has(GregTechMaterialTags.NEEDS_BLAST_FURNACE)).forEach(m -> { //TODO other ingot recipes
             if (m.has(NUGGET)){
-                ALLOY_SMELTING.RB().ii(NUGGET.getMaterialIngredient(m, 9), RecipeIngredient.of(GregTechData.MoldIngot, 1).setNoConsume()).io(INGOT.get(m, 1)).add(m.getId() + "_ingot_from_nugget", 200, 2);
+                ALLOY_SMELTING.RB().ii(NUGGET.getMaterialIngredient(m, 9), RecipeIngredient.of(GTCoreItems.MoldIngot, 1).setNoConsume()).io(INGOT.get(m, 1)).add(m.getId() + "_ingot_from_nugget", 200, 2);
             }
             if (m.has(RUBBERTOOLS)) {
-                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 1), RecipeIngredient.of(GregTechData.MoldIngot, 1).setNoConsume()).io(INGOT.get(m, 1)).add(m.getId() + "_ingot_from_dust", m.getMass(), 10);
+                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 1), RecipeIngredient.of(GTCoreItems.MoldIngot, 1).setNoConsume()).io(INGOT.get(m, 1)).add(m.getId() + "_ingot_from_dust", m.getMass(), 10);
             }
         });
         ITEM_CASING.all().forEach(m -> {
-            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 2), of(GregTechData.MoldCasing, 1).setNoConsume()).io(ITEM_CASING.get(m, 3)).add(m.getId() + "_item_casing", Math.max(m.getMass() * 2 / 3, 1), 16);
+            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 2), of(GTCoreItems.MoldCasing, 1).setNoConsume()).io(ITEM_CASING.get(m, 3)).add(m.getId() + "_item_casing", Math.max(m.getMass() * 2 / 3, 1), 16);
         });
         GEAR.all().stream().filter(m -> !m.has(GregTechMaterialTags.NEEDS_BLAST_FURNACE) && m.has(INGOT)).forEach(m ->{
             int euPerTick = m.has(RUBBERTOOLS) ? 8 : 32;
-            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 8), RecipeIngredient.of(GregTechData.MoldGear, 1).setNoConsume()).io(GEAR.get(m, 1)).add(m.getId() + "_gear", m.getMass() * 8, euPerTick);
+            ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(m, 8), RecipeIngredient.of(GTCoreItems.MoldGear, 1).setNoConsume()).io(GEAR.get(m, 1)).add(m.getId() + "_gear", m.getMass() * 8, euPerTick);
             if (m.has(RUBBERTOOLS)) {
-                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 8), RecipeIngredient.of(GregTechData.MoldGear, 1).setNoConsume()).io(GEAR.get(m, 1)).add(m.getId() + "_gear_from_dust", m.getMass() * 8, euPerTick);
+                ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(m, 8), RecipeIngredient.of(GTCoreItems.MoldGear, 1).setNoConsume()).io(GEAR.get(m, 1)).add(m.getId() + "_gear_from_dust", m.getMass() * 8, euPerTick);
             }
         });
-        ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Glass, 1), RecipeIngredient.of(GregTechData.MoldBall, 1).setNoConsume()).io(GregTechData.GlassTube).add("glass_tube", 160, 8);
-        ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Glass, 1), RecipeIngredient.of(GregTechData.MoldBottle, 1).setNoConsume()).io(Items.GLASS_BOTTLE).add("glass_bottle", 64, 4);
-        ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(Iron, 31), RecipeIngredient.of(GregTechData.MoldAnvil, 1).setNoConsume()).io(Items.ANVIL).add("anvil", 512, 64);
+        ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Glass, 1), RecipeIngredient.of(GTCoreItems.MoldBall, 1).setNoConsume()).io(GregTechData.GlassTube).add("glass_tube", 160, 8);
+        ALLOY_SMELTING.RB().ii(DUST.getMaterialIngredient(Glass, 1), RecipeIngredient.of(GTCoreItems.MoldBottle, 1).setNoConsume()).io(Items.GLASS_BOTTLE).add("glass_bottle", 64, 4);
+        ALLOY_SMELTING.RB().ii(INGOT.getMaterialIngredient(Iron, 31), RecipeIngredient.of(GTCoreItems.MoldAnvil, 1).setNoConsume()).io(Items.ANVIL).add("anvil", 512, 64);
 
         //Fissile Fuels
         FISSILE_FUEL.all().forEach(f -> ALLOY_SMELTING.RB().ii(of(INGOT.get(f), 1), of(INGOT.get(f))).io(FISSILE_FUEL.get(f)).add(f.getId() + "_fissile_fuel_smelting"));
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/AssemblyLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/AssemblyLoader.java
index 9f762616c..9ebf2a7af 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/AssemblyLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/AssemblyLoader.java
@@ -27,6 +27,8 @@
 
 import java.util.Arrays;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.CarbonFibre;
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.CarbonMesh;
 import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.*;
 import static muramasa.antimatter.Ref.L;
 import static muramasa.antimatter.data.AntimatterMaterials.*;
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java b/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java
index 0e1516f2c..0d3ccd539 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/Autoclave.java
@@ -1,5 +1,6 @@
 package muramasa.gregtech.loader.machines;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.gregtech.data.GregTechData;
 import muramasa.gregtech.data.GregTechMaterialTags;
 import muramasa.gregtech.data.Materials;
@@ -31,9 +32,9 @@ public static void init() {
         });
         AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Bauxite, 2), DUST.getMaterialIngredient(SodiumHydroxide, 3)).fi(DistilledWater.getLiquid(1000)).io(DUST.get(SodiumAluminate, 4), DUST_TINY.get(Ilmenite, 1), DUST_TINY.get(Rutile, 1)).chances(1.0, 0.25, 0.5).add("bauxite_distilled_water", 1500, 16);
         AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Bauxite, 2), DUST.getMaterialIngredient(SodiumHydroxide, 3)).fi(Water.getLiquid(1000)).io(DUST.get(SodiumAluminate, 4), DUST_TINY.get(Ilmenite, 1), DUST_TINY.get(Rutile, 1)).chances(1.0, 0.25, 0.5).add("bauxite", 3000, 16);
-        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Platinum.getLiquid(1)).io(new ItemStack(GregTechData.CarbonFibre, 2)).add("carbon_fibre", 150, 5);
-        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Lutetium.getLiquid(1)).io(new ItemStack(GregTechData.CarbonFibre, 2)).add("carbon_fibre_1", 150, 5);
-        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Palladium.getLiquid(1)).io(new ItemStack(GregTechData.CarbonFibre, 2)).add("carbon_fibre_2", 150, 5);
+        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Platinum.getLiquid(1)).io(new ItemStack(GTCoreItems.CarbonFibre, 2)).add("carbon_fibre", 150, 5);
+        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Lutetium.getLiquid(1)).io(new ItemStack(GTCoreItems.CarbonFibre, 2)).add("carbon_fibre_1", 150, 5);
+        AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Materials.Carbon, 4)).fi(Materials.Palladium.getLiquid(1)).io(new ItemStack(GTCoreItems.CarbonFibre, 2)).add("carbon_fibre_2", 150, 5);
         AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Energium, 9)).fi(DistilledWater.getLiquid(1000)).io(EnergyCrystal).add("energy_crystal_distilled_water", 250, 256);
         AUTOCLAVING.RB().ii(DUST.getMaterialIngredient(Energium, 9)).fi(Water.getLiquid(1000)).io(EnergyCrystal).add("energy_crystal", 500, 256);
         AUTOCLAVING.RB().ii(of(Items.NETHER_STAR)).fi(Neutronium.getLiquid(L * 2)).io(GregTechData.GraviStar).add("gravistar", 480, 7680);
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/CompressorLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/CompressorLoader.java
index d2c4a2e11..84f1d8ffd 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/CompressorLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/CompressorLoader.java
@@ -12,6 +12,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.GEM;
 import static muramasa.antimatter.data.AntimatterMaterials.Diamond;
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ExtruderLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/ExtruderLoader.java
index e64a6dd6b..448865c07 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/ExtruderLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/ExtruderLoader.java
@@ -1,5 +1,6 @@
 package muramasa.gregtech.loader.machines;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.data.AntimatterMaterials;
@@ -20,44 +21,44 @@ public static void init() {
         AntimatterMaterialTypes.RING.all().forEach(r -> {
             if (!r.has(AntimatterMaterialTypes.INGOT)) return;
             long duration = r.getElement() == null ? Math.max(r.getMass(), 1) : r.getElement().getHardness();
-            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(r),1),of(GregTechData.ShapeRing,1).setNoConsume()).io(AntimatterMaterialTypes.RING.get(r,4)).add("ring_" + r.getId(),duration,30);
+            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(r),1),of(GTCoreItems.ShapeRing,1).setNoConsume()).io(AntimatterMaterialTypes.RING.get(r,4)).add("ring_" + r.getId(),duration,30);
         });
 
         AntimatterMaterialTypes.GEAR.all().forEach(g -> {
             if (!g.has(AntimatterMaterialTypes.INGOT)) return;
             long duration = g.getElement() == null ? Math.max(g.getMass(), 1) : g.getElement().getHardness();
-            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(g),4),of(GregTechData.ShapeGear,1).setNoConsume()).io(AntimatterMaterialTypes.GEAR.get(g,1)).add("gear_" + g.getId(),duration*4,30);
+            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(g),4),of(GTCoreItems.ShapeGear,1).setNoConsume()).io(AntimatterMaterialTypes.GEAR.get(g,1)).add("gear_" + g.getId(),duration*4,30);
         });
 
         AntimatterMaterialTypes.BOLT.all().forEach(b -> {
             if (!b.has(AntimatterMaterialTypes.INGOT)) return;
             long duration = b.getElement() == null ? Math.max(b.getMass(), 1) : b.getElement().getHardness();
-            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(b),1),of(GregTechData.ShapeBolt,1).setNoConsume()).io(AntimatterMaterialTypes.BOLT.get(b,8)).add("bolt_" + b.getId(),duration,30);
+            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(b),1),of(GTCoreItems.ShapeBolt,1).setNoConsume()).io(AntimatterMaterialTypes.BOLT.get(b,8)).add("bolt_" + b.getId(),duration,30);
         });
 
         AntimatterMaterialTypes.GEAR_SMALL.all().forEach(g -> {
             if (!g.has(AntimatterMaterialTypes.INGOT)) return;
             long duration = g.getElement() == null ? Math.max(g.getMass(), 1) : g.getElement().getHardness();
-            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(g),1),of(GregTechData.ShapeGearSmall,1).setNoConsume()).io(AntimatterMaterialTypes.GEAR_SMALL.get(g,1)).add("gear_small_" + g.getId(),duration,30);
+            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(g),1),of(GTCoreItems.ShapeGearSmall,1).setNoConsume()).io(AntimatterMaterialTypes.GEAR_SMALL.get(g,1)).add("gear_small_" + g.getId(),duration,30);
         });
 
         AntimatterMaterialTypes.PLATE.all().forEach(p -> {
             if (!p.has(AntimatterMaterialTypes.INGOT)) return;
             long duration = p.getElement() == null ? Math.max(p.getMass(), 1) : p.getElement().getHardness();
-            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(p),1),of(GregTechData.ShapePlate,1).setNoConsume()).io(AntimatterMaterialTypes.PLATE.get(p,1)).add("plate_" + p.getId(),duration,30);
+            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(p),1),of(GTCoreItems.ShapePlate,1).setNoConsume()).io(AntimatterMaterialTypes.PLATE.get(p,1)).add("plate_" + p.getId(),duration,30);
         });
 
         AntimatterMaterialTypes.ROD.all().forEach(r -> {
             if (!r.has(AntimatterMaterialTypes.INGOT)) return;
             long duration = r.getElement() == null ? Math.max(r.getMass(), 1) : r.getElement().getHardness();
-            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(r),1),of(GregTechData.ShapeRod,1).setNoConsume()).io(AntimatterMaterialTypes.ROD.get(r,2)).add("rod_" + r.getId(),duration,30);
+            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(r),1),of(GTCoreItems.ShapeRod,1).setNoConsume()).io(AntimatterMaterialTypes.ROD.get(r,2)).add("rod_" + r.getId(),duration,30);
         });
 
         AntimatterAPI.all(Wire.class).forEach(t -> {
             Item wireItem = t.getBlockItem(PipeSize.VTINY);
             ItemStack stack = new ItemStack(wireItem,2);
             long duration = t.getMaterial().getElement() == null ? Math.max(t.getMaterial().getMass(), 1) : t.getMaterial().getElement().getHardness();
-            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(t.getMaterial()),1),of(GregTechData.ShapeWire,1).setNoConsume()).io(stack).add("wire_" + t.getMaterial().getId(),duration,30);
+            EXTRUDING.RB().ii(of(AntimatterMaterialTypes.INGOT.getMaterialTag(t.getMaterial()),1),of(GTCoreItems.ShapeWire,1).setNoConsume()).io(stack).add("wire_" + t.getMaterial().getId(),duration,30);
         });
 
         AntimatterAPI.all(FluidPipe.class).stream().filter(t -> t.getMaterial() != AntimatterMaterials.Wood).forEach(t -> {
@@ -94,11 +95,11 @@ private static void addPipeRecipe(Material material, int countIn, int countOut,
 
     private static Item getPipeMold(PipeSize size){
         return switch (size) {
-            case HUGE -> GregTechData.ShapePipeHuge;
-            case LARGE -> GregTechData.ShapePipeLarge;
-            case NORMAL -> GregTechData.ShapePipeNormal;
-            case SMALL -> GregTechData.ShapePipeSmall;
-            case TINY, VTINY -> GregTechData.ShapePipeTiny;
+            case HUGE -> GTCoreItems.ShapePipeHuge;
+            case LARGE -> GTCoreItems.ShapePipeLarge;
+            case NORMAL -> GTCoreItems.ShapePipeNormal;
+            case SMALL -> GTCoreItems.ShapePipeSmall;
+            case TINY, VTINY -> GTCoreItems.ShapePipeTiny;
             default -> Items.AIR;
         };
     }
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/FluidSolidifier.java b/common/src/main/java/muramasa/gregtech/loader/machines/FluidSolidifier.java
index 6081e8dc5..395768f2a 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/FluidSolidifier.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/FluidSolidifier.java
@@ -1,5 +1,6 @@
 package muramasa.gregtech.loader.machines;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.material.Material;
@@ -19,42 +20,42 @@ public static void init() {
         AntimatterAPI.all(Material.class, mat -> {
             if (!mat.has(AntimatterMaterialTypes.LIQUID) || mat == Glass) return;
             if (mat.has(PLATE)) {
-                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldPlate, 1).setNoConsume())
+                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume())
                 .fi(mat.getFluidTag(L)).io(PLATE.get(mat,1)).add(mat.getId() + "_plate",32, 8);
             }
             if (mat.has(ITEM_CASING)) {
-                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldCasing, 1).setNoConsume())
+                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldCasing, 1).setNoConsume())
                         .fi(mat.getFluidTag(L / 2)).io(ITEM_CASING.get(mat,1)).add(mat.getId() + "_casing",16, 8);
             }
             if (mat.has(INGOT)) {
-                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldIngot, 1).setNoConsume())
+                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldIngot, 1).setNoConsume())
                         .fi(mat.getFluidTag(L)).io(INGOT.get(mat,1)).add(mat.getId() + "_ingot",32, 8);
             }
             if (mat.has(GEAR)) {
-                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldGear, 1).setNoConsume())
+                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldGear, 1).setNoConsume())
                 .fi(mat.getFluidTag(L * 4)).io(GEAR.get(mat,1)).add(mat.getId() + "_gear",128, 8);
             }
             if (mat.has(GEAR_SMALL)) {
-                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldGearSmall, 1).setNoConsume())
+                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldGearSmall, 1).setNoConsume())
                 .fi(mat.getFluidTag(L)).io(GEAR_SMALL.get(mat,1)).add(mat.getId() + "_gear_small",16, 8);
             }
             if (mat.has(NUGGET)) {
-                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldNugget, 1).setNoConsume())
+                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldNugget, 1).setNoConsume())
                 .fi(mat.getFluidTag(L / 9)).io(NUGGET.get(mat,1)).add(mat.getId() + "_nugget",16, 4);
             }
             if (mat.has(BLOCK)) {
-                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldBlock, 1).setNoConsume())
+                FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldBlock, 1).setNoConsume())
                 .fi(mat.getFluidTag(L * 9)).io(BLOCK.get().get(mat).asStack(1)).add(mat.getId() + "_block",288, 8);
             }
         });
-        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldAnvil, 1).setNoConsume()).fi(Iron.getFluidTag(L * 31)).io(Items.ANVIL).add("anvil", 128, 16);
-        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldPlate, 1).setNoConsume()).fi(Glass.getFluidTag(L)).io(PLATE.get(Glass)).add("glass_plate",12, 4);
-        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldBlock, 1).setNoConsume()).fi(Glass.getFluidTag(L)).io(Items.GLASS).add("glass_block",12, 4);
-        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldBottle, 1).setNoConsume()).fi(Glass.getFluidTag(L)).io(Items.GLASS_BOTTLE).add("glass_bottle",12, 4);
-        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldBlock, 1).setNoConsume()).fi(Glowstone.getFluidTag(L * 4)).io(Items.GLOWSTONE).add("glowstone_block", 12, 4);
-        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldBlock, 1).setNoConsume()).fi(Water.getLiquid(1000)).io(Items.SNOW_BLOCK).add("snow_block", 512, 4);
-        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldBlock, 1).setNoConsume()).fi(DistilledWater.getFluidTag(1000)).io(Items.SNOW_BLOCK).add("snow_block_2", 512, 4);
-        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldBall, 1).setNoConsume()).fi(Water.getLiquid(250)).io(Items.SNOWBALL).add("snow_ball", 128, 4);
-        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GregTechData.MoldBall, 1).setNoConsume()).fi(DistilledWater.getFluidTag(250)).io(Items.SNOWBALL).add("snow_ball_2", 128, 4);
+        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldAnvil, 1).setNoConsume()).fi(Iron.getFluidTag(L * 31)).io(Items.ANVIL).add("anvil", 128, 16);
+        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldPlate, 1).setNoConsume()).fi(Glass.getFluidTag(L)).io(PLATE.get(Glass)).add("glass_plate",12, 4);
+        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldBlock, 1).setNoConsume()).fi(Glass.getFluidTag(L)).io(Items.GLASS).add("glass_block",12, 4);
+        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldBottle, 1).setNoConsume()).fi(Glass.getFluidTag(L)).io(Items.GLASS_BOTTLE).add("glass_bottle",12, 4);
+        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldBlock, 1).setNoConsume()).fi(Glowstone.getFluidTag(L * 4)).io(Items.GLOWSTONE).add("glowstone_block", 12, 4);
+        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldBlock, 1).setNoConsume()).fi(Water.getLiquid(1000)).io(Items.SNOW_BLOCK).add("snow_block", 512, 4);
+        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldBlock, 1).setNoConsume()).fi(DistilledWater.getFluidTag(1000)).io(Items.SNOW_BLOCK).add("snow_block_2", 512, 4);
+        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldBall, 1).setNoConsume()).fi(Water.getLiquid(250)).io(Items.SNOWBALL).add("snow_ball", 128, 4);
+        FLUID_SOLIDIFYING.RB().ii(RecipeIngredient.of(GTCoreItems.MoldBall, 1).setNoConsume()).fi(DistilledWater.getFluidTag(250)).io(Items.SNOWBALL).add("snow_ball_2", 128, 4);
     }
 }
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/FormingPress.java b/common/src/main/java/muramasa/gregtech/loader/machines/FormingPress.java
index 4afa32f10..ecd81d037 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/FormingPress.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/FormingPress.java
@@ -1,5 +1,6 @@
 package muramasa.gregtech.loader.machines;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.item.ItemBasic;
 import muramasa.gregtech.data.GregTechData;
 import net.minecraft.world.item.ItemStack;
@@ -8,31 +9,31 @@
 
 public class FormingPress {
     public static void init() {
-        molds(GregTechData.MoldAnvil);
-        molds(GregTechData.MoldBall);
-        molds(GregTechData.MoldBlock);
-        molds(GregTechData.MoldBottle);
-        molds(GregTechData.MoldCoinage);
-        molds(GregTechData.MoldGear);
-        molds(GregTechData.MoldGearSmall);
-        molds(GregTechData.MoldIngot);
-        molds(GregTechData.MoldNugget);
-        molds(GregTechData.MoldPlate);
+        molds(GTCoreItems.MoldAnvil);
+        molds(GTCoreItems.MoldBall);
+        molds(GTCoreItems.MoldBlock);
+        molds(GTCoreItems.MoldBottle);
+        molds(GTCoreItems.MoldCoinage);
+        molds(GTCoreItems.MoldGear);
+        molds(GTCoreItems.MoldGearSmall);
+        molds(GTCoreItems.MoldIngot);
+        molds(GTCoreItems.MoldNugget);
+        molds(GTCoreItems.MoldPlate);
 
-        molds(GregTechData.ShapeBolt);
-        molds(GregTechData.ShapeGear);
-        molds(GregTechData.ShapeGearSmall);
-        molds(GregTechData.ShapeRing);
-        molds(GregTechData.ShapeRod);
-        molds(GregTechData.ShapePipeHuge);
-        molds(GregTechData.ShapePipeLarge);
-        molds(GregTechData.ShapePipeNormal);
-        molds(GregTechData.ShapePipeSmall);
-        molds(GregTechData.ShapePipeTiny);
-        molds(GregTechData.ShapeWire);
-        molds(GregTechData.ShapePlate);
+        molds(GTCoreItems.ShapeBolt);
+        molds(GTCoreItems.ShapeGear);
+        molds(GTCoreItems.ShapeGearSmall);
+        molds(GTCoreItems.ShapeRing);
+        molds(GTCoreItems.ShapeRod);
+        molds(GTCoreItems.ShapePipeHuge);
+        molds(GTCoreItems.ShapePipeLarge);
+        molds(GTCoreItems.ShapePipeNormal);
+        molds(GTCoreItems.ShapePipeSmall);
+        molds(GTCoreItems.ShapePipeTiny);
+        molds(GTCoreItems.ShapeWire);
+        molds(GTCoreItems.ShapePlate);
     }
     private static void molds(ItemBasic mold){
-        PRESSING.RB().ii(of(GregTechData.EmptyShape,1),of(mold,1).setNoConsume()).io(new ItemStack(mold,1)).add(mold.getId(),120,20);
+        PRESSING.RB().ii(of(GTCoreItems.EmptyShape,1),of(mold,1).setNoConsume()).io(new ItemStack(mold,1)).add(mold.getId(),120,20);
     }
 }
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/MaceratorLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/MaceratorLoader.java
index 75179f157..88b1565c0 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/MaceratorLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/MaceratorLoader.java
@@ -24,13 +24,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.Biochaff;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST;
 import static muramasa.antimatter.data.AntimatterMaterials.Stone;
 import static muramasa.antimatter.data.AntimatterMaterials.Wood;
 import static muramasa.antimatter.material.Material.NULL;
 import static muramasa.antimatter.material.MaterialTags.*;
-import static muramasa.gregtech.data.GregTechData.Biochaff;
 import static muramasa.gregtech.data.Materials.Clay;
 import static muramasa.gregtech.data.RecipeMaps.*;
 import static muramasa.gregtech.data.RecipeMaps.HAMMERING;
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/MixerLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/MixerLoader.java
index 356c04262..2195fa8ee 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/MixerLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/MixerLoader.java
@@ -1,5 +1,6 @@
 package muramasa.gregtech.loader.machines;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.data.AntimatterMaterials;
 import muramasa.antimatter.material.Material;
@@ -118,7 +119,7 @@ private static void recipes() {
         MIXING.RB().ii(of(DUST.get(Saltpeter,2)),of(DUST.get(Sulfur,1)),of(DUST.get(AntimatterMaterials.Charcoal,1))).io(new ItemStack(Items.GUNPOWDER,2)).add("gunpowder_1",15*20, 8);
         MIXING.RB().ii(of(DUST.get(AntimatterMaterials.Stone,1))).fi(Lubricant.getLiquid(20), AntimatterMaterials.Water.getLiquid(4980)).fo(DrillingFluid.getLiquid(5000)).add("drilling_fluid",32*2, 16);
         MIXING.RB().ii(of(DUST.get(AntimatterMaterials.Stone,3)),of(DUST.get(Clay,1))).fi(AntimatterMaterials.Water.getLiquid(500)).fo(Concrete.getLiquid(576)).add("concrete", 20, 16);
-        MIXING.RB().ii(RecipeIngredient.of(GregTechData.Biochaff)).fi(AntimatterMaterials.Water.getLiquid(1000)).fo(Biomass.getLiquid(1000)).add("biomass", 400, 8);
+        MIXING.RB().ii(RecipeIngredient.of(GTCoreItems.Biochaff)).fi(AntimatterMaterials.Water.getLiquid(1000)).fo(Biomass.getLiquid(1000)).add("biomass", 400, 8);
         MIXING.RB().ii(DUST.getMaterialIngredient(Lapis, 1)).fi(Water.getLiquid(125)).fo(Coolant.getLiquid(125)).add("cold_coolant", 256, 48);
         long oneThird = AntimatterPlatformUtils.isFabric() ? 27000 : 333;
         MIXING.RB().ii(DUST.getMaterialIngredient(Wood, 4), DUST.getMaterialIngredient(Sulfur, 1), DUST.getMaterialIngredient(Lithium, 1)).fi(Glue.getLiquid(oneThird)).io(new ItemStack(SuperFuelBinder, 8)).add("super_fuel_binder", 40 * 20, 16);
diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/PyrolysisOven.java b/common/src/main/java/muramasa/gregtech/loader/multi/PyrolysisOven.java
index 646e9a76c..9d93dc280 100644
--- a/common/src/main/java/muramasa/gregtech/loader/multi/PyrolysisOven.java
+++ b/common/src/main/java/muramasa/gregtech/loader/multi/PyrolysisOven.java
@@ -1,5 +1,6 @@
 package muramasa.gregtech.loader.multi;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.data.AntimatterMaterials;
 import muramasa.antimatter.recipe.ingredient.RecipeIngredient;
@@ -19,8 +20,8 @@
 public class PyrolysisOven {
     public static void init(){
         PYROLYSISING.RB().ii(DUST.getMaterialIngredient(Materials.OilShale, 1)).fo(Materials.Oil.getLiquid(25)).add("oil", 200, 120);
-        PYROLYSISING.RB().ii(RecipeIngredient.of(GregTechData.Biochaff, 1), TierMaps.INT_CIRCUITS.get(1)).fi(AntimatterMaterials.Water.getLiquid(1000)).fo(Materials.Biomass.getLiquid(1500)).add("biomass", 100, 10);
-        PYROLYSISING.RB().ii(RecipeIngredient.of(GregTechData.Biochaff, 1), TierMaps.INT_CIRCUITS.get(2)).fi(AntimatterMaterials.Water.getLiquid(1500)).fo(Materials.Biomass.getLiquid(1500)).add("fermented_biomass", 200, 10);
+        PYROLYSISING.RB().ii(RecipeIngredient.of(GTCoreItems.Biochaff, 1), TierMaps.INT_CIRCUITS.get(1)).fi(AntimatterMaterials.Water.getLiquid(1000)).fo(Materials.Biomass.getLiquid(1500)).add("biomass", 100, 10);
+        PYROLYSISING.RB().ii(RecipeIngredient.of(GTCoreItems.Biochaff, 1), TierMaps.INT_CIRCUITS.get(2)).fi(AntimatterMaterials.Water.getLiquid(1500)).fo(Materials.Biomass.getLiquid(1500)).add("fermented_biomass", 200, 10);
         PYROLYSISING.RB().ii(DUST.getMaterialIngredient(Sugar, 23), TierMaps.INT_CIRCUITS.get(1)).io(DUST.get(Charcoal, 12)).fo(Water.getLiquid(11000)).add("sugar_to_charcoal", 320, 64);
         PYROLYSISING.RB().ii(DUST.getMaterialIngredient(Sugar, 23), TierMaps.INT_CIRCUITS.get(2)).fi(Nitrogen.getGas(500)).io(DUST.get(Charcoal, 12)).fo(Water.getLiquid(11000)).add("sugar_to_charcoal_2", 160, 96);
         PYROLYSISING.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(5)).io(new ItemStack(Items.CHARCOAL, 20)).fo(WoodGas.getGas(1500)).add("wood_gas", 640, 64);
diff --git a/gradle.properties b/gradle.properties
index 9683c3956..d04b6add4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@ fabric_api_version=0.76.0+1.18.2
 fabric_transfer_api_version=1.6.+
 fabric_loader_version=0.14.6
 
-gt_core_version=0.1-pre2
+gt_core_version=0.1-pre3
 terraform_version=3.1.4
 networkapi_version=0.1.1-rc2
 jei_version=10.2.1.1004