Merge branch '1.13.5' into master-ceu

planetme · Dec 9, 2024 · 1a12956 · 1a12956
2 parents 88d28b8 + cd02bd6
commit 1a12956
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 5 deletions.
diff --git a/groovy/classes/ChangeFlags.groovy b/groovy/classes/ChangeFlags.groovy
@@ -178,7 +178,8 @@ class ChangeFlags {
         Lepidolite.setFormula("(K,Rb)AlLi2Si4O10(OH,F)2", true);
         Tetrahedrite.setFormula("Cu12Sb4S13", true);
         IndiumGalliumPhosphide.setFormula("InGaP2", true);
-        NetherAir.setFormula("(N78O21Ar9)24(CO2)2(H2S)(SO2)", true)
+        NetherAir.setFormula("(N78O21Ar9)24(CO2)2(H2S)(SO2)", true);
+        Diatomite.setFormula("(SiO2)8(Fe2O3)(Al2O3)", true);
 
         // Ore Processing
 

diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy
@@ -614,6 +614,7 @@ for (feedstock in gasolineFeedstocks) {
     MIXER.recipeBuilder()
         .fluidInputs(fluid(feedstock) * 1000)
         .fluidOutputs(fluid('gasoline') * 1000)
+        .circuitMeta(10)
         .duration(2)
         .EUt(120)
         .buildAndRegister()

diff --git a/...ostInit/chemistry/organic_chemistry/petrochemistry/oil_refining/GasolineComponents.groovy b/...ostInit/chemistry/organic_chemistry/petrochemistry/oil_refining/GasolineComponents.groovy
@@ -12,6 +12,7 @@ PHASE_SEPARATOR = recipemap('phase_separator')
         .fluidInputs(fluid('hydrogen') * 200)
         .fluidOutputs(fluid('raw_isomerate') * 1000)
         .fluidOutputs(fluid('hydrogen') * 160)
+        .circuitMeta(1)
         .duration(800)
         .EUt(Globals.voltAmps[2])
         .buildAndRegister()
@@ -22,6 +23,7 @@ PHASE_SEPARATOR = recipemap('phase_separator')
         .fluidInputs(fluid('hydrogen') * 200)
         .fluidOutputs(fluid('raw_isomerate') * 1000)
         .fluidOutputs(fluid('hydrogen') * 160)
+        .circuitMeta(1)
         .duration(200)
         .EUt(Globals.voltAmps[2])
         .buildAndRegister()
@@ -33,6 +35,7 @@ PHASE_SEPARATOR = recipemap('phase_separator')
         .fluidInputs(fluid('hydrogen') * 800)
         .fluidOutputs(fluid('raw_isomerate') * 12000)
         .fluidOutputs(fluid('hydrogen') * 640)
+        .circuitMeta(2)
         .duration(800)
         .EUt(Globals.voltAmps[2])
         .buildAndRegister()
@@ -44,6 +47,7 @@ PHASE_SEPARATOR = recipemap('phase_separator')
         .fluidInputs(fluid('hydrogen') * 800)
         .fluidOutputs(fluid('raw_isomerate') * 12000)
         .fluidOutputs(fluid('hydrogen') * 640)
+        .circuitMeta(2)
         .duration(200)
         .EUt(Globals.voltAmps[2])
         .buildAndRegister()

diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/oil_refining/Hydrocracking.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/oil_refining/Hydrocracking.groovy
@@ -22,6 +22,7 @@ DT.recipeBuilder()
     .fluidInputs(fluid('hydrocracked_light_gas_oil') * 1000)
     .fluidOutputs(fluid('light_gas_oil') * 535)
     .fluidOutputs(fluid('naphtha') * 1780)
+    .fluidOutputs(fluid('fuel_gas') * 1790)
     .duration(50)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
@@ -30,7 +31,8 @@ DT.recipeBuilder()
     .fluidInputs(fluid('hydrocracked_light_cycle_oil') * 1000)
     .fluidInputs(fluid('furfural') * 40)
     .fluidOutputs(fluid('naphtha') * 450)
-    .fluidOutputs(fluid('btex_extract') * 300)
+    .fluidOutputs(fluid('btex_extract') * 320)
+    .fluidOutputs(fluid('fuel_gas') * 1270)
     .duration(50)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
@@ -40,6 +42,7 @@ DT.recipeBuilder()
     .fluidOutputs(fluid('heavy_gas_oil') * 200)
     .fluidOutputs(fluid('light_gas_oil') * 500)
     .fluidOutputs(fluid('naphtha') * 710)
+    .fluidOutputs(fluid('fuel_gas') * 1020)
     .duration(50)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
@@ -50,6 +53,7 @@ DT.recipeBuilder()
     .fluidOutputs(fluid('heavy_gas_oil') * 660)
     .fluidOutputs(fluid('light_gas_oil') * 920)
     .fluidOutputs(fluid('naphtha') * 490)
+    .fluidOutputs(fluid('fuel_gas') * 550)
     .duration(50)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
@@ -60,6 +64,7 @@ DT.recipeBuilder()
     .fluidOutputs(fluid('heavy_gas_oil') * 690)
     .fluidOutputs(fluid('light_gas_oil') * 900)
     .fluidOutputs(fluid('naphtha') * 455)
+    .fluidOutputs(fluid('fuel_gas') * 610)
     .duration(50)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/oil_refining/Hydrotreating.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/oil_refining/Hydrotreating.groovy
@@ -50,4 +50,15 @@ BCR.recipeBuilder()
     .fluidOutputs(fluid('ethanolamine_mix') * 1000)
     .duration(10)
     .EUt(120)
+    .buildAndRegister()
+
+// Sulfuric overheads
+
+BCR.recipeBuilder()
+    .fluidInputs(fluid('sulfuric_catalytic_overheads') * 4000)
+    .fluidInputs(fluid('ethanolamine_mix') * 1000)
+    .fluidOutputs(fluid('catalytic_overheads') * 4000)
+    .fluidOutputs(fluid('rich_amine') * 1000)
+    .duration(40)
+    .EUt(120)
     .buildAndRegister()
diff --git a/...postInit/chemistry/organic_chemistry/petrochemistry/oil_refining/ResidueProcessing.groovy b/...postInit/chemistry/organic_chemistry/petrochemistry/oil_refining/ResidueProcessing.groovy
@@ -94,7 +94,17 @@ for (residue in residues) {
     ROTARY_KILN.recipeBuilder()
         .fluidInputs(fluid(residue) * 1000)
         .fluidInputs(fluid('natural_gas') * 10)
-        .fluidInputs(fluid('oxygen') * 10)
+        .fluidInputs(fluid('oxygen') * 20)
+        .outputs(metaitem('dustCarbonBlack') * 30)
+        .fluidOutputs(fluid('flue_gas') * 1000)
+        .duration(200)
+        .EUt(120)
+        .buildAndRegister()
+
+    ROTARY_KILN.recipeBuilder()
+        .fluidInputs(fluid(residue) * 1000)
+        .fluidInputs(fluid('methane') * 35)
+        .fluidInputs(fluid('oxygen') * 70)
         .outputs(metaitem('dustCarbonBlack') * 30)
         .fluidOutputs(fluid('carbon_dioxide') * 10000)
         .duration(200)

diff --git a/groovy/postInit/metallurgy/Superalloys.groovy b/groovy/postInit/metallurgy/Superalloys.groovy
@@ -108,7 +108,7 @@ ABS.recipeBuilder()
     .buildAndRegister()
 
 ABS.recipeBuilder()
-    .circuitMeta(4)
+    .circuitMeta(14)
     .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
@@ -1514,7 +1514,7 @@ mods.gregtech.assembler.recipeBuilder()
         .inputs(metaitem('energy_hatch.output_4a.mv'))
         .inputs(metaitem('voltage_regulator.mv') * 2)
         .inputs(metaitem('voltage_coil.mv'))
-        .inputs(ore('cableGtOctupleCopper') * 2)
+        .inputs(ore('cableGtOctalCopper') * 2)
         .outputs(metaitem('energy_hatch.output_16a.mv'))
         .duration(200)
         .EUt(30)