Circuit material overhaul (#2814)

* first push to use new Materials for circuits

* dont deprecate or redefine ultimate

* sa

* move it

* second round

* dont deprecate or redefine advanced

* part 3

* part 4

* part 5

* part 6

* mini fix

4 files changed, 99 insertions, 100 deletions

diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
index efe94403e0..1531a80110 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
@@ -73,7 +73,7 @@ public class AssemblerRecipes implements Runnable {
                     ItemList.Component_Filter.get(2L),
                     GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L),
                     ItemList.Electric_Motor_HV.get(1L),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
                     GT_Utility.getIntegratedCircuit(1))
                 .itemOutputs(ItemList.Machine_Multi_Cleanroom.get(1L))
                 .fluidInputs(Materials.StainlessSteel.getMolten(864L))
@@ -85,7 +85,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Cover_Shutter.get(1L),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
                 GT_Utility.getIntegratedCircuit(1))
             .itemOutputs(ItemList.FluidFilter.get(1L))
             .duration(40 * SECONDS)
@@ -125,7 +125,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 16),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 4),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 4),
                 ItemList.Electric_Motor_IV.get(16),
                 ItemList.Emitter_EV.get(4),
                 ItemList.Duct_Tape.get(64),
@@ -216,7 +216,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_LV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_LV.get(1))
             .duration(20 * SECONDS)
@@ -226,7 +226,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_MV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_MV.get(1))
             .duration(17 * SECONDS + 10 * TICKS)
@@ -236,7 +236,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_HV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_HV.get(1))
             .duration(15 * SECONDS)
@@ -246,7 +246,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_EV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_EV.get(1))
             .duration(12 * SECONDS + 10 * TICKS)
@@ -256,7 +256,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_IV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Elite), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.IV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_IV.get(1))
             .duration(10 * SECONDS)
@@ -266,7 +266,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_LuV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Master), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LuV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_LuV.get(1))
             .duration(7 * SECONDS + 10 * TICKS)
@@ -276,7 +276,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_ZPM.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Ultimate), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.ZPM), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_ZPM.get(1))
             .duration(5 * SECONDS)
@@ -286,7 +286,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Electric_Pump_UV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.UV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.FluidRegulator_UV.get(1))
             .duration(2 * SECONDS + 10 * TICKS)
@@ -296,7 +296,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Steam_Valve_LV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Steam_Regulator_LV.get(1))
             .duration(20 * SECONDS)
@@ -306,7 +306,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Steam_Valve_MV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Steam_Regulator_MV.get(1))
             .duration(17 * SECONDS + 10 * TICKS)
@@ -316,7 +316,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Steam_Valve_HV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Steam_Regulator_HV.get(1))
             .duration(15 * SECONDS)
@@ -326,7 +326,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Steam_Valve_EV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Steam_Regulator_EV.get(1))
             .duration(12 * SECONDS + 10 * TICKS)
@@ -336,7 +336,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 ItemList.Steam_Valve_IV.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Elite), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.IV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Steam_Regulator_IV.get(1))
             .duration(10 * SECONDS)
@@ -401,7 +401,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Steel), 4),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 4),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 4),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Schematic.get(1L))
             .duration(30 * SECONDS)
@@ -411,7 +411,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Aluminium), 3),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Schematic.get(1L))
             .duration(15 * SECONDS)
@@ -421,7 +421,7 @@ public class AssemblerRecipes implements Runnable {
         GT_Values.RA.stdBuilder()
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.StainlessSteel), 2),
-                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 1),
+                GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 1),
                 GT_Utility.getIntegratedCircuit(3))
             .itemOutputs(ItemList.Schematic.get(1L))
             .duration(7 * SECONDS + 10 * TICKS)
@@ -6664,7 +6664,7 @@ public class AssemblerRecipes implements Runnable {
                 GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16),
                 GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2),
                 GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 4),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4),
                 ItemList.Shape_Extruder_Wire.get(16))
             .itemOutputs(ItemList.Spinneret.get(1))
             .fluidInputs(Materials.SolderingAlloy.getMolten(144))
@@ -6771,7 +6771,7 @@ public class AssemblerRecipes implements Runnable {
             .itemInputs(
                 getModItem(IC2NuclearControl.ID, "ItemSensorLocationCard", 1L, 0),
                 GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2))
