Merge branch '1.13.5' into master-ceu

planetme · Dec 10, 2024 · ad94cea · ad94cea
2 parents 3773d05 + bc37f62
commit ad94cea
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -92,3 +92,4 @@ jarmods/
 visualores/
 
 *__pycache__*
+servers.dat
diff --git a/groovy/material/UnknownCompositionMaterials.groovy b/groovy/material/UnknownCompositionMaterials.groovy
@@ -846,11 +846,7 @@ public class UnknownCompositionMaterials {
                 .iconSet(DULL)
                 .build()
 
-        HydrocrackingCatalyst = new Material.Builder(4161, SuSyUtility.susyId('hydrocracking_catalyst'))
-                .dust()
-                .color(0x5884db)
-                .flags(GENERATE_CATALYST_BED)
-                .build()
+        // FREE ID: 4161
 
         ZincLeach = new Material.Builder(4162, SuSyUtility.susyId('zinc_leach'))
                 .liquid()

diff --git a/groovy/postInit/chemistry/Catalysts.groovy b/groovy/postInit/chemistry/Catalysts.groovy
@@ -387,7 +387,7 @@ LCR.recipeBuilder()
         .inputs(ore('dustAmorphousSilicaAlumina') * 10)
         .inputs(ore('dustAmmoniumMetatungstate'))
         .fluidInputs(fluid('cobalt_nitrate_solution') * 2000)
-        .outputs(metaitem('dustHydrocrackingCatalyst') * 10)
+        .outputs(metaitem('hydrocracking_catalyst') * 10)
         .duration(200)
         .EUt(Globals.voltAmps[3])
         .buildAndRegister()

diff --git a/resources/gregtech/models/item/metaitems/hydrocracking_catalyst.json b/resources/gregtech/models/item/metaitems/hydrocracking_catalyst.json
@@ -2,6 +2,6 @@
 {
     "parent": "item/generated",
     "textures": {
-      "layer0": "gregtech:items/metaitems/hydrocracking_catalyst"
+      "layer0": "gregtech:items/metaitems/"
     }
   }
diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang
@@ -1989,7 +1989,6 @@ susy.material.chlorided_alumina=Chlorided Alumina
 susy.material.sulfated_metal_oxide=Sulfated Metal Oxide (SMO)
 susy.material.solid_phosphoric_acid=Solid Phosphoric Acid (SPA)
 susy.material.amorphous_silica_alumina=Amorphous Silica Alumina (ASA)
-susy.material.hydrocracking_catalyst=Hydrocracking Catalyst
 susy.material.heated_green_coke=Heated Green Coke
 susy.material.cobalt_nitrate_solution=Cobalt Nitrate Solution
 susy.material.sulfuric_light_gas_oil=Sulfuric Gas Oil
@@ -2273,6 +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.red_mud_slag.name=Red Mud Slag
 metaitem.leached_red_mud_slag.name=Leached Red Mud Slag
 metaitem.pitch_binder.name=Pitch Binder
Original file line number	Diff line number	Diff line change
Expand Up		@@ -92,3 +92,4 @@ jarmods/
		visualores/

		__pycache__
		servers.dat