Merge branch '1.13.5' into master-ceu

planetme · Dec 10, 2024 · 4b3e562 · 4b3e562
2 parents ad94cea + 0230cca
commit 4b3e562
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/groovy/material/SuSyMaterials.groovy b/groovy/material/SuSyMaterials.groovy
@@ -285,7 +285,6 @@ class SuSyMaterials {
         public static Material CrudeZinc;
         public static Material CadmiumRichZinc;
         public static Material AmorphousSilicaAlumina;
-        public static Material HydrocrackingCatalyst;
         public static Material ImpureSmithsoniteSlurry;
         public static Material SmithsoniteSlurry;
         public static Material ZincLeach;

diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/oil_refining/Hydrocracking.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/oil_refining/Hydrocracking.groovy
@@ -7,6 +7,7 @@ DT = recipemap('sieve_distillation')
 crackables.each { _, crackable ->
     if (crackable.hydro_crackable) {
         CRACKER.recipeBuilder()
+            .notConsumable(metaitem('hydrocracking_catalyst'))
             .fluidInputs(crackable.get(4000))
             .fluidInputs(fluid('hot_hp_hydrogen') * (4 * crackable.hydrogen_consumed))
             .fluidOutputs(crackable.getHydro(4000))

diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang
@@ -2272,7 +2272,7 @@ metaitem.bitumen.name=Bitumen
 metaitem.paraffin_wax.name=Paraffin Wax
 metaitem.spent_cracking_catalyst.name=Spent Cracking Catalyst
 metaitem.cracking_catalyst.name=Cracking Catalyst
-metaitem.hydrocracking_catalyst=Hydrocracking Catalyst
+metaitem.hydrocracking_catalyst.name=Hydrocracking Catalyst
 metaitem.red_mud_slag.name=Red Mud Slag
 metaitem.leached_red_mud_slag.name=Leached Red Mud Slag
 metaitem.pitch_binder.name=Pitch Binder