From 6f3cee310e825d0637e8902a63bfec3d99e17f3e Mon Sep 17 00:00:00 2001 From: planetme Date: Tue, 10 Dec 2024 14:09:57 -0500 Subject: [PATCH 1/2] ignore servers for dev instances --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d0109dbe3..d43b6ebc5 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ jarmods/ visualores/ *__pycache__* +servers.dat From bc37f6270a05a084dbf9afe586a8b4bb0343e017 Mon Sep 17 00:00:00 2001 From: planetme Date: Tue, 10 Dec 2024 14:10:18 -0500 Subject: [PATCH 2/2] fix hydrocracking catalysts --- groovy/material/UnknownCompositionMaterials.groovy | 6 +----- groovy/postInit/chemistry/Catalysts.groovy | 2 +- .../models/item/metaitems/hydrocracking_catalyst.json | 2 +- resources/langfiles/lang/en_us.lang | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/groovy/material/UnknownCompositionMaterials.groovy b/groovy/material/UnknownCompositionMaterials.groovy index b05964394..24f4580a8 100644 --- 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 index 1c302abe6..d957d5ed0 100644 --- 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 index e5c6c6ef7..ead686b94 100644 --- 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/" } } \ No newline at end of file diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang index f277d63e9..09664d3e3 100644 --- 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