+            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
@@ -6782,7 +6782,7 @@ public class AssemblerRecipes implements Runnable {
             .itemInputs(
                 getModItem(IC2NuclearControl.ID, "Item55ReactorCard", 1L, 0),
                 GT_Utility.getIntegratedCircuit(1))
-            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2))
+            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(assemblerRecipes);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
index 03c1f2a280..bea7f75a4f 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
@@ -303,9 +303,9 @@ public class AssemblyLineRecipes implements Runnable {
                     GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 3),
                     ItemList.Electric_Motor_LuV.get(2),
                     ItemList.Electric_Piston_LuV.get(1),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Elite), 4 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Data), 8 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.IV), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.EV), 8 },
                     GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6))
                 .itemOutputs(ItemList.Robot_Arm_LuV.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 576), Materials.Lubricant.getFluid(250))
@@ -323,9 +323,9 @@ public class AssemblyLineRecipes implements Runnable {
                     GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 3),
                     ItemList.Electric_Motor_ZPM.get(2),
                     ItemList.Electric_Piston_ZPM.get(1),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Elite), 8 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.IV), 8 },
                     GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6))
                 .itemOutputs(ItemList.Robot_Arm_ZPM.get(1))
                 .fluidInputs(new FluidStack(solderIndalloy, 1152), Materials.Lubricant.getFluid(750))
@@ -343,9 +343,9 @@ public class AssemblyLineRecipes implements Runnable {
                     GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3),
                     ItemList.Electric_Motor_UV.get(2),
                     ItemList.Electric_Piston_UV.get(1),
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Master), 8 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.LuV), 8 },
                     GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 6))
                 .itemOutputs(ItemList.Robot_Arm_UV.get(1))
                 .fluidInputs(
@@ -368,7 +368,7 @@ public class AssemblyLineRecipes implements Runnable {
                     ItemList.Electric_Motor_LuV.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.stick, LuVMat, 8),
                     ItemList.QuantumStar.get(1),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 },
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
@@ -388,7 +388,7 @@ public class AssemblyLineRecipes implements Runnable {
                     ItemList.Electric_Motor_ZPM.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8),
                     ItemList.QuantumStar.get(2),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 },
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
@@ -408,7 +408,7 @@ public class AssemblyLineRecipes implements Runnable {
                     ItemList.Electric_Motor_UV.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 8),
                     ItemList.Gravistar.get(4),
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 },
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
@@ -431,7 +431,7 @@ public class AssemblyLineRecipes implements Runnable {
                     ItemList.Electric_Motor_LuV.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.plate, LuVMat, 8),
                     ItemList.QuantumStar.get(1),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 },
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64),
@@ -451,7 +451,7 @@ public class AssemblyLineRecipes implements Runnable {
                     ItemList.Electric_Motor_ZPM.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8),
                     ItemList.QuantumStar.get(2),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 },
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64),
@@ -471,7 +471,7 @@ public class AssemblyLineRecipes implements Runnable {
                     ItemList.Electric_Motor_UV.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8),
                     ItemList.Gravistar.get(4),
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 },
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64),
@@ -494,7 +494,7 @@ public class AssemblyLineRecipes implements Runnable {
                     GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6),
                     ItemList.QuantumStar.get(2),
                     ItemList.Emitter_LuV.get(4),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 },
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64),
@@ -515,7 +515,7 @@ public class AssemblyLineRecipes implements Runnable {
                     GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6),
                     ItemList.QuantumStar.get(2),
                     ItemList.Emitter_ZPM.get(4),
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 },
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64),
@@ -536,7 +536,7 @@ public class AssemblyLineRecipes implements Runnable {
                     GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6),
                     ItemList.Gravistar.get(2),
                     ItemList.Emitter_UV.get(4),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 },
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64),
@@ -561,7 +561,7 @@ public class AssemblyLineRecipes implements Runnable {
                     ItemList.Hull_LuV.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2),
                     ItemList.Circuit_Chip_UHPIC.get(2),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 },
                     ItemList.LuV_Coil.get(2),
                     new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), ItemList.Reactor_Coolant_NaK_3.get(1),
                         ItemList.Reactor_Coolant_Sp_1.get(1) },
@@ -584,7 +584,7 @@ public class AssemblyLineRecipes implements Runnable {
                     ItemList.Hull_ZPM.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 2),
                     ItemList.Circuit_Chip_NPIC.get(2),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 },
                     ItemList.ZPM_Coil.get(2),
                     new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), ItemList.Reactor_Coolant_NaK_6.get(1),
                         ItemList.Reactor_Coolant_Sp_2.get(1) },
@@ -607,7 +607,7 @@ public class AssemblyLineRecipes implements Runnable {
                     ItemList.Hull_UV.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 2),
                     ItemList.Circuit_Chip_PPIC.get(2),
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 },
                     ItemList.UV_Coil.get(2),
                     new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), ItemList.Reactor_Coolant_NaK_6.get(1),
                         ItemList.Reactor_Coolant_Sp_2.get(1) },
