From 2c2fef1b04ff296ba005fbffe41cdd79195ffc8d Mon Sep 17 00:00:00 2001
From: migmist <migmist@aaathats3as.com>
Date: Sat, 19 Oct 2024 23:19:44 +0300
Subject: [PATCH 01/41] Add cyberzombie invasions in the nether

---
 groovy/postInit/gameplay/Invasions.groovy | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/groovy/postInit/gameplay/Invasions.groovy b/groovy/postInit/gameplay/Invasions.groovy
index a0ccc18f3..b225b29d2 100644
--- a/groovy/postInit/gameplay/Invasions.groovy
+++ b/groovy/postInit/gameplay/Invasions.groovy
@@ -3,21 +3,34 @@ import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.init.MobEffects;
 import net.minecraft.potion.PotionEffect;
 import techguns.entities.npcs.Bandit;
+import flaxbeard.cyberware.common.entity.EntityCyberZombie;
 
-new MobHordeEvent((player) -> {return new EntityZombie(player.world);}, 5, 10, "zombie_medium")
+new MobHordeEvent((player) -> {EntityZombie zombie = new EntityZombie(player.world);
+			        zombie.addPotionEffect(new PotionEffect(MobEffects.SPEED, 999999, 1));
+				return zombie;}, 5, 10, "zombie_medium")
 	.setAdvancementUnlock(new ResourceLocation("gregtech:steam/4_bronze_boiler"))
 	.setNightOnly(true)
 	.setTimer(144000, 216000)		// 2 - 3 hours
+	.setCanUsePods(false)
 
 new MobHordeEvent((player) -> {EntityZombie zombie = new EntityZombie(player.world); 
 			        zombie.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, 999999, 1));
 			        zombie.addPotionEffect(new PotionEffect(MobEffects.STRENGTH, 999999, 1));
-			        zombie.addPotionEffect(new PotionEffect(MobEffects.SPEED, 999999));
+			        zombie.addPotionEffect(new PotionEffect(MobEffects.SPEED, 999999, 1));
 				return zombie;}, 6, 12, "zombie_hard")
 	.setAdvancementUnlock(new ResourceLocation("gregtech:steam/16_steel_boiler"))
 	.setNightOnly(true)
 	.setTimer(144000, 216000)		// 2 - 3 hours
+	.setCanUsePods(false)
 
 new MobHordeEvent((player) -> {Bandit bandit = new Bandit(player.world); bandit.addRandomArmor(0); return bandit;}, 2, 4, "bandit_medium")
 	.setAdvancementUnlock(new ResourceLocation("gregtech:low_voltage/23_lv_assembler"))
 	.setTimer(72000, 216000)	        // 1 - 3 hours
+
+new MobHordeEvent((player) -> {EntityCyberZombie zombie = new EntityCyberZombie(player.world);
+			        zombie.addPotionEffect(new PotionEffect(MobEffects.SPEED, 999999, 1));
+				return zombie;}, 5, 10, "cyberzombie_medium")
+//	.setAdvancementUnlock(new ResourceLocation("gregtech:steam/4_bronze_boiler")) // Their fault for coming to the nether.
+	.setTimer(72000, 216000)	        // 1 - 3 hours
+	.setCanUsePods(false)
+	.setDimension(-1)

From 808e6d96424032524987ebe285245070908d1efd Mon Sep 17 00:00:00 2001
From: migmist <migmist@aaathats3as.com>
Date: Sun, 20 Oct 2024 18:10:57 +0300
Subject: [PATCH 02/41] Add fire resistance to cyberzombies.

---
 groovy/postInit/gameplay/Invasions.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/groovy/postInit/gameplay/Invasions.groovy b/groovy/postInit/gameplay/Invasions.groovy
index b225b29d2..a8fc377de 100644
--- a/groovy/postInit/gameplay/Invasions.groovy
+++ b/groovy/postInit/gameplay/Invasions.groovy
@@ -28,7 +28,8 @@ new MobHordeEvent((player) -> {Bandit bandit = new Bandit(player.world); bandit.
 	.setTimer(72000, 216000)	        // 1 - 3 hours
 
 new MobHordeEvent((player) -> {EntityCyberZombie zombie = new EntityCyberZombie(player.world);
-			        zombie.addPotionEffect(new PotionEffect(MobEffects.SPEED, 999999, 1));
+					zombie.addPotionEffect(new PotionEffect(MobEffects.SPEED, 999999, 1));
+					zombie.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 999999, 1));
 				return zombie;}, 5, 10, "cyberzombie_medium")
 //	.setAdvancementUnlock(new ResourceLocation("gregtech:steam/4_bronze_boiler")) // Their fault for coming to the nether.
 	.setTimer(72000, 216000)	        // 1 - 3 hours

From cffa7255fcce09e32e85e10714329ca08dad3aff Mon Sep 17 00:00:00 2001
From: migmist <migmist@aaathats3as.com>
Date: Mon, 21 Oct 2024 18:43:05 +0300
Subject: [PATCH 03/41] Remove cyberzombie invasions.

---
 groovy/postInit/gameplay/Invasions.groovy | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/groovy/postInit/gameplay/Invasions.groovy b/groovy/postInit/gameplay/Invasions.groovy
index a8fc377de..e373cd905 100644
--- a/groovy/postInit/gameplay/Invasions.groovy
+++ b/groovy/postInit/gameplay/Invasions.groovy
@@ -27,11 +27,3 @@ new MobHordeEvent((player) -> {Bandit bandit = new Bandit(player.world); bandit.
 	.setAdvancementUnlock(new ResourceLocation("gregtech:low_voltage/23_lv_assembler"))
 	.setTimer(72000, 216000)	        // 1 - 3 hours
 
-new MobHordeEvent((player) -> {EntityCyberZombie zombie = new EntityCyberZombie(player.world);
-					zombie.addPotionEffect(new PotionEffect(MobEffects.SPEED, 999999, 1));
-					zombie.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 999999, 1));
-				return zombie;}, 5, 10, "cyberzombie_medium")
-//	.setAdvancementUnlock(new ResourceLocation("gregtech:steam/4_bronze_boiler")) // Their fault for coming to the nether.
-	.setTimer(72000, 216000)	        // 1 - 3 hours
-	.setCanUsePods(false)
-	.setDimension(-1)

From 456a429e596a468ebf04e1f6910671f72e896aa8 Mon Sep 17 00:00:00 2001
From: migmist <migmist@aaathats3as.com>
Date: Mon, 21 Oct 2024 18:45:43 +0300
Subject: [PATCH 04/41] Forgot to remove the library.

---
 groovy/postInit/gameplay/Invasions.groovy | 1 -
 1 file changed, 1 deletion(-)

diff --git a/groovy/postInit/gameplay/Invasions.groovy b/groovy/postInit/gameplay/Invasions.groovy
index e373cd905..cacb9fb06 100644
--- a/groovy/postInit/gameplay/Invasions.groovy
+++ b/groovy/postInit/gameplay/Invasions.groovy
@@ -3,7 +3,6 @@ import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.init.MobEffects;
 import net.minecraft.potion.PotionEffect;
 import techguns.entities.npcs.Bandit;
-import flaxbeard.cyberware.common.entity.EntityCyberZombie;
 
 new MobHordeEvent((player) -> {EntityZombie zombie = new EntityZombie(player.world);
 			        zombie.addPotionEffect(new PotionEffect(MobEffects.SPEED, 999999, 1));

From 37277fb46ef53318851ad378d82e3b907aff8e50 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 13:32:50 +0800
Subject: [PATCH 05/41] add quest for graduated cylinders

---
 .../DefaultQuests/QuestLines/25.json          |  7 ++++
 .../DefaultQuests/Quests/25/1319048907.json   | 36 +++++++++++++++++++
 .../resources/supersymmetry/lang/en_us.lang   |  2 ++
 3 files changed, 45 insertions(+)
 create mode 100644 config/betterquesting/DefaultQuests/Quests/25/1319048907.json

diff --git a/config/betterquesting/DefaultQuests/QuestLines/25.json b/config/betterquesting/DefaultQuests/QuestLines/25.json
index a925db85d..8d0e5f561 100644
--- a/config/betterquesting/DefaultQuests/QuestLines/25.json
+++ b/config/betterquesting/DefaultQuests/QuestLines/25.json
@@ -110,6 +110,13 @@
       "sizeY:3": 24,
       "x:3": 216,
       "y:3": -12
+    },
+    "14:10": {
+      "id:3": 1319048907,
+      "sizeX:3": 24,
+      "sizeY:3": 24,
+      "x:3": 48,
+      "y:3": 84
     }
   }
 }
\ No newline at end of file
diff --git a/config/betterquesting/DefaultQuests/Quests/25/1319048907.json b/config/betterquesting/DefaultQuests/Quests/25/1319048907.json
new file mode 100644
index 000000000..b6506040f
--- /dev/null
+++ b/config/betterquesting/DefaultQuests/Quests/25/1319048907.json
@@ -0,0 +1,36 @@
+{
+  "preRequisiteTypes:7": [
+    2,
+    2,
+    2,
+    2,
+    2
+  ],
+  "preRequisites:11": [
+    59,
+    153,
+    156,
+    563,
+    80
+  ],
+  "properties:10": {
+    "betterquesting:10": {
+      "desc:8": "susy.quest.db.1319048907.desc",
+      "frame:8": "ROUNDED_SQUARE",
+      "icon:10": {
+        "Damage:2": 85,
+        "id:8": "gregtech:meta_item_1"
+      },
+      "ignoresview:1": 0,
+      "name:8": "susy.quest.db.1319048907.title",
+      "questlogic:8": "OR",
+      "visibility:8": "ALWAYS"
+    }
+  },
+  "rewards:9": {},
+  "tasks:9": {
+    "0:10": {
+      "taskID:8": "bq_standard:checkbox"
+    }
+  }
+}
\ No newline at end of file
diff --git a/config/betterquesting/resources/supersymmetry/lang/en_us.lang b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
index 78c5a8c0e..2236ecd82 100644
--- a/config/betterquesting/resources/supersymmetry/lang/en_us.lang
+++ b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
@@ -1866,3 +1866,5 @@ susy.quest.db.1958019111.title=Masonry Brick
 susy.quest.db.1958019111.desc=The §7Masonry Brick§r is essentially a brick-shaped piece of stone. It can be used to construct solid and insulated structures such as §6kilns§r, §6ovens§r, and the §6Primitive Smelter§r, or it can simply be utilized for architectural purposes. %n%nTo obtain some §7Masonry Bricks§r, break stones on an anvil using a pickaxe.
 susy.quest.db.2081939483.title=Brick
 susy.quest.db.2081939483.desc=By compressing §3Clays§r in a §6Wooden Form§r, you can get §3Compressed Clays§r, which can be fired in a pit kiln to produce §4Bricks§r.
+susy.quest.db.1319048907.title=Graduated Cylinders
+susy.quest.db.1319048907.desc=While holding any item which can contain fluids in your main hand (i.e. §7buckets§r, §7fluid cells§r, or §7drums§r, etc.), §a§2punch§r any placed block which can also hold fluids (i.e. §7drums§r, §7fluid hatches§r, or §7GregTech machines§r, etc.) to open the §6transfer GUI§r. Here, you can choose the amount in milibuckets to transfer and the direction.%n%nYou can also transfer fluids §2between two items§r, by right-clicking one on top of the other in an inventory.%n%nThis well help a lot for batch crafting with fluids.

From f7499d7debaf7715a00889188b9dc5620e564595 Mon Sep 17 00:00:00 2001
From: MCTian_mi <3431493799@qq.com>
Date: Mon, 21 Oct 2024 14:32:26 +0800
Subject: [PATCH 06/41] add Graduated Cylinders

---
 manifest.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/manifest.json b/manifest.json
index 1183ea01c..f20e724f7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -871,6 +871,11 @@
       "projectID": 284973,
       "fileID": 5405050,
       "required": true
+    },
+    {
+      "projectID": 839336,
+      "fileID": 5241774,
+      "required": true
     }
   ],
   "overrides": "overrides"

