cherry pick

a0031717d11db2c8c7f55ed0dc0de84ff8dc2a26
Make assembly line use cheaper circuit techs. #1114

1 files changed, 18 insertions, 18 deletions

diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index a172183628..5f247ce174 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -2044,9 +2044,9 @@ public class GT_MachineRecipeLoader implements Runnable {
         		GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSG, 3L),
         		ItemList.Electric_Motor_LuV.get(2, new Object(){}),
         		ItemList.Electric_Piston_LuV.get(1, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2L),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2L),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 6L),
+                ItemList.Circuit_Masterquantumcomputer.get(2, null),
+                ItemList.Circuit_Quantumcomputer.get(2, null),
+                ItemList.Circuit_Nanoprocessor.get(6,null),
         		GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6L)}, new FluidStack[]{
         		Materials.SolderingAlloy.getMolten(576),
         		Materials.Lubricant.getFluid(250)}, ItemList.Robot_Arm_LuV.get(1, new Object[]{}), 600, 6000);
@@ -2057,9 +2057,9 @@ public class GT_MachineRecipeLoader implements Runnable {
         		GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSE, 3L),
         		ItemList.Electric_Motor_ZPM.get(2, new Object(){}),
         		ItemList.Electric_Piston_ZPM.get(1, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4L),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 4L),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 12L),
+                ItemList.Circuit_Masterquantumcomputer.get(4, null),
+                ItemList.Circuit_Quantumcomputer.get(4, null),
+                ItemList.Circuit_Nanoprocessor.get(12,null),
         		GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6L)}, new FluidStack[]{
         		Materials.SolderingAlloy.getMolten(1152),
         		Materials.Lubricant.getFluid(750)}, ItemList.Robot_Arm_ZPM.get(1, new Object[]{}), 600, 24000);
@@ -2070,9 +2070,9 @@ public class GT_MachineRecipeLoader implements Runnable {
         		GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3L),
         		ItemList.Electric_Motor_UV.get(2, new Object(){}),
         		ItemList.Electric_Piston_UV.get(1, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 8L),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 8L),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 24L),
+                ItemList.Circuit_Crystalcomputer.get(8, null),
+                ItemList.Circuit_Crystalprocessor.get(8, null),
+                ItemList.Circuit_Nanoprocessor.get(24,null),
         		GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 6L)}, new FluidStack[]{
         		Materials.SolderingAlloy.getMolten(2304),
         		Materials.Lubricant.getFluid(2000)}, ItemList.Robot_Arm_UV.get(1, new Object[]{}), 600, 100000);
@@ -2090,7 +2090,7 @@ public class GT_MachineRecipeLoader implements Runnable {
         		ItemList.Electric_Motor_LuV.get(1, new Object(){}),
                 GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 8L),
         		ItemList.Gravistar.get(1, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 7L),
+                ItemList.Circuit_Nanoprocessor.get(7,null),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
@@ -2103,7 +2103,7 @@ public class GT_MachineRecipeLoader implements Runnable {
                 ItemList.Electric_Motor_ZPM.get(1, new Object(){}),
                 GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8L),
                 ItemList.Gravistar.get(2, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 7L),
+                ItemList.Circuit_Quantumcomputer.get(7, null),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
@@ -2116,7 +2116,7 @@ public class GT_MachineRecipeLoader implements Runnable {
                 ItemList.Electric_Motor_UV.get(1, new Object(){}),
                 GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 8L),
                 ItemList.Gravistar.get(4, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 7L),
+                ItemList.Circuit_Crystalcomputer.get(7, null),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
@@ -2131,7 +2131,7 @@ public class GT_MachineRecipeLoader implements Runnable {
                 ItemList.Electric_Motor_LuV.get(1, new Object(){}),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 8L),
                 ItemList.Gravistar.get(1, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 7L),
+                ItemList.Circuit_Nanoprocessor.get(7,null),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 64L),
@@ -2144,7 +2144,7 @@ public class GT_MachineRecipeLoader implements Runnable {
                 ItemList.Electric_Motor_ZPM.get(1, new Object(){}),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8L),
                 ItemList.Gravistar.get(2, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 7L),
+                ItemList.Circuit_Quantumcomputer.get(7, null),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 64L),
@@ -2157,7 +2157,7 @@ public class GT_MachineRecipeLoader implements Runnable {
                 ItemList.Electric_Motor_UV.get(1, new Object(){}),
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8L),
                 ItemList.Gravistar.get(4, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 7L),
+                ItemList.Circuit_Crystalcomputer.get(7, null),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 64L),
@@ -2172,7 +2172,7 @@ public class GT_MachineRecipeLoader implements Runnable {
         		GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSG, 6L),
         		ItemList.QuantumStar.get(2, new Object(){}),
         		ItemList.Emitter_LuV.get(4, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 8L),
+                ItemList.Circuit_Masterquantumcomputer.get(8, null),
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
@@ -2186,7 +2186,7 @@ public class GT_MachineRecipeLoader implements Runnable {
         		GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSE, 6L),
         		ItemList.Gravistar.get(1, new Object(){}),
         		ItemList.Emitter_ZPM.get(4, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 8L),
+                ItemList.Circuit_Crystalcomputer.get(16, null),
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
@@ -2204,7 +2204,7 @@ public class GT_MachineRecipeLoader implements Runnable {
         		GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L),
         		ItemList.Gravistar.get(2, new Object(){}),
         		ItemList.Emitter_UV.get(4, new Object(){}),
-        		GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 16L),
+                ItemList.Circuit_Neuroprocessor.get(64, null),
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
         		GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),