Merge pull request #1960 from TerraFirmaGreg-Team/dev

Release: 0.11.0
2025-10-06 03:43:08 +05:00 · 2025-10-06 03:43:08 +05:00 · 57a6586718
commit 57a6586718
parent a5ed4d8803 9674a19964
712 changed files with 36708 additions and 12724 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -194,7 +194,7 @@ jobs:
      - name: 📄 Format diff
        id: format_diff
        if: ${{ steps.read_diff.outputs.diff != '' }}
-        uses: roamingowl/template-output-with-eta@v1.13.0
+        uses: roamingowl/template-output-with-eta@v2.0.0
        with:
          template: |
            ```markdown
@ -304,6 +304,7 @@ jobs:


          sed -i -e "s/DEV/${VERSION}/g" pakku.json
+          sed -i -e "s/DEV/${VERSION}/g" config/mod-director/modpack.json
          sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt

          sed -i -e "s/DEV/${VERSION}/g" .pakku/multimc-overrides/instance.cfg
@ -316,7 +317,7 @@ jobs:
          sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/server-overrides/forge-auto-install.txt

      - name: 📝 Cache pakku
-        uses: actions/cache@v4.2.4
+        uses: actions/cache@v4.3.0
        id: cache
        with:
          path: build/.cache
@ -428,7 +429,7 @@ jobs:
      - name: 📄 Format diff
        id: format_diff
        if: ${{ needs.info.outputs.diff != '' }}
-        uses: roamingowl/template-output-with-eta@v1.13.0
+        uses: roamingowl/template-output-with-eta@v2.0.0
        with:
          template: |
            ```markdown
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,57 @@
 ### Changes
 ### Bug fixes

+## [0.11.0] - 05-10-2025
+- WARNING! If you're upgrading your world from 0.10 to 0.11, please read the upgrade guide [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/wiki/%5BEN%5D-Upgrading-from-0.10-to-0.11). We do not recommend using Alpha versions for progression, but if you do, please make frequent backups!
+### Mars
+- Build an upgraded rocket and set off to Mars, a long awaited new dimension! You can get started in EV.
+- We're still finishing it up, so a few things aren't done yet. Please check [our TODO list](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/discussions/1744) before sending a bug report!
+### EV changes
+- Radon, Plutonium, the Microprocessor Mainframe and Nano Circuits are now locked behind Fission tech. You shouldn't need IV-tier circuits for anything before then, please let us know if we've missed something.
+- Plutonium ore has been removed from the Beneath.
+- Tungsten now has a more complicated refinement process! It's pretty straightforward if you just need a little of it, but it has a fully loopable recipe chain too!
+- The Netherarium and Enderarium have been removed. You will be able to get all their important outputs from Mars. If you have any nether/ender air stored, distill it because those recipes will be going away soon too.
+### Create changes
+- Water wheels and windmills are now Greate tiered! Small water wheels are ULS (32 SU max), large water wheels and windmills are LS (128 SU max).
+- Large water wheels are now more expensive to craft (and now need steel), but also generate 128 SU by themselves, so you don't need to double them up any more. All water wheels now require actual rivers to rotate at their full effectiveness. You can still use them in oceans and lakes at partial efficiency.
+- Windmill Sail Frames no longer generate SU, but are cheaper to craft, only needing a single wrought iron rod per 8 frames. Windmills now also require large open spaces to work at full strength.
+- Water wheels and windmills no longer work in orbit or on the moon, and water wheels no longer work in the Beneath.
+- Blaze burners now only need regular steel to craft, so they are the best option if you want on-demand power generation anywhere you want. (#1889) @TreyR9
+- Removed all passive sources of steam engine heating. @Pyritie
+- Create Packagers/Jar Packagers are now significantly cheaper to craft (#1892) @airrice 
+- Create Casings now need stripped logs instead of any logs @Pyritie
+### AE2 changes
+- Programmed Circuit Card has been removed because it was incompatible with the above additions. Making several machines for different circuits is intended, however if you need to do something like make a whole assembler for a single unique recipe, let us know and we can move the circuit numbers around.
+- This is because we've moved to a new AE2 fork which comes with a [lot of new features](https://cdn.discordapp.com/attachments/1378754174983868416/1418355912095039570/image.png?ex=68e39321&is=68e241a1&hm=2846f781dbb856cee89a3f80ea3200e0e36840bb10305722b0304240ee1fe6b8&)! Shoutouts to [Cosmic Frontiers](https://www.curseforge.com/minecraft/modpacks/cosmic-frontiers) for their work on this.
+- Added the Interplanetary Wireless Card, an infinite-range, cross-dimension upgrade for your wireless terminal but costs a lot of power to transfer items. Great for if you forgot something at home, but not useful for mass logistics.
+- Universal Wireless Terminal is now obtainable at EV instead of IV
+### Other changes
+- Significantly increased durability of hiking boots, and now red steel ones have even more durability while blue steel ones increase your speed a little more (#1894) @Nashy1232
+- EV-tier guns and ammo now require titanium or HSLA instead of tungsten for some crafts @BlueBoat29
+- Improved placement of Illages so now they should never generate on top of a river, increased the number of mobs they have, and nerfed their loot a little @Pyritie
+- You can now use honey to make jam in a food processor (#1921) @ShadowDimentio
+- Your first MV circuit now needs a sequenced assembly instead of a crafting table recipe @Pyritie
+- Added recipes for making liquid concrete (for supports) with barrels and mixing bowl @Pyritie
+- Added a mixer recipe for bio diesel to get started @TomPlop
+- Added more stone supports, aqueducts, and many other stone type fixes (#1919) @vidal-adrien
+- Added sandpaper recipes for earlier gem rods @Pyritie
+### Bug fixes
+- Soup can no longer kill you from overheating @BlueBoat29
+- Air Distributors now consume as much gas as they should, instead of significantly more (#1760) @Bumperdo09
+- Fixed not being able to put igneous intrusive stones into the ore sack (#1893) @Nashy1232
+- Fixed food processor jam recipes not accepting honey (#1896) @Xaligal
+- Fixed stainless steel needles being consumed in sewing-type crafts (#1900) @Redeix
+- Updated boiler minecart models and textures (#1900) @Redeix
+- Fixed flux dupe using filled sea shells (#1903) @Redeix
+- Fixed some more dupes with tool heads and whisks (#1576) @Pyritie
+- Fixed missing recipe for raw to polished alabaster @Pyritie
+- Fixed food processor not being able to cut Basil properly (#1934) @aldp2883
+- Fixed food processor outputting only 1 shredded cheese instead of 4 (#1925) @aldp2883
+- Fixed some more stack size issues with the assembly line (#1952)
+### Translation updates
+- Chinese (simplified) @jmecn
+- Ukranian @MetEnBouldry
+
 ## [0.10.17] - 30-09-2025
 ### Bug fixes
 - Fixed not being able to use some extruder molds in the Curving Press @Pyritie
--- a/config/ambientsounds-client.json
+++ b/config/ambientsounds-client.json
@ -17,7 +17,8 @@
    "nether": 1,
    "surface": 1,
    "twilightforest": 1,
-    "void": 1
+    "void": 1,
+    "ad_astra": 1
  },
  "regions": {
    "abyssalcraft_dark": {
--- a/config/carryon-common.toml
+++ b/config/carryon-common.toml
@ -57,7 +57,7 @@
 [whitelist]
 	#Whitelist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config
 	#Entities that CAN be picked up (useWhitelistEntities must be true)
-	allowedEntities = ["tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfg:moon_rabbit", "species:birt"]
+	allowedEntities = ["tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfg:moon_rabbit", "species:birt", "species:stackatick", "species:springling", "tfg:glacian_ram"]
 	#Blocks that CAN be picked up (useWhitelistBlocks must be true)
 	allowedBlocks = ["framedblocks:framed_chest", "tfc:wood/chest/*", "tfc:wood/trapped_chest/*", "afc:wood/chest/*", "afc:wood/trapped_chest/*", "#forge:chests/wooden"]
 	#Entities that CAN have other entities stacked on top of them (useWhitelistStacking must be true)
--- a/config/createpickywheels-common.toml
+++ b/config/createpickywheels-common.toml
@ -0,0 +1,49 @@
+
+##Waterwheel requirements
+[waterwheels]
+	#Enable waterwheels modifications?
+	waterwheelsEnabled = true
+	#Only enable pickyness onPlacement, if the water wheel was instead generated during worldgen, it works as default.
+	waterwheelsPickyOnPlacement = true
+	#Boost for Waterwheels placed on boosted biomes.
+	#Range: 0.0 ~ 1.7976931348623157E308
+	waterwheelBaseBoost = 1.0
+	#Penalty for Waterwheels placed on whitelisted but not on preferential biomes [waterwheel_boosted biome tag].
+	#Range: 0.0 ~ 1.7976931348623157E308
+	waterwheelPenalty = 0.25
+	#The minimum amount of fluid blocks the waterwheel needs to find before rotation begins.
+	#Range: > 1
+	waterwheelThreshold = 512
+	#The maximum distance a waterwheel can consider fluid blocks from.
+	#Range: > 1
+	waterwheelRange = 128
+
+##Windmill requirements
+[windmills]
+	#Enable windmills modifications?
+	windmillsEnabled = true
+	#Penalty for Windmills placed on whitelisted but not on preferential biomes [windmills_boosted biome tag].
+	#Range: 0.0 ~ 1.7976931348623157E308
+	windmillBaseBoost = 1.0
+	#Penalty for Windmills placed on whitelisted but not on preferential biomes [windmills_boosted biome tag].
+	#Range: 0.0 ~ 1.7976931348623157E308
+	windmillPenalty = 1.0
+	#The minimum floor area required. Default: 1/4 of the max area [PI * 32 ^ 2].
+	#Range: > 1
+	windmillThreshold = 804
+	#The minimum length of air current required.
+	#Range: > 1
+	windmillRequiredRange = 24
+	#The minimum amount of points that must hit windmillRequiredRange.
+	#Range: > 1
+	windmillRequiredRangePoints = 128
+	#The maximum distance a waterwheel can consider air blocks from.
+	#Range: > 1
+	windmillMaxRange = 32
+	#The percentage of Generated Speed only given if windmills are raised enough.
+	#Range: 0.0 ~ 1.0
+	windmillAbovePenalty = 1.0
+	#The height required for the full benefit from windmillAbovePenalty.
+	#Range: > 1
+	windmillAbove = 3
+
--- a/config/deafission-common.toml
+++ b/config/deafission-common.toml
@ -0,0 +1,3 @@
+#Whether to add the default recipes. false is recommended for modpacks.
+addDefaultRecipes = false
+
--- a/config/fallingtrees_common.json
+++ b/config/fallingtrees_common.json
@ -1,104 +1,124 @@
 {
-  "disableCrouchMining": false,
-  "disableExtraToolDamage": false,
-  "disableExtraFoodExhaustion": false,
-  "treeLifetimeLength": 4.0,
-  "dynamicMiningSpeed": {
-    "disable": false,
-    "speedMultiplication": 0.05,
-    "maxSpeedMultiplication": 16.0
-  },
-  "trees": {
-    "standardTree": {
-      "algorithm": {
-        "maxLeavesRadius": 15,
-        "maxLogAmount": 512,
-        "shouldFallOnMaxLogAmount": true,
-        "shouldIgnorePersistentLeaves": true
-      },
-      "logFilter": {
-        "whitelistedTags": [
-          "minecraft:logs"
-        ],
-        "whitelist": [],
-        "blacklist": []
-      },
-      "leavesFilter": {
-        "whitelistedTags": [
-          "minecraft:leaves"
-        ],
-        "whitelist": [],
-        "blacklist": []
-      },
-      "extraBlockFilter": {
-        "whitelistedTags": [],
-        "whitelist": [
-          "minecraft:vine",
-          "minecraft:bee_nest",
-          "minecraft:cocoa"
-        ],
-        "blacklist": []
-      },
-      "enabled": true,
-      "onlyFallWithRequiredTool": false,
-      "allowedToolFilter": {
-        "whitelistedTags": [
-          "minecraft:axes"
-        ],
-        "whitelist": [],
-        "blacklist": []
-      }
+    "disableCrouchMining": false,
+    "disableExtraToolDamage": false,
+    "disableExtraFoodExhaustion": false,
+    "treeLifetimeLength": 4.0,
+    "dynamicMiningSpeed": {
+        "disable": false,
+        "speedMultiplication": 0.05,
+        "maxSpeedMultiplication": 16.0
    },
-    "verticalTree": {
-      "filter": {
-        "whitelistedTags": [],
-        "whitelist": [
-          "minecraft:cactus",
-          "minecraft:bamboo"
-        ],
-        "blacklist": []
-      },
-      "enabled": true,
-      "onlyFallWithRequiredTool": false,
-      "allowedToolFilter": {
-        "whitelistedTags": [],
-        "whitelist": [],
-        "blacklist": []
-      }
-    },
-    "chorusTree": {
-      "enabled": true,
-      "onlyFallWithRequiredTool": false,
-      "allowedToolFilter": {
-        "whitelistedTags": [],
-        "whitelist": [],
-        "blacklist": []
-      }
-    },
-    "mushroomTree": {
-      "stemFilter": {
-        "whitelistedTags": [],
-        "whitelist": [
-          "minecraft:mushroom_stem"
-        ],
-        "blacklist": []
-      },
-      "capFilter": {
-        "whitelistedTags": [],
-        "whitelist": [
-          "minecraft:red_mushroom_block",
-          "minecraft:brown_mushroom_block",
-          "minecraft:shroomlight"
-        ],
-        "blacklist": []
-      },
-      "enabled": true,
-      "onlyFallWithRequiredTool": false,
-      "allowedToolFilter": {
-        "whitelistedTags": [],
-        "whitelist": [],
-        "blacklist": []
-      }
+    "trees": {
+        "standardTree": {
+            "algorithm": {
+                "maxLeavesRadius": 22,
+                "maxLogAmount": 512,
+                "shouldFallOnMaxLogAmount": true,
+                "shouldIgnorePersistentLeaves": true
+            },
+            "logFilter": {
+                "whitelistedTags": [
+                    "minecraft:logs"
+                ],
+                "whitelist": [
+                    "minecraft:mushroom_stem",
+                    "beneath:wood/log/crimson",
+                    "beneath:wood/stripped_log/crimson",
+                    "beneath:wood/wood/crimson",
+                    "beneath:wood/stripped_wood/crimson",
+                    "beneath:wood/log/warped",
+                    "beneath:wood/stripped_log/warped",
+                    "beneath:wood/wood/warped",
+                    "beneath:wood/stripped_wood/warped",
+                    "ad_astra:aeronos_stem",
+                    "ad_astra:strophar_stem"
+                ],
+                "blacklist": []
+            },
+            "leavesFilter": {
+                "whitelistedTags": [
+                    "minecraft:leaves"
+                ],
+                "whitelist": [
+                    "minecraft:red_mushroom_block",
+                    "minecraft:brown_mushroom_block",
+                    "minecraft:shroomlight",
+                    "species:alphacene_mushroom_block",
+                    "species:alphacene_mushroom_growth",
+                    "minecraft:nether_wart_block",
+                    "minecraft:warped_wart_block",
+                    "beneath:wood/leaves/crimson",
+                    "beneath:wood/leaves/warped",
+                    "ad_astra:aeronos_cap",
+                    "ad_astra:strophar_cap"
+                ],
+                "blacklist": []
+            },
+            "extraBlockFilter": {
+                "whitelistedTags": [],
+                "whitelist": [
+                    "minecraft:vine",
+                    "minecraft:bee_nest",
+                    "minecraft:cocoa"
+                ],
+                "blacklist": []
+            },
+            "enabled": true,
+            "onlyFallWithRequiredTool": false,
+            "allowedToolFilter": {
+                "whitelistedTags": [
+                    "minecraft:axes"
+                ],
+                "whitelist": [],
+                "blacklist": []
+            }
+        },
+        "verticalTree": {
+            "filter": {
+                "whitelistedTags": [],
+                "whitelist": [
+                    "minecraft:cactus",
+                    "minecraft:bamboo"
+                ],
+                "blacklist": []
+            },
+            "enabled": true,
+            "onlyFallWithRequiredTool": false,
+            "allowedToolFilter": {
+                "whitelistedTags": [
+                    "minecraft:axes"
+                ],
+                "whitelist": [],
+                "blacklist": []
+            }
+        },
+        "chorusTree": {
+            "enabled": false,
+            "onlyFallWithRequiredTool": false,
+            "allowedToolFilter": {
+                "whitelistedTags": [],
+                "whitelist": [],
+                "blacklist": []
+            }
+        },
+        "mushroomTree": {
+            "stemFilter": {
+                "whitelistedTags": [],
+                "whitelist": [],
+                "blacklist": []
+            },
+            "capFilter": {
+                "whitelistedTags": [],
+                "whitelist": [],
+                "blacklist": []
+            },
+            "enabled": true,
+            "onlyFallWithRequiredTool": false,
+            "allowedToolFilter": {
+                "whitelistedTags": [],
+                "whitelist": [],
+                "blacklist": []
+            }
+        }
    }
-  }
 }
--- a/config/fancymenu/customization/gui_main_menu.txt
+++ b/config/fancymenu/customization/gui_main_menu.txt
--- a/config/fancymenu/panoramas/mars/panorama/panorama_0.png
+++ b/config/fancymenu/panoramas/mars/panorama/panorama_0.png
--- a/config/fancymenu/panoramas/mars/panorama/panorama_1.png
+++ b/config/fancymenu/panoramas/mars/panorama/panorama_1.png
--- a/config/fancymenu/panoramas/mars/panorama/panorama_2.png
+++ b/config/fancymenu/panoramas/mars/panorama/panorama_2.png
--- a/config/fancymenu/panoramas/mars/panorama/panorama_3.png
+++ b/config/fancymenu/panoramas/mars/panorama/panorama_3.png
--- a/config/fancymenu/panoramas/mars/panorama/panorama_4.png
+++ b/config/fancymenu/panoramas/mars/panorama/panorama_4.png
--- a/config/fancymenu/panoramas/mars/panorama/panorama_5.png
+++ b/config/fancymenu/panoramas/mars/panorama/panorama_5.png
--- a/config/fancymenu/panoramas/mars/properties.txt
+++ b/config/fancymenu/panoramas/mars/properties.txt
@ -0,0 +1,9 @@
+type = panorama
+
+panorama-meta {
+	name = mars
+	speed = 1.0
+	fov = 85.0
+	angle = 0.0
+	start_rotation = 20
+}
--- a/config/fancymenu/slideshows/new_loading_screen/images/image_13.jpg
+++ b/config/fancymenu/slideshows/new_loading_screen/images/image_13.jpg
--- a/config/fancymenu/slideshows/new_loading_screen/images/image_14.jpg
+++ b/config/fancymenu/slideshows/new_loading_screen/images/image_14.jpg
--- a/config/fancymenu/slideshows/new_loading_screen/images/image_15.jpg
+++ b/config/fancymenu/slideshows/new_loading_screen/images/image_15.jpg
--- a/config/ftbquests/chapter_groups.snbt
+++ b/config/ftbquests/chapter_groups.snbt
@ -1,3 +0,0 @@
-{
-	chapter_groups: [ ]
-}
--- a/config/ftbquests/data.snbt
+++ b/config/ftbquests/data.snbt
@ -1,21 +0,0 @@
-{
-	default_autoclaim_rewards: "disabled"
-	default_consume_items: false
-	default_quest_disable_jei: false
-	default_quest_shape: "circle"
-	default_reward_team: false
-	detection_delay: 20
-	disable_gui: false
-	drop_loot_crates: false
-	emergency_items_cooldown: 300
-	grid_scale: 0.5d
-	lock_message: ""
-	loot_crate_no_drop: {
-		boss: 0
-		monster: 600
-		passive: 4000
-	}
-	pause_game: false
-	progression_mode: "linear"
-	version: 13
-}
--- a/config/ftbquests/quests/chapters/applied_energistics_2.snbt
+++ b/config/ftbquests/quests/chapters/applied_energistics_2.snbt
@ -69,7 +69,12 @@
 		}
 	]
 	order_index: 3
-	quest_links: [ ]
+	quest_links: [{
+		id: "6845144F7EA1081D"
+		linked_quest: "24158DEE63DAEB41"
+		x: 5.0d
+		y: -4.5d
+	}]
 	quests: [
 		{
 			dependencies: ["00A2566109144D7F"]
@ -226,6 +231,7 @@
 			y: -0.5d
 		}
 		{
+			can_repeat: true
 			dependencies: ["0C0B09D66D0CFFBA"]
 			description: ["{quests.ae2.ae_guide.desc}"]
 			id: "6CF08AFB924905F0"
@ -1230,21 +1236,38 @@
 				type: "item"
 			}]
 			title: "{quests.ae2.cutting_knife.title}"
-			x: 0.0d
+			x: 0.5d
 			y: -10.5d
 		}
 		{
-			dependencies: ["378E2294EFD85C65"]
-			description: ["{quests.ae2.programmed_circuit_card.desc}"]
-			id: "51B34B3E51B6ECDD"
+			dependencies: ["386C54268DA9F2BF"]
+			description: ["{quests.ae2.pattern_box.desc}"]
+			id: "36BF57C3B7D81B6F"
 			tasks: [{
-				id: "295980339E1FE027"
-				item: "pccard:card_programmed_circuit"
+				id: "403A9E3BB8B14683"
+				item: "ae2:pattern_box"
 				type: "item"
 			}]
-			x: 1.0d
+			x: -0.5d
 			y: -10.5d
 		}
+		{
+			dependencies: [
+				"5187909B66DF2D43"
+				"24158DEE63DAEB41"
+			]
+			description: ["{quests.ae2.interplanetary_wireless.desc}"]
+			icon: "tfg:wireless_card"
+			id: "4B1F957EB41A5E9B"
+			subtitle: "{quests.ae2.interplanetary_wireless.subtitle}"
+			tasks: [{
+				id: "647F84B024E272BA"
+				item: "tfg:wireless_card"
+				type: "item"
+			}]
+			x: 5.0d
+			y: -3.5d
+		}
 	]
 	subtitle: ["{quests.ae2.subtitle}"]
 	title: "{quests.ae2}"
--- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
+++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
--- a/config/ftbquests/quests/chapters/ev_in_work.snbt
+++ b/config/ftbquests/quests/chapters/ev_in_work.snbt
--- a/config/ftbquests/quests/chapters/gregtech_energy.snbt
+++ b/config/ftbquests/quests/chapters/gregtech_energy.snbt
@ -541,7 +541,7 @@
 				}
 			]
 			title: "{quests.gregtech_energy.lgt_fuel.title}"
-			x: -9.5d
+			x: -10.0d
 			y: -3.0d
 		}
 		{
@ -574,7 +574,7 @@
 				}
 			]
 			title: "{quests.gregtech_energy.lpt_fuel.title}"
-			x: -8.5d
+			x: -9.0d
 			y: 3.0d
 		}
 		{
@ -604,7 +604,7 @@
 				}
 			]
 			title: "{quests.gregtech_energy.lst_fuel.title}"
-			x: -7.5d
+			x: -9.0d
 			y: -7.0d
 		}
 		{
@ -655,7 +655,7 @@
 				}
 			]
 			title: "{quests.gregtech_energy.lce_fuel.title}"
-			x: -8.5d
+			x: -9.0d
 			y: 1.0d
 		}
 		{
@ -800,7 +800,7 @@
 				}
 			]
 			title: "{quests.gregtech_energy.hv_fuel.title}"
-			x: -10.5d
+			x: -11.0d
 			y: -3.0d
 		}
 		{
@ -947,7 +947,7 @@
 				item: "gtceu:benzene_bucket"
 				type: "item"
 			}]
-			x: -9.5d
+			x: -10.0d
 			y: -5.0d
 		}
 		{
@ -958,19 +958,44 @@
 				item: "gtceu:diesel_bucket"
 				type: "item"
 			}]