@@ -640,7 +640,7 @@ public class AssemblyLineRecipes implements Runnable {
                         Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid,
                         2),
                     ItemList.Circuit_Chip_UHPIC.get(2),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 },
                     ItemList.LuV_Coil.get(2),
                     new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), ItemList.Reactor_Coolant_NaK_3.get(1),
                         ItemList.Reactor_Coolant_Sp_1.get(1) },
@@ -663,7 +663,7 @@ public class AssemblyLineRecipes implements Runnable {
                     ItemList.Hull_ZPM.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 4),
                     ItemList.Circuit_Chip_NPIC.get(2),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 },
                     ItemList.ZPM_Coil.get(2),
                     new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), ItemList.Reactor_Coolant_NaK_6.get(1),
                         ItemList.Reactor_Coolant_Sp_2.get(1) },
@@ -686,7 +686,7 @@ public class AssemblyLineRecipes implements Runnable {
                     ItemList.Hull_UV.get(1),
                     GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuvwire, 4),
                     ItemList.Circuit_Chip_PPIC.get(2),
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 },
                     ItemList.UV_Coil.get(2),
                     new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), ItemList.Reactor_Coolant_NaK_6.get(1),
                         ItemList.Reactor_Coolant_Sp_2.get(1) },
@@ -714,10 +714,10 @@ public class AssemblyLineRecipes implements Runnable {
                 .metadata(RESEARCH_TIME, 2 * HOURS)
                 .itemInputs(
                     ItemList.Casing_Fusion_Coil.get(1),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
                     GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 4),
                     GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 4),
                     ItemList.Field_Generator_LuV.get(2),
@@ -735,10 +735,10 @@ public class AssemblyLineRecipes implements Runnable {
                 .metadata(RESEARCH_TIME, 4 * HOURS)
                 .itemInputs(
                     ItemList.Casing_Fusion_Coil.get(1),
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
                     GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 4),
                     ItemList.Field_Generator_ZPM.get(2),
                     ItemList.Circuit_Wafer_PPIC.get(48),
@@ -755,10 +755,10 @@ public class AssemblyLineRecipes implements Runnable {
                 .metadata(RESEARCH_TIME, 6 * HOURS)
                 .itemInputs(
                     ItemList.Casing_Fusion_Coil.get(1),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 },
                     GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4),
                     ItemList.Field_Generator_UV.get(2),
                     ItemList.Circuit_Wafer_QPIC.get(64),
@@ -775,10 +775,10 @@ public class AssemblyLineRecipes implements Runnable {
             .metadata(RESEARCH_TIME, 4 * HOURS)
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16),
-                new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 },
-                new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 },
-                new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 },
-                new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 },
                 ItemList.Energy_LapotronicOrb2.get(8),
                 ItemList.Field_Generator_LuV.get(2),
                 ItemList.Circuit_Wafer_SoC2.get(64),
@@ -799,10 +799,10 @@ public class AssemblyLineRecipes implements Runnable {
             .metadata(RESEARCH_TIME, 4 * HOURS)
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32),
-                new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 },
-                new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 },
-                new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 },
-                new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 },
                 ItemList.Energy_Module.get(8),
                 ItemList.Field_Generator_ZPM.get(2),
                 ItemList.Circuit_Wafer_HPIC.get(64),
@@ -828,7 +828,7 @@ public class AssemblyLineRecipes implements Runnable {
                 ItemList.Electric_Pump_UHV.get(16),
                 ItemList.Conveyor_Module_UHV.get(8),
                 ItemList.Robot_Arm_UHV.get(8),
-                new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4 },
+                new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
                 new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Duranium, 32),
                     GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 32) },
                 GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 64),
@@ -848,7 +848,7 @@ public class AssemblyLineRecipes implements Runnable {
             .metadata(RESEARCH_TIME, 2 * HOURS)
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 16),
-                new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 },
+                new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 },
                 NewHorizonsCoreMod.isModLoaded()
                     ? GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier3", 4)
                     : ItemList.Casing_Firebox_TungstenSteel.get(16),