From 5438ac8d64da8e88dfe916183dc751e3e1c18e45 Mon Sep 17 00:00:00 2001
From: MCTian_mi <3431493799@qq.com>
Date: Mon, 21 Oct 2024 10:16:36 +0800
Subject: [PATCH 07/41] update VisualOres

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index f20e724f7..5341a9042 100644
--- a/manifest.json
+++ b/manifest.json
@@ -799,7 +799,7 @@
     },
     {
       "projectID": 895539,
-      "fileID": 5121879,
+      "fileID": 5828524,
       "required": true
     },
     {

From 776b5dbf3a4a57ddcede6608ad13bca47d2e6c34 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 19 Oct 2024 21:22:53 +0800
Subject: [PATCH 08/41] improve visualores display

---
 config/visualores.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/visualores.cfg b/config/visualores.cfg
index b25ca6c46..d0bea9ca7 100644
--- a/config/visualores.cfg
+++ b/config/visualores.cfg
@@ -50,7 +50,7 @@ general {
             # The size, in pixels, of ore icons on the map
             # Min: 4
             # Max: 2147483647
-            I:oreIconSize=32
+            I:oreIconSize=64
 
             # The string prepending ore names in the ore vein tooltip
             S:oreNamePrefix=- 
@@ -58,7 +58,7 @@ general {
             # The map scale at which displayed ores will stop scaling.
             # Min: 0.1
             # Max: 16.0
-            D:oreScaleStop=1.0
+            D:oreScaleStop=4.0
         }
 
         journeymap {

From 55ceb1eaba4abd4eb84a9e158795a156f9a55cd3 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 19 Oct 2024 21:42:05 +0800
Subject: [PATCH 09/41] change the threshold of bogosorter tool refill to 0 so
 you won't have dozens of trash in your inv also disabled quark's tool refill

---
 config/bogosorter/config.json | 5 ++---
 config/quark.cfg              | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/bogosorter/config.json b/config/bogosorter/config.json
index cf6dadf6b..ccd6c4a78 100644
--- a/config/bogosorter/config.json
+++ b/config/bogosorter/config.json
@@ -1,12 +1,11 @@
 {
   "General": {
     "enableAutoRefill": true,
-    "refillDmgThreshold": 1,
+    "refillDmgThreshold": 0,
     "enableHotbarSwap": true,
     "sortSound": "minecraft:ui.button.click",
     "buttonColor": "#ffffffff",
-    "_comment": "By setting the chance below to 0 you agree to have no humor and that you are boring.",
-    "baseBogoChance": 0.01
+    "_comment": "By setting the chance below to 0 you agree to have no humor and that you are boring."
   },
   "ItemSortRules": [
     {
diff --git a/config/quark.cfg b/config/quark.cfg
index 0eb3a835e..4f2ed3f67 100644
--- a/config/quark.cfg
+++ b/config/quark.cfg
@@ -782,7 +782,7 @@ experimental {
 
 
 management {
-    B:"Automatic tool restock"=true
+    B:"Automatic tool restock"=false
     B:"Better craft shifting"=true
     B:"Change hotbar keybind"=true
     B:"Chest buttons"=true

From a2a6dc4cd3de950c0bc2b42192596dd6c7251271 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 19 Oct 2024 21:47:32 +0800
Subject: [PATCH 10/41] add anvil recipe for pig iron -> wrought iron

---
 groovy/postInit/mod/Pyrotech.groovy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
index 7dc0c97f0..37c826f89 100644
--- a/groovy/postInit/mod/Pyrotech.groovy
+++ b/groovy/postInit/mod/Pyrotech.groovy
@@ -710,6 +710,7 @@ def anvil_recipes = [
         ["charcoal_flakes", ore('charcoal'), item('pyrotech:material', 15) * 8, 2],
         ["cobblestone_to_rocks", ore('cobblestone'), item('pyrotech:rock') * 8, 2, false],
         ["limestone_to_cobbled", ore('stoneLimestone'), item('susy:susy_stone_cobble', 2), 2],
+        ["pig_iron_shearing", ore('ingotPigIron'), metaitem('ingotWroughtIron'), 2],
         ["limestone_dust", item('susy:susy_stone_cobble', 2), metaitem('dustLimestone'), 2],
         ["pottery_shard_to_dust", item('pyrotech:material', 7), metaitem('dustSmallBrick') * 2, 1],
         ["pottery_fragments_to_dust", item('pyrotech:material', 6), metaitem('dustSmallBrick') * 2, 1]

From f0c8fd8b5d37e9c687afc4fb44e04c4c16b79fb8 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 14:00:29 +0800
Subject: [PATCH 11/41] move medium zombie invasion advancement lock to the
 wrench advancement

---
 groovy/postInit/gameplay/Invasions.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/groovy/postInit/gameplay/Invasions.groovy b/groovy/postInit/gameplay/Invasions.groovy
index a0ccc18f3..4152768df 100644
--- a/groovy/postInit/gameplay/Invasions.groovy
+++ b/groovy/postInit/gameplay/Invasions.groovy
@@ -5,7 +5,7 @@ import net.minecraft.potion.PotionEffect;
 import techguns.entities.npcs.Bandit;
 
 new MobHordeEvent((player) -> {return new EntityZombie(player.world);}, 5, 10, "zombie_medium")
-	.setAdvancementUnlock(new ResourceLocation("gregtech:steam/4_bronze_boiler"))
+	.setAdvancementUnlock(new ResourceLocation("gregtech:steam/1_first_tools"))
 	.setNightOnly(true)
 	.setTimer(144000, 216000)		// 2 - 3 hours
 

From 32fda1d9a33d6e701aa7d6dece64a433edf96442 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 15:20:06 +0800
Subject: [PATCH 12/41] change pyrotech cog recipe

---
 groovy/classes/ChangeFlags.groovy   |  1 +
 groovy/postInit/mod/Pyrotech.groovy | 43 +++++++++++++++++++++++------
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/groovy/classes/ChangeFlags.groovy b/groovy/classes/ChangeFlags.groovy
index e6fdb8ee3..4a089bd54 100644
--- a/groovy/classes/ChangeFlags.groovy
+++ b/groovy/classes/ChangeFlags.groovy
@@ -143,6 +143,7 @@ class ChangeFlags {
         BisphenolA.addFlags("no_unification");
         Phosphorus.addFlags("no_smelting");
         Tetrahedrite.addFlags("no_smelting");
+        Gold.addFlags("generate_gear");
 
         /*
         ManganesePhosphide.addFlags("no_smashing", "no_smelting")
diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
index 37c826f89..df149e42a 100644
--- a/groovy/postInit/mod/Pyrotech.groovy
+++ b/groovy/postInit/mod/Pyrotech.groovy
@@ -1,11 +1,13 @@
 package postInit.mod
 
-import com.codetaylor.mc.pyrotech.modules.tech.basic.ModuleTechBasic;
-import com.codetaylor.mc.pyrotech.modules.tech.basic.block.BlockKilnPit;
-import com.cleanroommc.groovyscript.api.IIngredient;
-import net.minecraft.util.EnumHand;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import net.minecraftforge.event.world.BlockEvent;
+import com.cleanroommc.groovyscript.api.IIngredient
+import com.codetaylor.mc.pyrotech.modules.tech.basic.ModuleTechBasic
+import com.codetaylor.mc.pyrotech.modules.tech.basic.block.BlockKilnPit
+import globals.Globals
+import globals.RecyclingHelper
+import net.minecraft.util.EnumHand
+import net.minecraftforge.event.entity.player.PlayerInteractEvent
+import net.minecraftforge.event.world.BlockEvent
 
 log.infoMC("Running Pyrotech.groovy...")
 
@@ -212,6 +214,8 @@ mods.jei.ingredient.yeet(
         item('pyrotech:material', 5),
         item('pyrotech:material', 8),
         item('pyrotech:material', 9),
+        item('pyrotech:material', 18),
+        item('pyrotech:material', 19),
         item('pyrotech:material', 20),
         item('pyrotech:material', 22),
         item('pyrotech:material', 23),
@@ -220,6 +224,7 @@ mods.jei.ingredient.yeet(
         item('pyrotech:material', 28),
         item('pyrotech:material', 31),
         item('pyrotech:material', 33),
+        item('pyrotech:material', 34),
         item('pyrotech:material', 35),
         item('pyrotech:material', 36),
         item('pyrotech:material', 37),
@@ -522,6 +527,29 @@ crafting.replaceShaped("pyrotech:bucket/bucket_clay_unfired", item('pyrotech:buc
         [null, metaitem('compressed.clay'), null]
 ])
 
+// Gears
+RecyclingHelper.addShapeless("susy:cog_stone", item('pyrotech:cog_stone'), [metaitem('gearStone')])
+RecyclingHelper.replaceShapeless("pyrotech:tech/machine/cog_iron", item('pyrotech:cog_iron'), [metaitem('gearIron')])
+RecyclingHelper.replaceShapeless("pyrotech:tech/machine/cog_gold", item('pyrotech:cog_gold'), [metaitem('gearGold')])
+RecyclingHelper.replaceShapeless("pyrotech:tech/machine/cog_diamond", item('pyrotech:cog_diamond'), [metaitem('gearDiamond')])
+
+oreDict.add("gearStone", item('pyrotech:cog_stone'))
+oreDict.add("gearIron", item('pyrotech:cog_iron'))
+oreDict.add("gearGold", item('pyrotech:cog_gold'))
+oreDict.add("gearDiamond", item('pyrotech:cog_diamond'))
+
+crafting.addShapeless("susy:cog_stone_to_gear", metaitem('gearStone'), [item('pyrotech:cog_stone')])
+crafting.addShapeless("susy:cog_iron_to_gear", metaitem('gearIron'), [item('pyrotech:cog_iron')])
+crafting.addShapeless("susy:cog_gold_to_gear", metaitem('gearGold'), [item('pyrotech:cog_gold')])
+crafting.addShapeless("susy:cog_diamond_to_gear", metaitem('gearDiamond'), [item('pyrotech:cog_diamond')])
+
+// Slag Heap
+crafting.addShaped("susy:slag_heap", item('pyrotech:pile_slag'), [
+        [item('pyrotech:slag'), item('pyrotech:slag'), item('pyrotech:slag')],
+        [item('pyrotech:slag'), item('pyrotech:slag'), item('pyrotech:slag')],
+        [item('pyrotech:slag'), item('pyrotech:slag'), item('pyrotech:slag')]
+])
+
 // Mechanical hopper
 crafting.replaceShaped("pyrotech:tech/machine/mechanical_hopper", item('pyrotech:mechanical_hopper'), [
         [item('pyrotech:material', 16), null, item('pyrotech:material', 16)],
@@ -703,9 +731,6 @@ def anvil_recipes = [
         ["stick_stone", item('pyrotech:material', 16), item('pyrotech:material', 27) * 2, 2, false],
         ["bone_shard", ore('bone'), item('pyrotech:material', 11) * 3, 2],
         ["flint_shard", ore('gemFlint'), item('pyrotech:material', 10) * 3, 2],
-        ["iron_shard", ore('ingotIron'), item('pyrotech:material', 19) * 9, 2],
-        ["gold_shard", ore('ingotGold'), item('pyrotech:material', 34) * 9, 2],
-        ["diamond_shard", ore('gemDiamond'), item('pyrotech:material', 18) * 9, 4],
         ["coal_pieces", ore('gemCoal'), item('pyrotech:material', 21) * 8, 2],
         ["charcoal_flakes", ore('charcoal'), item('pyrotech:material', 15) * 8, 2],
         ["cobblestone_to_rocks", ore('cobblestone'), item('pyrotech:rock') * 8, 2, false],

From 558ec0b97baa30dfdb8bc9ab95d9e377225a9a35 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 15:23:48 +0800
Subject: [PATCH 13/41] alloy smelter recipe changes - reduce slag output - add
 Anglesite and Silver smelting - add Potin alloying - removes Cassiterite Sand
 recipes since it doesn't exist - removes meaningless coal/charcoal flakes

---
 groovy/postInit/mod/Pyrotech.groovy | 34 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
index df149e42a..dcd087bca 100644
--- a/groovy/postInit/mod/Pyrotech.groovy
+++ b/groovy/postInit/mod/Pyrotech.groovy
@@ -731,8 +731,6 @@ def anvil_recipes = [
         ["stick_stone", item('pyrotech:material', 16), item('pyrotech:material', 27) * 2, 2, false],
         ["bone_shard", ore('bone'), item('pyrotech:material', 11) * 3, 2],
         ["flint_shard", ore('gemFlint'), item('pyrotech:material', 10) * 3, 2],
-        ["coal_pieces", ore('gemCoal'), item('pyrotech:material', 21) * 8, 2],
-        ["charcoal_flakes", ore('charcoal'), item('pyrotech:material', 15) * 8, 2],
         ["cobblestone_to_rocks", ore('cobblestone'), item('pyrotech:rock') * 8, 2, false],
         ["limestone_to_cobbled", ore('stoneLimestone'), item('susy:susy_stone_cobble', 2), 2],
         ["pig_iron_shearing", ore('ingotPigIron'), metaitem('ingotWroughtIron'), 2],
@@ -764,32 +762,32 @@ crafting.replaceShaped("pyrotech:tech/machine/stone_kiln", item('pyrotech:stone_
 
 // Primitive smelter
 // Controller
-crafting.addShaped("susy:primitive_smelter", item('gregtech:machine', 14800), [
+crafting.addShaped("susy:primitive_smelter", metaitem('primitive_smelter'), [
         [ore('craftingToolHardHammer')],
         [item('pyrotech:masonry_brick_block')]
 ])
 
 // Export
-crafting.addShaped("susy:primitive_item_export_bus", item('gregtech:machine', 14802), [
+crafting.addShaped("susy:primitive_item_export_bus", metaitem('primitive_item_export'), [
         [item('pyrotech:masonry_brick_block')],
         [item('pyrotech:mechanical_hopper')]
 ])
 
 // Import
-crafting.addShaped("susy:primitive_item_import_bus", item('gregtech:machine', 14801), [
+crafting.addShaped("susy:primitive_item_import_bus", metaitem('primitive_item_import'), [
         [item('pyrotech:mechanical_hopper')],
         [item('pyrotech:masonry_brick_block')]
 ])
 
 // Interconversion
-crafting.addShaped("susy:primitive_bus_import_to_export", item('gregtech:machine', 14802), [
+crafting.addShaped("susy:primitive_bus_import_to_export", metaitem('primitive_item_export'), [
         [ore('craftingToolHardHammer')],
-        [item('gregtech:machine', 14801)]
+        [metaitem('primitive_item_import')]
 ])
 
-crafting.addShaped("susy:primitive_bus_export_to_import", item('gregtech:machine', 14801), [
+crafting.addShaped("susy:primitive_bus_export_to_import", metaitem('primitive_item_import'), [
         [ore('craftingToolHardHammer')],
-        [item('gregtech:machine', 14802)]
+        [metaitem('primitive_item_export')]
 ])
 
 // Misc machines
@@ -890,9 +888,6 @@ def materials = [
 // Smelter recipes
 // Ore metallurgy
 
-oreDict.add("flakeCoal", item('pyrotech:material', 15))
-oreDict.add("flakeCharcoal", item('pyrotech:material', 21))
-
 class Reductant {
     String name
     int consumption
@@ -946,7 +941,7 @@ class Ore {
     }
 
     ItemStack getByproduct(Prefix prefix) {
-        int amount = prefix.byproduct_amount * output_multiplier * 8
+        int amount = prefix.byproduct_amount * output_multiplier * (byproduct == "pyrotech:slag" ? 1 : 8)
         return (byproduct == null || amount == 0) ? null : (item(byproduct) * amount)
     }
 }
@@ -961,9 +956,7 @@ def reductants = [
         new Reductant("dustCoal", 10, 0.9),
         new Reductant("dustLigniteCoke", 12, 1),
         new Reductant("dustCoke", 8, 0.75),
-        new Reductant("dustAnthracite", 8, 0.7),
-        new Reductant("flakeCharcoal", 96, 0.95),
-        new Reductant("flakeCoal", 80, 0.9)
+        new Reductant("dustAnthracite", 8, 0.7)
 ]
 
 def prefix_ore = new Prefix("ore", 1, 2)
@@ -990,6 +983,7 @@ def ores = [
         new Ore("Chalcocite", "Copper"),
 
         // Lead ores
+        new Ore("Anglesite", "Lead"),
         new Ore("Cerussite", "Lead"),
         new Ore("Galena", "Lead"),
 
@@ -998,8 +992,10 @@ def ores = [
         new Ore("Sphalerite", "Zinc"),
 
         // Tin ores
-        new Ore("CassiteriteSand", "Tin", 2),
-        new Ore("Cassiterite", "Tin", 2)
+        new Ore("Cassiterite", "Tin", 2),
+
+        // Silver ores
+        new Ore("Silver", "Silver")
 ]
 
 // Ore smashing
@@ -1102,6 +1098,8 @@ alloying_recipes = [
         ["Brass", 4, 200, ["Copper", 3, "Zinc", 1]],
         // SnFe
         ["TinAlloy", 2, 100, ["Iron", 1, "Tin", 1]],
+        // Potin
+        ["Potin", 9, 100, ["Copper", 6, "Tin", 2, "Lead", 1]],
         // Kovar
         ["Kovar", 2, 100, ["Iron", 2, "Nickel", 1, "CobaltMatte", 1]]
 ]

From 72d649ca1860582ba98921d90b8ca85c17bec1a5 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 15:24:29 +0800
Subject: [PATCH 14/41] add slag glass recipes in alloy furnace

---
 groovy/postInit/mod/Pyrotech.groovy | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
index dcd087bca..50a423a78 100644
--- a/groovy/postInit/mod/Pyrotech.groovy
+++ b/groovy/postInit/mod/Pyrotech.groovy
@@ -1167,3 +1167,22 @@ mods.gregtech.coke_oven.recipeBuilder()
         .fluidOutputs(fluid('creosote') * 2250)
         .duration(900)
         .buildAndRegister()
+
+ALLOY_SMELTER = recipemap('alloy_smelter')
+
+// Slag glass
+ALLOY_SMELTER.recipeBuilder()
+        .inputs(item('pyrotech:slag') * 9)
+        .notConsumable(metaitem('shape.mold.block'))
+        .outputs(item('pyrotech:slag_glass'))
+        .duration(100)
+        .EUt(Globals.voltAmps[1])
+        .buildAndRegister();
+
+ALLOY_SMELTER.recipeBuilder()
+        .inputs(item('pyrotech:pile_slag'))
+        .notConsumable(metaitem('shape.mold.block'))
+        .outputs(item('pyrotech:slag_glass'))
+        .duration(100)
+        .EUt(Globals.voltAmps[1])
+        .buildAndRegister();
\ No newline at end of file

From 0d77613d4fe92fb9848d2e02b294e17f72dc8eb7 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 15:25:34 +0800
Subject: [PATCH 15/41] change some recipes to accept ore('blockGlass') instead
 of vanilla glass only (sync behavior with gregtech itself)

---
 groovy/postInit/mod/GregTech.groovy             | 12 ++++++------
 groovy/postInit/mod/ImmersiveRailroading.groovy | 15 ++++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy
index f448921de..5e4161541 100644
--- a/groovy/postInit/mod/GregTech.groovy
+++ b/groovy/postInit/mod/GregTech.groovy
@@ -349,13 +349,13 @@ RecyclingHelper.replaceShaped("gregtech:gregtech.machine.macerator.lv", metaitem
 ])
 
 RecyclingHelper.replaceShaped("gregtech:gregtech.machine.cutter.lv", metaitem('gregtech:cutter.lv'), [
-    [metaitem('cableGtSingleTin'), ore('circuitLv'), item('minecraft:glass')],
+    [metaitem('cableGtSingleTin'), ore('circuitLv'), ore('blockGlass')],
 	[metaitem('conveyor.module.lv'), metaitem('gregtech:hull.lv'), metaitem('toolHeadBuzzSawSteel')],
 	[ore('circuitLv'), metaitem('cableGtSingleTin'), metaitem('electric.motor.lv')]
 ])
 
 RecyclingHelper.replaceShaped("gregtech:gregtech.machine.cutter.mv", metaitem('gregtech:cutter.mv'), [
-    [metaitem('cableGtSingleCopper'), ore('circuitMv'), item('minecraft:glass')],
+    [metaitem('cableGtSingleCopper'), ore('circuitMv'), ore('blockGlass')],
 	[metaitem('conveyor.module.mv'), metaitem('gregtech:hull.mv'), metaitem('toolHeadBuzzSawAluminium')],
 	[ore('circuitMv'), metaitem('cableGtSingleCopper'), metaitem('electric.motor.mv')]
 ])
@@ -367,13 +367,13 @@ RecyclingHelper.replaceShaped("gregtech:gregtech.machine.cutter.hv", metaitem('g
 ])
 
 RecyclingHelper.replaceShaped("gregtech:gregtech.machine.electrolyzer.lv", metaitem('gregtech:electrolyzer.lv'), [
-		[metaitem('wireGtSingleSilver'), item('minecraft:glass'), metaitem('wireGtSingleSilver')],
+		[metaitem('wireGtSingleSilver'), ore('blockGlass'), metaitem('wireGtSingleSilver')],
 		[metaitem('wireGtSingleSilver'), metaitem('gregtech:hull.lv'), metaitem('wireGtSingleSilver')],
 		[ore('circuitLv'), metaitem('cableGtSingleTin'), ore('circuitLv')]
 ])
 
 RecyclingHelper.replaceShaped("gregtech:gregtech.machine.electrolyzer.mv", metaitem('gregtech:electrolyzer.mv'), [
-		[metaitem('wireGtSingleGold'), item('minecraft:glass'), metaitem('wireGtSingleGold')],
+		[metaitem('wireGtSingleGold'), ore('blockGlass'), metaitem('wireGtSingleGold')],
 		[metaitem('wireGtSingleGold'), metaitem('gregtech:hull.mv'), metaitem('wireGtSingleGold')],
 		[ore('circuitMv'), metaitem('cableGtSingleCopper'), ore('circuitMv')]
 ])
@@ -1418,7 +1418,7 @@ mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:
 mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 4])
 
 crafting.addShaped("gregtech:fluid_hatch.import.ulv", metaitem('fluid_hatch.import.ulv'), [
-		[null, item('minecraft:glass'), null],
+		[null, ore('blockGlass'), null],
 		[null, metaitem('hull.ulv'), null],
 		[null, null, null]
 ])
@@ -1432,7 +1432,7 @@ mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:
 crafting.addShaped("gregtech:fluid_hatch.export.ulv", metaitem('fluid_hatch.export.ulv'), [
 		[null, null, null],
 		[null, metaitem('hull.ulv'), null],
-		[null, item('minecraft:glass'), null]
+		[null, ore('blockGlass'), null]
 ])
 
 // Black Granite Dust * 1
diff --git a/groovy/postInit/mod/ImmersiveRailroading.groovy b/groovy/postInit/mod/ImmersiveRailroading.groovy
index e48b5e2d9..d206910ee 100755
--- a/groovy/postInit/mod/ImmersiveRailroading.groovy
+++ b/groovy/postInit/mod/ImmersiveRailroading.groovy
@@ -1,10 +1,11 @@
-log.infoMC("Running ImmersiveRailroading.groovy...")
 
+import cam72cam.immersiverailroading.IRItems
+import cam72cam.mod.serialization.TagCompound
 import globals.Globals
-import supersymmetry.api.recipes.SuSyRecipeMaps;
-import cam72cam.immersiverailroading.IRItems;
-import cam72cam.mod.serialization.TagCompound;
-import trackapi.lib.Gauges;
+import supersymmetry.api.recipes.SuSyRecipeMaps
+import trackapi.lib.Gauges
+
+log.infoMC("Running ImmersiveRailroading.groovy...")
 
 ArrayList<String> name_removals = [
 		"immersiverailroading:item_manual",
@@ -204,7 +205,7 @@ Globals.solders.each { key, val ->
 			.inputs(metaitem('electric.motor.lv') * 4)
 			.inputs(metaitem('electric.piston.lv') * 4)
 			.inputs(item('gregtech:boiler_firebox_casing', 1) * 2)
-			.inputs(item('minecraft:glass') * 4)
+			.inputs(ore('blockGlass') * 4)
 			.inputs(ore('plateSteel') * 16)
 			.inputs(ore('stickLongSteel') * 8)
 			.fluidInputs(fluid(key) * (val * 10))
@@ -247,7 +248,7 @@ Globals.solders.each { key, val ->
 			.inputs(metaitem('minecart_wheels.steel') * 4)
 			.inputs(ore('plateSteel') * 20)
 			.inputs(ore('stickLongSteel') * 6)
-			.inputs(item('minecraft:glass') * 4)
+			.inputs(ore('blockGlass') * 4)
 			.fluidInputs(fluid(key) * (val * 10))
 			.outputs(is3.internal)
 			.EUt(30)

From 63d8bb3c0eb8a37b3cb8cdb8c2794363f4bd82c8 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 15:58:59 +0800
Subject: [PATCH 16/41] :cringe:

---
 groovy/postInit/mod/Pyrotech.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
index 50a423a78..304ad9022 100644
--- a/groovy/postInit/mod/Pyrotech.groovy
+++ b/groovy/postInit/mod/Pyrotech.groovy
@@ -1099,7 +1099,7 @@ alloying_recipes = [
         // SnFe
         ["TinAlloy", 2, 100, ["Iron", 1, "Tin", 1]],
         // Potin
-        ["Potin", 9, 100, ["Copper", 6, "Tin", 2, "Lead", 1]],
+        ["Potin", 9, 100, ["Bronze", 8, "Lead", 1]],
         // Kovar
         ["Kovar", 2, 100, ["Iron", 2, "Nickel", 1, "CobaltMatte", 1]]
 ]

From 9bddb264d4c3e7b94b380a9c882d2248cc23aa2b Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 23:28:47 +0800
Subject: [PATCH 17/41] quest fixes

---
 .../DefaultQuests/QuestLines/0.json           | 76 +++++++++----------
 .../DefaultQuests/Quests/0/117.json           |  8 +-
 .../DefaultQuests/Quests/0/1958019111.json    |  3 +-
 .../DefaultQuests/Quests/0/366.json           |  2 +-
 .../DefaultQuests/Quests/0/58115670.json      |  1 +
 .../DefaultQuests/Quests/0/744003683.json     |  3 +-
 .../DefaultQuests/Quests/0/89.json            |  2 +-
 .../DefaultQuests/Quests/25/150.json          |  1 +
 .../DefaultQuests/Quests/5/756.json           |  2 +-
 .../Quests/MultipleQuestLine/602.json         |  2 +-
 .../resources/supersymmetry/lang/en_us.lang   |  4 +-
 11 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/config/betterquesting/DefaultQuests/QuestLines/0.json b/config/betterquesting/DefaultQuests/QuestLines/0.json
index 3e378fe09..8611fc147 100644
--- a/config/betterquesting/DefaultQuests/QuestLines/0.json
+++ b/config/betterquesting/DefaultQuests/QuestLines/0.json
@@ -156,7 +156,7 @@
       "id:3": 22,
       "sizeX:3": 48,
       "sizeY:3": 48,
-      "x:3": 420,
+      "x:3": 456,
       "y:3": 83
     },
     "21:10": {
@@ -170,7 +170,7 @@
       "id:3": 25,
       "sizeX:3": 40,
       "sizeY:3": 40,
-      "x:3": 424,
+      "x:3": 460,
       "y:3": -21
     },
     "23:10": {
@@ -191,7 +191,7 @@
       "id:3": 30,
       "sizeX:3": 48,
       "sizeY:3": 48,
-      "x:3": 420,
+      "x:3": 456,
       "y:3": -89
     },
     "26:10": {
@@ -205,7 +205,7 @@
       "id:3": 74,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 432,
+      "x:3": 468,
       "y:3": 356
     },
     "28:10": {
@@ -240,8 +240,8 @@
       "id:3": 89,
       "sizeX:3": 48,
       "sizeY:3": 48,
-      "x:3": 112,
-      "y:3": 36
+      "x:3": 396,
+      "y:3": -25
     },
     "33:10": {
       "id:3": 90,
@@ -254,28 +254,28 @@
       "id:3": 91,
       "sizeX:3": 48,
       "sizeY:3": 48,
-      "x:3": 112,
-      "y:3": 128
+      "x:3": 100,
+      "y:3": 43
     },
     "35:10": {
       "id:3": 93,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 71,
+      "x:3": 84,
       "y:3": 260
     },
     "36:10": {
       "id:3": 106,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 432,
+      "x:3": 468,
       "y:3": 304
     },
     "37:10": {
       "id:3": 107,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 432,
+      "x:3": 468,
       "y:3": 249
     },
     "38:10": {
@@ -303,7 +303,7 @@
       "id:3": 129,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 432,
+      "x:3": 468,
       "y:3": 39
     },
     "42:10": {
@@ -317,8 +317,8 @@
       "id:3": 149,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 165,
-      "y:3": 95
+      "x:3": 178,
+      "y:3": 55
     },
     "44:10": {
       "id:3": 187,
@@ -331,15 +331,15 @@
       "id:3": 213,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 476,
-      "y:3": -40
+      "x:3": 512,
+      "y:3": -13
     },
     "46:10": {
       "id:3": 366,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 256,
-      "y:3": -21
+      "x:3": 40,
+      "y:3": 356
     },
     "47:10": {
       "id:3": 441,
@@ -352,8 +352,8 @@
       "id:3": 650,
       "sizeX:3": 48,
       "sizeY:3": 48,
-      "x:3": 536,
-      "y:3": -52
+      "x:3": 555,
+      "y:3": -25
     },
     "49:10": {
       "id:3": 656,
@@ -380,22 +380,22 @@
       "id:3": 722,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 388,
+      "x:3": 512,
       "y:3": -56
     },
     "53:10": {
       "id:3": 723,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 388,
-      "y:3": -28
+      "x:3": 567,
+      "y:3": -56
     },
     "54:10": {
       "id:3": 738,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 388,
-      "y:3": 28
+      "x:3": 567,
+      "y:3": 32
     },
     "55:10": {
       "id:3": 763,
@@ -408,8 +408,8 @@
       "id:3": 861,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 388,
-      "y:3": 0
+      "x:3": 512,
+      "y:3": 32
     },
     "57:10": {
       "id:3": 862,
@@ -450,8 +450,8 @@
       "id:3": 456863075,
       "sizeX:3": 32,
       "sizeY:3": 32,
-      "x:3": 28,
-      "y:3": 256
+      "x:3": 36,
+      "y:3": 240
     },
     "63:10": {
       "id:3": 530373325,
@@ -471,15 +471,15 @@
       "id:3": 744003683,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 71,
+      "x:3": 84,
       "y:3": 300
     },
     "66:10": {
       "id:3": 1107188354,
       "sizeX:3": 32,
       "sizeY:3": 32,
-      "x:3": 176,
-      "y:3": 264
+      "x:3": 166,
+      "y:3": 296
     },
     "67:10": {
       "id:3": 1241306929,
@@ -499,7 +499,7 @@
       "id:3": 1580653524,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 144,
+      "x:3": 127,
       "y:3": 300
     },
     "70:10": {
@@ -520,8 +520,8 @@
       "id:3": 1677924297,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 476,
-      "y:3": -12
+      "x:3": 424,
+      "y:3": -56
     },
     "73:10": {
       "id:3": 1767849062,
@@ -534,8 +534,8 @@
       "id:3": 1867050010,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 476,
-      "y:3": 16
+      "x:3": 424,
+      "y:3": 32
     },
     "75:10": {
       "id:3": 1902566957,
@@ -555,7 +555,7 @@
       "id:3": 2081939483,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 71,
+      "x:3": 84,
       "y:3": 344
     }
   }
diff --git a/config/betterquesting/DefaultQuests/Quests/0/117.json b/config/betterquesting/DefaultQuests/Quests/0/117.json
index 397183a93..e8c7fd10f 100644
--- a/config/betterquesting/DefaultQuests/Quests/0/117.json
+++ b/config/betterquesting/DefaultQuests/Quests/0/117.json
@@ -1,6 +1,11 @@
 {
+  "preRequisiteTypes:7": [
+    0,
+    2
+  ],
   "preRequisites:11": [
-    58115670
+    58115670,
+    1677924297
   ],
   "properties:10": {
     "betterquesting:10": {
@@ -12,6 +17,7 @@
       },
       "ignoresview:1": 0,
       "name:8": "susy.quest.db.117.title",
+      "questlogic:8": "OR",
       "visibility:8": "ALWAYS"
     }
   },
diff --git a/config/betterquesting/DefaultQuests/Quests/0/1958019111.json b/config/betterquesting/DefaultQuests/Quests/0/1958019111.json
index 0f33493a2..eab43f1a7 100644
--- a/config/betterquesting/DefaultQuests/Quests/0/1958019111.json
+++ b/config/betterquesting/DefaultQuests/Quests/0/1958019111.json
@@ -1,7 +1,6 @@
 {
   "preRequisites:11": [
-    1107188354,
-    1580653524
+    1107188354
   ],
   "properties:10": {
     "betterquesting:10": {
diff --git a/config/betterquesting/DefaultQuests/Quests/0/366.json b/config/betterquesting/DefaultQuests/Quests/0/366.json
index 112e6228d..7257d9b01 100644
--- a/config/betterquesting/DefaultQuests/Quests/0/366.json
+++ b/config/betterquesting/DefaultQuests/Quests/0/366.json
@@ -1,6 +1,6 @@
 {
   "preRequisites:11": [
-    21
+    87
   ],
   "properties:10": {
     "betterquesting:10": {
diff --git a/config/betterquesting/DefaultQuests/Quests/0/58115670.json b/config/betterquesting/DefaultQuests/Quests/0/58115670.json
index 3a5393375..6acad7749 100644
--- a/config/betterquesting/DefaultQuests/Quests/0/58115670.json
+++ b/config/betterquesting/DefaultQuests/Quests/0/58115670.json
@@ -11,6 +11,7 @@
       },
       "ignoresview:1": 0,
       "name:8": "susy.quest.db.58115670.title",
+      "tasklogic:8": "OR",
       "visibility:8": "ALWAYS"
     }
   },
diff --git a/config/betterquesting/DefaultQuests/Quests/0/744003683.json b/config/betterquesting/DefaultQuests/Quests/0/744003683.json
index 1d37cbb7f..b51ff9169 100644
--- a/config/betterquesting/DefaultQuests/Quests/0/744003683.json
+++ b/config/betterquesting/DefaultQuests/Quests/0/744003683.json
@@ -1,7 +1,6 @@
 {
   "preRequisites:11": [
-    87,
-    456863075
+    87
   ],
   "properties:10": {
     "betterquesting:10": {
diff --git a/config/betterquesting/DefaultQuests/Quests/0/89.json b/config/betterquesting/DefaultQuests/Quests/0/89.json
index 4152c792b..4f4b5f331 100644
--- a/config/betterquesting/DefaultQuests/Quests/0/89.json
+++ b/config/betterquesting/DefaultQuests/Quests/0/89.json
@@ -1,6 +1,6 @@
 {
   "preRequisites:11": [
-    149
+    25
   ],
   "properties:10": {
     "betterquesting:10": {
diff --git a/config/betterquesting/DefaultQuests/Quests/25/150.json b/config/betterquesting/DefaultQuests/Quests/25/150.json
index 08661cea0..4a70a30dc 100644
--- a/config/betterquesting/DefaultQuests/Quests/25/150.json
+++ b/config/betterquesting/DefaultQuests/Quests/25/150.json
@@ -22,6 +22,7 @@
       "requiredItems:9": {
         "0:10": {
           "Count:3": 1,
+          "OreDict:8": "chest",
           "id:8": "minecraft:chest"
         }
       },
diff --git a/config/betterquesting/DefaultQuests/Quests/5/756.json b/config/betterquesting/DefaultQuests/Quests/5/756.json
index eaca1c172..65a4c14fa 100644
--- a/config/betterquesting/DefaultQuests/Quests/5/756.json
+++ b/config/betterquesting/DefaultQuests/Quests/5/756.json
@@ -25,7 +25,7 @@
         "0:10": {
           "Count:3": 64,
           "Damage:2": 15014,
-          "id:8": "gregtech:meta_wire_fine"
+          "id:8": "gregtech:meta_thread"
         }
       },
       "taskID:8": "bq_standard:retrieval"
diff --git a/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/602.json b/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/602.json
index 0d8cd61ba..c4cfbb2f3 100644
--- a/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/602.json
+++ b/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/602.json
@@ -1,6 +1,6 @@
 {
   "preRequisites:11": [
-    124
+    126
   ],
   "properties:10": {
     "betterquesting:10": {
diff --git a/config/betterquesting/resources/supersymmetry/lang/en_us.lang b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
index 78c5a8c0e..911a928ef 100644
--- a/config/betterquesting/resources/supersymmetry/lang/en_us.lang
+++ b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
@@ -81,7 +81,7 @@ susy.quest.db.11.desc=§6Leather §rneeds to be boiled to make §6Treated Leathe
 susy.quest.db.12.title=Stone Tools
 susy.quest.db.12.desc=Now, you should be able to craft your first §7tools§r in your own crafting inventory! A pickaxe and an axe should suffice for now, although a shovel is nice for getting through dirt.%n%nNote: To find the recipe for stone tools, you should check the recipe for their iron variant (or simply by pressing §6[R]§r on the items on the right-hand side) and turn to the §6last§r page of the JEI.
 susy.quest.db.13.title=Copper
-susy.quest.db.13.desc=Copper is found in §6Chalcopyrite, Chalcocite, Malachite, Bornite§f, or §6Tetrahedrite §fveins. Copper can be found pretty much everywhere in the Earth's crust, and even in the deeper layers. Sometimes you might even find some §6Native Copper Deposits§r, which contains coppers in its elemental form.%n%nIf you are having trouble finding a specific deposit, look it up in the JEI database, you will find a page showing where it is found. %n%nLet's start by getting 30 copper ingots.%n%nFinding a §6Tiny Pile of Copper Dust §ron the ground means that there is a deposit under it.%n%n§0§9§e§d§c§b§l§c§c§lAs a very important rule of thumb, quest retrieval numbers are arbitrary. You can follow the suggestion here, but trust me when I say you will need a whole lot more Copper.
+susy.quest.db.13.desc=Copper can be found pretty much everywhere in the Earth's crust, and even in the deeper layers. Sometimes you might even find some §6Native Copper Deposits§r, which contains coppers in its elemental form.%n%nYou can get coppers from §eChalcopyrite§r, §8Chalcocite§r, §2Malachite§r, §6Bornite§r, or §4Tetrahedrite§r veins. However, the Primitive Smelter §c§lcannot process§r Chalcopyrite since it contains too much irons in it. %n%nFinding a §6Tiny Pile of Copper Dust §ron the ground means that there is a deposit under it. If you are having trouble finding a specific deposit, look it up in the JEI database, you will find a page showing where it is found. %n%nLet's start by getting 30 copper ingots.%n%n§c§lAs a very important rule of thumb, quest retrieval numbers are arbitrary. You can follow the suggestion here, but trust me when I say you will need a whole lot more Copper.
 susy.quest.db.14.title=Tin
 susy.quest.db.14.desc=Tin can be found in §6Cassiterite Sand§r and §6Cassiterite§f§6 Ore§f veins. You can look them up in the JEI database to see where you can find them.%n%nTin is a silvery-coloured metal. Tin is soft enough to be cut with little force and a bar of tin can be bent with little effort. %n§6%n§l§rOre deposits cover a surface of 20 by 20 meters across. Each deposit can contain up to 5,000 ingots worth of ore. %n%n§0§9§e§d§c§b§l§c§c§lAs a very important rule of thumb, quest retrieval numbers are arbitrary. You can follow the suggestion here, but trust me when I say you will need a lot more Tin and especially Copper.
 susy.quest.db.15.title=Macerator V0.1 Alpha
@@ -787,7 +787,7 @@ susy.quest.db.364.desc=No Description
 susy.quest.db.365.title=118 | Oganesson
 susy.quest.db.365.desc=No Description
 susy.quest.db.366.title=Home Block
-susy.quest.db.366.desc=You can craft §6home blocks §rusing a block of smooth stone and a file.%n %nThe home block has 4 variants, you can cycle through them by putting them in a crafting table.%n
+susy.quest.db.366.desc=You can craft §6home blocks §rusing a block of smooth stone and a hammer. You can reset your spawn by R-clicking them.%n%nThe home block has 4 variants, you can cycle through them by putting them in a crafting table, or using a chisel if you have aquired some iron.
 susy.quest.db.367.title=Catalysts
 susy.quest.db.367.desc=A §6catalyst§r is a substance that speeds up a chemical reaction without being consumed in the process.%n%nThere are §6catalyst beds, pellets, and dusts§r, depending on the machine used. §cTiered§r catalysts can affect speed and energy consumption, similarly to the way overclocking can increase the efficiency of a machine.%n%nCatalysts can be used to help §6speed up processes, or even make them cheaper§r, this chapter will serve as a list of useful or commonly used catalysts.
 susy.quest.db.368.title=Annealed Copper

From 49adfe4f6de8f5b131f8cdb4113474941c107fe5 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 23:30:23 +0800
Subject: [PATCH 18/41] nerf coke oven a little

---
 groovy/postInit/mod/Pyrotech.groovy | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
index 304ad9022..a6eb510e6 100644
--- a/groovy/postInit/mod/Pyrotech.groovy
+++ b/groovy/postInit/mod/Pyrotech.groovy
@@ -1123,7 +1123,7 @@ mods.gregtech.coke_oven.removeByInput(1, [item('minecraft:coal_block')], null)
 mods.gregtech.coke_oven.recipeBuilder()
         .inputs(ore('logWood'))
         .outputs(item('minecraft:coal', 1))
-        .fluidOutputs(fluid('creosote') * 250)
+        .fluidOutputs(fluid('creosote') * 125)
         .duration(100)
         .buildAndRegister()
 
@@ -1131,7 +1131,7 @@ mods.gregtech.coke_oven.recipeBuilder()
 mods.gregtech.coke_oven.recipeBuilder()
         .inputs(ore('gemCoal'))
         .outputs(metaitem('gemCoke'))
-        .fluidOutputs(fluid('creosote') * 500)
+        .fluidOutputs(fluid('creosote') * 250)
         .duration(100)
         .buildAndRegister()
 
@@ -1139,7 +1139,7 @@ mods.gregtech.coke_oven.recipeBuilder()
 mods.gregtech.coke_oven.recipeBuilder()
         .inputs(ore('blockCoal'))
         .outputs(metaitem('blockCoke'))
-        .fluidOutputs(fluid('creosote') * 4500)
+        .fluidOutputs(fluid('creosote') * 2250)
         .duration(900)
         .buildAndRegister()
 
@@ -1148,7 +1148,7 @@ mods.gregtech.coke_oven.recipeBuilder()
 mods.gregtech.coke_oven.recipeBuilder()
         .inputs(item('pyrotech:log_pile'))
         .outputs(item('minecraft:coal', 1) * 10)
-        .fluidOutputs(fluid('creosote') * 2500)
+        .fluidOutputs(fluid('creosote') * 1250)
         .duration(900)
         .buildAndRegister()
 
@@ -1156,7 +1156,7 @@ mods.gregtech.coke_oven.recipeBuilder()
 mods.gregtech.coke_oven.recipeBuilder()
         .inputs(ore('gemLignite'))
         .outputs(ore('gemLigniteCoke').getFirst())
-        .fluidOutputs(fluid('creosote') * 250)
+        .fluidOutputs(fluid('creosote') * 125)
         .duration(100)
         .buildAndRegister()
 
@@ -1164,7 +1164,7 @@ mods.gregtech.coke_oven.recipeBuilder()
 mods.gregtech.coke_oven.recipeBuilder()
         .inputs(ore('blockLignite'))
         .outputs(ore('blockLigniteCoke').getFirst())
-        .fluidOutputs(fluid('creosote') * 2250)
+        .fluidOutputs(fluid('creosote') * 1125)
         .duration(900)
         .buildAndRegister()
 

From 44b2f53389220c511dea16053563af7ab210244c Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 23:34:34 +0800
Subject: [PATCH 19/41] increase back some slag output

---
 groovy/postInit/mod/Pyrotech.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
index a6eb510e6..691defa70 100644
--- a/groovy/postInit/mod/Pyrotech.groovy
+++ b/groovy/postInit/mod/Pyrotech.groovy
@@ -941,7 +941,7 @@ class Ore {
     }
 
     ItemStack getByproduct(Prefix prefix) {
-        int amount = prefix.byproduct_amount * output_multiplier * (byproduct == "pyrotech:slag" ? 1 : 8)
+        int amount = prefix.byproduct_amount * output_multiplier * (byproduct == "pyrotech:slag" ? 2 : 8)
         return (byproduct == null || amount == 0) ? null : (item(byproduct) * amount)
     }
 }

From 7446b27a60e7c8eff4ff0737a4c76e1c6365d3df Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 23:38:06 +0800
Subject: [PATCH 20/41] fix H20 issue (wow there's another one)

---
 groovy/material/FirstDegreeMaterials.groovy        | 2 +-
 groovy/material/UnknownCompositionMaterials.groovy | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy
index c8f7a7266..0e4b253e2 100644
--- a/groovy/material/FirstDegreeMaterials.groovy
+++ b/groovy/material/FirstDegreeMaterials.groovy
@@ -3423,7 +3423,7 @@ public class FirstDegreeMaterials {
                 .components(Argon, Water)
                 .colorAverage()
                 .build()
-                .setFormula("(Ar)(H20)")
+                .setFormula("(Ar)(H2O)")
 
         ArgonHydrogenMixture = new Material.Builder(8628, SuSyUtility.susyId("argon_hydrogen_mixture"))
                 .gas()
diff --git a/groovy/material/UnknownCompositionMaterials.groovy b/groovy/material/UnknownCompositionMaterials.groovy
index b21c520b0..c3b689120 100644
--- a/groovy/material/UnknownCompositionMaterials.groovy
+++ b/groovy/material/UnknownCompositionMaterials.groovy
@@ -1141,7 +1141,7 @@ public class UnknownCompositionMaterials {
                 .color(0x74561d)
                 .build();
 
-        TitanylSulfateSolution.setFormula('(H20)(TiO[SO4])(?)', true);
+        TitanylSulfateSolution.setFormula('(H2O)(TiO[SO4])(?)', true);
 
         AcidicWastewater = new Material.Builder(4233, SuSyUtility.susyId('acidic_wastewater'))
                 .liquid(new FluidBuilder().attribute(FluidAttributes.ACID))

From 8634d9a5d6f148aa00cbac2f46b6557a45f86026 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 26 Oct 2024 23:57:49 +0800
Subject: [PATCH 21/41] add formula to cobalt matte

---
 groovy/material/FirstDegreeMaterials.groovy        | 7 +++++++
 groovy/material/UnknownCompositionMaterials.groovy | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy
index 0e4b253e2..0f3083a8c 100644
--- a/groovy/material/FirstDegreeMaterials.groovy
+++ b/groovy/material/FirstDegreeMaterials.groovy
@@ -162,6 +162,13 @@ public class FirstDegreeMaterials {
                 .colorAverage()
                 .build();
 
+        CobaltMatte = new Material.Builder(8106, SuSyUtility.susyId("cobalt_matte"))
+                .ingot()
+                .flags(NO_UNIFICATION)
+                .color(0x7070d6)
+                .build()
+                .setFormula("(Co)(?)")
+
         AmmoniumNitrate = new Material.Builder(8107, SuSyUtility.susyId('ammonium_nitrate'))
                 .dust()
                 .components(Nitrogen * 2, Oxygen * 3, Hydrogen * 4)
diff --git a/groovy/material/UnknownCompositionMaterials.groovy b/groovy/material/UnknownCompositionMaterials.groovy
index c3b689120..86c1a1d93 100644
--- a/groovy/material/UnknownCompositionMaterials.groovy
+++ b/groovy/material/UnknownCompositionMaterials.groovy
@@ -1937,11 +1937,5 @@ public class UnknownCompositionMaterials {
                 .dust()
                 .color(0x631a87)
                 .build()
-
-        CobaltMatte = new Material.Builder(4424, SuSyUtility.susyId("cobalt_matte"))
-                .ingot()
-                .flags(NO_UNIFICATION)
-                .color(0x7070d6)
-                .build()
     }
 }

From 15f69c55d5b92e9250973b7a73da44c5c4dcca77 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sun, 27 Oct 2024 10:09:20 +0800
Subject: [PATCH 22/41] allows alloying recipes to use all kinds of fuels

---
 groovy/postInit/mod/Pyrotech.groovy | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
index 691defa70..709945193 100644
--- a/groovy/postInit/mod/Pyrotech.groovy
+++ b/groovy/postInit/mod/Pyrotech.groovy
@@ -1057,20 +1057,11 @@ def alloying_prefixes = [
         prefix_dust
 ]
 
-def fuels = [
-        "gemCoal",
-        "fuelCoke",
-        "gemAnthracite",
-        "dustCoal",
-        "dustCoke",
-        "dustAnthracite"
-]
-
 def alloy_add = {String output, int amount, int duration, ArrayList inputs ->
         int recipe_multiplier = Math.ceil(8 / amount)
         def size = inputs.size().intdiv(2)
         def real = ([alloying_prefixes] * size).combinations()
-        fuels.forEach { fuel ->
+        reductants.forEach { reductant ->
             real.forEach { bad ->
                 def builder = SMELTER.recipeBuilder()
                 double multiplier_sum = 0
@@ -1081,7 +1072,7 @@ def alloy_add = {String output, int amount, int duration, ArrayList inputs ->
                     count += amountIn
                     builder.inputs(ore(bad[i].name + inputs[ 2 * i ]) * (amountIn * recipe_multiplier))
                 }
-                builder.inputs(ore(fuel) * (count * recipe_multiplier))
+                builder.inputs(ore(reductant.name) * (count * recipe_multiplier))
                         .outputs(metaitem("ingot" + output) * (amount * recipe_multiplier))
                         .duration((int) (duration *  multiplier_sum / count) * recipe_multiplier)
                         .buildAndRegister()

From cc96744f8b605cf1471b4a5094f2e6a647d880b4 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sun, 27 Oct 2024 10:31:13 +0800
Subject: [PATCH 23/41] updates BQu

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 5341a9042..576809699 100644
--- a/manifest.json
+++ b/manifest.json
@@ -252,7 +252,7 @@
     },
     {
       "projectID": 629629,
-      "fileID": 5802573,
+      "fileID": 5849559,
       "required": true
     },
     {

From 9758a7875df58c1f69c90321401a95dbd36fdf61 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sun, 27 Oct 2024 19:22:38 +0800
Subject: [PATCH 24/41] oops

---
 groovy/material/FirstDegreeMaterials.groovy    | 4 ++--
 groovy/material/SecondDegreeMaterials.groovy   | 4 ++--
 groovy/material/ThermodynamicsMaterials.groovy | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy
index 0f3083a8c..d1924e51f 100644
--- a/groovy/material/FirstDegreeMaterials.groovy
+++ b/groovy/material/FirstDegreeMaterials.groovy
@@ -3430,13 +3430,13 @@ public class FirstDegreeMaterials {
                 .components(Argon, Water)
                 .colorAverage()
                 .build()
-                .setFormula("(Ar)(H2O)")
+                .setFormula("(Ar)(H2O)", true)
 
         ArgonHydrogenMixture = new Material.Builder(8628, SuSyUtility.susyId("argon_hydrogen_mixture"))
                 .gas()
                 .components(Argon, Hydrogen * 4)
                 .color(0x20a291)
                 .build()
-                .setFormula("(Ar)(H)")
+                .setFormula("(Ar)(H)", true)
     }
 }
diff --git a/groovy/material/SecondDegreeMaterials.groovy b/groovy/material/SecondDegreeMaterials.groovy
index 315996693..caa7aec13 100644
--- a/groovy/material/SecondDegreeMaterials.groovy
+++ b/groovy/material/SecondDegreeMaterials.groovy
@@ -719,13 +719,13 @@ public class SecondDegreeMaterials {
                 .components(Argon, Hydrogen * 4, HydrogenChloride)
                 .colorAverage()
                 .build()
-                .setFormula("(Ar)(HCl)(H)");
+                .setFormula("(Ar)(HCl)(H)", true);
 
         AmmoniacalArgonHydrogenMixture = new Material.Builder(8627, SuSyUtility.susyId("ammoniacal_argon_hydrogen_mixture"))
                 .gas()
                 .components(Argon, Hydrogen * 4, Ammonia)
                 .colorAverage()
                 .build()
-                .setFormula("(Ar)(NH3)(H)")
+                .setFormula("(Ar)(NH3)(H)", true)
     }
 }
diff --git a/groovy/material/ThermodynamicsMaterials.groovy b/groovy/material/ThermodynamicsMaterials.groovy
index 1b17c57f0..3b4ce4c09 100755
--- a/groovy/material/ThermodynamicsMaterials.groovy
+++ b/groovy/material/ThermodynamicsMaterials.groovy
@@ -487,20 +487,20 @@ class ThermodynamicsMaterials {
                 .components(Argon, Hydrogen, Ammonia)
                 .colorAverage()
                 .build()
-                .setFormula("(Ar)(NH3)(H)")
+                .setFormula("(Ar)(NH3)(H)", true)
 
         ColdArgonHydrogenMixture = new Material.Builder(22845, SuSyUtility.susyId('cold_argon_hydrogen_mixture'))
                 .gas(new FluidBuilder().temperature(220))
                 .components(Argon, Hydrogen)
                 .color(0x20a591)
                 .build()
-                .setFormula("(Ar)(H)")
+                .setFormula("(Ar)(H)", true)
 
         PartiallyLiquefiedArgonHydrogenMixture = new Material.Builder(22846, SuSyUtility.susyId('partially_liquefied_argon_hydrogen_mixture'))
                 .liquid(new FluidBuilder().temperature(73))
                 .components(Argon, Hydrogen)
                 .color(0x20aa91)
                 .build()
-                .setFormula("(Ar)(H)")
+                .setFormula("(Ar)(H)", true)
     }
 }
\ No newline at end of file

From 22f6c1b69c5e66761076d712d74710f6e57ad75c Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sun, 27 Oct 2024 22:56:06 +0800
Subject: [PATCH 25/41] remove Tetrahedrite and Bornite smelting

---
 config/betterquesting/resources/supersymmetry/lang/en_us.lang | 2 +-
 groovy/postInit/mod/Pyrotech.groovy                           | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/config/betterquesting/resources/supersymmetry/lang/en_us.lang b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
index 911a928ef..79488959a 100644
--- a/config/betterquesting/resources/supersymmetry/lang/en_us.lang
+++ b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
@@ -81,7 +81,7 @@ susy.quest.db.11.desc=§6Leather §rneeds to be boiled to make §6Treated Leathe
 susy.quest.db.12.title=Stone Tools
 susy.quest.db.12.desc=Now, you should be able to craft your first §7tools§r in your own crafting inventory! A pickaxe and an axe should suffice for now, although a shovel is nice for getting through dirt.%n%nNote: To find the recipe for stone tools, you should check the recipe for their iron variant (or simply by pressing §6[R]§r on the items on the right-hand side) and turn to the §6last§r page of the JEI.
 susy.quest.db.13.title=Copper
-susy.quest.db.13.desc=Copper can be found pretty much everywhere in the Earth's crust, and even in the deeper layers. Sometimes you might even find some §6Native Copper Deposits§r, which contains coppers in its elemental form.%n%nYou can get coppers from §eChalcopyrite§r, §8Chalcocite§r, §2Malachite§r, §6Bornite§r, or §4Tetrahedrite§r veins. However, the Primitive Smelter §c§lcannot process§r Chalcopyrite since it contains too much irons in it. %n%nFinding a §6Tiny Pile of Copper Dust §ron the ground means that there is a deposit under it. If you are having trouble finding a specific deposit, look it up in the JEI database, you will find a page showing where it is found. %n%nLet's start by getting 30 copper ingots.%n%n§c§lAs a very important rule of thumb, quest retrieval numbers are arbitrary. You can follow the suggestion here, but trust me when I say you will need a whole lot more Copper.
+susy.quest.db.13.desc=Copper can be found pretty much everywhere in the Earth's crust, and even in the deeper layers. Sometimes you might even find some §6Native Copper Deposits§r, which contains coppers in its elemental form.%n%nYou can get coppers from §eChalcopyrite§r, §8Chalcocite§r, §2Malachite§r, §6Bornite§r, or §4Tetrahedrite§r veins. However, the Primitive Smelter can only process ores that contains no other matels, which means §c§lONLY§r Chalcocite and Malachite can be used at the moment.%n%nFinding a §6Tiny Pile of Copper Dust §ron the ground means that there is a deposit under it. If you are having trouble finding a specific deposit, look it up in the JEI database, you will find a page showing where it is found. %n%nLet's start by getting 30 copper ingots.%n%n§c§lAs a very important rule of thumb, quest retrieval numbers are arbitrary. You can follow the suggestion here, but trust me when I say you will need a whole lot more Copper.
 susy.quest.db.14.title=Tin
 susy.quest.db.14.desc=Tin can be found in §6Cassiterite Sand§r and §6Cassiterite§f§6 Ore§f veins. You can look them up in the JEI database to see where you can find them.%n%nTin is a silvery-coloured metal. Tin is soft enough to be cut with little force and a bar of tin can be bent with little effort. %n§6%n§l§rOre deposits cover a surface of 20 by 20 meters across. Each deposit can contain up to 5,000 ingots worth of ore. %n%n§0§9§e§d§c§b§l§c§c§lAs a very important rule of thumb, quest retrieval numbers are arbitrary. You can follow the suggestion here, but trust me when I say you will need a lot more Tin and especially Copper.
 susy.quest.db.15.title=Macerator V0.1 Alpha
diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
index 709945193..4d83b5570 100644
--- a/groovy/postInit/mod/Pyrotech.groovy
+++ b/groovy/postInit/mod/Pyrotech.groovy
@@ -977,9 +977,6 @@ def smelting_prefixes = [
 def ores = [
         // Copper ores
         new Ore("Malachite", "Copper", 2),
-        new Ore("Tetrahedrite", "Copper"),
-//        new Ore("Chalcopyrite", "Copper"),
-        new Ore("Bornite", "Copper"),
         new Ore("Chalcocite", "Copper"),
 
         // Lead ores

From c77bfd2a49e1336a74957a4b02ff4fe1973b5e12 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Mon, 28 Oct 2024 00:34:36 +0800
Subject: [PATCH 26/41] more quest fixes

---
 .../DefaultQuests/Quests/1/10.json            |  2 +-
 .../DefaultQuests/Quests/1/34.json            | 27 ++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/config/betterquesting/DefaultQuests/Quests/1/10.json b/config/betterquesting/DefaultQuests/Quests/1/10.json
index c2cd467d1..8d4b62858 100644
--- a/config/betterquesting/DefaultQuests/Quests/1/10.json
+++ b/config/betterquesting/DefaultQuests/Quests/1/10.json
@@ -1,6 +1,6 @@
 {
   "preRequisites:11": [
-    9
+    12
   ],
   "properties:10": {
     "betterquesting:10": {
diff --git a/config/betterquesting/DefaultQuests/Quests/1/34.json b/config/betterquesting/DefaultQuests/Quests/1/34.json
index 939965976..58cb76fe7 100644
--- a/config/betterquesting/DefaultQuests/Quests/1/34.json
+++ b/config/betterquesting/DefaultQuests/Quests/1/34.json
@@ -24,26 +24,39 @@
       "requiredItems:9": {
         "0:10": {
           "Count:3": 1,
-          "Damage:2": 16,
+          "Damage:2": 18,
           "id:8": "gregtech:meta_item_1"
         },
         "1:10": {
           "Count:3": 1,
-          "Damage:2": 12,
+          "Damage:2": 17,
           "id:8": "gregtech:meta_item_1"
-        },
-        "2:10": {
+        }
+      },
+      "taskID:8": "bq_standard:retrieval"
+    },
+    "1:10": {
+      "entryLogic:8": "AND",
+      "index:3": 1,
+      "partialMatch:1": 1,
+      "requiredItems:9": {
+        "0:10": {
           "Count:3": 1,
           "Damage:2": 13,
           "id:8": "gregtech:meta_item_1"
         },
-        "3:10": {
+        "1:10": {
           "Count:3": 1,
-          "Damage:2": 17,
+          "Damage:2": 23,
+          "id:8": "gregtech:meta_item_1"
+        },
+        "2:10": {
+          "Count:3": 1,
+          "Damage:2": 16,
           "id:8": "gregtech:meta_item_1"
         }
       },
-      "taskID:8": "bq_standard:retrieval"
+      "taskID:8": "bq_standard:optional_retrieval"
     }
   }
 }
\ No newline at end of file

From ff2244000a542e6238a74ed3653fc5114cd7f418 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Mon, 28 Oct 2024 00:41:05 +0800
Subject: [PATCH 27/41] allows igniting pyrotech furnaces with GT items

---
 groovy/postInit/mod/Pyrotech.groovy | 42 +++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
index 4d83b5570..85ab9224e 100644
--- a/groovy/postInit/mod/Pyrotech.groovy
+++ b/groovy/postInit/mod/Pyrotech.groovy
@@ -1,13 +1,19 @@
 package postInit.mod
 
 import com.cleanroommc.groovyscript.api.IIngredient
+import com.codetaylor.mc.pyrotech.library.spi.block.IBlockIgnitableWithIgniterItem
 import com.codetaylor.mc.pyrotech.modules.tech.basic.ModuleTechBasic
 import com.codetaylor.mc.pyrotech.modules.tech.basic.block.BlockKilnPit
 import globals.Globals
 import globals.RecyclingHelper
+import gregtech.api.items.metaitem.MetaItem
+import gregtech.api.items.metaitem.stats.IItemBehaviour
+import gregtech.api.util.GTUtility
+import gregtech.common.items.behaviors.LighterBehaviour
 import net.minecraft.util.EnumHand
 import net.minecraftforge.event.entity.player.PlayerInteractEvent
 import net.minecraftforge.event.world.BlockEvent
+import net.minecraftforge.fml.common.eventhandler.Event
 
 log.infoMC("Running Pyrotech.groovy...")
 
@@ -43,6 +49,42 @@ event_manager.listen { BlockEvent.HarvestDropsEvent event ->
     }
 }
 
+// Allow igniting pyrotech furnaces with GT items
+eventManager.listen { PlayerInteractEvent.RightClickBlock event ->
+
+    World world = event.getWorld()
+    BlockPos pos = event.getPos()
+    EnumFacing facing = event.getFace()
+    EntityPlayer player = event.getEntityPlayer()
+    IBlockState blockState = world.getBlockState(pos)
+    Block block = blockState.getBlock()
+
+    if (block instanceof IBlockIgnitableWithIgniterItem) {
+        def ignitable = (IBlockIgnitableWithIgniterItem) block
+        ItemStack stack = event.getItemStack()
+        Item item = stack.getItem()
+
+        if (item instanceof MetaItem) {
+            def metaItem = (MetaItem) item
+            for (IItemBehaviour behaviour : metaItem.getBehaviours(stack)) {
+                if (behaviour instanceof LighterBehaviour) {
+                    NBTTagCompound compound = GTUtility.getOrCreateNbtCompound(stack)
+                    if (stack.isItemEqual(metaitem('tool.matches'))     // Special checks for non-openable igniters
+                            || stack.isItemEqual(metaitem('tool.matchbox')) // WTF why is canOpen field privite
+                            || compound.getBoolean(LighterBehaviour.LIGHTER_OPEN)) {
+                        def lighterBehaviour = (LighterBehaviour) behaviour
+                        lighterBehaviour.consumeFuel(player, stack)
+                        ignitable.igniteWithIgniterItem(world, pos, blockState, facing)
+                        event.setUseItem(Event.Result.DENY)
+                        return
+                    }
+                    break
+                }
+            }
+        }
+    }
+}
+
 def name_removals = [
         "pyrotech:crude_hammer",
         "pyrotech:tech/basic/worktable",

From 89caf015cfce3c1694bfe3bdf15b11f5426e9f0b Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 2 Nov 2024 20:31:04 +0800
Subject: [PATCH 28/41] add warning

---
 config/betterquesting/resources/supersymmetry/lang/en_us.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/betterquesting/resources/supersymmetry/lang/en_us.lang b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
index 2236ecd82..5b1c032a6 100644
--- a/config/betterquesting/resources/supersymmetry/lang/en_us.lang
+++ b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
@@ -1867,4 +1867,4 @@ susy.quest.db.1958019111.desc=The §7Masonry Brick§r is essentially a brick-sha
 susy.quest.db.2081939483.title=Brick
 susy.quest.db.2081939483.desc=By compressing §3Clays§r in a §6Wooden Form§r, you can get §3Compressed Clays§r, which can be fired in a pit kiln to produce §4Bricks§r.
 susy.quest.db.1319048907.title=Graduated Cylinders
-susy.quest.db.1319048907.desc=While holding any item which can contain fluids in your main hand (i.e. §7buckets§r, §7fluid cells§r, or §7drums§r, etc.), §a§2punch§r any placed block which can also hold fluids (i.e. §7drums§r, §7fluid hatches§r, or §7GregTech machines§r, etc.) to open the §6transfer GUI§r. Here, you can choose the amount in milibuckets to transfer and the direction.%n%nYou can also transfer fluids §2between two items§r, by right-clicking one on top of the other in an inventory.%n%nThis well help a lot for batch crafting with fluids.
+susy.quest.db.1319048907.desc=While holding any item which can contain fluids in your main hand (i.e. §7buckets§r, §7fluid cells§r, or §7drums§r, etc.), §a§2punch§r any placed block which can also hold fluids (i.e. §7drums§r, §7fluid hatches§r, or §7GregTech machines§r, etc.) to open the §6transfer GUI§r. Here, you can choose the amount in milibuckets to transfer and the direction.%n%nYou can also transfer fluids §2between two items§r, by right-clicking one on top of the other in an inventory.%n%nThis well help a lot for batch crafting with fluids.%n%n§4§lWARNING: DO NOT use this on Coke Oven Hatches, THIS WILL CRASH YOUR GAME!

From f2a7532de44eda77d8d5cbf3fbf47c955788c794 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 2 Nov 2024 20:43:22 +0800
Subject: [PATCH 29/41] updates Universal Tweaks (and configs)

---
 config/Universal Tweaks - Bugfixes.cfg        | 10 +--
 config/Universal Tweaks - Mod Integration.cfg | 75 ++++++++++++++--
 config/Universal Tweaks - Tweaks.cfg          | 89 +++++++++++++++++--
 config/vintagefix.properties                  | 10 +++
 manifest.json                                 |  2 +-
 5 files changed, 160 insertions(+), 26 deletions(-)

diff --git a/config/Universal Tweaks - Bugfixes.cfg b/config/Universal Tweaks - Bugfixes.cfg
index 9afdea5f0..391178b5b 100644
--- a/config/Universal Tweaks - Bugfixes.cfg	
+++ b/config/Universal Tweaks - Bugfixes.cfg	
@@ -178,6 +178,7 @@ general {
         B:"Crafted Item Statistics"=true
 
         # Fixes entity and particle rendering issues by enabling depth buffer writing
+        # Can cause issues with modded particles
         B:"Depth Mask"=true
 
         # Replaces the help command, sorts and reports broken commands
@@ -201,17 +202,8 @@ general {
         B:"Spectator Menu"=true
 
         "model gap" {
-            # Fixes transparent gaps in all 3D models of blocks and items
             B:"[1] Model Gap Toggle"=true
-
-            # Quad X/Y offset
-            # Moves the quad toward the center of the item
-            # Use to hide gaps, keep as close to 0 as possible
             D:"[2] Recess Value"=0.007
-
-            # Quad expansion increment
-            # Enlarges each quad
-            # Use to hide gaps, keep as close to 0 as possible
             D:"[3] Expansion Value"=0.008
         }
 
diff --git a/config/Universal Tweaks - Mod Integration.cfg b/config/Universal Tweaks - Mod Integration.cfg
index 2a01d7413..fc726ee5d 100644
--- a/config/Universal Tweaks - Mod Integration.cfg	
+++ b/config/Universal Tweaks - Mod Integration.cfg	
@@ -14,6 +14,15 @@ general {
         # Fixes various duplication exploits
         B:"Duplication Fixes"=true
 
+        # Sets what level of Particles Setting is required to disable the Item Particles generated by Item Lasers transferring items
+        # The config setting here is complex due to how Vanilla Minecraft handles the Particles setting
+        # -1 or lower will not register the mixin
+        # 0 disables the creation of these particles entirely
+        # 1 disables the creation of these particles when the Particle setting is on Minimal only
+        # 2 disables the creation of these particles when the Particle setting is on Decreased or Minimal
+        # 3 or higher will never disable these particles
+        I:"Item Laser Particles Graphics"=-1
+
         # Fixes Laser Upgrades voiding instead of applying if there is only one item in the stack
         B:"Laser Upgrade Voiding"=true
     }
@@ -38,10 +47,11 @@ general {
         # Fixes various duplication exploits
         B:"Duplication Fixes"=true
 
+        # Fixes memory leak when unloading worlds/switching dimensions
+        B:"Memory Leak Fix"=true
+
         # Optimizes the Hellfire/Soul Forge to reduce tick time
         B:"Optimized Hellfire Forge"=true
-
-        # Fixes memory leak when unloading worlds/switching dimensions
         B:"World Unload Memory Leak Fix"=true
     }
 
@@ -74,6 +84,9 @@ general {
     "elementary staffs" {
         # Reintroduces the 1.5 electric staff behavior along with some subtle particles
         B:"Electric Staff Port"=true
+
+        # Lets the health staff also heal other players (and potentially more living entities)
+        B:"Health Staff Player Healing"=true
     }
 
     "elenai dodge 2" {
@@ -117,6 +130,9 @@ general {
         # Fixes the Creative Mill Generator not respecting the Creative Block Breaking config
         B:"Creative Mill Harvestability"=true
 
+        # Downgrades the message when creating a potion recipe from info to a debug
+        B:"Downgrade Potion Recipes Log Level"=true
+
         # Fixes various duplication exploits
         B:"Duplication Fixes"=true
 
@@ -275,10 +291,7 @@ general {
     }
 
     thaumcraft {
-        # Fixes various duplication exploits
         B:"Duplication Fixes"=true
-
-        # Fixes the bounding box always being at the center in both cinderpearls and shimmerleafs
         B:"Flower Bounding Box"=true
 
         # Stops the thaumometer from bobbing rapidly when using it to scan objects
@@ -286,13 +299,10 @@ general {
     }
 
     "thaumcraft: entities" {
-        # Adds particles to firebats similar to legacy versions
         B:"Firebat Particles"=true
 
         # Rotates dead eldritch crabs all the way like endermites, silverfish, and spiders
         B:"Spiderlike Eldritch Crabs"=true
-
-        # Increases particle size of wisps similar to legacy versions
         B:"Wisp Particles"=true
     }
 
@@ -455,8 +465,16 @@ general {
     }
 
     "compact machines" {
+        # Improves server performance by properly controlling spawn checks (effectiveness depends on CM's config)
+        # Disable both 'allowHostileSpawns' and 'allowPeacefulSpawns' in the CM config for best performance
+        # Does nothing if both config values are true
+        B:"Allowed Spawns Improvement"=true
+
         # Fixes some compact machine walls being invisible if Nothirium 0.2.x (and up) or Vintagium is installed
         B:"Invisible Wall Render Fix"=true
+
+        # Fixes client-side memory leak associated with miniaturization recipes
+        B:"Memory Leak Fix"=true
     }
 
     "effortless building" {
@@ -526,6 +544,47 @@ general {
         B:"Sky of Old Dimension Fix"=true
     }
 
+    bibliocraft {
+        # Fixes client-side memory leak by disabling version check
+        B:"Disable Version Check"=true
+    }
+
+    collective {
+        # Fixes memory leak when unloading worlds/switching dimensions
+        B:"Memory Leak Fix"=true
+    }
+
+    emojicord {
+        # Improves emoji context calculation to improve fps when rendering a lot of text
+        B:"Emoji Context"=true
+    }
+
+    "ender io" {
+        # Fixes client-side memory leak by replacing obelisk renderer with a simpler one
+        B:"Replace Obelisk Renderer"=true
+    }
+
+    "in control!" {
+        # Fixes onJoin spawn rules repeatedly modifying mob attack/health/speed
+        B:"Spawn Rule Stats Fix"=true
+    }
+
+    "iron chests" {
+        # Fixes client-side memory leak by replacing the crystal chest/shulker box renderer with a simpler one
+        # Note: Stack sizes are not rendered, similar to modern versions of this mod
+        B:"Replace Crystal Chest/Shulker Renderer"=true
+    }
+
+    "random things" {
+        # Fixes a bug where crafting the output of an Anvil recipe would modify the recipe, preventing crafts until restart
+        B:"Anvil Crafting Fix"=true
+    }
+
+    woot {
+        # Remove any leftover entities spawned on simulated mob's death
+        B:"Cleanup Simulated Kills"=true
+    }
+
 }
 
 
diff --git a/config/Universal Tweaks - Tweaks.cfg b/config/Universal Tweaks - Tweaks.cfg
index aa64911da..5d1450211 100644
--- a/config/Universal Tweaks - Tweaks.cfg	
+++ b/config/Universal Tweaks - Tweaks.cfg	
@@ -54,6 +54,9 @@ general {
         # Controls if the observer activates itself on the first tick when it is placed
         B:"Prevent Observer Activating on Placement"=false
 
+        # Lets projectiles like arrows bounce off slime blocks
+        B:"Projectiles Bounce Off Slime Blocks"=false
+
         # Controls if the End Portal renders its texture on the bottom face
         B:"Render End Portal Bottom"=true
 
@@ -295,22 +298,49 @@ general {
         attributes {
             # Sets custom ranges for entity attributes
             B:"[01] Attributes Toggle"=true
+
+            # Min: 0.0
+            # Max: 1.7976931348623157E308
             D:"[02] Max Health Min"=-65536.0
             D:"[03] Max Health Max"=65536.0
+
+            # Min: 0.0
+            # Max: 1.7976931348623157E308
             D:"[04] Follow Range Min"=-65536.0
             D:"[05] Follow Range Max"=65536.0
+
+            # Min: 0.0
+            # Max: 1.7976931348623157E308
             D:"[06] Knockback Resistance Min"=-65536.0
             D:"[07] Knockback Resistance Max"=65536.0
+
+            # Min: 0.0
+            # Max: 1.7976931348623157E308
             D:"[08] Movement Speed Min"=-65536.0
             D:"[09] Movement Speed Max"=65536.0
+
+            # Min: 0.0
+            # Max: 1.7976931348623157E308
             D:"[10] Flying Speed Min"=-65536.0
             D:"[11] Flying Speed Max"=65536.0
+
+            # Min: 0.0
+            # Max: 1.7976931348623157E308
             D:"[12] Attack Damage Min"=-65536.0
             D:"[13] Attack Damage Max"=65536.0
+
+            # Min: 0.0
+            # Max: 1.7976931348623157E308
             D:"[14] Attack Speed Min"=-65536.0
             D:"[15] Attack Speed Max"=65536.0
+
+            # Min: 0.0
+            # Max: 1.7976931348623157E308
             D:"[16] Armor Min"=-65536.0
             D:"[17] Armor Max"=65536.0
+
+            # Min: 0.0
+            # Max: 1.7976931348623157E308
             D:"[18] Armor Toughness Min"=-65536.0
             D:"[19] Armor Toughness Max"=65536.0
             D:"[20] Luck Min"=-65536.0
@@ -335,11 +365,7 @@ general {
         }
 
         "collision damage" {
-            # Applies horizontal collision damage to the player akin to elytra collision
             B:"[1] Collision Damage Toggle"=false
-
-            # The damage factor that gets multiplied with the player speed
-            # Vanilla default for elytra damage is 10
             I:"[2] Damage Factor"=10
         }
 
@@ -422,6 +448,9 @@ general {
             # Disables skipping night by using a bed while making it still able to set spawn
             B:"Disable Sleeping"=false
 
+            # Disables setting the spawn point by using a bed while making it still able to sleep
+            B:"Disable Sleeping Setting Spawn"=false
+
             # Determines at which time of day sleeping is allowed in ticks (0 - 23999)
             # -1 for vanilla default
             # Min: -1
@@ -634,6 +663,9 @@ general {
         # Prevents placing of liquid source blocks overriding portal blocks
         B:"Prevent Placing Buckets in Portals"=false
 
+        # Requires the hunger bar to be missing food points equal to or more than the amount restored by the food
+        B:"Smart Eat"=false
+
         # Enables one-time ignition of entities by hitting them with a torch
         B:"Super Hot Torch"=false
 
@@ -830,8 +862,6 @@ general {
 
         # Disables potion effect particles emitting from yourself
         B:"Hide Personal Effect Particles"=false
-
-        # Provides more information to addPacket removed entity warnings
         B:"Improved Entity Tracker Warning"=true
 
         # Lets background music play continuously without delays
@@ -873,6 +903,7 @@ general {
         B:"Prevent Keybinds from Overflowing Screen"=true
 
         # Removes the 3D Anaglyph button from the video settings menu
+        # Incompatible with OptiFine
         B:"Remove 3D Anaglyph Button"=true
 
         # Removes the redundant Minecraft Realms button from the main menu and silences notifications
@@ -981,14 +1012,14 @@ general {
             S:"[1] Mode"=NOTHING
 
             # Sounds to play when Minecraft is loaded
-            # Syntax: eventname;pitch
+            # Syntax: eventname;pitch;volume
             S:"[2] Minecraft Loaded Sounds" <
                 entity.experience_orb.pickup;1.0
                 entity.player.levelup;1.0
              >
 
             # Sounds to play when the world is loaded
-            # Syntax: eventname;pitch
+            # Syntax: eventname;pitch;volume
             S:"[3] World Loaded Sounds" <
                 entity.experience_orb.pickup;1.0
                 entity.player.levelup;1.0
@@ -1086,6 +1117,12 @@ general {
             # Syntax: modid:block
             S:"[3] Whitelist" <
              >
+
+            # Excludes items from the swing through grass tweak
+            # Syntax: modid:item
+            S:"[4] Item Blacklist" <
+                erebus:wand_of_animation
+             >
         }
 
         "toast control" {
@@ -1166,6 +1203,21 @@ general {
             B:"[3] Compact Messages"=false
         }
 
+        "connection timeouts" {
+            # Allows configuring read/login timeouts.
+            # If you are having trouble logging into a server of a large modpack, try changing the timeouts below.
+            B:"[1] Connection Timeouts Toggle"=true
+
+            # The connection read timeout in seconds.
+            # This value is used on both client and server.
+            # On the server, also extends the time allowed to respond to a KeepAlive packet.
+            I:"[2] Read Timeout"=90
+
+            # The login timeout in seconds. (Vanilla default: 600 ticks, or 30 secs)
+            # Only used on the server.
+            I:"[3] Login Timeout"=90
+        }
+
     }
 
     performance {
@@ -1176,6 +1228,7 @@ general {
         B:"Check Animated Models"=true
 
         # Adds an IRecipe cache to improve recipe performance in larger modpacks
+        # Incompatible with KemonoCraft
         B:"Crafting Cache"=true
 
         # Improves loading times by removing debug code for missing sounds and subtitles
@@ -1187,6 +1240,9 @@ general {
         # Improves rendering performance by disabling rendering the entity inside mob spawners
         B:"Disable Mob Spawner Entity"=false
 
+        # Prevents Rain and Snow Particles from rendering when Raining or Thundering
+        B:"Disable Rain Particles"=false
+
         # Replaces color lookup for sheep to check a predefined table rather than querying the recipe registry
         B:"Fast Dye Blending"=true
 
@@ -1198,9 +1254,11 @@ general {
         B:"Fast World Loading"=true
 
         # Fixes slow background startup edge case caused by checking tooltips during the loading process
+        # May have side effects concerning tooltips
         B:"Faster Background Startup"=true
 
         # Improves the speed of switching languages in the Language GUI
+        # Incompatible with OptiFine
         B:"Improve Language Switching Speed"=true
 
         # Improves the speed of connecting to servers by setting the InetAddress host name to the IP in situations
@@ -1338,6 +1396,21 @@ general {
             I:"[9] Particle Spawn Y Level"=8
         }
 
+        "cave generation" {
+            # Sets custom values for the vanilla cave generation
+            B:"[1] Cave Generation Toggle"=false
+
+            # Size of cave systems
+            # 40 for pre-1.7 generation
+            # 15 for vanilla default
+            I:"[2] Cave Size"=15
+
+            # Chance for generating cave systems
+            # 15 for pre-1.7 generation
+            # 7 for vanilla default
+            I:"[3] Cave Rarity"=7
+        }
+
     }
 
 }
diff --git a/config/vintagefix.properties b/config/vintagefix.properties
index 0fd03db99..82e620c6e 100644
--- a/config/vintagefix.properties
+++ b/config/vintagefix.properties
@@ -1,19 +1,29 @@
 # VintageFix config file
 
+mixin.allocation_rate=true
 mixin.backports.new_world_name=true
 mixin.backports.white_button_text=true
 mixin.blockstates=true
 mixin.branding=true
+mixin.bugfix.entity_disappearing=true
+mixin.bugfix.exit_freeze=true
+mixin.bugfix.extrautils=false
 mixin.bugfix.missing_edge_chunks=true
+mixin.bugfix.slow_tps_catchup=true
 mixin.bugfix.tab_complete_ddos=true
+mixin.chunk_access=true
 mixin.dynamic_resources=true
 mixin.dynamic_resources.background_item_bake=true
 mixin.dynamic_resources.hide_model_exceptions=false
 mixin.dynamic_structures=true
+mixin.invisible_subchunks=true
+mixin.jar_discoverer_cache=true
 mixin.mod_opts.agricraft=true
 mixin.model_optimizations.dedup_baked_quad=true
 mixin.model_optimizations.dedup_multipart=true
 mixin.model_optimizations.dedup_quad_lists=true
 mixin.model_optimizations.location_canon=true
+mixin.model_optimizations.simpler_perspective_wrapper=true
 mixin.resourcepacks=true
 mixin.textures=true
+mixin.version_protest=false
diff --git a/manifest.json b/manifest.json
index 576809699..6200a9b1d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -272,7 +272,7 @@
     },
     {
       "projectID": 705000,
-      "fileID": 5529764,
+      "fileID": 5860191,
       "required": true
     },
     {

From ef5a2b448da92e2de93e5b3a0efb18fd90a0aec8 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 2 Nov 2024 22:48:54 +0800
Subject: [PATCH 30/41] make MonumentSpire non-rotatable

---
 structures/active/MonumentSpire.rcst | Bin 2248 -> 2248 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/structures/active/MonumentSpire.rcst b/structures/active/MonumentSpire.rcst
index 2e3f0ec15cf1a6732d65b6276e4914084ee6cc10..81566ef8635e6a5615eb69420871e064c18448d9 100644
GIT binary patch
delta 1211
zcmX>hctWr~z?+#xgn@y9gW=r9q)54K*%$9IGcbJRVqo9{iWZj?l_r;z7NzQC73b%z
z4a+UQWg+lS+hsEU*&g*|1O21-=R7dG({Qq(cxLwc#}joOO}47~P0QRl<$s;_eugrI
z%;&$(My(C|ZL|CLiSrrGsi#=nx1}x+eHxO)dfG6)OXOz#{P`1at<&5jcwB3;g`2N>
ziv8l!9%Zffs=h0kuA5BuHc(i6=Yn2BfYUXlV>*dkl260r+>I1x-cs6Kn=9q<DEBSH
z%}=H(Q}Y$7^Z%)(_%x}X3iIcBTXw9Dnb~B|qITw+Qa8P2mS1sbS$690zP2gcA6~>t
zbic^XQcrRgJ{9`<ef=2|>%Z4nz27eFkYw4F^*7_7R@(oRo-28m+WD>vOw&5k$RO=d
zqy6bpN7-)ut<Djy{?9)~FT44chj&VskK2}MuUXTC<{l_0Ji#|<;Ri*{ouUD%GoK`$
zef@C5-Q4eM*PT1+py-!*refmDmEHFa`Zh#e(hxdnwe0@eJ->9gE}2gGR?qb=@yP|*
zgA@4J1E+t>$}Q>^jpf{VRaH^?f!X9)YbSKJ*ggBQ<o7*BrPR0!Q7zJMqrNyr)Ga#g
ze!Tqoivt@td8Ci?eHTuDqZ@GdN1|D|c->)(xwaK{7UpNlAD>)OS@-dU&->YC$EE*X
z<$0+$M?A0IYTorNc2?Z?=Q^~cHMAeCzguHA+w4reO@+L=-mTikU&a|Bu`A~*7l!N<
zcbT+Ubyv-YyvB3=n}7b89Gwz$|9e`a{ce7>$1iWJcYFLP?b+|mnTIXD+4bz*`2HR5
zI^*x}C%mgY5$Sm*_-=ozPRQa3N4pk^@9qhyc04Xs;?q@nUtrA#$LuL*7HwMirOnRm
zXPamJ!LK6zUwd9AtdQHgOncHZtEWdko)$4W_a$k)bdL-lOPIRR+Bkg|_4emiE;LM-
z&^4n)YfbPq@9r(98`Es`!{){7dCp>zxajd{>89?3>;0Z3ua5AEUH9pyn+>x7@65`{
zx4&<ZPrQ`7-}NEufgRTZyL*E7u)U4g>y)#Si*IuJJNtSImcQqU3^>}~&VL@nec^S?
zH7A9|yZFvnynk~sZpH5F&rZL!eCDF^=KdyyTwMd}$49z<aBXP_y7Zc->e>4jf}ch7
zF8tXfUnp_;QKy#tn*Y2z<L#pMU-1*%$Tm&%;r3fE!*_FD;du5(t$x{gm4Y`yUk=N$
z$njmAxx9Dcqi37<eqCJubym0D<*PHBMAk2>>(%_zvgGLZz^MU~L;b=XezxgdJKBF)
zv%qxz0{a*}UE?0V#lLxP_&Kir<QAl{rbuO~ftrt(V)n9_eI>rR0+|u{8&Ym1stBFg
zaV#{lWbW7h91F8gaX!7ct?uo{C$`FSRxbY&FQh4$UwFc5?)RVd4ji&ywn~0r_t<s&
z)11VqOTAPUKl+pRT^?E@Om5&1-)zJ3kvW}_NuB{$5upMsBtSp`OrjSUTu^aF1__3S
zpq_R^-P?>Xdgk|}Y7jrbn~_NbWIoVBMRhI~28QzdqMQ_$#F9k4yrhx<Z&o&t*-St<
K8%T?DfOr5SZY~f2

delta 1234
zcmX>hctWr~z?+#xgn@&DgP|q!dKd!|-~+OYONvU9OG=AU^|Ffd^VWt%7tgj5_@}*5
zjsIkidULP7X}-#`UTd>+H=d-NvwUm7l;R#dVTC~6U77#iHw*n>QuMTbD}5{W?bF-&
z;Wi6-1tp*IM5alv<y2<!w(z^rm44z^{ddljxn2`mC8q5>V7N+J@ipgCL%z-(!Yax_
zKAU6KI4~@0b(-1WP!#x4;&O|ZfmX<^{sl1sJ6*$`pUO~f+&-22;<Tj`ri5vH4*JvE
zZShH-GuGZ~%k8cFTs%u3np(!42u@jBFlVA!mxtQi_nJ#$MEdobX0*o}X+M;nB%pTQ
z?rDA7McFx9Gt$;p_#C|W^k#i}LD$RcbKItSyt-uQ<6_(?$&lbEc)x2;i0kgV&rhl9
z96mn%wK?zN>#|z|j};3}@>-|s!<w~XVd)vZNs1p7JxUHQ^j5l<*Sq@Sip#Hg&dfWt
zw3lhl#2K5EE-!Ns7vNkarovM>>DZIqOLzM_+j}qEI=x<iy-D`Q!~PQ)65l-bJ583>
zIXSC)ZI<U2#+>4X7q~S1Pc*lwTNki5i0oP@%76XTmIqD&b&Ec;-!2w=(XoM%W4k}^
zyJg>w#4cL(;cv}DoxQUP%=VYt8m#NgSHGP3_ur?3^X^_v-Ddr7_q$7xx6YsWw<&hJ
zUhRhI^Nd;fOWD7lzFmK`#%^_|{k`4t%lK~9w*3oMSoP}4`9_O-v&9|U)ZI(!-rr-G
zBmb=Xq`lun&(QbhYV+%!`>Sv6+%Dhy`Ss4{XVXm|9;vl2RG(KYVDatHZr85g6E=&?
zNbTxB8g--JNzS`#UZ&~RE$80PI=s$t!z14oRl9dmnx8hPObJ?%-IBZFLA{UfN1wAZ
zirQA))2?<E*t`6VMcq87b1ST5zP0(S-1A`e-3tc4|1y~J`Cq<pK&kWF0Tq{|shg~3
z1umD#I90NlYu)OpOB5Oed0FE;S4;f)>ubAh(y=3nLFdhrEJXsNjq{U!_whK%e6`AV
zywPN|Zpw9~$2`k7SYKPu5S_;wt$tUe{(r^;{#~md8c3AZ$$4*Wh&#UN5mQR4g+TJz
zHy;xNzh9{i4%av6u5hZK!uxUsYcbQCkFGUKP3BKnabNaZul+&6#Vhr0{8W`M6qx*|
zQ%io$eZ9&6yQuvx%MFa$mq|X_{^HB(oTgls;<~l-Uy2J^n0{n;l$YsuJ9}cgUPg#Z
z-NgE6hNs$Ut9+;Hn=Gj?y_)UwKwU+9pZ~6wS1XJ*v7InanJH%P*V|*Y^&|V@tEWtw
zHtgJG9}xYRXKJPLLDel`p-Bgs+V;)}P~2fL^~KYrR#EfJBLbGne`X0@w(6F5$n>lC
zJzRngDIGeLTU*f2{hsq-jNL1HPnF6&M;YIi-G8~i!H(g_=cOCkn?$ac94k0wd~$MO
zVg2^s@&VrL98bOmM?PX^VED|%z<{fi*sR3zojI7DgDtH2JxJ|cAP(?mWD;ROlqtyO
zfXWn9fLg-9^-dOK5jRArlw)CFD9<m-NpVRmNz}_rDhcprWdlhw0bx0iw&now03Tx(
AfB*mh


From be003f3fd9c42152b1c4ac4814ff6911e57e5506 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 2 Nov 2024 22:49:13 +0800
Subject: [PATCH 31/41] remove furnace from TinyStash

---
 structures/active/TinyStash.rcst | Bin 3588 -> 3307 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/structures/active/TinyStash.rcst b/structures/active/TinyStash.rcst
index 7a3f14067aff699b32718dd7ca7982c29480084d..7426403472d744a3ecef497d06f5f24fb4b0c716 100644
GIT binary patch
delta 2164
zcmV-)2#fcG9P1elP)h>@6aWYa2mo%dVp*{c83Y7wuwq%0D+C^Y0SNy0ABzY800000
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

delta 2447
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
Nv<xu@cMSjl005IKmQ?@%


From 086394b541c2256b36bb6b98817763b0d2238498 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sat, 2 Nov 2024 22:50:59 +0800
Subject: [PATCH 32/41] add ground/loots to SupportBeamThing

---
 structures/active/SupportBeamThing.rcst | Bin 5159 -> 5376 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/structures/active/SupportBeamThing.rcst b/structures/active/SupportBeamThing.rcst
index c59b15f76cdbe4bc78b927c29e44c56909aee7fd..9150c6c8c5a0bee9979b26ff18fc8214d32fb358 100644
GIT binary patch
delta 4375
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

delta 4132
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
F{{mkb`au8y


From 89903e960449eea8423d6fedb621f125caf1b19f Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sun, 3 Nov 2024 00:22:45 +0800
Subject: [PATCH 33/41] gocha

---
 groovy/material/FirstDegreeMaterials.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy
index d1924e51f..556e98b9a 100644
--- a/groovy/material/FirstDegreeMaterials.groovy
+++ b/groovy/material/FirstDegreeMaterials.groovy
@@ -167,7 +167,7 @@ public class FirstDegreeMaterials {
                 .flags(NO_UNIFICATION)
                 .color(0x7070d6)
                 .build()
-                .setFormula("(Co)(?)")
+                .setFormula("(Co)(?)", true)
 
         AmmoniumNitrate = new Material.Builder(8107, SuSyUtility.susyId('ammonium_nitrate'))
                 .dust()

From 4425a20275da6800d69ad569dddad762f427b15d Mon Sep 17 00:00:00 2001
From: trainvoi <voitrainelephant@gmail.com>
Date: Sat, 2 Nov 2024 18:21:29 +0700
Subject: [PATCH 34/41] add recipe for large pump

---
 .../DefaultQuests/Quests/3/599.json           | 29 ++++++++-----------
 .../resources/supersymmetry/lang/en_us.lang   |  4 +--
 groovy/postInit/mod/GregTech.groovy           |  2 +-
 groovy/postInit/mod/MachineRecipes.groovy     | 12 ++++++--
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/config/betterquesting/DefaultQuests/Quests/3/599.json b/config/betterquesting/DefaultQuests/Quests/3/599.json
index 2fd844bbd..bcca44b8f 100644
--- a/config/betterquesting/DefaultQuests/Quests/3/599.json
+++ b/config/betterquesting/DefaultQuests/Quests/3/599.json
@@ -5,46 +5,41 @@
   "properties:10": {
     "betterquesting:10": {
       "desc:8": "susy.quest.db.599.desc",
-      "frame:8": "ROUNDED_SQUARE",
       "icon:10": {
         "Damage:2": 4,
         "id:8": "gregtech:meta_block_frame_20"
       },
-      "ignoresview:1": 0,
-      "name:8": "susy.quest.db.599.title",
-      "visibility:8": "ALWAYS"
+      "name:8": "susy.quest.db.599.title"
     }
   },
-  "rewards:9": {},
+  "questID:3": 599,
   "tasks:9": {
     "0:10": {
-      "entryLogic:8": "AND",
-      "partialMatch:1": 1,
       "requiredItems:9": {
         "0:10": {
           "Count:3": 1,
-          "Damage:2": 17011,
+          "Damage:2": 17021,
           "id:8": "gregtech:machine"
         },
         "1:10": {
-          "Count:3": 36,
+          "Count:3": 9,
           "Damage:2": 1,
           "id:8": "gregtech:boiler_casing"
         },
         "2:10": {
-          "Count:3": 16,
-          "Damage:2": 2,
-          "id:8": "gregtech:multiblock_casing"
-        },
-        "3:10": {
-          "Count:3": 91,
+          "Count:3": 28,
           "Damage:2": 4,
           "id:8": "gregtech:metal_casing"
         },
-        "4:10": {
-          "Count:3": 300,
+        "3:10": {
+          "Count:3": 4,
           "Damage:2": 4,
           "id:8": "gregtech:meta_block_frame_20"
+        },
+        "4:10": {
+          "Count:3": 2,
+          "Damage:2": 1,
+          "id:8": "gregtech:turbine_casing"
         }
       },
       "taskID:8": "bq_standard:retrieval"
diff --git a/config/betterquesting/resources/supersymmetry/lang/en_us.lang b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
index 78c5a8c0e..7fc0618cc 100644
--- a/config/betterquesting/resources/supersymmetry/lang/en_us.lang
+++ b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
@@ -1252,8 +1252,8 @@ susy.quest.db.597.title=Thompson
 susy.quest.db.597.desc=The §6Thompson §ris a §ctwo-handed§r sub-machine gun (SMG) you can make at MV. It uses §6SMG Magazines §ras ammo.
 susy.quest.db.598.title=Raw Electrum
 susy.quest.db.598.desc=§6Electrum §rdeposits can be found naturally. They contain a source of §7Silver §rand §6Gold§r.
-susy.quest.db.599.title=Ocean Drill
-susy.quest.db.599.desc=The §bOcean Drill§r is an electric machine that collect§b 8,000 L of seawater per second §rif its§c controller §ris placed between altitude levels §970 and 75 §rin an ocean.%n%nThe Ocean Drill requires:%n§6%n- 1 Ocean Drill Controller%n- 300 Steel Frame Boxes%n- 16 Grate Machine Casings%n- 91 Solid Steel Machine Casings%n- 36 Steel Pipe Casings%n- 1 Maintenance Hatch%n- 1 MV Energy Hatch%n
+susy.quest.db.599.title=Large Fluid Pump
+susy.quest.db.599.desc=The §bLarge Fluid Pump§r is an electric machine that collect §b1000 L of fluid per second§r, depending on the §ebiome§r if its§c controller §ris placed at Y level equal to §964§r. The maximum amount of parallel recipes that can be done in this multiblock is 256.%nThe §bLarge Fluid Pump§r requires:%n§6%n- 1 Large Fluid Pump Controller%n- 28 Solid Steel Machine Casings%n- 9 Steel Pipe Casings%n- 2 Steel Gearbox Casings%n- 1 Maintenance Hatch%n- 1 to 2 Energy Hatch%n- 1 Input Bus%n§r%n%nIf you are wondering what happened to the Ocean Pump, that multiblock will be removed from the pack in the near future, and its role has been replaced by Large Fluid Pump.
 susy.quest.db.600.title=Auto Chisel
 susy.quest.db.600.desc=The §6Auto Chisel §rcan chisel blocks §aautomatically§r.%n%nThe §6Auto Chisel §rrequires a §6chisel §rto be placed into the top middle slot to work. %n%nThe block to be created is placed into the bottom middle slot, and blocks to be chiseled should be in the left slots. %n%nThe machine will output to the right slots.%n%nThe machine can hold up to 10,000 FE (2,500 EU)
 susy.quest.db.601.title=Elevators
diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy
index f448921de..d93d1d3eb 100644
--- a/groovy/postInit/mod/GregTech.groovy
+++ b/groovy/postInit/mod/GregTech.groovy
@@ -302,7 +302,7 @@ mods.gregtech.assembler.recipeBuilder()
         .duration(100)
         .EUt(30)
         .buildAndRegister();
-		
+
 //Steam Conveyor (no recipe for now)
 
 
diff --git a/groovy/postInit/mod/MachineRecipes.groovy b/groovy/postInit/mod/MachineRecipes.groovy
index 57a1b242d..b8b5c3ab2 100755
--- a/groovy/postInit/mod/MachineRecipes.groovy
+++ b/groovy/postInit/mod/MachineRecipes.groovy
@@ -813,11 +813,11 @@ RecyclingHelper.addShaped("gregtech:dumper", metaitem('dumper'), [
 		[metaitem('plateSteel'), metaitem('plateSteel'), metaitem('plateSteel')]
 ])
 
-RecyclingHelper.addShaped("gregtech:ocean_pumper", metaitem('ocean_pumper'), [
+/*RecyclingHelper.addShaped("gregtech:ocean_pumper", metaitem('ocean_pumper'), [
 		[metaitem('stickLongAluminium'), metaitem('electric.pump.mv'), metaitem('stickLongAluminium')],
 		[ore('circuitMv'), metaitem('hull.mv'), ore('circuitMv')],
 		[metaitem('cableGtSingleCopper'), metaitem('electric.pump.mv'), metaitem('cableGtSingleCopper')]
-])
+*/
 
 RecyclingHelper.addShaped("gregtech:coking_tower", metaitem('coking_tower'), [
 		[metaitem('pipeHugeFluidSteel'), pumps[3], metaitem('pipeHugeFluidSteel')],
@@ -1085,3 +1085,11 @@ recipemap('assembler').recipeBuilder()
 		.EUt(30)
 		.duration(600)
 		.buildAndRegister()
+
+RecyclingHelper.addShaped('gregtech:large_fluid_pump', metaitem('large_fluid_pump'), [
+		[metaitem('rotorBronze'), ore('circuitLv'), metaitem('rotorBronze')],
+		[metaitem('cableGtQuadrupleTin'), metaitem('hull.lv'), metaitem('cableGtQuadrupleTin')],
+		[metaitem('rotorBronze'), ore('circuitLv'), metaitem('rotorBronze')]
+])
+
+crafting.addShapeless("gregtech:ocean_pumper_switching", metaitem('large_fluid_pump'), [metaitem('ocean_pumper')]);
\ No newline at end of file

From 73df6b43cff7f6028b08b4348d0cd24c1b9280de Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sun, 3 Nov 2024 21:31:06 +0800
Subject: [PATCH 35/41] un-nerf ignition

---
 config/pyrotech/module.Ignition.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/pyrotech/module.Ignition.cfg b/config/pyrotech/module.Ignition.cfg
index e76209bfe..b1559d017 100755
--- a/config/pyrotech/module.Ignition.cfg
+++ b/config/pyrotech/module.Ignition.cfg
@@ -114,7 +114,7 @@ general {
         # Default: 20
         # Min: 0
         # Max: 2147483647
-        I:BOW_DRILL_USE_DURATION_TICKS=80
+        I:BOW_DRILL_USE_DURATION_TICKS=20
 
         # Defines how many cooldown ticks applied after using the durable bow drill.
         # Default: 20
@@ -132,7 +132,7 @@ general {
         # Default: 20
         # Min: 0
         # Max: 2147483647
-        I:DURABLE_BOW_DRILL_USE_DURATION_TICKS=60
+        I:DURABLE_BOW_DRILL_USE_DURATION_TICKS=5
 
         # Defines how many cooldown ticks applied after using the flint and tinder.
         # Default: 20
@@ -150,7 +150,7 @@ general {
         # Default: 80
         # Min: 0
         # Max: 2147483647
-        I:FLINT_AND_TINDER_USE_DURATION_TICKS=80
+        I:FLINT_AND_TINDER_USE_DURATION_TICKS=40
 
         # How many ticks the player must wait before using a matchstick again.
         # Default: 40

From 6ecbd3c56b58a47af055cd08e7343e7b0bfbc4fe Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sun, 3 Nov 2024 21:31:43 +0800
Subject: [PATCH 36/41] add pyrotech leather processing recipes

---
 groovy/postInit/mod/Pyrotech.groovy | 168 +++++++++++++++++++++++++++-
 1 file changed, 163 insertions(+), 5 deletions(-)

diff --git a/groovy/postInit/mod/Pyrotech.groovy b/groovy/postInit/mod/Pyrotech.groovy
index 85ab9224e..91f40db96 100644
--- a/groovy/postInit/mod/Pyrotech.groovy
+++ b/groovy/postInit/mod/Pyrotech.groovy
@@ -17,6 +17,12 @@ import net.minecraftforge.fml.common.eventhandler.Event
 
 log.infoMC("Running Pyrotech.groovy...")
 
+SMELTER = recipemap('primitive_smelter')
+ALLOY_SMELTER = recipemap('alloy_smelter')
+CUTTER = recipemap('cutter')
+ASSEMBLER = recipemap('assembler')
+CHEMICAL_BATH = recipemap('chemical_bath')
+
 // Make it easier to create a pit kiln
 event_manager.listen { PlayerInteractEvent.RightClickBlock event ->
     EnumFacing facing = event.getFace();
@@ -99,7 +105,20 @@ def name_removals = [
         "pyrotech:bucket/bucket_stone",
         "pyrotech:ignition/matchstick",
         "pyrotech:stone_hammer",
+        "pyrotech:flint_hammer",
+        "pyrotech:flint_hammer_durable",
+        "pyrotech:bone_hammer",
+        "pyrotech:bone_hammer_durable",
+        "pyrotech:iron_hammer",
+        "pyrotech:gold_hammer",
+        "pyrotech:diamond_hammer",
         "pyrotech:obsidian_hammer",
+        "pyrotech:tech/bloomery/tongs_stone",
+        "pyrotech:tech/bloomery/tongs_flint",
+        "pyrotech:tech/bloomery/tongs_bone",
+        "pyrotech:tech/bloomery/tongs_iron",
+        "pyrotech:tech/bloomery/tongs_gold",
+        "pyrotech:tech/bloomery/tongs_diamond",
         "pyrotech:tech/bloomery/tongs_obsidian",
         "pyrotech:tech/machine/sawmill_blade_stone",
         "pyrotech:tech/machine/sawmill_blade_flint",
@@ -119,6 +138,13 @@ def name_removals = [
         "pyrotech:tech/machine/mechanical_spreader",
         "pyrotech:tech/machine/stone_crucible",
         "pyrotech:tech/machine/brick_crucible",
+        "pyrotech:saddle",
+        "pyrotech:leather_helmet",
+        "pyrotech:leather_chestplate",
+        "pyrotech:leather_leggings",
+        "pyrotech:leather_boots",
+        "pyrotech:item_frame",
+        "pyrotech:book",
         "pyrotech:boat_spruce",
         "pyrotech:boat_oak",
         "pyrotech:boat_jungle",
@@ -227,7 +253,20 @@ mods.jei.ingredient.yeet(
         item('pyrotech:anvil_iron_plated'),
         item('pyrotech:crude_hammer'),
         item('pyrotech:stone_hammer'),
+        item('pyrotech:flint_hammer'),
+        item('pyrotech:flint_hammer_durable'),
+        item('pyrotech:bone_hammer'),
+        item('pyrotech:bone_hammer_durable'),
+        item('pyrotech:iron_hammer'),
+        item('pyrotech:gold_hammer'),
+        item('pyrotech:diamond_hammer'),
         item('pyrotech:obsidian_hammer'),
+        item('pyrotech:tongs_stone'),
+        item('pyrotech:tongs_flint'),
+        item('pyrotech:tongs_bone'),
+        item('pyrotech:tongs_iron'),
+        item('pyrotech:tongs_gold'),
+        item('pyrotech:tongs_diamond'),
         item('pyrotech:tongs_obsidian'),
         item('pyrotech:sawmill_blade_stone'),
         item('pyrotech:sawmill_blade_flint'),
@@ -544,10 +583,17 @@ crafting.replaceShaped("pyrotech:straw", item('pyrotech:material', 2) * 4, [
         [item('pyrotech:material', 13), item('pyrotech:material', 13), item('pyrotech:material', 13)]
 ])
 
+// Durable Bow Drill
+crafting.replaceShaped("pyrotech:bow_drill_durable", item('pyrotech:bow_drill_durable'), [
+        [ore('string'), ore('stickWood'), ore('craftingToolKnife')],
+        [ore('string'), item('pyrotech:material', 39), ore('stickStone')],
+        [ore('string'), ore('stickWood'), null]
+])
+
 // Durable spindle
 crafting.replaceShaped("pyrotech:bow_drill_durable_stick", item('pyrotech:material', 48), [
-        [item('pyrotech:material', 39)],
-        [ore('stickLongWood')]
+        [ore('craftingToolKnife'), item('pyrotech:material', 39)],
+        [null, ore('stickLongWood')]
 ])
 
 // Bow drill
@@ -585,6 +631,121 @@ crafting.addShapeless("susy:cog_iron_to_gear", metaitem('gearIron'), [item('pyro
 crafting.addShapeless("susy:cog_gold_to_gear", metaitem('gearGold'), [item('pyrotech:cog_gold')])
 crafting.addShapeless("susy:cog_diamond_to_gear", metaitem('gearDiamond'), [item('pyrotech:cog_diamond')])
 
+// Leather ingredients
+// Leather Sheet
+crafting.addShaped("susy:leather_sheet", item('pyrotech:material', 38), [
+        [ore('craftingToolKnife')],
+        [ore('leather')]
+])
+
+CUTTER.recipeBuilder()
+        .inputs(ore('leather'))
+        .outputs(item('pyrotech:material', 38))
+        .chancedOutput(item('pyrotech:material', 38), 5000, 0)
+        .duration(80)
+        .EUt(7)
+        .buildAndRegister()
+
+// Leather Strap
+crafting.addShaped("susy:leather_strap", item('pyrotech:material', 39) * 2, [
+        [ore('craftingToolKnife'), item('pyrotech:material', 38)]
+])
+
+CUTTER.recipeBuilder()
+        .inputs(item('pyrotech:material', 38))
+        .outputs(item('pyrotech:material', 39) * 4)
+        .duration(50)
+        .EUt(7)
+        .buildAndRegister()
+
+// Leather Cord
+crafting.addShaped("susy:leather_cord", item('pyrotech:material', 40), [
+        [item('pyrotech:material', 39)],
+        [item('pyrotech:material', 39)],
+        [item('pyrotech:material', 39)]
+])
+
+ASSEMBLER.recipeBuilder()
+        .inputs(item('pyrotech:material', 39) * 2)
+        .outputs(item('pyrotech:material', 40))
+        .duration(100)
+        .EUt(7)
+        .buildAndRegister()
+
+// Durable Leather ingredients
+// Durable Leather
+CHEMICAL_BATH.recipeBuilder()
+        .inputs(ore('leather'))
+        .fluidInputs(fluid('creosote') * 200)
+        .outputs(item('pyrotech:material', 41))
+        .duration(100)
+        .EUt(30)
+        .buildAndRegister()
+
+// Durable Leather Sheet
+crafting.addShaped("susy:leather_sheet_durable", item('pyrotech:material', 42), [
+        [ore('craftingToolKnife')],
+        [ore('leatherDurable')]
+])
+
+CUTTER.recipeBuilder()
+        .inputs(ore('leatherDurable'))
+        .outputs(item('pyrotech:material', 42))
+        .chancedOutput(item('pyrotech:material', 42), 5000, 0)
+        .duration(100)
+        .EUt(16)
+        .buildAndRegister()
+
+CHEMICAL_BATH.recipeBuilder()
+        .inputs(item('pyrotech:material', 38))
+        .fluidInputs(fluid('creosote') * 200)
+        .outputs(item('pyrotech:material', 42))
+        .duration(80)
+        .EUt(30)
+        .buildAndRegister()
+
+// Durable Leather Strap
+crafting.addShaped("susy:leather_strap_durable", item('pyrotech:material', 43) * 2, [
+        [ore('craftingToolKnife'), item('pyrotech:material', 42)]
+])
+
+CUTTER.recipeBuilder()
+        .inputs(item('pyrotech:material', 42))
+        .outputs(item('pyrotech:material', 43) * 4)
+        .duration(80)
+        .EUt(16)
+        .buildAndRegister()
+
+CHEMICAL_BATH.recipeBuilder()
+        .inputs(item('pyrotech:material', 39))
+        .fluidInputs(fluid('creosote') * 50)
+        .outputs(item('pyrotech:material', 43))
+        .duration(50)
+        .EUt(7)
+        .buildAndRegister()
+
+// Durable Leather Cord
+crafting.addShaped("susy:leather_cord_durable", item('pyrotech:material', 44), [
+        [item('pyrotech:material', 43)],
+        [item('pyrotech:material', 43)],
+        [item('pyrotech:material', 43)]
+])
+
+ASSEMBLER.recipeBuilder()
+        .inputs(item('pyrotech:material', 43) * 2)
+        .outputs(item('pyrotech:material', 44))
+        .duration(120)
+        .EUt(16)
+        .buildAndRegister()
+
+CHEMICAL_BATH.recipeBuilder()
+        .inputs(item('pyrotech:material', 40))
+        .fluidInputs(fluid('creosote') * 100)
+        .outputs(item('pyrotech:material', 44))
+        .duration(80)
+        .EUt(16)
+        .buildAndRegister()
+
 // Slag Heap
 crafting.addShaped("susy:slag_heap", item('pyrotech:pile_slag'), [
         [item('pyrotech:slag'), item('pyrotech:slag'), item('pyrotech:slag')],
@@ -1050,7 +1211,6 @@ ores.forEach { oreIn ->
 }
 
 // Actual ore smelting
-SMELTER = recipemap('primitive_smelter')
 
 reductants.forEach { reductant ->
     ores.forEach { oreIn ->
@@ -1198,8 +1358,6 @@ mods.gregtech.coke_oven.recipeBuilder()
         .duration(900)
         .buildAndRegister()
 
-ALLOY_SMELTER = recipemap('alloy_smelter')
-
 // Slag glass
 ALLOY_SMELTER.recipeBuilder()
         .inputs(item('pyrotech:slag') * 9)

From b668d896569c23be580e9ab61a9704115c770ec8 Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Sun, 3 Nov 2024 22:32:32 +0800
Subject: [PATCH 37/41] potin quest

---
 config/betterquesting/DefaultQuests/QuestLines/1.json     | 8 ++++----
 config/betterquesting/DefaultQuests/Quests/1/518.json     | 2 +-
 .../resources/supersymmetry/lang/en_us.lang               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/betterquesting/DefaultQuests/QuestLines/1.json b/config/betterquesting/DefaultQuests/QuestLines/1.json
index 93e39e43d..a46b2d6d5 100644
--- a/config/betterquesting/DefaultQuests/QuestLines/1.json
+++ b/config/betterquesting/DefaultQuests/QuestLines/1.json
@@ -430,15 +430,15 @@
       "id:3": 518,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -174,
-      "y:3": -60
+      "x:3": -175,
+      "y:3": -72
     },
     "60:10": {
       "id:3": 535,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -204,
-      "y:3": -90
+      "x:3": -228,
+      "y:3": -72
     },
     "61:10": {
       "id:3": 536,
diff --git a/config/betterquesting/DefaultQuests/Quests/1/518.json b/config/betterquesting/DefaultQuests/Quests/1/518.json
index a904f0c6f..f7e0e0d53 100644
--- a/config/betterquesting/DefaultQuests/Quests/1/518.json
+++ b/config/betterquesting/DefaultQuests/Quests/1/518.json
@@ -1,6 +1,6 @@
 {
   "preRequisites:11": [
-    32
+    97148971
   ],
   "properties:10": {
     "betterquesting:10": {
diff --git a/config/betterquesting/resources/supersymmetry/lang/en_us.lang b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
index 79488959a..4432737f4 100644
--- a/config/betterquesting/resources/supersymmetry/lang/en_us.lang
+++ b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
@@ -1831,7 +1831,7 @@ susy.quest.db.18799598.desc=The §6Soaking Pot§r can be used to... soak things.
 susy.quest.db.58115670.title=Stone Oven
 susy.quest.db.58115670.desc=The §6Stone Oven§r contains a hollow chamber, where the materials are exposed to a hot environment in a controlled way.%n%nNot like kilns, although working at a much lower temperature, ovens can be used to heat food to a desired temperature, and thus can be used for §6cooking§r. The better control of temperature also makes ovens possible to §6dry things§r like a drying rack.%n%nAdditionally, ovens can dry §4Mud Bricks§r into §eAdobe Bricks§r, which can be used to build the §6Primitive Baking Oven§r, a type of oven specially designed for cooking food. Check corresponding quests for more information.%n%nTo use a stone oven, you need to right click the lower/upper part of the oven to insert fuels/items that you want to smelt, and then ignite it to start the process.
 susy.quest.db.97148971.title=Primitive Smelter
-susy.quest.db.97148971.desc=The §6Primitive Smelter§r is a primitive multiblock furnace capable of §4Smelting Metals§r and §eAlloys§r.%n%nIt can be used to extract certain metals, such as §6Copper§r, §7Tin§r, §5Lead§r, and §7Zinc§r, from their ores through decomposition, driving off other elements as §8gases§r or §8slag§r and leaving the metal behind.%n%nAdditionally, it can produce some basic alloys, such as §6Bronze§r or §eBrass§r, from their components.%n%nThe speed of the §6Primitive Smelter§r depends on the §7Reductant§r (which also serves as §cFuel§r) it is using, as well as the form of the ingredients used for smelting. Generally, the §4dust§r form of the ingredients takes the least time.%n%nCheck the JEI page for more infomation.
+susy.quest.db.97148971.desc=The §6Primitive Smelter§r is a primitive multiblock furnace capable of §4Smelting Metals§r and §eAlloys§r.%n%nIt can be used to extract certain metals, such as §6Copper§r, §7Tin§r, §5Lead§r, and §7Zinc§r, from their ores through decomposition, driving off other elements as §8gases§r or §8slag§r and leaving the metal behind.%n%nAdditionally, it can produce some basic alloys, such as §6Bronze§r, §cPotin§r, or §eBrass§r, from their components.%n%nThe speed of the §6Primitive Smelter§r depends on the §7Reductant§r (which also serves as §cFuel§r) it is using, as well as the form of the ingredients used for smelting. Generally, the §4dust§r form of the ingredients takes the least time.%n%nCheck the JEI page for more infomation.
 susy.quest.db.302928877.title=Coke Oven Brick
 susy.quest.db.302928877.desc=By mixing §bClays§r and §eSands§r, you created a new kind of clay which, after forming and firing, creates bricks that are quite air-tight, making them suitable to be used as §6Coke Oven Bricks§r.
 susy.quest.db.456863075.title=Lighting a Fire

From bd03d8d7c3a492c7e198cdbf1be51b502ab80203 Mon Sep 17 00:00:00 2001
From: bruberu <80226372+bruberu@users.noreply.github.com>
Date: Sun, 3 Nov 2024 18:28:16 -0600
Subject: [PATCH 38/41] Update SuSyCore and Gregic Probe

---
 manifest.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 6200a9b1d..593b01ddd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -11,7 +11,7 @@
   "manifestType": "minecraftModpack",
   "manifestVersion": 1,
   "name": "Supersymmetry",
-  "version": "0.1.13.1",
+  "version": "0.1.13.2",
   "author": "SymmetricDevs",
   "externalDeps": [],
   "files": [
@@ -397,7 +397,7 @@
     },
     {
       "projectID": 846224,
-      "fileID": 5826319,
+      "fileID": 5870351,
       "required": true
     },
     {
@@ -859,7 +859,7 @@
     },
     {
       "projectID": 1109784,
-      "fileID": 5804158,
+      "fileID": 5872534,
       "required": true
     },
     {

From e6662fec7e49a685bd38b7d08e6129acd2cb0d4b Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Mon, 4 Nov 2024 10:48:37 +0800
Subject: [PATCH 39/41] sorry I forgor

---
 structures/active/SupportBeamChestUp.rcig | 127 ++++++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 structures/active/SupportBeamChestUp.rcig

diff --git a/structures/active/SupportBeamChestUp.rcig b/structures/active/SupportBeamChestUp.rcig
new file mode 100644
index 000000000..8bb103f59
--- /dev/null
+++ b/structures/active/SupportBeamChestUp.rcig
@@ -0,0 +1,127 @@
+{
+  "version": 2,
+  "inventoryGeneratorID": "SupportBeamChest",
+  "items": [
+    {
+      "weight": 1.0,
+      "min": 1,
+      "max": 16,
+      "item": {
+        "id": "gregtech:meta_stick",
+        "damage": 324,
+        "count": 1
+      }
+    },
+    {
+      "weight": 0.4858947992324829,
+      "min": 1,
+      "max": 4,
+      "item": {
+        "id": "gregtech:meta_block_frame_20",
+        "damage": 4,
+        "count": 1
+      }
+    },
+    {
+      "weight": 0.646636426448822,
+      "min": 1,
+      "max": 8,
+      "item": {
+        "id": "gregtech:meta_screw",
+        "damage": 324,
+        "count": 1
+      }
+    },
+    {
+      "weight": 1.0,
+      "min": 1,
+      "max": 12,
+      "item": {
+        "id": "gregtech:meta_bolt",
+        "damage": 324,
+        "count": 1
+      }
+    },
+    {
+      "weight": 0.16315889358520508,
+      "min": 1,
+      "max": 2,
+      "item": {
+        "id": "gregtech:meta_item_2",
+        "damage": 1103,
+        "count": 1
+      }
+    },
+    {
+      "weight": 0.12706157565116882,
+      "min": 1,
+      "max": 1,
+      "item": {
+        "id": "gregtech:meta_item_2",
+        "damage": 1102,
+        "count": 1
+      }
+    },
+    {
+      "weight": 0.11158588528633118,
+      "min": 1,
+      "max": 1,
+      "item": {
+        "id": "susy:meta_item",
+        "damage": 2,
+        "count": 1
+      }
+    },
+    {
+      "weight": 0.08515378087759018,
+      "min": 1,
+      "max": 1,
+      "item": {
+        "id": "susy:meta_item",
+        "damage": 3,
+        "count": 1
+      }
+    },
+    {
+      "weight": 0.4858947992324829,
+      "min": 1,
+      "max": 5,
+      "item": {
+        "id": "industrialrenewal:brace_steel",
+        "damage": 0,
+        "count": 1
+      }
+    },
+    {
+      "weight": 0.646636426448822,
+      "min": 2,
+      "max": 8,
+      "item": {
+        "id": "industrialrenewal:catwalk_steel_pillar",
+        "damage": 0,
+        "count": 1
+      }
+    },
+    {
+      "weight": 0.5889394283294678,
+      "min": 1,
+      "max": 6,
+      "item": {
+        "id": "industrialrenewal:frame",
+        "damage": 0,
+        "count": 1
+      }
+    },
+    {
+      "weight": 0.3978064954280853,
+      "min": 2,
+      "max": 12,
+      "item": {
+        "id": "industrialrenewal:catwalk_column_steel",
+        "damage": 0,
+        "count": 1
+      }
+    }
+  ],
+  "dependencyExpression": ""
+}
\ No newline at end of file

From ec3b87b88537891bc993a90424b860b1913876f9 Mon Sep 17 00:00:00 2001
From: bruberu <80226372+bruberu@users.noreply.github.com>
Date: Sun, 3 Nov 2024 20:51:04 -0600
Subject: [PATCH 40/41] fix: minor spelling error

---
 config/betterquesting/resources/supersymmetry/lang/en_us.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/betterquesting/resources/supersymmetry/lang/en_us.lang b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
index 4432737f4..b58f2984e 100644
--- a/config/betterquesting/resources/supersymmetry/lang/en_us.lang
+++ b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
@@ -81,7 +81,7 @@ susy.quest.db.11.desc=§6Leather §rneeds to be boiled to make §6Treated Leathe
 susy.quest.db.12.title=Stone Tools
 susy.quest.db.12.desc=Now, you should be able to craft your first §7tools§r in your own crafting inventory! A pickaxe and an axe should suffice for now, although a shovel is nice for getting through dirt.%n%nNote: To find the recipe for stone tools, you should check the recipe for their iron variant (or simply by pressing §6[R]§r on the items on the right-hand side) and turn to the §6last§r page of the JEI.
 susy.quest.db.13.title=Copper
-susy.quest.db.13.desc=Copper can be found pretty much everywhere in the Earth's crust, and even in the deeper layers. Sometimes you might even find some §6Native Copper Deposits§r, which contains coppers in its elemental form.%n%nYou can get coppers from §eChalcopyrite§r, §8Chalcocite§r, §2Malachite§r, §6Bornite§r, or §4Tetrahedrite§r veins. However, the Primitive Smelter can only process ores that contains no other matels, which means §c§lONLY§r Chalcocite and Malachite can be used at the moment.%n%nFinding a §6Tiny Pile of Copper Dust §ron the ground means that there is a deposit under it. If you are having trouble finding a specific deposit, look it up in the JEI database, you will find a page showing where it is found. %n%nLet's start by getting 30 copper ingots.%n%n§c§lAs a very important rule of thumb, quest retrieval numbers are arbitrary. You can follow the suggestion here, but trust me when I say you will need a whole lot more Copper.
+susy.quest.db.13.desc=Copper can be found pretty much everywhere in the Earth's crust, and even in the deeper layers. Sometimes you might even find some §6Native Copper Deposits§r, which contains coppers in its elemental form.%n%nYou can get coppers from §eChalcopyrite§r, §8Chalcocite§r, §2Malachite§r, §6Bornite§r, or §4Tetrahedrite§r veins. However, the Primitive Smelter can only process ores with a single type of metal inside, which means that §c§lONLY§r Chalcocite and Malachite can be processed by this.%n%nFinding a §6Tiny Pile of Copper Dust §ron the ground means that there is a deposit under it. If you are having trouble finding a specific deposit, look it up in the JEI database, you will find a page showing where it is found. %n%nLet's start by getting 30 copper ingots.%n%n§c§lAs a very important rule of thumb, quest retrieval numbers are arbitrary. You can follow the suggestion here, but trust me when I say you will need a whole lot more Copper.
 susy.quest.db.14.title=Tin
 susy.quest.db.14.desc=Tin can be found in §6Cassiterite Sand§r and §6Cassiterite§f§6 Ore§f veins. You can look them up in the JEI database to see where you can find them.%n%nTin is a silvery-coloured metal. Tin is soft enough to be cut with little force and a bar of tin can be bent with little effort. %n§6%n§l§rOre deposits cover a surface of 20 by 20 meters across. Each deposit can contain up to 5,000 ingots worth of ore. %n%n§0§9§e§d§c§b§l§c§c§lAs a very important rule of thumb, quest retrieval numbers are arbitrary. You can follow the suggestion here, but trust me when I say you will need a lot more Tin and especially Copper.
 susy.quest.db.15.title=Macerator V0.1 Alpha

From 7ed4720bd5961edfdfd63bc1d1be9d874a30dd3d Mon Sep 17 00:00:00 2001
From: bruberu <80226372+bruberu@users.noreply.github.com>
Date: Sun, 3 Nov 2024 21:09:31 -0600
Subject: [PATCH 41/41] Remove installing java

---
 .github/workflows/release.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 28104d382..9a31a5b5d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -21,11 +21,6 @@ jobs:
     - name: Install requests
       run: |
        pip install requests
-    - uses: actions/setup-java@v2
-      with:
-        distribution: 'adopt' # See 'Supported distributions' for available options
-        java-version: '8'
-    - run: java -version
     - name: Run Build
       run: |
         python build/main.py
@@ -65,4 +60,4 @@ jobs:
             buildOut/supersymmetry-${{steps.get-version.outputs.result}}.zip
             buildOut/server-${{steps.get-version.outputs.result}}.zip
             buildOut/modlist.html
-    
\ No newline at end of file
+