-			x: -8.5d
+			x: -9.0d
 			y: -5.0d
 		}
 		{
-			dependencies: ["05E2F203DA46A5E8"]
+			dependencies: ["7AF726555D721DFC"]
+			description: [
+				"The &dFission Reactor&r is certainly an uncommon sight in GregTech - both in theme, and how it works. But fear not, we are here to guide you with this multi-purpose big-brain multiblock!\\n\\nWe'll spare you the physics for now, &efellow engineer&r. The most important thing you should know is that the reactor is like a big thermal &dbattery-generator&r. You input proper fuel, and get &cheat&r (just like &6EU/t&r) that gets stored in the reactor as &crising temperature&r (stored &6EU&r).\\n\\nYou can then transfer this heat to &9coolant fluids&r for running turbines, or performing EBF-style crafting recipes. Sometimes you may even have &ctoo much&r of it. And oh, you also get new elements to make new fuels and circuits and stuff. Maybe explore the solar system a bit more? Boring stuff.\\n\\n&7Flip the page to learn more.&r"
+				"{@pagebreak}"
+				"To start off, get your hands on some &dThorium&r. Remember to wear all the relevant PPE - &eDeatek Intergalactic&r is not responsible for any bodily harm resulting from improper handling of fissile materials. We really shouldn't have to remind you at this point anymore. Check the hazards quest if you need a refresher.\\n\\nNext, craft some empty &dFuel Rods&r and fill them with the &dNuclear Fuel Processing Plant&r. The rods"
+				"are reusable, so you don't have to make too many. In fact, you might want to make just a single one for now.\\n\\nYou'll of course need a completed reactor, too. Check the EMI preview. Note how there is a central column of Fuel Holders, and then some optional columns for Components and Material Holders - more of these later.\\n\\nWait. Why just a &osingle&r rod? Oh, are &ewe&r glad you asked. Let's delve deep into the reactor mechanics in the next quest."
+				"{@pagebreak}"
+				"The more fuel rods you have installed in the reactor, the &chotter&r it gets. And the hotter it is, the more heat it is able to transfer out to the coolant fluid and processable items. But physics has its limits, and the reactor can only ever get &cso hot&r, so don't install too many fuel cells.\\n\\nBut fear not! Unlike how the &0big-oil&r propaganda machine insists, nuclear energy is &aperfectly safe&r. Should the heat level of the reactor border dangerous territory, the reactor enters an &9automatic cooldown sequence&r, and won't start again until all heat has been &asafely dissipated&r. It's quite slow, though.\\n\\nThere has to be a way to make it hotter and faster? Once again, good thing you asked! &eOur brilliant engineers&r have a solution for you!"
+				"{@pagebreak}"
+				"In addition to the 5 &dFuel Holders&r, you can install &oup to&r 20 &dComponents&r. The reactors from some other manufacturers require very exact positioning, but our reactor is smarter. The &6stats&r of all installed ones will simply be &6summed up&r, and that's it!\\n\\nCurrently, the reactor is able to utilize them in three&8*&r different ways:\\n&e1)&r Max temperature &7(insulator)&r\\n&e2)&r Efficiency &7(fuel lasts longer)&r\\n&e3)&r Throttle &7(slows down the reactions)&r\\n\\n&8*)&r It's possible your local galaxy doesn't have the necessary materials for all of them. We estimate to find materials only for the first category.\\n\\nBut be wary. Rising the &ctemperature&r comes with a &cdownside&r."
+				"{@pagebreak}"
+				"While a &chotter&r reactor makes coolants and processing &cfaster&r, it is also more demaning for the fuel rods. Each fuel rod has limited durability, and this scales linearly with the temperature.\\n\\nAs you need more fuel rods for the higher heat, this in effect makes the damage scale &nquadratically&r. If you want to heat coolants the most efficiently, you'll use low temperature. But if you want faster fissile conversion, use as high a heat as the insulation allows."
+				"{@pagebreak}"
+				"You are finally ready to take a look at the various recipes involving the reactor; check where the &dcontroller&r is used, and you'll find three &eEMI&r tabs:\\n\\n&e1)&r Fission Reactor &7(fuels and compatible coolants)&r\\n&e2)&r Fission Heat Processing &7(think: EBF)&r\\n&e3)&r Fission\\nProducts &7(when the fuel runs out)&r\\n&e4)&r The multiblock preview\\n\\nVarious &afuels&r are only compatible with certain &9coolant fluids&r, so pay attention to this. And once a fuel rod is completely used up, statistical certainty can safely state it having &btra&dns&rf&dor&bmed&r into new elements.\\n\\nThe processing recipes on the other hand can run regardless of the fuel, as long as the temperature level is high enough."
+				"{@pagebreak}"
+				"The simplified math is as follows: with sufficient coolant fluid and a &c100%&r heat fuel rod, the reactor will reach a temperature of about &c200&r. This can also be referred to as heat level, or just heat. Having &dtwo&r &c100%&r fuel cells is equal to &done&r &c200%&r cell, and both lead to about &c400&r heat.\\n\\nThis is because the fuel rod generates &6200 HU/t&r (heat units). Coolant fluids are able to extract &61 HU/t&r per &c1&r degree of heat.\\n\\nIf the reactor's max heat is &c190&r, a &c100%&r fuel cell will overheat it. You can increase this with the components, or alternatively &dactive coolants&r via the processing system. Each recipe has a heat impact."
+				"{@pagebreak}"
+				"For example, if the recipe's temperature is &c100&r, and impact &6-10 HU/t&r, it is able to cool down the reactor by &619 HU/t &rat &c190&r degrees.\\n\\nThat makes it possible to run the reactor with lower max heat, and not overheat! If the temperature is below &c100&r, it won't run at all - just like EBF recipes have limits.\\n\\nThis is all &ewe&r can teach you for now. Come back later to see if there was been any advancements, &efellow nuclear engineer&r!"
+			]
 			id: "4512E5DE7A84F809"
-			tasks: [{
-				id: "4BAECE3F4EC86920"
-				item: "gtceu:fission_reactor"
-				type: "item"
-			}]
-			x: -3.0d
-			y: 1.0d
+			tasks: [
+				{
+					id: "4BAECE3F4EC86920"
+					item: "deafission:fission_reactor_mk1"
+					type: "item"
+				}
+				{
+					id: "73A11457C2E4230D"
+					item: "tfg:nuclear_turbine"
+					type: "item"
+				}
+			]
+			x: -7.5d
+			y: -1.0d
 		}
 		{
 			dependencies: ["4C620105AAC49381"]
@ -980,7 +1005,7 @@
 				item: "gtceu:bio_diesel_bucket"
 				type: "item"
 			}]
-			x: -8.5d
+			x: -10.0d
 			y: -7.0d
 		}
 		{
@ -991,7 +1016,7 @@
 				item: "gtceu:cetane_boosted_diesel_bucket"
 				type: "item"
 			}]
-			x: -8.5d
+			x: -9.0d
 			y: -3.0d
 		}
 		{
@ -1002,7 +1027,7 @@
 				item: "gtceu:high_octane_gasoline_bucket"
 				type: "item"
 			}]
