Recipe conflict squashing (#3154)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

1 files changed, 21 insertions, 21 deletions

diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
index 8172711508..5972d2d072 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
@@ -6083,7 +6083,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Copper, 4),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(tRailES)
                 .duration(20 * SECONDS)
                 .eut(16)
@@ -6093,7 +6093,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Gold, 2),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(2, tRailES))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
@@ -6103,7 +6103,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Electrum, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(4, tRailES))
                 .duration(20 * SECONDS)
                 .eut(48)
@@ -6113,7 +6113,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(8, tRailES))
                 .duration(20 * SECONDS)
                 .eut(64)
@@ -6123,7 +6123,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Platinum, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(16, tRailES))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
@@ -6133,7 +6133,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.VanadiumGallium, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(32, tRailES))
                 .duration(20 * SECONDS)
                 .eut(256)
@@ -6143,7 +6143,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.springSmall, Materials.Naquadah, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(64, tRailES))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
@@ -6160,7 +6160,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Copper, 4),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(tRailEw)
                 .duration(20 * SECONDS)
                 .eut(16)
@@ -6170,7 +6170,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Gold, 2),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(2, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
@@ -6180,7 +6180,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Electrum, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(4, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(48)
@@ -6190,7 +6190,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(8, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(64)
@@ -6200,7 +6200,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(16, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
@@ -6210,7 +6210,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.VanadiumGallium, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(32, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(256)
@@ -6220,7 +6220,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Naquadah, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(64, tRailEw))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
@@ -6237,7 +6237,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.screw, Materials.Copper, 4),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(tRailEJ)
                 .duration(20 * SECONDS)
                 .eut(16)
@@ -6247,7 +6247,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.screw, Materials.Gold, 2),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(2, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
@@ -6257,7 +6257,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(4, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(48)
@@ -6267,7 +6267,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(8, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(64)
@@ -6277,7 +6277,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.screw, Materials.Platinum, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(16, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
@@ -6287,7 +6287,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.screw, Materials.VanadiumGallium, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(32, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(256)
@@ -6297,7 +6297,7 @@ public class AssemblerRecipes implements Runnable {
                 .itemInputs(
                     GTUtility.copyAmount(2, tRailEl),
                     GTOreDictUnificator.get(OrePrefixes.screw, Materials.Naquadah, 1),
-                    GTUtility.getIntegratedCircuit(1))
+                    GTUtility.getIntegratedCircuit(17))
                 .itemOutputs(GTUtility.copyAmount(64, tRailEJ))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_HV)