Merge branch '1.13.5' into master-ceu

planetme · Dec 10, 2024 · e0c595d · e0c595d
2 parents 4b3e562 + fc89a8c
commit e0c595d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/oil_refining/Hydrocracking.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/oil_refining/Hydrocracking.groovy
@@ -12,7 +12,6 @@ crackables.each { _, crackable ->
             .fluidInputs(fluid('hot_hp_hydrogen') * (4 * crackable.hydrogen_consumed))
             .fluidOutputs(crackable.getHydro(4000))
             .fluidOutputs(fluid('fuel_gas') * (4 * crackable.gas_produced))
-            .circuitMeta(2)
             .duration(200)
             .EUt(Globals.voltAmps[2])
             .buildAndRegister()  

diff --git a/groovy/postInit/metallurgy/Superalloys.groovy b/groovy/postInit/metallurgy/Superalloys.groovy
@@ -108,7 +108,7 @@ ABS.recipeBuilder()
     .buildAndRegister()
 
 ABS.recipeBuilder()
-    .circuitMeta(14)
+    .circuitMeta(16)
     .inputs(ore('dustIron') * 39)
     .inputs(ore('dustManganese') * 1)
     .fluidOutputs(fluid('hsla_eighty_x') * 5760)

diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy
@@ -1123,7 +1123,9 @@ Globals.solders.each { key, val ->
                 .duration(10)
                 .EUt(16)
                 .buildAndRegister();
+}
 
+Globals.solders.each { key, val ->
         mods.gregtech.assembler.recipeBuilder()
                 .inputs(metaitem('circuit_board.plastic'))
                 .inputs(metaitem('plate.integrated_logic_circuit'))