-			x: -8.5d
+			x: -9.0d
 			y: -1.0d
 		}
 		{
--- a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt
+++ b/config/ftbquests/quests/chapters/iv__insane_voltage.snbt
@ -6,14 +6,7 @@
 	icon: "tfg:iv_universal_circuit"
 	id: "32EF20533F323E02"
 	order_index: 1
-	quest_links: [{
-		id: "050247AED8C803F9"
-		linked_quest: "30A6EDDF25A5E5F8"
-		shape: "gear"
-		size: 1.2d
-		x: 0.375d
-		y: 4.875d
-	}]
+	quest_links: [ ]
 	quests: [
 		{
 			dependencies: [
@ -68,7 +61,6 @@
 			dependencies: [
 				"1776FA1F3255731E"
 				"5CA86A333670A55C"
-				"069FD86133D7D582"
 			]
 			description: [
 				"&aHSS-G Coils&r bring up the Heat Capacity to &d5,400K&r."
@ -94,7 +86,7 @@
 			y: 1.5d
 		}
 		{
-			dependencies: ["069FD86133D7D582"]
+			dependencies: ["61D5055F344DDFAD"]
 			description: [
 				"&7High-Speed Steels&r (HSS) are more resistant Steel Alloys typically used in Rails."
 				""
@ -139,7 +131,6 @@
 			dependencies: [
 				"1776FA1F3255731E"
 				"0425179329ED1B72"
-				"58BBD540D7D4FF01"
 			]
 			description: [
 				"When running the &3Extreme Combustion Engine&r, you're gonna want to boost it! &mWhy bother otherwise?&r"
@ -175,8 +166,6 @@
 		}
 		{
 			dependencies: [
-				"7820DF52516344F4"
-				"4CD9F6D1B4CC7D81"
 				"5BACED5AE350EAB1"
 				"4343746E706264E6"
 				"528CE69DA4358B2E"
@ -259,10 +248,7 @@
 			y: 2.625d
 		}
 		{
-			dependencies: [
-				"7CC79617A4965F25"
-				"30A6EDDF25A5E5F8"
-			]
+			dependencies: ["7CC79617A4965F25"]
 			description: [
 				"Tungstensteel under your belt? Nanoprocessor Mainframes on demand? Let's make some machinery."
 				""
@ -285,7 +271,6 @@
 			y: 3.75d
 		}
 		{
-			dependencies: ["30A6EDDF25A5E5F8"]
 			description: [
 				"The &aLarge Tungstensteel Boiler&r is the final Steam Boiler. It's even more efficient than the previous ones, and produces more steam."
 				""
@ -362,7 +347,6 @@
 			y: 1.5d
 		}
 		{
-			dependencies: ["7D15EEE81B1A3100"]
 			description: [
 				"Getting &aIndium&r requires a lot of &dSulfuric Acid&r, and two different ores: Galena and Sphalerite."
 				""
@ -387,7 +371,6 @@
 		}
 		{
 			dependencies: [
-				"7820DF52516344F4"
 				"0F192D1F44B9B599"
 				"5CA86A333670A55C"
 				"528CE69DA4358B2E"
@ -411,7 +394,6 @@
 			y: 3.75d
 		}
 		{
-			dependencies: ["30A6EDDF25A5E5F8"]
 			description: [
 				"&1IV&r Components - fortunately for you - aren't a massive step up in terms of complexity."
 				""
@ -465,10 +447,7 @@
 			y: 6.0d
 		}
 		{
-			dependencies: [
-				"7CC79617A4965F25"
-				"30A6EDDF25A5E5F8"
-			]
+			dependencies: ["7CC79617A4965F25"]
 			description: [
 				"Better Ore Processing for &6chanced Byproducts&r, only at the cost of this &3Macerator&r! A must have."
 				""
@ -510,11 +489,9 @@
 		}
 		{
 			dependencies: [
-				"73E8283634E5E33A"
 				"12B4423F055BFBF5"
 				"327C3E02CD751453"
 				"0425179329ED1B72"
-				"069FD86133D7D582"
 				"6B128610C7D2825D"
 			]
 			description: [
@ -542,11 +519,7 @@
 			y: 4.875d
 		}
 		{
-			dependencies: [
-				"0988B5FB795FF7DA"
-				"383B789B654C4094"
-				"69E384F389B0D07B"
-			]
+			dependencies: ["0988B5FB795FF7DA"]
 			description: [
 				"&o&7\"250,000,000 EU in a Battery? That's 25 minutes of Power when drained constantly.\""
 				""
@ -664,7 +637,6 @@
 		{
 			dependencies: [
 				"635D14B8E9F996FD"
-				"7820DF52516344F4"
 				"528CE69DA4358B2E"
 			]
 			description: [
@ -704,7 +676,6 @@
 			dependencies: [
 				"635D14B8E9F996FD"
 				"528CE69DA4358B2E"
-				"069FD86133D7D582"
 				"5DBBD9B1F5B01F4E"
 			]
 			description: [
@ -810,11 +781,7 @@
 			y: 1.5d
 		}
 		{
-			dependencies: [
-				"73E8283634E5E33A"
-				"0F192D1F44B9B599"
-				"63A87C9303D54487"
-			]
+			dependencies: ["0F192D1F44B9B599"]
 			description: [
 				"We know... this isn't actually gated behind &dIndium&r. However, you gotta trust us - this is the better recipe, so we don't want you wasting your time."
 				""
@ -834,9 +801,7 @@
 		}
 		{
 			dependencies: [
-				"73E8283634E5E33A"
 				"216E5A3574AC08BF"
-				"069FD86133D7D582"
 				"6B128610C7D2825D"
 			]
 			description: [
@ -927,7 +892,6 @@
 			y: 3.75d
 		}
 		{
-			dependencies: ["117FBB18DEE6F08B"]
 			description: [
 				"The next board material."
 				""
--- a/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt
+++ b/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt
@ -7,14 +7,6 @@
 	id: "262A03F6F4EC713C"
 	order_index: 2
 	quest_links: [
-		{
-			id: "7F8B55C8510200AF"
-			linked_quest: "188A8C3DD38C2762"
-			shape: "rsquare"
-			size: 0.66d
-			x: 6.75d
-			y: 0.0d
-		}
 		{
 			id: "217218CFDDD8EAC4"
 			linked_quest: "195E5BFDE4C5A0DE"
@ -36,20 +28,6 @@
 			x: 1.125d
 			y: 3.375d
 		}
-		{
-			id: "7E79CDC95173C788"
-			linked_quest: "1A4AD56965407DC5"
-			size: 0.75d
-			x: 0.375d
-			y: 5.25d
-		}
-		{
-			id: "2FD482405B15F06A"
-			linked_quest: "77070668969E31BF"
-			size: 0.75d
-			x: 1.125d
-			y: 5.625d
-		}
 		{
 			id: "6205AC829E90CE53"
 			linked_quest: "4F6E351C5F676618"
@ -793,10 +771,8 @@
 			dependencies: [
 				"35D4F93EFB6EACB6"
 				"300348B1238BCB9A"
-				"1A4AD56965407DC5"
 				"12FEE0A47E4658D5"
 				"4F6E351C5F676618"
-				"77070668969E31BF"
 				"3A7491323AC5C70C"
 			]
 			description: [
--- a/config/ftbquests/quests/chapters/ore_processing.snbt
+++ b/config/ftbquests/quests/chapters/ore_processing.snbt
@ -183,19 +183,6 @@
 			x: 9.0d
 			y: -15.0d
 		}
-		{
-			id: "668281162F13AA91"
-			linked_quest: "16E7CAC7BC8BFD8E"
-			x: -6.0d
-			y: -0.5d
-		}
-		{
-			icon: "gtceu:uraninite_dust"
-			id: "561FFC1C2CED7596"
-			linked_quest: "06B4AAC7DD796182"
-			x: 12.0d
-			y: -0.5d
-		}
 		{
 			id: "21670DA706D747EC"
 			linked_quest: "378F0AFCF95354B2"
@ -208,6 +195,18 @@
 			x: -3.0d
 			y: -13.0d
 		}
+		{
+			id: "68F9EF067F3F0F59"
+			linked_quest: "3F77D528961D5C5E"
+			x: -6.0d
+			y: -0.5d
+		}
+		{
+			id: "50BB4A87A144C6CD"
+			linked_quest: "2814C6FA71B07C95"
+			x: 12.0d
+			y: -0.5d
+		}
 	]
 	quests: [
 		{
--- a/config/ftbquests/quests/chapters/progression.snbt
+++ b/config/ftbquests/quests/chapters/progression.snbt
@ -70,34 +70,6 @@
 			x: 2.0d
 			y: -1.0d
 		}
-		{
-			id: "6ABFBA6855A6E7E9"
-			linked_quest: "196FC518F744B983"
-			shape: "square"
-			x: 3.0d
-			y: 2.0d
-		}
-		{
-			id: "629EAE6BC0519572"
-			linked_quest: "0017FFFAD7CD2EFE"
-			shape: "square"
-			x: 3.0d
-			y: 3.0d
-		}
-		{
-			id: "59568D32C47265ED"
-			linked_quest: "5CC9B0E832545569"
-			shape: "square"
-			x: 3.0d
-			y: 4.0d
-		}
-		{
-			id: "42DA2C0B99DB2545"
-			linked_quest: "58BBD540D7D4FF01"
-			shape: "square"
-			x: 3.0d
-			y: 5.0d
-		}
 		{
 			id: "39C4E4082B9B5731"
 			linked_quest: "49C1D61741AA288E"
@ -185,72 +157,66 @@
 		{
 			id: "709FB8C1561E7BB8"
 			linked_quest: "1646BF9194100E57"
-			x: 10.0d
-			y: -3.0d
+			x: 8.0d
+			y: 0.0d
 		}
 		{
 			id: "10F2DA9FCC5E3860"
 			linked_quest: "6B08799BCFD01D3D"
-			x: 10.0d
-			y: -1.0d
-		}
-		{
-			id: "72CBEEAD5A41685E"
-			linked_quest: "069FD86133D7D582"
-			x: 10.0d
-			y: 0.0d
+			x: 8.0d
+			y: 2.0d
 		}
 		{
 			id: "76C69275A82861C8"
 			linked_quest: "7A1E3C3A2D699C5B"
-			x: 10.0d
-			y: 1.0d
+			x: 8.0d
+			y: 4.0d
 		}
 		{
 			id: "6C144735C40EE615"
 			linked_quest: "2FCBA0D780DBDA9E"
-			x: 10.0d
-			y: 2.0d
+			x: 8.0d
+			y: 5.0d
 		}
 		{
 			id: "5FDCCB7CE9DACB34"
 			linked_quest: "4C7C0F6A6598BC24"
-			x: 10.0d
-			y: 3.0d
+			x: 8.0d
+			y: 6.0d
 		}
 		{
 			id: "4ACE1AFCEDC37A05"
 			linked_quest: "6AF3A40BC9CE7122"
-			x: 10.0d
-			y: 4.0d
+			x: 8.0d
+			y: 7.0d
 		}
 		{
 			id: "532482B324E31386"
 			linked_quest: "1776FA1F3255731E"
 			shape: "square"
-			x: 11.0d
-			y: 1.0d
+			x: 9.0d
+			y: 4.0d
 		}
 		{
 			id: "0F86FC5CD130B2E1"
 			linked_quest: "78277DBC07D3C45C"
 			shape: "square"
-			x: 11.0d
-			y: 2.0d
+			x: 9.0d
+			y: 5.0d
 		}
 		{
 			id: "7D227159C48FAB94"
 			linked_quest: "0DC999F79A685194"
 			shape: "square"
-			x: 11.0d
-			y: 3.0d
+			x: 9.0d
+			y: 6.0d
 		}
 		{
 			id: "718938D16A6098A7"
 			linked_quest: "35F13B6D60361904"
 			shape: "square"
-			x: 11.0d
-			y: 4.0d
+			x: 9.0d
+			y: 7.0d
 		}
 		{
 			id: "713A4F2E798A8BDB"
@ -268,14 +234,14 @@
 		{
 			id: "13ADAD728012FCB1"
 			linked_quest: "1C55AE6AD5BDE304"
-			x: 10.0d
-			y: -2.0d
+			x: 8.0d
+			y: 1.0d
 		}
 		{
 			id: "7C16D34BB19B0B27"
 			linked_quest: "4058958C4743E522"
-			x: 11.0d
-			y: -2.0d
+			x: 9.0d
+			y: 1.0d
 		}
 		{
 			id: "5D77547BEDCC8C01"
@ -292,64 +258,57 @@
 		{
 			id: "6C5CB6A5A223CB66"
 			linked_quest: "48A8E3210B2BAE1C"
-			x: 8.5d
-			y: -3.0d
+			x: 0.0d
+			y: -4.5d
 		}
 		{
 			id: "40D9CA59F1C83729"
 			linked_quest: "3C173357029AB649"
-			x: 8.5d
-			y: -2.0d
+			x: 1.0d
+			y: -4.5d
 		}
 		{
 			id: "1DF239C119DF26F3"
 			linked_quest: "174DA15847665CF8"
-			x: 8.5d
-			y: -1.0d
+			x: 2.0d
+			y: -4.5d
 		}
 		{
 			id: "2FF35C2F777C21C9"
 			linked_quest: "04DE7C58F20B535A"
-			x: 8.5d
-			y: 0.0d
+			x: 3.0d
+			y: -4.5d
 		}
 		{
 			id: "5A2EFA6523C736B0"
 			linked_quest: "56CA2EB7812529C5"
-			x: 8.5d
-			y: 2.0d
+			x: 5.0d
+			y: -4.5d
 		}
 		{
 			id: "5F9DCB9698B1FBC7"
 			linked_quest: "52DAF93E2F3D688A"
-			x: 8.5d
-			y: 1.0d
-		}
-		{
-			id: "3644488B52C563F6"
-			linked_quest: "173A04F328414A36"
-			x: 11.0d
-			y: 0.0d
+			x: 4.0d
+			y: -4.5d
 		}
 		{
 			id: "1824692F2A7A8B43"
 			linked_quest: "7E755297E9685374"
-			x: 11.0d
-			y: -1.0d
+			x: 9.0d
+			y: 2.0d
 		}
 		{
 			id: "35C2CDE00DEC7D92"
 			linked_quest: "3FBDC8552F7D8008"
 			shape: "none"
-			size: 1.5d
-			x: 13.5d
-			y: -3.0d
+			x: -2.0d
+			y: 2.0d
 		}
 		{
 			id: "5A5FBC9F634D16FA"
 			linked_quest: "6042514C8FC54334"
-			x: 11.0d
-			y: -3.0d
+			x: 9.0d
+			y: 0.0d
 		}
 		{
 			id: "429CE7B1CDBB2A2D"
@ -357,6 +316,61 @@
 			x: 2.0d
 			y: 4.0d
 		}
+		{
+			id: "123C2CBD093AC92C"
+			linked_quest: "52AB0BDC64293253"
+			shape: "none"
+			x: -2.0d
+			y: 3.0d
+		}
+		{
+			id: "638F235BE94AB3DA"
+			linked_quest: "00A2566109144D7F"
+			x: -3.0d
+			y: 2.0d
+		}
+		{
+			id: "40F87EE4C9FE5E71"
+			linked_quest: "2979AFD231E5B37B"
+			x: -3.0d
+			y: 3.0d
+		}
+		{
+			id: "114F4440C35A8772"
+			linked_quest: "5F3B9E4565922E77"
+			x: -3.0d
+			y: 4.0d
+		}
+		{
+			id: "2270E4372C4A926F"
+			linked_quest: "5F937028722EB4C6"
+			x: -4.0d
+			y: 4.0d
+		}
+		{
+			id: "04B2D5C575260C0D"
+			linked_quest: "7E7F18A8422A6A28"
+			x: 3.0d
+			y: 2.0d
+		}
+		{
+			id: "54AE0DEA1D8B32F8"
+			linked_quest: "5D254C351CC8FA1B"
+			x: 3.0d
+			y: 3.0d
+		}
+		{
+			id: "60482D9D410069C5"
+			linked_quest: "3E2FE834084D2946"
+			x: 3.0d
+			y: 4.0d
+		}
+		{
+			id: "28BBABC4D9D5590F"
+			linked_quest: "25A863E014BB1AF5"
+			x: 3.0d
+			y: 5.0d
+		}
 	]
 	quests: [
 		{
@ -413,10 +427,10 @@
 		}
 		{
 			dependencies: [
-				"196FC518F744B983"
-				"5CC9B0E832545569"
-				"0017FFFAD7CD2EFE"
-				"58BBD540D7D4FF01"
+				"7E7F18A8422A6A28"
+				"5D254C351CC8FA1B"
+				"25A863E014BB1AF5"
+				"3E2FE834084D2946"
 			]
 			description: ["{quests.development.hull_ev.desc}"]
 			hide_dependency_lines: true
@ -547,7 +561,6 @@
 		}
 		{
 			dependencies: [
-				"196FC518F744B983"
 				"5063FDFFBE3E4855"
 				"26394C1290D70AB6"
 			]
@ -567,10 +580,7 @@
 			y: 2.0d
 		}
 		{
-			dependencies: [
-				"49C1D61741AA288E"
-				"0017FFFAD7CD2EFE"
-			]
+			dependencies: ["49C1D61741AA288E"]
 			description: ["{quests.development.ev.desc}"]
 			hide_dependency_lines: true
 			icon: "tfg:ev_universal_circuit"
@ -590,7 +600,6 @@
 			dependencies: [
 				"42CD789B8C40E424"
 				"698B5F65F2DE4439"
-				"5CC9B0E832545569"
 			]
 			description: ["{quests.development.iv.desc}"]
 			hide_dependency_lines: true
@ -612,7 +621,6 @@
 				"082AB255886E73C2"
 				"47087361D6DE7DCF"
 				"145F71A817C5996E"
-				"58BBD540D7D4FF01"
 			]
 			description: ["{quests.development.luv.desc}"]
 			hide_dependency_lines: true
@ -713,19 +721,6 @@
 			x: -1.0d
 			y: -3.0d
 		}
-		{
-			dependencies: ["3FBDC8552F7D8008"]
-			id: "2FF9BECA093B4D74"
-			subtitle: "This one will come with Mars Update"
-			tasks: [{
-				id: "6572F2DD0C89A68B"
-				title: "Coming with Mars"
-				type: "checkmark"
-			}]
-			title: "Rocket Tier 2"
-			x: 13.5d
-			y: -1.0d
-		}
 	]
 	subtitle: ["{quests.development.subtitle}"]
 	title: "{quests.development}"
--- a/config/ftbquests/quests/chapters/questssteam_age.snbt
+++ b/config/ftbquests/quests/chapters/questssteam_age.snbt
--- a/config/ftbquests/quests/chapters/space_survival.snbt
+++ b/config/ftbquests/quests/chapters/space_survival.snbt
@ -148,9 +148,21 @@
 		{
 			id: "52ABE7722ABB3281"
 			linked_quest: "0585527D1854628B"
-			x: -2.5d
+			x: -1.0d
 			y: 1.0d
 		}
+		{
+			id: "44E5362EDCDE6A5C"
+			linked_quest: "3AEAB1930F4CC034"
+			x: -1.0d
+			y: 2.0d
+		}
+		{
+			id: "1EABB6DEF6179357"
+			linked_quest: "7CA3A5EFE3D5B688"
+			x: -1.0d
+			y: 3.0d
+		}
 	]
 	quests: [
 		{
@ -246,13 +258,10 @@
 					id: "328B134E6C8F1E76"
 					item: {
 						Count: 1
-						ForgeCaps: {
-							"tfc:food": {
-								creationDate: 14190000L
-								traits: [ ]
-							}
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(minecraft:chorus_fruit))"
 						}
-						id: "minecraft:chorus_fruit"
 					}
 					type: "item"
 				}
@ -277,12 +286,13 @@
 				{
 					id: "4E8C67A543FEB861"
 					item: "gtceu:mv_4a_energy_converter"
+					optional_task: true
 					type: "item"
 				}
 			]
 			title: "{quests.space_survival.solar_panels.title}"
 			x: -1.0d
-			y: -0.5d
+			y: 0.0d
 		}
 		{
 			dependencies: [
@ -362,7 +372,7 @@
 			}]
 			title: "{quests.space_survival.rover.title}"
 			x: -4.0d
-			y: -0.5d
+			y: 0.0d
 		}
 		{
 			dependencies: ["493D733A5438DD7E"]
@ -453,7 +463,7 @@
 			}]
 			title: "{quests.space_survival.railgun.title}"
 			x: 2.0d
-			y: 1.0d
+			y: 0.0d
 		}
 		{
 			dependencies: ["72BD27FEEB34C7B0"]
@ -511,7 +521,7 @@
 			}]
 			title: "{quests.space_survival.interplanetary_railgun.title}"
 			x: 4.5d
-			y: -1.5d
+			y: -2.5d
 		}
 		{
 			dependencies: ["1A9A5F55F1F0AC58"]
@ -529,7 +539,7 @@
 			}]
 			title: "{quests.space_survival.monitor_railgun.title}"
 			x: 4.5d
-			y: 1.0d
+			y: 0.0d
 		}
 		{
 			dependencies: ["1A9A5F55F1F0AC58"]
@ -547,7 +557,7 @@
 			}]
 			title: "{quests.space_survival.receiver_railgun.title}"
 			x: 4.5d
-			y: 3.5d
+			y: 2.5d
 		}
 		{
 			dependencies: [
@ -575,7 +585,7 @@
 			}]
 			title: "{quests.space_survival.input_bus_railgun.title}"
 			x: 6.5d
-			y: -1.5d
+			y: -2.5d
 		}
 		{
 			dependencies: ["783BB3FC5702DA8C"]
@ -601,7 +611,7 @@
 			]
 			title: "{quests.space_survival.ammo_railgun.title}"
 			x: 6.5d
-			y: -2.5d
+			y: -3.5d
 		}
 		{
 			dependencies: ["498E559B9C37D2CA"]
@ -616,7 +626,7 @@
 			}]
 			title: "{quests.space_survival.redstone_railgun.title}"
 			x: 6.5d
-			y: 0.0d
+			y: -1.0d
 		}
 		{
 			dependencies: ["498E559B9C37D2CA"]
@ -631,7 +641,7 @@
 			}]
 			title: "{quests.space_survival.robot_arm_railgun.title}"
 			x: 6.5d
-			y: 1.0d
+			y: 0.0d
 		}
 		{
 			dependencies: [
@ -661,7 +671,7 @@
 			}]
 			title: "{quests.space_survival.output_bus_railgun.title}"
 			x: 6.5d
-			y: 3.5d
+			y: 2.5d
 		}
 		{
 			dependencies: ["498E559B9C37D2CA"]
@ -676,7 +686,7 @@
 			}]
 			title: "{quests.space_survival.delay_railgun.title}"
 			x: 6.5d
-			y: 2.0d
+			y: 1.0d
 		}
 		{
 			dependencies: ["3F785579F13B0F46"]
@ -701,6 +711,434 @@
 			x: 3.0d
 			y: -4.0d
 		}
+		{
+			description: [""]
+			id: "1777E6C81C8353D5"
+			shape: "octagon"
+			size: 3.0d
+			tasks: [{
+				dimension: "ad_astra:moon"
+				icon: "ad_astra:mars_globe"
+				id: "4A794ADEE7A89594"
+				title: "I'm on the Moon"
+				type: "dimension"
+			}]
+			title: "{quests.space_survival.mars.title}"
+			x: 13.5d
+			y: -8.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			id: "4259CD4F819806AB"
+			tasks: [{
+				id: "4DB592981780B997"
+				item: "tfg:semiheavy_ammoniacal_water_bucket"
+				type: "item"
+			}]
+			x: 14.5d
+			y: -5.0d
+		}
+		{
+			dependencies: ["1777E6C81C8353D5"]
+			icon: "tfg:grass/rusticus_mycelium"
+			id: "5AC5AAB9B3758E30"
+			tasks: [{
+				id: "019AC4216D25FA19"
+				type: "checkmark"
+			}]
+			x: 13.5d
+			y: -4.0d
+		}
+		{
+			dependencies: ["1777E6C81C8353D5"]
+			icon: "ad_astra:mars_sand"
+			id: "26FB2DB58A28BE6A"
+			tasks: [{
+				id: "5C0832BD72EB54C7"
+				type: "checkmark"
+			}]
+			x: 10.0d
+			y: -8.0d
+		}
+		{
+			dependencies: ["26FB2DB58A28BE6A"]
+			id: "70F93982FC045A08"
+			tasks: [{
+				biome: "tfg:mars/martian_deep_desert"
+				icon: "minecraft:red_sand"
+				id: "4935048F5603F79B"
+				type: "biome"
+			}]
+			x: 10.0d
+			y: -7.0d
+		}
+		{
+			dependencies: ["26FB2DB58A28BE6A"]
+			id: "62A5111836CB4D37"
+			optional: true
+			shape: "heart"
+			tasks: [
+				{
+					id: "028ACAA581D97577"
+					item: "sandworm_mod:sandworm_tooth"
+					type: "item"
+				}
+				{
+					id: "5F74F03288BDE713"
+					item: "sandworm_mod:thumper"
+					optional_task: true
+					type: "item"
+				}
+			]
+			x: 9.0d
+			y: -8.0d
+		}
+		{
+			dependencies: [
+				"70F93982FC045A08"
+				"2F711C064635EF2D"
+			]
+			dependency_requirement: "one_completed"
+			id: "0CA5B715B76E4A5B"
+			tasks: [{
+				icon: "tfg:spice"
+				id: "00C333C49F5BBFC2"
+				observe_type: 0
+				timer: 0L
+				to_observe: "tfg:spice"
+				type: "observation"
+			}]
+			x: 10.0d
+			y: -6.0d
+		}
+		{
+			dependencies: ["1777E6C81C8353D5"]
+			icon: "tfg:mars_ice"
+			id: "3768570EC6535DBB"
+			tasks: [{
+				id: "677DF79B4DE1D571"
+				type: "checkmark"
+			}]
+			x: 17.0d
+			y: -8.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			id: "204DDAFEA40C0146"
+			tasks: [{
+				id: "4A86DF6B1EB149DB"
+				item: "tfg:heavy_ammoniacal_water_bucket"
+				type: "item"
+			}]
+			x: 12.5d
+			y: -5.0d
+		}
+		{
+			dependencies: ["00E2E32B33A65301"]
+			id: "0967CE7F5DFF5CF6"
+			tasks: [{
+				id: "2713B99184310ED3"
+				item: "tfg:glacian_wool"
+				type: "item"
+			}]
+			x: 17.0d
+			y: -6.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			icon: "wan_ancient_beasts:soarer_egg"
+			id: "2F711C064635EF2D"
+			shape: "heart"
+			tasks: [{
+				id: "43FA9228D7E788F4"
+				type: "checkmark"
+			}]
+			x: 10.0d
+			y: -4.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			id: "24E25ED8D00F0918"
+			tasks: [{
+				icon: "species:wraptor_egg"
+				id: "2B5C32298882BD0E"
+				observe_type: 5
+				timer: 0L
+				to_observe: "tfg:wraptor"
+				type: "observation"
+			}]
+			x: 10.0d
+			y: 0.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			id: "5F0D553D08A5985C"
+			tasks: [{
+				icon: "minecraft:sniffer_egg"
+				id: "6339BB0940C0BE77"
+				observe_type: 5
+				timer: 0L
+				to_observe: "tfg:sniffer"
+				type: "observation"
+			}]
+			x: 10.0d
+			y: -2.0d
+		}
+		{
+			dependencies: ["3768570EC6535DBB"]
+			id: "00E2E32B33A65301"
+			tasks: [{
+				icon: "ad_astra:glacian_ram_spawn_egg"
+				id: "20B88332B3FED126"
+				observe_type: 5
+				timer: 0L
+				to_observe: "tfg:glacian_ram"
+				type: "observation"
+			}]
+			x: 17.0d
+			y: -7.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			id: "155F421FC2F39C3C"
+			tasks: [
+				{
+					icon: "beneath:wood/log/crimson"
+					id: "5C76478F563CE947"
+					observe_type: 1
+					timer: 0L
+					to_observe: "#tfc:crimson_logs"
+					type: "observation"
+				}
+				{
+					icon: "beneath:wood/log/warped"
+					id: "2D46DA77329E9F66"
+					observe_type: 1
+					timer: 0L
+					to_observe: "#tfc:warped_logs"
+					type: "observation"
+				}
+			]
+			x: 15.5d
+			y: -1.5d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			id: "52E45601E8575846"
+			tasks: [{
+				id: "72E35CA3CF29585B"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(betterend:amber_root_seeds)item(betterend:blossom_berry_seeds)item(betterend:cave_pumpkin_plant_seeds)item(betterend:chorus_mushroom_seeds)item(betterend:shadow_berry_seeds)item(betterend:bolux_mushroom_seeds))"
+					}
+				}
+				type: "item"
+			}]
+			x: 13.5d
+			y: -1.5d
+		}
+		{
+			dependencies: ["0967CE7F5DFF5CF6"]
+			id: "6D7ADBBCEF5770B6"
+			shape: "hexagon"
+			size: 1.5d
+			tasks: [
+				{
+					id: "0D11FBA73B54918F"
+					item: {
+						Count: 1
+						id: "ad_astra:netherite_space_helmet"
+						tag: {
+							Damage: 0
+						}
+					}
+					type: "item"
+				}
+				{
+					id: "04A7D0429E419846"
+					item: {
+						Count: 1
+						id: "ad_astra:netherite_space_suit"
+						tag: {
+							Damage: 0
+						}
+					}
+					type: "item"
+				}
+				{
+					id: "608858DB0AEA4378"
+					item: {
+						Count: 1
+						id: "ad_astra:netherite_space_pants"
+						tag: {
+							Damage: 0
+						}
+					}
+					type: "item"
+				}
+				{
+					id: "5BC5195C7775137C"
+					item: {
+						Count: 1
+						id: "ad_astra:netherite_space_boots"
+						tag: {
+							Damage: 0
+						}
+					}
+					type: "item"
+				}
+			]
+			x: 17.0d
+			y: -4.0d
+		}
+		{
+			dependencies: [
+				"24E25ED8D00F0918"
+				"5F0D553D08A5985C"
+			]
+			dependency_requirement: "one_completed"
+			id: "75DE44FFAC51DD60"
+			tasks: [{
+				id: "4295E3343126DFEF"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfg:mineral_rich_wool)"
+					}
+				}
+				title: "Any #tfg:mineral_rich_wool"
+				type: "item"
+			}]
+			x: 9.0d
+			y: -1.0d
+		}
+		{
+			dependencies: ["75DE44FFAC51DD60"]
+			id: "14710D52AE1732FD"
+			shape: "hexagon"
+			size: 1.5d
+			tasks: [{
+				id: "44970A2CAF24030A"
+				item: "tfg:mli_shielding"
+				type: "item"
+			}]
+			x: 9.0d
+			y: 1.0d
+		}
+		{
+			dependencies: [
+				"24E25ED8D00F0918"
+				"52E45601E8575846"
+			]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:food": {
+						creationDate: 22686000L
+						traits: [ ]
+					}
+				}
+				id: "betterend:cave_pumpkin_pie"
+			}
+			id: "1AC201876984D248"
+			shape: "heart"
+			size: 1.5d
+			tasks: [{
+				id: "5F863BCE6DAA30D6"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(betterend:cave_pumpkin_pie))"
+					}
+				}
+				type: "item"
+			}]
+			x: 13.5d
+			y: 0.0d
+		}
+		{
+			dependencies: ["155F421FC2F39C3C"]
+			id: "00202200344F3456"
+			tasks: [{
+				id: "0F811696C5BB0AA5"
+				item: "gtceu:iodine_dust"
+				type: "item"
+			}]
+			x: 15.5d
+			y: 0.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			id: "43EBECA48E341C47"
+			optional: true
+			shape: "heart"
+			tasks: [{
+				id: "0417B5DE47BE08CA"
+				item: "wan_ancient_beasts:surfer_egg"
+				type: "item"
+			}]
+			x: 10.0d
+			y: -3.0d
+		}
+		{
+			dependencies: [
+				"5F0D553D08A5985C"
+				"24E25ED8D00F0918"
+			]
+			dependency_requirement: "one_completed"
+			id: "63F1FC03DC3198AB"
+			optional: true
+			shape: "heart"
+			tasks: [{
+				id: "71BA5426AA25BED0"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(tfg:large_nest_box)item(tfg:large_nest_box_warped))"
+					}
+				}
+				type: "item"
+			}]
+			x: 10.0d
+			y: -1.0d
+		}
+		{
+			dependencies: ["6D7ADBBCEF5770B6"]
+			description: [""]
+			id: "5F3B9E4565922E77"
+			shape: "octagon"
+			size: 3.0d
+			tasks: [{
+				dimension: "ad_astra:venus"
+				icon: "ad_astra:venus_globe"
+				id: "40A3104927F366FF"
+				type: "dimension"
+			}]
+			title: "{quests.space_survival.venus.title}"
+			x: 20.5d
+			y: -2.0d
+		}
+		{
+			dependencies: ["6D7ADBBCEF5770B6"]
+			description: [""]
+			id: "5F937028722EB4C6"
+			shape: "octagon"
+			size: 3.0d
+			tasks: [{
+				dimension: "ad_astra:mercury"
+				icon: "ad_astra:mercury_globe"
+				id: "7B5C6F856AE2380E"
+				type: "dimension"
+			}]
+			title: "{quests.space_survival.mercury.title}"
+			x: 20.5d
+			y: -6.0d
+		}
 	]
 	subtitle: ["{quests.space_survival.subtitle}"]
 	title: "{quests.space_survival}"
