Merge pull request #769 from SymmetricDevs/master-hotfixes

Scheduled merge of fixes for minor update
SymmetricDevs · Mar 3, 2024 · bff9c80 · bff9c80
2 parents a8aaf55 + a7d5acb
commit bff9c80
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 44 deletions.
diff --git a/config/gregtech/gregtech.cfg b/config/gregtech/gregtech.cfg
@@ -494,8 +494,7 @@ general {
 
         # Whether to require a Wrench, Wirecutter, or other GregTech tools to break machines, casings, wires, and more.
         # Default: false
-        B:requireGTToolsForBlocks=false
-        B:requireWrenchForMachines=false
+        B:requireGTToolsForBlocks=true
 
         # Whether Steam Multiblocks should use Steel instead of Bronze.
         # Default: false

diff --git a/config/gregtech/modules.cfg b/config/gregtech/modules.cfg
@@ -47,6 +47,10 @@ modules {
     # Module Dependencies: [ gregtech:integration ]
     # Mod Dependencies: [ theoneprobe ]
     B:"gregtech:top_integration"=true
+
+    # VisualOres GregTech Integration. Disabling this will disable all GT integration in VisualOres.
+    # Module Dependencies: [ gregtech:core ]
+    B:"visualores:visualores"=true
 }
 
 
diff --git a/config/justenoughdimensions/dimensions.json b/config/justenoughdimensions/dimensions.json
@@ -1,6 +1,21 @@
 {
     "dimensions": [
 		{
+            "dim": -1,
+            "override": true,
+            "dimensiontype":
+            {
+                "id": -1,
+                "name": "Nether",
+                "keeploaded": false,
+                "worldprovider": "WorldProviderHellJED",
+                "require_exact_match": true
+            },
+            "jed": {
+                "MovementFactor": 0.125
+            }
+        },
+        {
             "dim": 8,
             "dimensiontype": {
                 "id": 8,

diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy
@@ -776,13 +776,7 @@ public class FirstDegreeMaterials {
                 .color(0xa9aec4)
                 .build()
 
-        DilutedSilverNitrateSolution = new Material.Builder(8209, SuSyUtility.susyId('diluted_silver_nitrate_solution'))
-                .liquid()
-                .components(Silver, 1, Nitrogen, 1, Oxygen, 3, Water, 2)
-                .colorAverage()
-                .build();
-
-        DilutedSilverNitrateSolution.setFormula("(AgNO3)(H2O)2", true)
+        //FREE IDs: 8208-8209
 
         DicobaltOctacarbonyl = new Material.Builder(8210, SuSyUtility.susyId('dicobalt_octacarbonyl'))
                 .dust()
@@ -2800,15 +2794,7 @@ public class FirstDegreeMaterials {
 
         SodiumMolybdateSolution.setFormula("(Na2MoO4)(H2O)", true)
 
-        // FREE ID: 8532
-
-        DilutedSilverNitrateSolution = new Material.Builder(8533, SuSyUtility.susyId('diluted_silver_nitrate_solution'))
-                .liquid()
-                .components(Silver, 1, Nitrogen, 1, Oxygen, 3, Water, 2)
-                .colorAverage()
-                .build();
-
-        DilutedSilverNitrateSolution.setFormula("(AgNO3)(H2O)2", true)
+        // FREE ID: 8532-8533
 
         TitaniumIodide = new Material.Builder(8534, SuSyUtility.susyId('titanium_iodide'))
                 .dust()

diff --git a/groovy/material/SuSyMaterials.groovy b/groovy/material/SuSyMaterials.groovy
@@ -925,7 +925,6 @@ class SuSyMaterials {
         public static Material GoldAmalgam;
         public static Material AntimonyTrichloride;
         public static Material AntimonyPentachloride;
-        public static Material DilutedSilverNitrateSolution;
         public static Material DecarburizedAir;
         public static Material MolybdenumTrisulfide;
         public static Material AmmoniumIsopolytungstateSolution;

diff --git a/groovy/postInit/chemistry/AirDistillation.groovy b/groovy/postInit/chemistry/AirDistillation.groovy
@@ -176,7 +176,6 @@ HIGH_PRESSURE_DISTILLATION_TOWER.recipeBuilder()
 BATH_CONDENSER.recipeBuilder()
     .fluidInputs(fluid('nitrogen_rich_gas') * 200)
     .fluidOutputs(fluid('untreated_liquid_nitrogen') * 25)
-    //.cleanroom(CleanroomType.LOW_PRESSURE_DISTILLATION_TOWER)
     .duration(1)
     .buildAndRegister()
 
@@ -300,7 +299,6 @@ BATH_CONDENSER.recipeBuilder()
     .fluidOutputs(fluid('liquid_crude_argon') * 15)
     .fluidOutputs(fluid('oxygen_rich_liquid') * 100)
     .fluidOutputs(fluid('oxygen_rich_gas') * 400)
-    //.cleanroom(CleanroomType.SINGLE_COLUMN_CRYOGENIC_DISTILLATION_PLANT)
     .duration(1)
     .buildAndRegister()
 
@@ -335,6 +333,7 @@ FBR.recipeBuilder()
 //ARGON PURIFICATION
 //STARTUP DISTILLATION
 SINGLE_COLUMN_CRYOGENIC_DISTILLATION_PLANT.recipeBuilder()
+    .circuitMeta(1)
     .fluidInputs(fluid('liquid_deoxygenated_argon') * 200)
     .fluidOutputs(fluid('cold_waste_gaseous_nitrogen') * 16)
     .fluidOutputs(fluid('liquid_argon_product') * 200)
@@ -346,11 +345,11 @@ SINGLE_COLUMN_CRYOGENIC_DISTILLATION_PLANT.recipeBuilder()
 BATH_CONDENSER.recipeBuilder()
     .fluidInputs(fluid('cold_waste_gaseous_nitrogen') * 8)
     .fluidOutputs(fluid('liquid_waste_nitrogen') * 1)
-    //.cleanroom(CleanroomType.SINGLE_COLUMN_CRYOGENIC_DISTILLATION_PLANT)
     .duration(1)
     .buildAndRegister()
 
 SINGLE_COLUMN_CRYOGENIC_DISTILLATION_PLANT.recipeBuilder()
+    .circuitMeta(2)
     .fluidInputs(fluid('liquid_deoxygenated_argon') * 200)
     .fluidInputs(fluid('argon') * 400)
     .fluidInputs(fluid('liquid_waste_nitrogen'))

diff --git a/groovy/postInit/chemistry/WaterPurificationChain.groovy b/groovy/postInit/chemistry/WaterPurificationChain.groovy
@@ -139,7 +139,7 @@ BR.recipeBuilder()
 
 BCR.recipeBuilder()
         .fluidInputs(fluid('lithium_free_brine') * 50)
-        .fluidInputs(fluid('chlorine') * 10)
+        .fluidInputs(fluid('chlorine') * 25)
         .fluidOutputs(fluid('chlorinated_brine') * 50)
         .duration(1)
         .EUt(120)
@@ -148,7 +148,7 @@ BCR.recipeBuilder()
 VACUUM_CHAMBER.recipeBuilder()
         .fluidInputs(fluid('steam') * 250)
         .fluidInputs(fluid('chlorinated_brine') * 1000)
-        .fluidOutputs(fluid('impure_bromine') * 100)
+        .fluidOutputs(fluid('impure_bromine') * 500)
         .fluidOutputs(fluid('wastewater_sludge') * 500)
         .duration(120)
         .EUt(120)

diff --git a/groovy/postInit/chemistry/elements/GoldChain.groovy b/groovy/postInit/chemistry/elements/GoldChain.groovy
@@ -37,10 +37,9 @@ ROASTER.recipeBuilder()
 BATCH_REACTOR.recipeBuilder()
     .inputs(ore('dustRawElectrum') * 3)
     .fluidInputs(fluid('nitric_acid') * 4000)
-    .fluidInputs(fluid('distilled_water') * 2000)
     .outputs(metaitem('dustGold') * 2)
-    .fluidOutputs(fluid('silver_nitrate_solution') * 4000)
-    .fluidOutputs(fluid('nitric_oxide') * 1000)
+    .fluidOutputs(fluid('silver_nitrate_solution') * 2000)
+    .fluidOutputs(fluid('nitrogen_dioxide') * 2000)
     .duration(360)
     .EUt(Globals.voltAmps[2])
     .buildAndRegister()

diff --git a/groovy/postInit/chemistry/elements/NiobiumChain.groovy b/groovy/postInit/chemistry/elements/NiobiumChain.groovy
@@ -90,7 +90,7 @@ REACTION_FURNACE.recipeBuilder() // Ferroniobium-tantalum
     .outputs(metaitem('dustFerroniobiumTantalum') * 20)
     .outputs(metaitem('dustAlumina') * 105)
     .outputs(metaitem('dustCalcium') * 14)
-    .fluidOutputs(fluid('sodium_nitrite') * 720)
+    .fluidOutputs(fluid('sodium_nitrite') * 576)
     .duration(800)
     .EUt(Globals.voltAmps[4])
     .buildAndRegister()

diff --git a/groovy/postInit/chemistry/elements/PhosphorusChain.groovy b/groovy/postInit/chemistry/elements/PhosphorusChain.groovy
@@ -81,7 +81,7 @@ for (apatite in apatites) {
 BATCH_REACTOR.recipeBuilder()
     .inputs(ore('dustHydroxyapatite'))
     .fluidInputs(fluid('sulfuric_acid') * 5000)
-    .outputs(metaitem('dustCalciumSulfate') * 6)
+    .outputs(metaitem('dustCalciumSulfate') * 30)
     .fluidOutputs(fluid('diluted_phosphoric_acid') * 4000)
     .duration(200)
     .EUt(Globals.voltAmps[2])
@@ -90,7 +90,7 @@ BATCH_REACTOR.recipeBuilder()
 BATCH_REACTOR.recipeBuilder()
     .inputs(ore('dustFluorapatite'))
     .fluidInputs(fluid('sulfuric_acid') * 5000)
-    .outputs(metaitem('dustCalciumSulfate') * 6)
+    .outputs(metaitem('dustCalciumSulfate') * 30)
     .fluidOutputs(fluid('phosphoric_acid') * 3000)
     .fluidOutputs(fluid('hydrogen_fluoride') * 1000)
     .duration(200)
@@ -100,7 +100,7 @@ BATCH_REACTOR.recipeBuilder()
 BATCH_REACTOR.recipeBuilder()
     .inputs(ore('dustChlorapatite'))
     .fluidInputs(fluid('sulfuric_acid') * 5000)
-    .outputs(metaitem('dustCalciumSulfate') * 6)
+    .outputs(metaitem('dustCalciumSulfate') * 30)
     .fluidOutputs(fluid('phosphoric_acid') * 3000)
     .fluidOutputs(fluid('hydrogen_chloride') * 1000)
     .duration(200)

diff --git a/groovy/postInit/chemistry/elements/SilverChain.groovy b/groovy/postInit/chemistry/elements/SilverChain.groovy
@@ -257,18 +257,10 @@ DISTILLERY.recipeBuilder()
     .buildAndRegister()
 
 //SILVER NITRATE
-MIXER.recipeBuilder()
-    .fluidInputs(fluid('water') * 1000)
-    .fluidInputs(fluid('silver_nitrate_solution') * 1000)
-    .fluidOutputs(fluid('diluted_silver_nitrate_solution') * 1000)
-    .duration(20)
-    .EUt(Globals.voltAmps[1])
-    .buildAndRegister()
-
 ELECTROLYZER.recipeBuilder()
     .notConsumable(metaitem('stickSilver'))
     .notConsumable(metaitem('graphite_electrode'))
-    .fluidInputs(fluid('diluted_silver_nitrate_solution') * 2000)
+    .fluidInputs(fluid('silver_nitrate_solution') * 2000)
     .outputs(metaitem('dustSilver') * 2)
     .fluidOutputs(fluid('nitric_acid') * 2000)
     .fluidOutputs(fluid('oxygen') * 1000)
@@ -281,7 +273,7 @@ BATCH_REACTOR.recipeBuilder()
     .inputs(ore('dustSilver') * 3) 
     .fluidInputs(fluid('nitric_acid') * 4000)
     .fluidInputs(fluid('distilled_water') * 1000)
-    .fluidOutputs(fluid('silver_nitrate_solution') * 2700)
+    .fluidOutputs(fluid('silver_nitrate_solution') * 2750)
     .fluidOutputs(fluid('nitric_oxide') * 1000)
     .duration(360)
     .EUt(Globals.voltAmps[2])

diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy
@@ -527,7 +527,7 @@ mods.gregtech.assembler.recipeBuilder()
 mods.gregtech.assembler.recipeBuilder()
         .inputs(ore('plateSteel') * 4)
         .inputs(ore('foilAluminium') * 8)
-        .inputs(ore('foilPolypropylene') * 16)
+        .inputs(ore('foilPolypropylene') * 8)
         .outputs(metaitem('hepa_filter'))
         .duration(80)
         .EUt(120)

diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang
@@ -1494,7 +1494,6 @@ susy.material.fluix=Fluix
 susy.material.carnallite_leach=Carnallite Leach
 susy.material.zinc_chloride_solution=Zinc Chloride Solution
 susy.material.ammoniacal_sodium_bicarbonate_solution=Ammoniacal Sodium Bicarbonate Solution
-susy.material.diluted_silver_nitrate_solution=Diluted Silver Nitrate Solution
 susy.material.picric_acid=Picric Acid (TNP)
 susy.material.tnp_slurry=Picric Acid Slurry
 susy.material.monomethylhydrazine=Monomethylhydrazine (MMH)

diff --git a/resources/langfiles/lang/zh_cn.lang b/resources/langfiles/lang/zh_cn.lang
@@ -1494,7 +1494,6 @@ susy.material.fluix=福鲁伊克斯
 susy.material.carnallite_leach=光卤石浸出液
 susy.material.zinc_chloride_solution=氯化锌溶液
 susy.material.ammoniacal_sodium_bicarbonate_solution=氨性碳酸氢钠溶液
-susy.material.diluted_silver_nitrate_solution=稀硝酸银溶液
 susy.material.picric_acid=苦味酸（TNP）
 susy.material.tnp_slurry=苦味酸浆液
 susy.material.monomethylhydrazine=甲肼（MMH）