@@ -869,7 +869,7 @@ public class AssemblyLineRecipes implements Runnable {
             .metadata(RESEARCH_TIME, 8 * HOURS)
             .itemInputs(
                 GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16),
-                new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4 },
+                new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
                 ItemList.Field_Generator_UV.get(16),
                 ItemList.Gravistar.get(8),
                 ItemList.Emitter_UV.get(4),
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java
index 10aaff6b4d..072992d07e 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java
@@ -42,7 +42,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
                     ItemList.Cover_Controller.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 0))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -53,7 +53,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
                     ItemList.Sensor_LV.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 1))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -64,7 +64,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1),
                     getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 2))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -75,7 +75,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
                     ItemList.Cover_Controller.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 0))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -86,7 +86,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
                     ItemList.Sensor_LV.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 1))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -97,7 +97,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1),
                     getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 2))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -108,7 +108,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Epoxy_Advanced.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1),
                     ItemList.Cover_Controller.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 0))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -119,7 +119,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Epoxy_Advanced.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1),
                     ItemList.Sensor_LV.get(1))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 1))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -130,7 +130,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Epoxy_Advanced.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1),
                     getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0))
                 .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 2))
                 .fluidInputs(tMat.getMolten(144L * tMultiplier / 2))
@@ -141,7 +141,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Primitive, 2),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2),
                     GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1),
@@ -155,7 +155,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2),
                     GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1),
@@ -169,7 +169,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2),
                     GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1),
@@ -183,7 +183,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2),
                     GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1),
@@ -268,7 +268,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Primitive, 2),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2),
                     GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1),
@@ -282,7 +282,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Coated_Basic.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2),
                     GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1),
@@ -296,7 +296,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2),
                     GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1),
@@ -310,7 +310,7 @@ public class CircuitAssemblerRecipes implements Runnable {
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     ItemList.Circuit_Board_Phenolic_Good.get(1),
-                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2),
+                    GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2),
                     GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2),
                     GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4),
                     GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1),
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java
index 17bc8b3002..441da5a116 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java
@@ -709,9 +709,9 @@ public class ThaumcraftRecipes implements Runnable {
                     tKey,
                     ItemList.Hull_LV.get(1L),
                     new ItemStack[] { new ItemStack(Blocks.beacon),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
-                        ItemList.Sensor_MV.get(2L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L),
+                        ItemList.Sensor_MV.get(2L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L),
                         ItemList.Sensor_MV.get(2L) },
                     ItemList.MagicEnergyConverter_LV.get(1L),
@@ -747,10 +747,9 @@ public class ThaumcraftRecipes implements Runnable {
                     tKey,
                     ItemList.Hull_MV.get(1L),
                     new ItemStack[] { new ItemStack(Blocks.beacon),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Thaumium, 1L),
-                        ItemList.Sensor_HV.get(2L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L),
+                        ItemList.Sensor_HV.get(2L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 1L),
                         ItemList.Sensor_HV.get(2L) },
                     ItemList.MagicEnergyConverter_MV.get(1L),
@@ -786,10 +785,10 @@ public class ThaumcraftRecipes implements Runnable {
                     tKey,
                     ItemList.Hull_HV.get(1L),
                     new ItemStack[] { new ItemStack(Blocks.beacon),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1L),
                         ItemList.Field_Generator_MV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 1L),
                         ItemList.Field_Generator_MV.get(1L) },
                     ItemList.MagicEnergyConverter_HV.get(1L),
@@ -825,7 +824,7 @@ public class ThaumcraftRecipes implements Runnable {
                     tKey,
                     ItemList.Hull_LV.get(1L),
                     new ItemStack[] { ItemList.MagicEnergyConverter_LV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L),
                         ItemList.Sensor_MV.get(2L) },
                     ItemList.MagicEnergyAbsorber_LV.get(1L),
@@ -863,9 +862,9 @@ public class ThaumcraftRecipes implements Runnable {
                     tKey,
                     ItemList.Hull_MV.get(1L),
                     new ItemStack[] { ItemList.MagicEnergyConverter_MV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), ItemList.Sensor_HV.get(2L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L) },
                     ItemList.MagicEnergyAbsorber_MV.get(1L),
                     6,
@@ -880,10 +879,10 @@ public class ThaumcraftRecipes implements Runnable {
                     tKey,
                     ItemList.Hull_HV.get(1L),
                     new ItemStack[] { ItemList.MagicEnergyConverter_MV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1),
                         ItemList.Field_Generator_MV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), },
                     ItemList.MagicEnergyAbsorber_HV.get(1L),
                     8,
@@ -898,11 +897,11 @@ public class ThaumcraftRecipes implements Runnable {
                     tKey,
                     ItemList.Hull_EV.get(1L),
                     new ItemStack[] { ItemList.MagicEnergyConverter_HV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1),
                         ItemList.Field_Generator_HV.get(1L),
-                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1), },
                     ItemList.MagicEnergyAbsorber_EV.get(1L),