--- a/config/ftbquests/quests/chapters/tips__tools.snbt
+++ b/config/ftbquests/quests/chapters/tips__tools.snbt
@ -532,7 +532,7 @@
 		{
 			dependencies: [
 				"5D188F6C46EA9ED0"
-				"30A6EDDF25A5E5F8"
+				"0FB5E513356117C1"
 			]
 			description: ["{quests.tfg_tips.tungstensteel_backpack.desc}"]
 			id: "13F2929C1C303A0B"
--- a/config/ftbquests/quests/chapters/tips__transportation.snbt
+++ b/config/ftbquests/quests/chapters/tips__transportation.snbt
@ -13,7 +13,7 @@
 			rotation: 0.0d
 			width: 3.0d
 			x: 18.5d
-			y: -2.5d
+			y: -4.0d
 		}
 		{
 			alpha: 150
@ -21,8 +21,8 @@
 			image: "minecraft:textures/particle/big_smoke_2.png"
 			rotation: 0.0d
 			width: 7.0d
-			x: 17.5d
-			y: -1.5d
+			x: 15.0d
+			y: -2.5d
 		}
 		{
 			alpha: 150
@ -393,6 +393,15 @@
 			x: 8.5d
 			y: 0.5d
 		}
+		{
+			alpha: 150
+			height: 3.5d
+			image: "minecraft:textures/particle/big_smoke_3.png"
+			rotation: 0.0d
+			width: 7.0d
+			x: 19.5d
+			y: 0.0d
+		}
 	]
 	order_index: 2
 	quest_links: [{
@ -407,7 +416,7 @@
 			description: ["{quests.tfg_tips.create_sloop.desc}"]
 			id: "78358ED2C6F6FCFD"
 			shape: "gear"
-			size: 4.0d
+			size: 3.0d
 			subtitle: "{quests.tfg_tips.create_sloop.subtitle}"
 			tasks: [{
 				icon: "firmaciv:sloop_icon_only"
@ -427,7 +436,7 @@
 			description: ["{quests.tfg_tips.create_rowboat.desc}"]
 			icon: "firmaciv:rowboat_icon_only"
 			id: "4F9A15016C9F51A1"
-			size: 2.0d
+			size: 1.5d
 			subtitle: "{quests.tfg_tips.create_rowboat.subtitle}"
 			tasks: [
 				{
@ -455,7 +464,7 @@
 			description: ["{quests.tfg_tips.create_kayak.desc}"]
 			icon: "firmaciv:kayak"
 			id: "7B824CC8BD6E4E30"
-			size: 2.0d
+			size: 1.5d
 			subtitle: "{quests.tfg_tips.create_kayak.subtitle}"
 			tasks: [
 				{
@ -478,7 +487,7 @@
 			description: ["{quests.tfg_tips.create_canoe.desc}"]
 			icon: "firmaciv:canoe_icon_only"
 			id: "22DA27A8E2D11106"
-			size: 2.0d
+			size: 1.5d
 			subtitle: "{quests.tfg_tips.create_canoe.subtitle}"
 			tasks: [
 				{
@ -829,7 +838,7 @@
 				}
 			]
 			title: "{quests.tfg_tips.warfare.title}"
-			x: -2.5d
+			x: -4.0d
 			y: 0.0d
 		}
 		{
@ -838,7 +847,6 @@
 			icon: "createdeco:decal_fire"
 			id: "252EB7FA56D1F88E"
 			shape: "diamond"
-			size: 2.0d
 			subtitle: "{quests.tfg_tips.beneathxfirmaciv.subtitle}"
 			tasks: [{
 				id: "6C19AB80033D5E24"
@ -1268,7 +1276,7 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.economy_plane.title}"
-			x: 17.5d
+			x: 18.0d
 			y: 2.0d
 		}
 		{
@ -1282,7 +1290,7 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.biplane.title}"
-			x: 17.5d
+			x: 18.0d
 			y: 0.0d
 		}
 		{
@ -1394,6 +1402,8 @@
 			dependencies: ["6E4754288899732B"]
 			description: ["{quests.tfg_tips.scarlet_biplane.desc}"]
 			id: "7B5AD6AD5E99449C"
+			shape: "gear"
+			size: 2.0d
 			subtitle: "{quests.tfg_tips.scarlet_biplane.subtitle}"
 			tasks: [{
 				id: "3E274FFB71007307"
@ -1408,6 +1418,8 @@
 			dependencies: ["6E4754288899732B"]
 			description: ["{quests.tfg_tips.aluminium_hopper.desc}"]
 			id: "06D07F7991FAB2CB"
+			shape: "gear"
+			size: 2.0d
 			subtitle: "{quests.tfg_tips.aluminium_hopper.subtitle}"
 			tasks: [{
 				id: "62A13F1E58F54CDD"
@ -1415,7 +1427,7 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.aluminium_hopper.title}"
-			x: 18.0d
+			x: 19.0d
 			y: -2.0d
 		}
 		{
@ -1452,6 +1464,26 @@
 			x: 7.5d
 			y: -1.5d
 		}
+		{
+			description: ["{quests.tfg_tips.hiking_boots.desc}"]
+			id: "598CA763D195C84E"
+			subtitle: "{quests.tfg_tips.hiking_boots.subtitle}"
+			tasks: [{
+				id: "0045E073FBF1F8CA"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(sns:hiking_boots)item(sns:steel_toe_hiking_boots)item(sns:black_steel_toe_hiking_boots)item(sns:blue_steel_toe_hiking_boots)item(sns:red_steel_toe_hiking_boots))"
+					}
+				}
+				title: "{quests.tfg_tips.hiking_boots.task}"
+				type: "item"
+			}]
+			title: "{quests.tfg_tips.hiking_boots.title}"
+			x: 8.5d
+			y: 0.5d
+		}
 	]
 	subtitle: ["{quests.tfg_tips.transportation_tips.subtitle}"]
 	title: "{quests.tfg_tips.transportation_tips.title}"
--- a/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt
+++ b/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt
@ -56,16 +56,7 @@
 			hide_details_until_startable: true
 			hide_text_until_complete: true
 			hide_until_deps_visible: true
-			icon: {
-				Count: 1
-				id: "gtceu:iron_wrench"
-				tag: {
-					Damage: 0
-					GT.Tool: {
-						Damage: 0
-					}
-				}
-			}
+			icon: "gtceu:nan_certificate"
 			id: "6E8F257261F93501"
 			shape: "heart"
 			size: 4.0d
--- a/config/greate-recipes.yaml
+++ b/config/greate-recipes.yaml
@ -5,3 +5,9 @@ enableGTWireCoatingRecipes: true
 # Enable/Disable harder recipes for various Create blocks & items.
 enableHardCreateRecipes: false

+# Recipe types that should not be copied to Greate machines. Ex. 'gtceu:macerator' for macerator recipes
+ignoredRecipeTypes:
+  - gtceu:ore_washer
+  - gtceu:bender
+  - gtceu:compressor
+
--- a/config/mod-director/modpack.json
+++ b/config/mod-director/modpack.json
@ -5,5 +5,6 @@
        "width": 32,
        "height": 32
    },
-    "localVersion": "0.10.12"
+    "localVersion": "DEV",
+    "requiresRestart": true
 }
--- a/config/tacztweaks.json
+++ b/config/tacztweaks.json
@ -0,0 +1,143 @@
+{
+  "gun": {
+    "shootWhileSprinting": true,
+    "sprintWhileReloading": true,
+    "reloadWhileShooting": true,
+    "reloadDiscardsMagazine": false,
+    "reloadDiscardsMagazineExclusions": [
+      "tacz:m870",
+      "tacz:db_short",
+      "tacz:db_long"
+    ],
+    "allowUnload": true,
+    "cancelInspection": false,
+    "disableBulletCulling": false
+  },
+  "modifiers": {
+    "damage": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "playerDamage": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "headshot": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "playerHeadshot": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "armorIgnore": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "speed": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "gravity": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "friction": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "inaccuracy": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "aimInaccuracy": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "sneakInaccuracy": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "crawlInaccuracy": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "rpm": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "verticalRecoil": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "horizontalRecoil": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "aimVerticalRecoil": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "aimHorizontalRecoil": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "crawlVerticalRecoil": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    },
+    "crawlHorizontalRecoil": {
+      "addend": 0.0,
+      "multiplier": 1.0,
+      "function": ""
+    }
+  },
+  "crawl": {
+    "enabled": false,
+    "pitchUpperLimit": 25.0,
+    "pitchLowerLimit": -10.0,
+    "dynamicPitchLimit": false,
+    "visualTweak": true
+  },
+  "compat": {
+    "firstAidCompat": false,
+    "lsoCompat": false,
+    "vsCollisionCompat": false,
+    "vsExplosionCompat": false,
+    "mtsFix": false
+  },
+  "tweaks": {
+    "forceFirstPersonShootingSound": false,
+    "betterMonoConversion": false,
+    "endermenEvadeBullets": false,
+    "alwaysFilterByHand": true,
+    "suppressHeadHitSounds": false,
+    "suppressFleshHitSounds": false,
+    "suppressKillSounds": false,
+    "hideHitMarkers": false
+  },
+  "debug": {
+    "bulletInteractions": false,
+    "bulletParticles": false,
+    "bulletSounds": false,
+    "meleeInteractions": false
+  }
+}
--- a/defaultconfigs/create-server.toml
+++ b/defaultconfigs/create-server.toml
@ -94,7 +94,7 @@
 	#.
 	#Number of sail-type blocks required to increase windmill speed by 1RPM.
 	#Range: > 1
-	windmillSailsPerRPM = 8
+	windmillSailsPerRPM = 4
 	#.
 	#Max Distance in blocks a Weighted Ejector can throw
 	#Range: > 0
@ -243,8 +243,8 @@
 		#.
 		#Fine tune the kinetic stats of individual components
 		[kinetics.stressValues.v2]
-			large_water_wheel = 16.0
-			windmill_bearing = 32.0
+			large_water_wheel = 32.0
+			windmill_bearing = 16.0
 			hand_crank = 2.0
 			creative_motor = 2097152.0
 			water_wheel = 4.0
@ -312,9 +312,9 @@
 				hand_crank = 2.0
 				steam_engine = 16.0
 				creative_motor = 16384.0
-				large_water_wheel = 16.0
+				large_water_wheel = 32.0
 				water_wheel = 4.0
-				windmill_bearing = 32.0
+				windmill_bearing = 16.0

 #.
 #Create's liquid manipulation tools
--- a/defaultconfigs/createhorsepower-server.toml
+++ b/defaultconfigs/createhorsepower-server.toml
@ -17,18 +17,18 @@
 #Path Category
 [paths]
 	#Types of blocks valid as "Poor" quality,
-	poor_path_block = ["tfc:rooted_dirt/sandy_loam", "tfc:clay/sandy_loam", "tfc:dirt/sandy_loam", "tfc:rooted_dirt/loam", "tfc:clay/loam", "tfc:clay/silt", "tfc:dirt/loam", "tfc:rooted_dirt/silt", "tfc:dirt/silt", "tfc:dirt/silty_loam", "tfc:clay/silty_loam", "tfc:rooted_dirt/silty_loam", "tfc:peat_grass", "tfc:clay_grass/silty_loam", "tfc:grass/silty_loam", "tfc:clay_grass/sandy_loam", "tfc:grass/sandy_loam", "tfc:clay_grass/loam", "tfc:grass/loam", "tfc:clay_grass/silt", "tfc:grass/silt"]
+	poor_path_block = ["tfc:rooted_dirt/sandy_loam", "tfc:clay/sandy_loam", "tfc:dirt/sandy_loam", "tfc:rooted_dirt/loam", "tfc:clay/loam", "tfc:clay/silt", "tfc:dirt/loam", "tfc:rooted_dirt/silt", "tfc:dirt/silt", "tfc:dirt/silty_loam", "tfc:clay/silty_loam", "tfc:rooted_dirt/silty_loam", "tfc:peat_grass", "tfc:clay_grass/silty_loam", "tfc:grass/silty_loam", "tfc:clay_grass/sandy_loam", "tfc:grass/sandy_loam", "tfc:clay_grass/loam", "tfc:grass/loam", "tfc:clay_grass/silt", "tfc:grass/silt", "tfg:grass/mars_dirt", "tfg:grass/sangnum_mycelium", "tfg:grass/amber_mycelium", "tfg:grass/rusticus_mycelium", "tfg:grass/sangnum_clay_mycelium", "tfg:grass/amber_clay_mycelium", "tfg:grass/rusticus_clay_mycelium", "tfg:grass/sangnum_kaolin_mycelium", "tfg:grass/amber_kaolin_mycelium", "tfg:grass/rusticus_kaolin_mycelium"]
 	#Types of blocks valid as "Normal" quality,
-	normal_path_block = ["tfc:rock/gravel/granite", "tfc:rock/gravel/diorite", "tfc:rock/gravel/gabbro", "tfc:rock/gravel/shale", "tfc:rock/gravel/claystone", "tfc:rock/gravel/limestone", "tfc:rock/gravel/conglomerate", "tfc:rock/gravel/dolomite", "tfc:rock/gravel/chert", "tfc:rock/gravel/schist", "tfc:rock/gravel/phyllite", "tfc:rock/gravel/slate", "tfc:rock/gravel/quartzite", "tfc:rock/gravel/dacite", "tfc:rock/gravel/andesite", "tfc:rock/gravel/basalt", "tfc:rock/gravel/rhyolite", "tfc:rock/gravel/chalk", "tfc:rock/gravel/marble", "tfc:grass_path/silt", "tfc:grass_path/loam", "tfc:grass_path/sandy_loam", "tfc:grass_path/silty_loam", "rnr:hoggin"]
+	normal_path_block = ["tfc:rock/gravel/granite", "tfc:rock/gravel/diorite", "tfc:rock/gravel/gabbro", "tfc:rock/gravel/shale", "tfc:rock/gravel/claystone", "tfc:rock/gravel/limestone", "tfc:rock/gravel/conglomerate", "tfc:rock/gravel/dolomite", "tfc:rock/gravel/chert", "tfc:rock/gravel/schist", "tfc:rock/gravel/phyllite", "tfc:rock/gravel/slate", "tfc:rock/gravel/quartzite", "tfc:rock/gravel/dacite", "tfc:rock/gravel/andesite", "tfc:rock/gravel/basalt", "tfc:rock/gravel/rhyolite", "tfc:rock/gravel/chalk", "tfc:rock/gravel/marble", "tfg:rock/gravel_dripstone", "tfg:rock/gravel_deepslate", "tfg:rock/gravel_blackstone", "tfg:rock/gravel_moon", "tfg:rock/gravel_moon_deepslate", "tfg:rock/gravel_glacio", "tfg:rock/gravel_mars", "tfg:rock/gravel_venus", "tfg:rock/gravel_mercury", "tfg:rock/gravel_crackrack", "tfc:grass_path/silt", "tfc:grass_path/loam", "tfc:grass_path/sandy_loam", "tfc:grass_path/silty_loam", "tfg:grass/mars_path", "rnr:hoggin"]
 	#Types of blocks valid as "Great" quality,
 	great_path_block = ["rnr:rock/gravel_road/chert", "rnr:rock/gravel_road/chalk", "rnr:rock/gravel_road/rhyolite", "rnr:rock/gravel_road/basalt", "rnr:rock/gravel_road/andesite", "rnr:rock/gravel_road/claystone", "rnr:rock/gravel_road/limestone", "rnr:rock/gravel_road/conglomerate", "rnr:rock/gravel_road/dolomite", "rnr:rock/sett_road/granite", "rnr:rock/sett_road/diorite", "rnr:rock/sett_road/chalk", "rnr:rock/sett_road/rhyolite", "rnr:rock/sett_road/basalt", "rnr:rock/sett_road/quartzite", "rnr:rock/sett_road/dacite", "rnr:rock/sett_road/andesite", "rnr:rock/cobbled_road/chert", "rnr:rock/cobbled_road/dolomite", "rnr:rock/gravel_road/granite", "rnr:rock/gravel_road/marble", "rnr:rock/gravel_road/schist", "rnr:rock/gravel_road/phyllite", "rnr:rock/gravel_road/slate", "rnr:rock/gravel_road/quartzite", "rnr:rock/gravel_road/dacite", "rnr:rock/macadam_road/rhyolite", "rnr:rock/macadam_road/chalk", "rnr:rock/macadam_road/chert", "rnr:rock/macadam_road/dolomite", "rnr:rock/macadam_road/conglomerate", "rnr:rock/macadam_road/limestone", "rnr:rock/macadam_road/gabbro", "rnr:rock/macadam_road/claystone", "rnr:rock/macadam_road/shale", "rnr:rock/macadam_road/gneiss", "rnr:rock/macadam_road/marble", "rnr:rock/macadam_road/schist", "rnr:rock/macadam_road/phyllite", "rnr:rock/macadam_road/slate", "rnr:rock/macadam_road/quartzite", "rnr:rock/macadam_road/dacite", "rnr:rock/macadam_road/andesite", "rnr:rock/macadam_road/basalt", "rnr:rock/gravel_road/diorite", "rnr:rock/gravel_road/gabbro", "rnr:rock/gravel_road/shale", "rnr:rock/macadam_road/diorite", "rnr:rock/macadam_road/granite", "rnr:rock/cobbled_road/conglomerate", "rnr:rock/cobbled_road/limestone", "rnr:rock/cobbled_road/claystone", "rnr:rock/cobbled_road/shale", "rnr:rock/cobbled_road/gabbro", "rnr:rock/cobbled_road/diorite", "rnr:rock/cobbled_road/granite", "rnr:rock/cobbled_road/phyllite", "rnr:rock/cobbled_road/schist", "rnr:rock/cobbled_road/slate", "rnr:rock/cobbled_road/quartzite", "rnr:rock/cobbled_road/dacite", "rnr:rock/cobbled_road/andesite", "rnr:rock/cobbled_road/rhyolite", "rnr:rock/cobbled_road/basalt", "rnr:rock/cobbled_road/chalk", "rnr:rock/cobbled_road/gneiss", "rnr:rock/cobbled_road/marble", "rnr:rock/sett_road/chert", "rnr:rock/sett_road/dolomite", "rnr:rock/sett_road/conglomerate", "rnr:rock/sett_road/limestone", "rnr:rock/sett_road/claystone", "rnr:rock/sett_road/shale", "rnr:rock/sett_road/gabbro", "rnr:rock/flagstones/gneiss", "rnr:rock/flagstones/marble", "rnr:black_sandstone_flagstones", "rnr:brown_sandstone_flagstones", "rnr:green_sandstone_flagstones", "rnr:pink_sandstone_flagstones", "rnr:red_sandstone_flagstones", "rnr:white_sandstone_flagstones", "rnr:yellow_sandstone_flagstones", "rnr:concrete_road_sett", "rnr:brick_road", "rnr:rock/sett_road/marble", "rnr:rock/sett_road/gneiss", "rnr:rock/sett_road/schist", "rnr:rock/sett_road/phyllite", "rnr:rock/sett_road/slate", "rnr:rock/sett_road/quartzite", "rnr:rock/sett_road/dacite", "rnr:rock/flagstones/chert", "rnr:rock/flagstones/dolomite", "rnr:rock/flagstones/conglomerate", "rnr:rock/flagstones/limestone", "rnr:rock/flagstones/claystone", "rnr:rock/flagstones/shale", "rnr:rock/flagstones/gabbro", "rnr:rock/flagstones/diorite", "rnr:rock/flagstones/granite", "rnr:rock/flagstones/schist", "rnr:rock/flagstones/phyllite", "rnr:rock/flagstones/slate", "rnr:rock/flagstones/quartzite", "rnr:rock/flagstones/andesite", "rnr:rock/flagstones/dacite", "rnr:rock/flagstones/basalt", "rnr:rock/flagstones/rhyolite", "rnr:rock/flagstones/chalk"]

 #Creature Category
 [workers]
 	#Valid "Small" creatures
-	small_creatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tfc:alpaca"]
+	small_creatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tfc:alpaca", "tfg:glacian_ram", "tfg:wraptor", "species:springaling", "wan_ancient_beasts:surfer"]
 	#Valid "Medium" creatures
-	medium_creatures = ["tfc:cow", "tfc:donkey", "tfc:dolphin"]
+	medium_creatures = ["tfc:cow", "tfc:donkey", "tfc:dolphin", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer"]
 	#Valid "Large" creatures
-	large_creatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak"]
+	large_creatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak", "tfg:sniffer", "wan_ancient_beasts:walker", "species:cruncher"]

--- a/defaultconfigs/sns-server.toml
+++ b/defaultconfigs/sns-server.toml
@ -187,7 +187,7 @@
 	["Boot config"."Blue Steel Toe Boots"]
 		#The movement speed bonus these boots provide
 		#Range: 0.0 ~ 1024.0
-		movementSpeed = 0.2
+		movementSpeed = 0.25
 		#The step height bonus these boots provide
 		#Range: 0.0 ~ 512.0
 		stepHeight = 0.5
@ -197,7 +197,7 @@
 		#The amount of 'steps' taken before one point of durability is lost
 		#Steps are defined as being any change in position while grounded between ticks (IE over 1 second 20 'steps' occur)
 		#Range: > 0
-		stepsPerDamage = 4000
+		stepsPerDamage = 3000

 	["Boot config"."Red Steel Toe Boots"]
 		#The movement speed bonus these boots provide
--- a/defaultconfigs/wan_ancient_beasts-server.toml
+++ b/defaultconfigs/wan_ancient_beasts-server.toml
@ -15,7 +15,7 @@
 [eater]
 	#Eater health [default: 100]
 	#Range: 1.0 ~ 1024.0
-	health = 400.0
+	health = 300.0
 	#Eater attack damage [default: 30]
 	#Range: 0.0 ~ 1024.0
 	damage = 30.0
@ -30,10 +30,10 @@
 [walker]
 	#Walker health [default: 200]
 	#Range: 1.0 ~ 1024.0
-	health = 600.0
+	health = 400.0
 	#Walker armor [default: 5]
 	#Range: 0.0 ~ 30.0
-	armor = 14.0
+	armor = 8.0
 	#Walker armor toughness [default: 4]
 	#Range: 0.0 ~ 20.0
 	armorToughness = 4.0
@ -42,16 +42,16 @@
 [crusher]
 	#Crusher health [default: 50]
 	#Range: 1.0 ~ 1024.0
-	health = 200.0
+	health = 150.0
 	#Crusher attack damage [default: 10]
 	#Range: 0.0 ~ 1024.0
 	damage = 10.0
 	#Crusher armor [default: 20]
 	#Range: 0.0 ~ 30.0
-	armor = 30.0
+	armor = 20.0
 	#Crusher armor toughness [default: 4]
 	#Range: 0.0 ~ 20.0
-	armorToughness = 6.0
+	armorToughness = 4.0

 #Glider Attributes
 [glider]
@ -63,7 +63,7 @@
 [soarer]
 	#Soarer health [default: 40]
 	#Range: 1.0 ~ 1024.0
-	health = 250.0
+	health = 200.0
 	#Soarer attack damage [default: 15]
 	#Range: 0.0 ~ 1024.0
 	damage = 25.0
--- a/kubejs/assets/ad_astra/lang/uk_ua.json
+++ b/kubejs/assets/ad_astra/lang/uk_ua.json
@ -3,16 +3,16 @@
  "block.ad_astra.oxygen_distributor": "Розподілювач повітря",
  "block.ad_astra.moon_sand": "Місячний пісок",
  "block.ad_astra.moon_stone": "Необроблений Анортозит",
-  "block.ad_astra.moon_cobblestone": "Анортоцитовий брук",
-  "block.ad_astra.moon_cobblestone_slab": "Анортоцитова бруківна плита",
-  "block.ad_astra.moon_cobblestone_stairs": "Анортоцитові бруківні сходи",
+  "block.ad_astra.moon_cobblestone": "Анортоцитовий кругляк",
+  "block.ad_astra.moon_cobblestone_slab": "Анортоцитова круглякова плита",
+  "block.ad_astra.moon_cobblestone_stairs": "Анортоцитові круглякові сходи",
  "block.ad_astra.moon_pillar": "Анортоцитовий стовп",
  "block.ad_astra.moon_stone_brick_slab": "Анортоцитова цегляна плита",
  "block.ad_astra.moon_stone_brick_stairs": "Анортоцитові цегляні сходи",
  "block.ad_astra.moon_stone_brick_wall": "Анортоцитова цегляна стіна",
  "block.ad_astra.moon_stone_bricks": "Анортоцитована цеглина",
-  "block.ad_astra.moon_stone_slab": "Анортоцитова плита",
-  "block.ad_astra.moon_stone_stairs": "Анортоцитові сходи",
+  "block.ad_astra.moon_stone_slab": "Необроблена анортозитова плита",
+  "block.ad_astra.moon_stone_stairs": "Необроблені анортозитові сходи",
  "block.ad_astra.chiseled_moon_stone_bricks": "Оброблена анортоцитова цеглина",
  "block.ad_astra.chiseled_moon_stone_slab": "Оброблена анортоцитова плита",
  "block.ad_astra.chiseled_moon_stone_stairs": "Оброблені анортоцитові сходи",
@ -24,18 +24,21 @@
  "block.ad_astra.moon_deepslate": "Необроблений Норит",
  "block.ad_astra.cheese_block": "Місячний сирний блок",
  "block.ad_astra.moon_cheese_ore": "Анортоцитовий сирна руда",
+  "block.ad_astra.glacian_log": "Стебло Ґлаціана",
+  "block.ad_astra.stripped_glacian_log": "Обтесане стебло Ґлаціана",
+  "block.ad_astra.glacian_leaves": "Ламела Ґлаціана",
  "block.ad_astra.mars_sand": "Аргілітовий пісок",
  "block.ad_astra.mars_stone": "Необроблений Аргіліт",
-  "block.ad_astra.mars_cobblestone": "Аргілітовий брук",
-  "block.ad_astra.mars_cobblestone_slab": "Аргілітова бруківна плита",
-  "block.ad_astra.mars_cobblestone_stairs": "Аргілітові бруківні сходи",
+  "block.ad_astra.mars_cobblestone": "Аргілітовий кругляк",
+  "block.ad_astra.mars_cobblestone_slab": "Аргілітова круглякова плита",
+  "block.ad_astra.mars_cobblestone_stairs": "Аргілітові круглякові сходи",
  "block.ad_astra.mars_pillar": "Аргілітовий стовп",
  "block.ad_astra.mars_stone_brick_slab": "Аргілітова цегляна плита",
  "block.ad_astra.mars_stone_brick_stairs": "Аргілітові цегляні сходи",
  "block.ad_astra.mars_stone_brick_wall": "Аргілітова цегляна стіна",
  "block.ad_astra.mars_stone_bricks": "Аргілітова цеглина",
-  "block.ad_astra.mars_stone_slab": "Аргілітова плита",
-  "block.ad_astra.mars_stone_stairs": "Аргілітові сходи",
+  "block.ad_astra.mars_stone_slab": "Необроблена аргілітова плита",
+  "block.ad_astra.mars_stone_stairs": "Необроблені аргілітові сходи",
  "block.ad_astra.chiseled_mars_stone_bricks": "Оброблена аргілітова цеглина",
  "block.ad_astra.chiseled_mars_stone_slab": "Оброблена аргілітова плита",
  "block.ad_astra.chiseled_mars_stone_stairs": "Оброблені аргілітові сходи",
@ -47,16 +50,16 @@
  "block.ad_astra.polished_conglomerate": "Оброблений марсіанський конгломерат",
  "block.ad_astra.venus_sand": "Трахітовий пісок",
  "block.ad_astra.venus_stone": "Необроблений Трахіт",
-  "block.ad_astra.venus_cobblestone": "Трахітовий брук",
-  "block.ad_astra.venus_cobblestone_slab": "Трахітова бруківна плита",
-  "block.ad_astra.venus_cobblestone_stairs": "Trachyte Cobble Stairs",
+  "block.ad_astra.venus_cobblestone": "Трахітовий кругляк",
+  "block.ad_astra.venus_cobblestone_slab": "Плита з трахітового кругляка",
+  "block.ad_astra.venus_cobblestone_stairs": "Сходи з трахітового кругляка",
  "block.ad_astra.venus_pillar": "Трахітовий стовп",
  "block.ad_astra.venus_stone_brick_slab": "Трахітова цегляна плита",
  "block.ad_astra.venus_stone_brick_stairs": "Трахітові цегляні сходи",
  "block.ad_astra.venus_stone_brick_wall": "Трахітова цегляна стіна",
  "block.ad_astra.venus_stone_bricks": "Трахітова цеглина",
-  "block.ad_astra.venus_stone_slab": "Трахітова плита",
-  "block.ad_astra.venus_stone_stairs": "Трахітові сходи",
+  "block.ad_astra.venus_stone_slab": "Необроблена трахітова плита",
+  "block.ad_astra.venus_stone_stairs": "Необроблені трахітові сходи",
  "block.ad_astra.chiseled_venus_stone_bricks": "Оброблена трахітова цеглина",
  "block.ad_astra.chiseled_venus_stone_slab": "Оброблена трахітова плита",
  "block.ad_astra.chiseled_venus_stone_stairs": "Оброблені трахітові сходи",
@ -70,16 +73,16 @@
  "block.ad_astra.venus_sandstone_brick_stairs": "Сходи з цегли з трахітового пісковику",
  "block.ad_astra.cracked_venus_sandstone_bricks": "Тріскана цегла з трахітового пісковику",
  "block.ad_astra.mercury_stone": "Необроблений Коматіїт",
-  "block.ad_astra.mercury_cobblestone": "Коматієва бруківка",
-  "block.ad_astra.mercury_cobblestone_slab": "Коматієва бруківна плита",
-  "block.ad_astra.mercury_cobblestone_stairs": "Коматієві бруківні сходи",
+  "block.ad_astra.mercury_cobblestone": "Коматіїтовий кругляк",
+  "block.ad_astra.mercury_cobblestone_slab": "Плита з коматіїтового кругляка",
+  "block.ad_astra.mercury_cobblestone_stairs": "Сходи з коматіїтового кругляка",
  "block.ad_astra.mercury_pillar": "Коматієвий стовп",
  "block.ad_astra.mercury_stone_brick_slab": "Коматієва цегляна плита",
  "block.ad_astra.mercury_stone_brick_stairs": "Коматієві цегляні сходи",
  "block.ad_astra.mercury_stone_brick_wall": "Коматієва цегляна стіна",
  "block.ad_astra.mercury_stone_bricks": "Коматієва цеглина",
-  "block.ad_astra.mercury_stone_slab": "Коматієва плита",
-  "block.ad_astra.mercury_stone_stairs": "Коматієві сходи",
+  "block.ad_astra.mercury_stone_slab": "Необроблена коматіїтова плита",
+  "block.ad_astra.mercury_stone_stairs": "Необроблені коматіїтові сходи",
  "block.ad_astra.chiseled_mercury_stone_bricks": "Оброблена коматієва цеглина",
  "block.ad_astra.chiseled_mercury_stone_slab": "Оброблена коматієва плита",
  "block.ad_astra.chiseled_mercury_stone_stairs": "Оброблені коматієві сходи",
@ -88,16 +91,16 @@
  "block.ad_astra.polished_mercury_stone_slab": "Оброблена коматієва плита",
  "block.ad_astra.polished_mercury_stone_stairs": "Оброблені коматієві сходи",
  "block.ad_astra.glacio_stone": "Необроблений Фоноліт",
-  "block.ad_astra.glacio_cobblestone": "Фонолітова бруківка",
-  "block.ad_astra.glacio_cobblestone_slab": "Фонолітова бруківна плита",
-  "block.ad_astra.glacio_cobblestone_stairs": "Фонолітові бруківні сходи",
+  "block.ad_astra.glacio_cobblestone": "Фонолітовий кругляк",
+  "block.ad_astra.glacio_cobblestone_slab": "Плита з фонолітового кругляка",
+  "block.ad_astra.glacio_cobblestone_stairs": "Сходи з фонолітового кругляка",
  "block.ad_astra.glacio_pillar": "Фонолітовий стовп",
  "block.ad_astra.glacio_stone_brick_slab": "Фонолітова цегляна плита",
  "block.ad_astra.glacio_stone_brick_stairs": "Фонолітові цегляні сходи",
  "block.ad_astra.glacio_stone_brick_wall": "Фонолітова цегляна стіна",
  "block.ad_astra.glacio_stone_bricks": "Фонолітова цеглина",
-  "block.ad_astra.glacio_stone_slab": "Фонолітова плита",
-  "block.ad_astra.glacio_stone_stairs": "Фонолітові сходи",
+  "block.ad_astra.glacio_stone_slab": "Необроблена фонолітова плита",
+  "block.ad_astra.glacio_stone_stairs": "Необроблені фонолітові сходи",
  "block.ad_astra.chiseled_glacio_stone_bricks": "Оброблена Фонолітова цеглина",
  "block.ad_astra.chiseled_glacio_stone_slab": "Оброблена фонолітова плита",
  "block.ad_astra.chiseled_glacio_stone_stairs": "Оброблені Фонолітові сходи",
--- a/kubejs/assets/ad_astra/lang/zh_cn.json
+++ b/kubejs/assets/ad_astra/lang/zh_cn.json
@ -11,8 +11,8 @@
  "block.ad_astra.moon_stone_brick_stairs": "斜长岩砖楼梯",
  "block.ad_astra.moon_stone_brick_wall": "斜长岩砖墙",
  "block.ad_astra.moon_stone_bricks": "斜长岩砖",
-  "block.ad_astra.moon_stone_slab": "斜长岩台阶",
-  "block.ad_astra.moon_stone_stairs": "斜长岩楼梯",
+  "block.ad_astra.moon_stone_slab": "天然斜长岩台阶",
+  "block.ad_astra.moon_stone_stairs": "天然斜长岩楼梯",
  "block.ad_astra.chiseled_moon_stone_bricks": "雕纹斜长岩砖",
  "block.ad_astra.chiseled_moon_stone_slab": "雕纹斜长岩台阶",
  "block.ad_astra.chiseled_moon_stone_stairs": "雕纹斜长岩楼梯",
@ -24,6 +24,9 @@
  "block.ad_astra.moon_deepslate": "天然苏长岩",
  "block.ad_astra.cheese_block": "月球奶酪块",
  "block.ad_astra.moon_cheese_ore": "斜长岩奶酪矿",
+  "block.ad_astra.glacian_log": "霜原菌柄",
+  "block.ad_astra.stripped_glacian_log": "去皮霜原菌柄",
+  "block.ad_astra.glacian_leaves": "霜原瓣叶",
  "block.ad_astra.mars_sand": "泥板岩沙",
  "block.ad_astra.mars_stone": "天然泥岩",
  "block.ad_astra.mars_cobblestone": "泥岩圆石",
@ -34,8 +37,8 @@
  "block.ad_astra.mars_stone_brick_stairs": "泥岩砖楼梯",
  "block.ad_astra.mars_stone_brick_wall": "泥岩砖墙",
  "block.ad_astra.mars_stone_bricks": "泥岩砖",
-  "block.ad_astra.mars_stone_slab": "泥岩台阶",
-  "block.ad_astra.mars_stone_stairs": "泥岩楼梯",
+  "block.ad_astra.mars_stone_slab": "天然泥岩台阶",
+  "block.ad_astra.mars_stone_stairs": "天然泥岩楼梯",
  "block.ad_astra.chiseled_mars_stone_bricks": "雕纹泥岩砖",
  "block.ad_astra.chiseled_mars_stone_slab": "雕纹泥岩台阶",
  "block.ad_astra.chiseled_mars_stone_stairs": "雕纹泥岩楼梯",
@ -55,8 +58,8 @@
  "block.ad_astra.venus_stone_brick_stairs": "粗面岩砖楼梯",
  "block.ad_astra.venus_stone_brick_wall": "粗面岩砖墙",
  "block.ad_astra.venus_stone_bricks": "粗面岩砖",
-  "block.ad_astra.venus_stone_slab": "粗面岩台阶",
-  "block.ad_astra.venus_stone_stairs": "粗面岩楼梯",
+  "block.ad_astra.venus_stone_slab": "天然粗面岩台阶",
+  "block.ad_astra.venus_stone_stairs": "天然粗面岩楼梯",
  "block.ad_astra.chiseled_venus_stone_bricks": "雕纹粗面岩砖",
  "block.ad_astra.chiseled_venus_stone_slab": "雕纹粗面岩台阶",
  "block.ad_astra.chiseled_venus_stone_stairs": "雕纹粗面岩楼梯",
@ -78,8 +81,8 @@
  "block.ad_astra.mercury_stone_brick_stairs": "科马提岩砖楼梯",
  "block.ad_astra.mercury_stone_brick_wall": "科马提岩砖墙",
  "block.ad_astra.mercury_stone_bricks": "科马提岩砖",
-  "block.ad_astra.mercury_stone_slab": "科马提岩台阶",
-  "block.ad_astra.mercury_stone_stairs": "科马提岩楼梯",
+  "block.ad_astra.mercury_stone_slab": "天然科马提岩台阶",
+  "block.ad_astra.mercury_stone_stairs": "天然科马提岩楼梯",
  "block.ad_astra.chiseled_mercury_stone_bricks": "雕纹科马提岩砖",
  "block.ad_astra.chiseled_mercury_stone_slab": "雕纹科马提岩台阶",
  "block.ad_astra.chiseled_mercury_stone_stairs": "雕纹科马提岩楼梯",
@ -96,8 +99,8 @@
  "block.ad_astra.glacio_stone_brick_stairs": "响岩砖楼梯",
  "block.ad_astra.glacio_stone_brick_wall": "响岩砖墙",
  "block.ad_astra.glacio_stone_bricks": "响岩砖",
-  "block.ad_astra.glacio_stone_slab": "响岩台阶",
-  "block.ad_astra.glacio_stone_stairs": "响岩楼梯",
+  "block.ad_astra.glacio_stone_slab": "天然响岩台阶",
+  "block.ad_astra.glacio_stone_stairs": "天然响岩楼梯",
  "block.ad_astra.chiseled_glacio_stone_bricks": "雕纹响岩砖",
  "block.ad_astra.chiseled_glacio_stone_slab": "雕纹响岩台阶",
  "block.ad_astra.chiseled_glacio_stone_stairs": "雕纹响岩楼梯",
--- a/kubejs/assets/additionalplacements/lang/zh_cn.json
+++ b/kubejs/assets/additionalplacements/lang/zh_cn.json
@ -0,0 +1,32 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "tooltip.additionalplacements.vertical_placement": "可垂直放置",
+  "tooltip.additionalplacements.stair_connections.all_connections": "允许混合垂直-水平连接（相对于放置方向）",
+  "tooltip.additionalplacements.stair_connections.no_mixed_connections": "允许垂直连接（相对于放置方向）",
+  "tooltip.additionalplacements.stair_connections.no_vertical_connections": "不允许垂直连接（相对于放置方向）",
+  "tooltip.additionalplacements.ceiling_placement": "可放置于天花板",
+  "msg.additionalplacements.mismatchedtags.0": "[额外放置] 发现生成方块上存在缺失和/或额外标签。使用 \"",
+  "msg.additionalplacements.mismatchedtags.1": "\" 生成标签，然后使用 \"",
+  "msg.additionalplacements.mismatchedtags.2": "\" 重新加载标签（若失败请重新加载世界）。查看游戏输出日志获取详细信息，或编辑配置文件禁用此消息。",
+  "msg.additionalplacements.generate.failure.definition": "生成数据包时出错：无法复制包定义",
+  "msg.additionalplacements.generate.failure.tag": "生成数据包时出错：无法保存标签 %s",
+  "msg.additionalplacements.generate.failure.initialization": "生成数据包时出错：无法初始化数据包",
+  "msg.additionalplacements.generate.success": "标签导出完成",
+  "msg.additionalplacements.generate.notfixed": "自动创建标签未能解决标签不匹配问题，需要手动修正。请确保已启用标签不匹配日志记录并检查游戏输出日志。需要掌握数据包创建及添加/移除方块标签的相关知识。",
+  "key.categories.additionalplacements": "额外放置",
+  "key.additionalplacements.placement_toggle": "切换放置逻辑",
+  "msg.additionalplacements.placement_enable": "已启用额外放置的放置逻辑",
+  "msg.additionalplacements.placement_disable": "已禁用额外放置的放置逻辑",
+  "msg.additionalplacements.disconnected": "额外放置配置冲突",
+  "msg.additionalplacements.errors.type": "以下生成类型拒绝了连接：",
+  "msg.additionalplacements.errors.client": "客户端拒绝：",
+  "msg.additionalplacements.errors.server": "服务端拒绝：",
+  "msg.additionalplacements.stairs.data_not_found": "未从客户端接收到楼梯连接配置数据",
+  "msg.additionalplacements.stairs.connections_type_not_found": "未知的楼梯连接类型 %s",
+  "msg.additionalplacements.stairs.mismatched.header": "以下楼梯方块使用了错误的连接类型。需要设置为：",
+  "additionalplacements.stairs.connections_type.all_connections": "允许所有连接",
+  "additionalplacements.stairs.connections_type.no_mixed_connections": "不允许混合连接",
+  "additionalplacements.stairs.connections_type.no_vertical_connections": "不允许垂直连接",
+  "msg.additionalplacements.stairs.mismatched.footer": "要连接至此服务器，请更正 config/additionalplacements-bootup.toml 中的条目并重启游戏。",
+  "commands.ap_stairs_state_debug.wrong_block": "%s 不是有效方块，必须为具有附加状态的楼梯方块。"
+}
--- a/kubejs/assets/beneath/lang/en_us.json
+++ b/kubejs/assets/beneath/lang/en_us.json
@ -9,8 +9,16 @@
  "block.beneath.ore.blackstone_sylvite": "Sylvite Ore",
  "block.beneath.crackrack": "Keratophyre",
  "block.beneath.soul_clay": "Muddy Clay",
+  "block.beneath.wood.log.crimson": "Crimson Stem",
+  "block.beneath.wood.stripped_log.crimson": "Stripped Crimson Stem",
+  "block.beneath.wood.wood.crimson": "Crimson Hyphae",
+  "block.beneath.wood.stripped_wood.crimson": "Stripped Crimson Hyphae",
  "block.beneath.wood.fallen_leaves.crimson": "Fallen Crimson Lamella",
  "block.beneath.wood.leaves.crimson": "Crimson Lamella",
+  "block.beneath.wood.log.warped": "Warped Stem",
+  "block.beneath.wood.stripped_log.warped": "Stripped Warped Stem",
+  "block.beneath.wood.wood.warped": "Warped Hyphae",
+  "block.beneath.wood.stripped_wood.warped": "Stripped Warped Hyphae",
  "block.beneath.wood.fallen_leaves.warped": "Fallen Warped Lamella",
  "block.beneath.wood.leaves.warped": "Warped Lamella",
  "item.beneath.cursed_hide": "Lavaproof Hide",
--- a/kubejs/assets/betterend/lang/uk_ua.json
+++ b/kubejs/assets/betterend/lang/uk_ua.json
@ -46,6 +46,7 @@
  "block.betterend.flamaea": "Гриб Фламаеа",
  "block.betterend.flammalix": "Гриб Фламмалікс",
  "block.betterend.fracturn": "Фрактурн",
+  "block.betterend.glacian_hymenophore": "Гіменофор Ґлаціана",
  "block.betterend.globulagus": "Глобулагус",
  "block.betterend.hydralux": "Гідралюкс",
  "block.betterend.hydralux_sapling": "Паросток Гідралюкса",
@ -67,6 +68,7 @@
  "block.betterend.rubinea": "Рубінеа",
  "block.betterend.ruscus": "Трава Рускус",
  "block.betterend.salteago": "Сальтеаго",
+  "block.betterend.selagine": "Селагіна",
  "block.betterend.shadow_berry": "Ягоди Нокс",
  "block.betterend.shadow_berry_wild": "Дикі ягоди Нокс",
  "block.betterend.shadow_berry_dead": "Мертві ягоди Нокс",
--- a/kubejs/assets/betterend/lang/zh_cn.json
+++ b/kubejs/assets/betterend/lang/zh_cn.json
@ -46,6 +46,7 @@
  "block.betterend.flamaea": "焰心菇",
  "block.betterend.flammalix": "焰顶菇",
  "block.betterend.fracturn": "碎晶蕨",
+  "block.betterend.glacian_hymenophore": "霜原菌褶",
  "block.betterend.globulagus": "球囊藻",
  "block.betterend.hydralux": "水光莲",
  "block.betterend.hydralux_sapling": "水光莲苗",
@ -67,6 +68,7 @@
  "block.betterend.rubinea": "红玉草",
  "block.betterend.ruscus": "假叶草",
  "block.betterend.salteago": "盐晶草",
+  "block.betterend.selagine": "卷柏",
  "block.betterend.shadow_berry": "夜影浆果",
  "block.betterend.shadow_berry_wild": "野生夜影浆果",
  "block.betterend.shadow_berry_dead": "枯萎的夜影浆果",
--- a/kubejs/assets/create/lang/uk_ua.json
+++ b/kubejs/assets/create/lang/uk_ua.json
@ -11,6 +11,14 @@
  "block.create.dark_oak_window_pane": "Гікорієва віконна панель",
  "block.create.cherry_window": "Фігурне Вікно",
  "block.create.cherry_window_pane": "Скло Фігурного Вікна",
+  "block.create.spruce_window": "Кипарисове вікно",
+  "block.create.spruce_window_pane": "Кипарисова шибка",
+  "block.create.jungle_window": "Тикове вікно",
+  "block.create.jungle_window_pane": "Тикова шибка",
+  "block.create.birch_window": "Евкаліптове вікно",
+  "block.create.birch_window_pane": "Евкаліптова шибка",
+  "block.create.acacia_window": "Баобабове вікно",
+  "block.create.acacia_window_pane": "Баобабова шибка",
  "block.create.andesite_bars": "Металеві ґрати",
  "block.create.andesite_belt_funnel": "Металева стрічкова лійка",
  "block.create.andesite_casing": "Металевий корпус",
--- a/kubejs/assets/create/lang/zh_cn.json
+++ b/kubejs/assets/create/lang/zh_cn.json
@ -11,6 +11,14 @@
  "block.create.dark_oak_window_pane": "山核桃木窗户板",
  "block.create.cherry_window": "无花果木窗户",
  "block.create.cherry_window_pane": "无花果木窗户板",
+  "block.create.spruce_window": "柏木窗户",
+  "block.create.spruce_window_pane": "柏木窗户板",
+  "block.create.jungle_window": "柚木窗户",
+  "block.create.jungle_window_pane": "柚木窗户板",
+  "block.create.birch_window": "桉木窗户",
+  "block.create.birch_window_pane": "桉木窗户板",
+  "block.create.acacia_window": "猴面包木窗户",
+  "block.create.acacia_window_pane": "猴面包木窗户板",
  "block.create.andesite_bars": "金属栏杆",
  "block.create.andesite_belt_funnel": "金属传送带漏斗",
  "block.create.andesite_casing": "金属外壳",
--- a/kubejs/assets/emi/category/properties/ae2_condenser.json
+++ b/kubejs/assets/emi/category/properties/ae2_condenser.json
@ -1 +1 @@
-{"ae2:condenser":{"order":153}}
+{"ae2:condenser":{"order":155}}
--- a/kubejs/assets/emi/category/properties/ae2_item_transformation.json
+++ b/kubejs/assets/emi/category/properties/ae2_item_transformation.json
@ -1 +1 @@
-{"ae2:item_transformation":{"order":142}}
+{"ae2:item_transformation":{"order":144}}
--- a/kubejs/assets/emi/category/properties/ae2_p2p_attunement.json
+++ b/kubejs/assets/emi/category/properties/ae2_p2p_attunement.json
@ -0,0 +1 @@
+{"ae2:p2p_attunement":{"order":165}}
--- a/kubejs/assets/emi/category/properties/create_draining.json
+++ b/kubejs/assets/emi/category/properties/create_draining.json
@ -1 +1 @@
-{"create:draining":{"order":164}}
+{"create:draining":{"order":166}}
--- a/kubejs/assets/emi/category/properties/create_spout_filling.json
+++ b/kubejs/assets/emi/category/properties/create_spout_filling.json
@ -1 +1 @@
-{"create:spout_filling":{"order":165}}
+{"create:spout_filling":{"order":167}}
--- a/kubejs/assets/emi/category/properties/createaddition_rolling.json
+++ b/kubejs/assets/emi/category/properties/createaddition_rolling.json
@ -1 +1 @@
-{"createaddition:rolling":{"order":73}}
+{"createaddition:rolling":{"order":77}}
--- a/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant.json
+++ b/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant.json
@ -0,0 +1 @@
+{"deafission:fission_reactor_coolant":{"order":66}}
--- a/kubejs/assets/emi/category/properties/deafission_fission_reactor_fuel.json
+++ b/kubejs/assets/emi/category/properties/deafission_fission_reactor_fuel.json
@ -0,0 +1 @@
+{"deafission:fission_reactor_fuel":{"order":68}}
--- a/kubejs/assets/emi/category/properties/deafission_fission_reactor_processing.json
+++ b/kubejs/assets/emi/category/properties/deafission_fission_reactor_processing.json
@ -0,0 +1 @@
+{"deafission:fission_reactor_processing":{"order":67}}
--- a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json
+++ b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json
@ -1 +1 @@
-{"domum_ornamentum:architects_cutter":{"order":162}}
+{"domum_ornamentum:architects_cutter":{"order":164}}
--- a/kubejs/assets/emi/category/properties/emi_info.json
+++ b/kubejs/assets/emi/category/properties/emi_info.json
@ -1 +1 @@
-{"emi:info":{"order":171}}
+{"emi:info":{"order":172}}
--- a/kubejs/assets/emi/category/properties/emi_tag.json
+++ b/kubejs/assets/emi/category/properties/emi_tag.json
@ -1 +1 @@
-{"emi:tag":{"order":172}}
+{"emi:tag":{"order":173}}
--- a/kubejs/assets/emi/category/properties/exposure_photograph_printing.json
+++ b/kubejs/assets/emi/category/properties/exposure_photograph_printing.json
@ -1 +1 @@
-{"exposure:photograph_printing":{"order":158}}
+{"exposure:photograph_printing":{"order":160}}
--- a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json
+++ b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json
@ -1 +1 @@
-{"exposure:photograph_stacking":{"order":167}}
+{"exposure:photograph_stacking":{"order":168}}
--- a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json
+++ b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json
@ -1 +1 @@
-{"framedblocks:framing_saw":{"order":161}}
+{"framedblocks:framing_saw":{"order":163}}
--- a/kubejs/assets/emi/category/properties/greate_automatic_packing.json
+++ b/kubejs/assets/emi/category/properties/greate_automatic_packing.json
@ -1 +1 @@
-{"greate:automatic_packing":{"order":156}}
+{"greate:automatic_packing":{"order":158}}
--- a/kubejs/assets/emi/category/properties/greate_automatic_shaped.json
+++ b/kubejs/assets/emi/category/properties/greate_automatic_shaped.json
@ -1 +1 @@
-{"greate:automatic_shaped":{"order":154}}
+{"greate:automatic_shaped":{"order":156}}
--- a/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json
+++ b/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json
@ -1 +1 @@
-{"greate:automatic_shapeless":{"order":155}}
+{"greate:automatic_shapeless":{"order":157}}
--- a/kubejs/assets/emi/category/properties/greate_block_cutting.json
+++ b/kubejs/assets/emi/category/properties/greate_block_cutting.json
@ -1 +1 @@
-{"greate:block_cutting":{"order":160}}
+{"greate:block_cutting":{"order":162}}
--- a/kubejs/assets/emi/category/properties/greate_crushing.json
+++ b/kubejs/assets/emi/category/properties/greate_crushing.json
@ -1 +1 @@
-{"greate:crushing":{"order":108}}
+{"greate:crushing":{"order":112}}
--- a/kubejs/assets/emi/category/properties/greate_fan_washing.json
+++ b/kubejs/assets/emi/category/properties/greate_fan_washing.json
@ -1 +1 @@
-{"greate:fan_washing":{"order":144}}
+{"greate:fan_washing":{"order":146}}
--- a/kubejs/assets/emi/category/properties/greate_milling.json
+++ b/kubejs/assets/emi/category/properties/greate_milling.json
@ -1 +1 @@
-{"greate:milling":{"order":107}}
+{"greate:milling":{"order":111}}
--- a/kubejs/assets/emi/category/properties/greate_mixing.json
+++ b/kubejs/assets/emi/category/properties/greate_mixing.json
@ -1 +1 @@
-{"greate:mixing":{"order":111}}
+{"greate:mixing":{"order":115}}
--- a/kubejs/assets/emi/category/properties/greate_pressing.json
+++ b/kubejs/assets/emi/category/properties/greate_pressing.json
@ -1 +1 @@
-{"greate:pressing":{"order":98}}
+{"greate:pressing":{"order":102}}
--- a/kubejs/assets/emi/category/properties/greate_sawing.json
+++ b/kubejs/assets/emi/category/properties/greate_sawing.json
@ -1 +1 @@
-{"greate:sawing":{"order":85}}
+{"greate:sawing":{"order":89}}
--- a/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json
+++ b/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json
@ -1 +1 @@
-{"gtceu:air_scrubber":{"order":67}}
+{"gtceu:air_scrubber":{"order":71}}
--- a/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json
+++ b/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json
@ -1 +1 @@
-{"gtceu:alloy_blast_smelter":{"order":121}}
+{"gtceu:alloy_blast_smelter":{"order":125}}
--- a/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json
+++ b/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json
@ -1 +1 @@
-{"gtceu:alloy_smelter":{"order":68}}
+{"gtceu:alloy_smelter":{"order":72}}
--- a/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json
+++ b/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json
@ -1 +1 @@
-{"gtceu:aqueous_accumulator":{"order":69}}
+{"gtceu:aqueous_accumulator":{"order":73}}
--- a/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json
+++ b/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json
@ -1 +1 @@
-{"gtceu:arc_furnace":{"order":70}}
+{"gtceu:arc_furnace":{"order":74}}
--- a/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json
+++ b/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json
@ -1 +1 @@
-{"gtceu:arc_furnace_recycling":{"order":150}}
+{"gtceu:arc_furnace_recycling":{"order":152}}
--- a/kubejs/assets/emi/category/properties/gtceu_assembler.json
+++ b/kubejs/assets/emi/category/properties/gtceu_assembler.json
@ -1 +1 @@
-{"gtceu:assembler":{"order":71}}
+{"gtceu:assembler":{"order":75}}
--- a/kubejs/assets/emi/category/properties/gtceu_assembly_line.json
+++ b/kubejs/assets/emi/category/properties/gtceu_assembly_line.json
@ -1 +1 @@
-{"gtceu:assembly_line":{"order":122}}
+{"gtceu:assembly_line":{"order":126}}
--- a/kubejs/assets/emi/category/properties/gtceu_autoclave.json
+++ b/kubejs/assets/emi/category/properties/gtceu_autoclave.json
@ -1 +1 @@
-{"gtceu:autoclave":{"order":72}}
+{"gtceu:autoclave":{"order":76}}
--- a/kubejs/assets/emi/category/properties/gtceu_bender.json
+++ b/kubejs/assets/emi/category/properties/gtceu_bender.json
@ -1 +1 @@
-{"gtceu:bender":{"order":75}}
+{"gtceu:bender":{"order":79}}
--- a/kubejs/assets/emi/category/properties/gtceu_brewery.json
+++ b/kubejs/assets/emi/category/properties/gtceu_brewery.json
@ -1 +1 @@
-{"gtceu:brewery":{"order":76}}
+{"gtceu:brewery":{"order":80}}
--- a/kubejs/assets/emi/category/properties/gtceu_canner.json
+++ b/kubejs/assets/emi/category/properties/gtceu_canner.json
@ -1 +1 @@
-{"gtceu:canner":{"order":77}}
+{"gtceu:canner":{"order":81}}
--- a/kubejs/assets/emi/category/properties/gtceu_centrifuge.json
+++ b/kubejs/assets/emi/category/properties/gtceu_centrifuge.json
@ -1 +1 @@
-{"gtceu:centrifuge":{"order":79}}
+{"gtceu:centrifuge":{"order":83}}
--- a/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json
+++ b/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json
@ -1 +1 @@
-{"gtceu:chem_dyes":{"order":148}}
+{"gtceu:chem_dyes":{"order":150}}
--- a/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json
+++ b/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json
@ -1 +1 @@
-{"gtceu:chemical_bath":{"order":80}}
+{"gtceu:chemical_bath":{"order":84}}
--- a/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json
+++ b/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json
@ -1 +1 @@
-{"gtceu:chemical_reactor":{"order":81}}
+{"gtceu:chemical_reactor":{"order":85}}
--- a/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json
+++ b/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json
@ -1 +1 @@
-{"gtceu:circuit_assembler":{"order":83}}
+{"gtceu:circuit_assembler":{"order":87}}
--- a/kubejs/assets/emi/category/properties/gtceu_coke_oven.json
+++ b/kubejs/assets/emi/category/properties/gtceu_coke_oven.json
@ -1 +1 @@
-{"gtceu:coke_oven":{"order":57}}
+{"gtceu:coke_oven":{"order":58}}
--- a/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json
+++ b/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json
@ -1 +1 @@
-{"gtceu:combustion_generator":{"order":59}}
+{"gtceu:combustion_generator":{"order":60}}
--- a/kubejs/assets/emi/category/properties/gtceu_compressor.json
+++ b/kubejs/assets/emi/category/properties/gtceu_compressor.json
@ -1 +1 @@
-{"gtceu:compressor":{"order":84}}
+{"gtceu:compressor":{"order":88}}
--- a/kubejs/assets/emi/category/properties/gtceu_cracker.json
+++ b/kubejs/assets/emi/category/properties/gtceu_cracker.json
@ -1 +1 @@
-{"gtceu:cracker":{"order":123}}
+{"gtceu:cracker":{"order":127}}
--- a/kubejs/assets/emi/category/properties/gtceu_cutter.json
+++ b/kubejs/assets/emi/category/properties/gtceu_cutter.json
@ -1 +1 @@
-{"gtceu:cutter":{"order":86}}
+{"gtceu:cutter":{"order":90}}
--- a/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json
+++ b/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json
@ -1 +1 @@
-{"gtceu:distillation_tower":{"order":88}}
+{"gtceu:distillation_tower":{"order":92}}
--- a/kubejs/assets/emi/category/properties/gtceu_distillery.json
+++ b/kubejs/assets/emi/category/properties/gtceu_distillery.json
@ -1 +1 @@
-{"gtceu:distillery":{"order":87}}
+{"gtceu:distillery":{"order":91}}
--- a/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json
+++ b/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json
@ -1 +1 @@
-{"gtceu:electric_blast_furnace":{"order":124}}
+{"gtceu:electric_blast_furnace":{"order":128}}
--- a/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json
+++ b/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json
@ -1 +1 @@
-{"gtceu:electrolyzer":{"order":89}}
+{"gtceu:electrolyzer":{"order":93}}
--- a/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json
+++ b/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json
@ -1 +1 @@
-{"gtceu:electromagnetic_separator":{"order":90}}
+{"gtceu:electromagnetic_separator":{"order":94}}
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`{"deafission:fission_reactor_coolant":{"order":66}}`
				`@ -0,0 +1 @@`
				`{"deafission:fission_reactor_fuel":{"order":68}}`
				`@ -0,0 +1 @@`
				`{"deafission:fission_reactor_processing":{"order":67}}`