Merge pull request #1002 from MCTian-mi/bug-fixes

Too Many Bug Fixes

config/Universal Tweaks - Bugfixes.cfg

@@ -134,7 +134,7 @@ general {
         B:"Mount Desync"=true
 
         # Fixes saturation depleting in peaceful mode
-        B:"Player Saturation"=true
+        B:"Player Saturation"=false
 
         # Fixes a duplication exploit connected to shearing mooshrooms
         B:"Shear Mooshroom Dupe"=true

config/Universal Tweaks - Mod Integration.cfg

@@ -261,7 +261,7 @@ general {
     "storage drawers" {
         # Approximate range in blocks at which drawers render contained items
         # 0 for default unlimited range
-        I:"Render Range"=0
+        I:"Render Range"=32
     }
 
     "tardis mod" {

config/betterquesting/DefaultQuests/Quests/16/569.json

@@ -18,6 +18,7 @@
       "ignoresview:1": 0,
       "ismain:1": 1,
       "name:8": "susy.quest.db.569.title",
+      "tasklogic:8": "OR",
       "visibility:8": "ALWAYS"
     }
   },

config/betterquesting/DefaultQuests/Quests/21/773.json

@@ -18,18 +18,6 @@
   "rewards:9": {},
   "tasks:9": {
     "0:10": {
-      "entryLogic:8": "AND",
-      "partialMatch:1": 1,
-      "requiredItems:9": {
-        "0:10": {
-          "Count:3": 1,
-          "Damage:2": 5009,
-          "id:8": "gregtech:meta_item_2"
-        }
-      },
-      "taskID:8": "bq_standard:retrieval"
-    },
-    "1:10": {
       "entryLogic:8": "AND",
       "index:3": 1,
       "partialMatch:1": 1,

config/betterquesting/DefaultQuests/Quests/21/778.json

@@ -18,18 +18,6 @@
   "rewards:9": {},
   "tasks:9": {
     "0:10": {
-      "entryLogic:8": "AND",
-      "partialMatch:1": 1,
-      "requiredItems:9": {
-        "0:10": {
-          "Count:3": 1,
-          "Damage:2": 5008,
-          "id:8": "gregtech:meta_item_2"
-        }
-      },
-      "taskID:8": "bq_standard:retrieval"
-    },
-    "1:10": {
       "entryLogic:8": "AND",
       "index:3": 1,
       "partialMatch:1": 1,

config/betterquesting/DefaultQuests/Quests/23/133.json

@@ -45,6 +45,7 @@
   "tasks:9": {
     "0:10": {
       "entryLogic:8": "AND",
+      "ignoreNBT:1": 1,
       "partialMatch:1": 1,
       "requiredItems:9": {
         "0:10": {

config/betterquesting/DefaultQuests/Quests/23/137.json

@@ -37,6 +37,7 @@
   "tasks:9": {
     "0:10": {
       "entryLogic:8": "AND",
+      "ignoreNBT:1": 1,
       "partialMatch:1": 1,
       "requiredItems:9": {
         "0:10": {
@@ -49,8 +50,9 @@
               "AttackDamage:5": 3.5,
               "AttackSpeed:5": -1.3,
               "Durability:3": 0,
-              "Material:8": "iron",
-              "MaxDurability:3": 256
+              "HarvestLevel:3": 2,
+              "Material:8": "gregtech:iron",
+              "MaxDurability:3": 255
             },
             "HideFlags:3": 2,
             "ench:9": {

config/betterquesting/DefaultQuests/Quests/23/392.json

@@ -30,6 +30,7 @@
   "tasks:9": {
     "0:10": {
       "entryLogic:8": "AND",
+      "ignoreNBT:1": 1,
       "index:3": 1,
       "partialMatch:1": 1,
       "requiredItems:9": {

config/betterquesting/DefaultQuests/Quests/4/701.json

@@ -18,6 +18,7 @@
       },
       "ignoresview:1": 0,
       "name:8": "susy.quest.db.701.title",
+      "tasklogic:8": "OR",
       "visibility:8": "ALWAYS"
     }
   },

config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/410.json

@@ -15,6 +15,7 @@
       },
       "ignoresview:1": 0,
       "name:8": "susy.quest.db.410.title",
+      "tasklogic:8": "OR",
       "visibility:8": "ALWAYS"
     }
   },
@@ -28,6 +29,10 @@
         }
       },
       "taskID:8": "bq_standard:fluid"
+    },
+    "1:10": {
+      "index:3": 1,
+      "taskID:8": "bq_standard:checkbox"
     }
   }
 }

config/betterquesting/resources/supersymmetry/lang/en_us.lang

@@ -1187,7 +1187,7 @@ susy.quest.db.564.desc=The §6RAID§r (redundant array of independent disks) hou
 susy.quest.db.565.title=HTS Catalyst
 susy.quest.db.565.desc=The LTS catalyst can be made by dissolving §6Iron (III) Oxide§r, §6and Chromium Trioxide§r in§9 sodium hydroxide§r.%n%nIt can be turned into a catalyst bed for §c§c§lsyngas reforming, §ra way to make syngas even more powerful for faster steel production.%n%nRemember that catalyst beds can be made with §apellets§r, which are made using the Extruder.
 susy.quest.db.566.title=MFU
-susy.quest.db.566.desc=The §6MFU§r acts as a remote adapter.%n%n[§aClick§r] while sneaking onto any side of any block to bind it to a specific position. %n%nThen, place it into an §6adapter§r nearby (the range is very limited) and it will act §6s if the adapter was placed right next to the specific side§r you bound it to!%n%nKeep in mind that keeping §6the remote adapter connection active uses energy§r.
+susy.quest.db.566.desc=The §6MFU§r acts as a remote adapter.%n%n[§aClick§r] while sneaking onto any side of any block to bind it to a specific position. %n%nThen, place it into an §6adapter§r nearby (the range is very limited) and it will act §6as if the adapter was placed right next to the specific side§r you bound it to!%n%nKeep in mind that keeping §6the remote adapter connection active uses energy§r.
 susy.quest.db.567.title=Augmented Reality
 susy.quest.db.567.desc=The §6AR Glasses §rare augmented reality glasses that you can link to a §bcomputer§r%n%nIt has a capacity of §c50,000 FE (12,500 EU)§r, which can be increased with upgrades. When you wear the glasses, they consume power at a rate of §c1 FE/tick§r. You can recharge the glasses in any electric device.%n%nThe glasses can handle up to §99 different widgets§r. This can be expanded to a maximum of 255 with a Database Upgrade.%n%nBy right-clicking on a terminal block, you can establish a connection between the glasses and the terminal.%n%nYou need to wear the glasses in the helmet slot.
 susy.quest.db.568.title=Electronics Assembler

config/noworldgen5you.cfg

@@ -92,7 +92,7 @@ scattered_structures {
     B:disable_dessert_pyramid=false
 
     # Should igloo generation be disabled? [default: false]
-    B:disable_igloo=false
+    B:disable_igloo=true
 
     # Should jungle_temple generation be disabled? [default: false]
     B:disable_jungle_temple=false

config/quark.cfg

@@ -788,7 +788,7 @@ management {
     B:"Chest buttons"=true
     B:"Chests in boats"=true
     B:"Ctrl-click an item to favorite it. Favorited items aren't stored by the other features here"=true
-    B:"Inventory sorting"=true
+    B:"Inventory sorting"=false
     B:"Press Ctrl-DELETE in the inventory to delete an item"=true
     B:"Press F in the inventory to switch item to main hand"=true
     B:"Press T in the inventory to link items to chat"=true
@@ -967,7 +967,7 @@ management {
     }
 
     "inventory sorting" {
-        B:"Enable Button in Player Inventory"=true
+        B:"Enable Button in Player Inventory"=false
 
         # This feature disables itself if any of the following mods are loaded: 
         #  - inventorytweaks

config/recipehandler.cfg

@@ -0,0 +1,44 @@
+# Configuration file
+
+client {
+    # Offset for button from its default position, negative values to the left, positive to the right [default: 0]
+    I:"Cycle Button Horizontal Offset"=15
+
+    # Offset for button from its default position, negative values to under, positive to over [default: 0]
+    I:"Cycle Button Vertical Offset"=-22
+
+    # Shows craft space in creative inventory tab [default: false]
+    B:"Enable Craft In Creative Inventory"=false
+
+    # Only render button in case of conflict [default: false]
+    B:"Limit Button To Conflict"=true
+}
+
+
+general {
+    # List of containers to ignore for custom crafting detection [default: [net.blay09.mods.cookingforblockheads.container.ContainerRecipeBook], [morph.avaritia.container.ContainerExtremeCrafting], [slimeknights.tconstruct.tools.common.inventory.ContainerPartBuilder], [slimeknights.tconstruct.tools.common.inventory.ContainerStencilTable], [jds.bibliocraft.containers.ContainerDiscRack]]
+    S:"Black List Crafting Container" <
+        net.blay09.mods.cookingforblockheads.container.ContainerRecipeBook
+        morph.avaritia.container.ContainerExtremeCrafting
+        slimeknights.tconstruct.tools.common.inventory.ContainerPartBuilder
+        slimeknights.tconstruct.tools.common.inventory.ContainerStencilTable
+        jds.bibliocraft.containers.ContainerDiscRack
+     >
+
+    # Tries to detect other crafting systems, disable for less processing [default: true]
+    B:"Enable Custom Crafting Detection"=true
+
+    # Rendered in the crafting GUI [default: true]
+    B:"Enable Cycle Button"=true
+
+    # Tracks furnace recipes changes from the mod starting point [default: false]
+    B:"Enable Furnace Recipes Tracking"=false
+
+    # Can be modified in controls menu [default: false]
+    B:"Enable Switch Key"=false
+
+    # Rendered in the Top Right Corner of the screen [default: false]
+    B:"Render Text Tooltip"=true
+}
+
+

config/scalinghealth/main.cfg

@@ -439,7 +439,7 @@ main {
             I:"Delay (Initial)"=400
 
             # Enable bonus health regen for players. Vanilla regen is not changed in any way, this just adds extra healing! Vanilla regen can be disabled with the naturalRegeneration gamerule.
-            B:"Enable Bonus Regen"=true
+            B:"Enable Bonus Regen"=false
 
             # The food consumption for each bonus regen tick. [range: 0.0 ~ 1.0, default: 0.10000000149011612]
             S:"Exhaustion Added"=0.10000000149011612

groovy/material/FirstDegreeMaterials.groovy

@@ -2290,14 +2290,14 @@ public class FirstDegreeMaterials {
 
         MonocalciumPhosphate.setFormula("Ca(H2PO4)2", true)
 
-        CalciumPhosphite = new Material.Builder(8439, SuSyUtility.susyId('calcium_phosphite'))
+        CalciumMetaphosphate = new Material.Builder(8439, SuSyUtility.susyId('calcium_metaphosphate'))
                 .dust()
-                .components(Calcium * 3, Phosphorus * 2, Oxygen * 6)
+                .components(Calcium * 1, Phosphorus * 2, Oxygen * 6)
                 .color(0xa2a832)
                 .iconSet(CERTUS)
                 .build()
 
-        CalciumPhosphite.setFormula("Ca3(PO3)2", true)
+        CalciumMetaphosphate.setFormula("Ca(PO3)2", true)
 
         SulfurTrioxideReactionMixture = new Material.Builder(8440, SuSyUtility.susyId('sulfur_trioxide_reaction_mixture'))
                 .gas()

groovy/material/SuSyMaterials.groovy

@@ -749,7 +749,7 @@ class SuSyMaterials {
         public static Material IronPentacarbonyl;
         public static Material DilutedPhosphoricAcid;
         public static Material MonocalciumPhosphate;
-        public static Material CalciumPhosphite;
+        public static Material CalciumMetaphosphate;
         public static Material AluminiumSulfate;
         public static Material DemineralizedWater;
         public static Material DeaeratedWater;

groovy/postInit/biology/PaperChain.groovy

@@ -61,7 +61,7 @@ DT.recipeBuilder()
 ROASTER.recipeBuilder()
         .inputs(ore('dustCarbon') * 2)
         .fluidInputs(fluid('concentrated_black_liquor') * 1000)
-        .fluidOutputs(fluid('carbon_dioxide') * 2000)
+        .fluidOutputs(fluid('carbon_dioxide') * 1000)
         .fluidOutputs(fluid('green_liquor') * 1000)
         .duration(200)
         .EUt(30)
@@ -70,7 +70,7 @@ ROASTER.recipeBuilder()
 BR.recipeBuilder()
         .inputs(ore('dustQuicklime') * 2)
         .fluidInputs(fluid('green_liquor') * 1000)
-        .outputs(metaitem('dustLimestone') * 5)
+        .outputs(metaitem('dustCalcite') * 5)
         .fluidOutputs(fluid('white_liquor') * 1000)
         .duration(200)
         .EUt(30)

groovy/postInit/chemistry/ChemistryOverhaul.groovy

@@ -853,7 +853,7 @@ BR.recipeBuilder()
 ROASTER.recipeBuilder()
         .inputs(ore('dustLimestone') * 5)
         .circuitMeta(2)
-        .fluidOutputs(fluid('carbon_dioxide') * 3000)
+        .fluidOutputs(fluid('carbon_dioxide') * 1000)
         .outputs(metaitem('dustQuicklime') * 2)
         .duration(80)
         .EUt(30)

groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/PhosphorusChain.groovy

@@ -26,6 +26,7 @@ AUTOCLAVE.recipeBuilder()
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
 
+// Ca3(PO4)2 + 2 H2SO4 → Ca(H2PO4)2 + 2 CaSO4
 BATCH_REACTOR.recipeBuilder()
     .inputs(ore('dustTricalciumPhosphate') * 13)
     .fluidInputs(fluid('sulfuric_acid') * 2000)
@@ -35,23 +36,61 @@ BATCH_REACTOR.recipeBuilder()
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
 
+// Ca(H2PO4)2 → Ca(PO3)2 + 2 H2O
 ROASTER.recipeBuilder()
     .inputs(ore('dustMonocalciumPhosphate') * 15)
-    .outputs(metaitem('dustCalciumPhosphite') * 11)
+    .outputs(metaitem('dustCalciumMetaphosphate') * 9)
     .fluidOutputs(fluid('dense_steam') * 2000)
     .duration(120)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
 
+// 3 Ca(PO3)2 + 10 C → Ca3(PO4)2 + P4, no CO since 10kL is exceeding 8kL limit in a LV roaster
 ROASTER.recipeBuilder()
-    .inputs(ore('dustCalciumPhosphite') * 33)
+    .inputs(ore('dustCalciumMetaphosphate') * 27)
     .inputs(ore('dustAnyPurityCarbon') * 10)
+    .circuitMeta(1)
     .outputs(metaitem('dustTricalciumPhosphate') * 13)
     .outputs(metaitem('dustPhosphorus') * 4)
     .duration(360)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
 
+// 3 Ca(PO3)2 + 10 C → Ca3(PO4)2 + 10 CO + P4
+ROASTER.recipeBuilder()
+    .inputs(ore('dustCalciumMetaphosphate') * 27)
+    .inputs(ore('dustAnyPurityCarbon') * 10)
+    .circuitMeta(2)
+    .outputs(metaitem('dustTricalciumPhosphate') * 13)
+    .outputs(metaitem('dustPhosphorus') * 4)
+    .fluidOutputs(fluid('carbon_monoxide') * 10000)
+    .duration(360)
+    .EUt(Globals.voltAmps[1])
+    .buildAndRegister()
+
+// (2 Ca3(PO4)2 + 6 SiO2 + 10 C -> 6 CaSiO3 + 10 CO + P4) / 2
+EBF.recipeBuilder()
+        .inputs(ore('dustTricalciumPhosphate') * 13)
+        .inputs(ore('dustSiliconDioxide') * 9)
+        .inputs(ore('dustAnyPurityCarbon') * 5)
+        .outputs(metaitem('dustPhosphorus') * 2)
+        .outputs(metaitem('dustCalciumMetasilicate') * 15)
+        .fluidOutputs(fluid('carbon_monoxide') * 5000)
+        .blastFurnaceTemp(1200)
+        .duration(240)
+        .EUt(Globals.voltAmps[2])
+        .buildAndRegister()
+
+// 3 Ca(OH)2 + 2 H3PO4 -> Ca3(PO4)2 + 6H2O
+BATCH_REACTOR.recipeBuilder()
+        .inputs(ore('dustCalciumHydroxide') * 15)
+        .fluidInputs(fluid('phosphoric_acid') * 2000)
+        .outputs(metaitem('dustTricalciumPhosphate') * 13)
+        .fluidOutputs(fluid('water') * 6000)
+        .duration(200)
+        .EUt(Globals.voltAmps[1])
+        .buildAndRegister()
+
 //UNIVERSAL (MV)
 //REMOVE APATITE RECIPES
 
@@ -115,22 +154,12 @@ DISTILLATION_TOWER.recipeBuilder()
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
 
-//CONVERSION TO WHITE PHOSPHORUS
-BATCH_REACTOR.recipeBuilder()
-    .inputs(ore('dustCalciumHydroxide') * 5)
-    .fluidInputs(fluid('phosphoric_acid') * 2000)
-    .outputs(metaitem('dustMonocalciumPhosphate') * 15)
-    .fluidOutputs(fluid('water') * 2000)
-    .duration(200)
-    .EUt(Globals.voltAmps[1])
-    .buildAndRegister()
-
 //SULFURIC ACID REGENERATION
 ROASTER.recipeBuilder()
     .inputs(ore('dustCalciumSulfate') * 6)
     .inputs(ore('dustSiliconDioxide') * 3)
     .outputs(metaitem('dustCalciumMetasilicate') * 5)
-    .fluidOutputs(fluid('sulfur_trioxide_reaction_mixture') * 2000)
+    .fluidOutputs(fluid('sulfur_trioxide_reaction_mixture') * 1000)
     .duration(200)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()

manifest.json

@@ -397,7 +397,7 @@
     },
     {
       "projectID": 846224,
-      "fileID": 5747897,
+      "fileID": 5753902,
       "required": true
     },
     {

resources/langfiles/lang/en_us.lang

@@ -321,7 +321,7 @@ susy.material.crude_gallium_arsenide=Crude Gallium Arsenide
 susy.material.gallium_arsenide=Pure Gallium Arsenide
 
 susy.material.monocalcium_phosphate=Monocalcium Phosphate
-susy.material.calcium_phosphite=Calcium Phosphite
+susy.material.calcium_metaphosphate=Calcium Metaphosphate
 susy.material.phosphorus=White Phosphorus
 susy.material.hydroxyapatite=Hydroxyapatite
 susy.material.calcium_metasilicate=Calcium Metasilicate

resources/langfiles/lang/zh_cn.lang

@@ -321,7 +321,7 @@ susy.material.crude_gallium_arsenide=粗砷化镓
 susy.material.gallium_arsenide=纯净砷化镓
 
 susy.material.monocalcium_phosphate=磷酸二氢钙
-susy.material.calcium_phosphite=亚磷酸钙
+susy.material.calcium_metaphosphate=偏磷酸钙
 susy.material.phosphorus=白磷
 susy.material.hydroxyapatite=羟基磷灰石
 susy.material.calcium_metasilicate=偏硅酸钙