Merge branch 'feature/space' into dev

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-06-22 00:40:02 -05:00 · 2025-06-22 00:40:02 -05:00 · 2138a8b0dc
commit 2138a8b0dc
parent 4914fa660d 8e9f1c51ab
988 changed files with 238425 additions and 5714 deletions
--- a/.github/README.md
+++ b/.github/README.md
@ -3,14 +3,14 @@
 <div align="center">
  <h1>TerraFirmaGreg - Modern</h1>
  <a href="https://github.com/TerraFirmaGreg-Team/Modpack-Modern">
-    <img src="https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/logo.png?raw=true" alt="Logo" height="100">
+    <img src="https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/logo.png?raw=true" alt="Logo" height="100"/>
  </a>
  <br/>
  <a href="https://discord.gg/AEaCzCTUwQ">
-    <img src="https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/discord_logo.png?raw=true" alt="Join our Discord" height="50">
+    <img src="https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/discord_logo.png?raw=true" alt="Join our Discord" height="50"/>
  </a>
  <a href="https://www.curseforge.com/minecraft/modpacks/terrafirmagreg-modern">
-    <img src="https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/curseforge_logo.png?raw=true" alt="Available on CurseForge" height="50">
+    <img src="https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/curseforge_logo.png?raw=true" alt="Available on CurseForge" height="50"/>
  </a>
  <br/>
  <p align="center">
@ -30,30 +30,36 @@

 ---

-## Survival Modpack as it Should've Been
+## Survival Modpack as It Should've Been
+*(Do we want to keep this tagline? it's a reference to TFC's, but it feels a little too pompous I think?)*

-**TerraFirmaGreg-Modern** is a Forge modpack that redefines Minecraft survival by introducing realistic challenges alongside advanced technological mechanics. 
-In this modpack, you will be put to the task of taking control of untouched wilderness and turning it to an industrial wonderland. 
-Start from humble beginning picking up rocks, and end while traversing interstellar space (coming soon)! 
-The heart of the modpack is formed by two standout mods:
+**TerraFirmaGreg-Modern** is a survival and tech modpack for Minecraft 1.20.1 Forge.
+Embark on a technological journey, starting by banging rocks together, taming an untouched wilderness into an industrial wonderland, and ending with control over the very stars.

- **[TerraFirmaCraft]** - Renowned for its immersive survival mechanics and a unique, challenging approach.
- **[GregTech Modern]** - A pinnacle of technical mods that brings deep, complex machinery and automation into the mix.
+Are you looking for a longer modpack where every step feels rewarding, and you're constantly building upon previous technologies in a way that feels seamless and natural? Do you want a modpack where every mod is carefully integrated instead of just thrown in? Do you dislike magic mods, or want to try a tech modpack that feels less "minecrafty" with its automation? Or do you just want to try out GregTech without losing years of your life? Then TerraFirmaGreg may be the modpack for you!

-In addition to these core mods, TerraFirmaGreg-Modern includes several other compelling additions that enrich gameplay further:
+The heart of the modpack is a tight integration between the two namesake mods:
+- **[TerraFirmaCraft]** – A total overhaul mod renowned for its immersive survival mechanics
+- **[GregTech Modern]** – An expansive tech mod famous for its realistic chemistry and deep, complex progession

- **[Applied Energistics]** – Cutting-edge storage and automation systems.
- **[Create]** – Innovative machinery and kinetic contraptions.
+On top of these, other major mods help provide even more depth:
+- **[Create]** and **[Greate]** – Start automating your problems away early with Create's kinetic machines, integrated seamlessly through Greate
+- **[Ad Astra]** (WIP) – Grow your factory even further beyond, with new logistic and survival problems to solve
+- **[Applied Energistics 2]** – Cutting-edge storage and automation systems appropriate for an advanced era

+Many new mechanics, tools, and dimensions are also built completely from the ground up just for TerraFirmaGreg!

-Several hand-picked TFC and Create addons to provide even more depth.
-Many other small mods tie everything together, and the modpack also integrates quests to help you navigate its complex world.
+Other small mods and addons tie everything together, and an ingame book and quest system provide all the information you'll need to help you succeed.

 ---

 ## Development

-Interested in contributing? For detailed setup instructions, coding standards, and guidelines, please refer to the [CONTRIBUTING.md](CONTRIBUTING.md).
+This modpack is still a work in progress, and is constantly being updated. In its current state, the modpack is fully completable, and worlds will always be compatible with future versions. Clear instructions will be provided if you need to take any extra steps when updating. 
+
+Interested in contributing? For detailed setup instructions, coding standards, and guidelines, please read [this](CONTRIBUTING.md).
+
+Want to help translate? Please read [this](../kubejs/README%20IF%20TRANSLATING.md) instead.

 ---

@ -66,5 +72,7 @@ Interested in contributing? For detailed setup instructions, coding standards, a
 <!-- Links: -->
 [TerraFirmaCraft]: https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft
 [GregTech Modern]: https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern
-[Applied Energistics]: https://www.curseforge.com/minecraft/mc-mods/ae2
+[Applied Energistics 2]: https://www.curseforge.com/minecraft/mc-mods/ae2
 [Create]: https://www.curseforge.com/minecraft/mc-mods/create
+[Greate]: https://www.curseforge.com/minecraft/mc-mods/greate
+[Ad Astra]: https://www.curseforge.com/minecraft/mc-mods/ad-astra
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,29 @@
 # Changelog

+## [0.10.0] - TODO DATE
+### Major changes
+- Build a rocket and blast off to the moon, a new dimension! You can get started in mid-HV.
+- AE2 inscriber presses are now found on the moon instead of being craftable, and making various AE2 components is also significantly cheaper there. @TomPlop & @Pyritie
+- Significant ore changes: certus quartz, raw aluminium, ilmenite, and some other mid-lategame materials have been moved from the overworld to the moon. Check your field guide for more information. @TomPlop
+- A new system for interstellar item transport, made just for TerraFirmaGreg - a new logistical problem to solve and automate. @ofoxsmith
+- New bedrock ore veins on the moon! Much better sources of infinite materials than stone dusts. @TomPlop
+- New machines to properly automate food, along with proper compatibility between machines and TFC's food system, so you can't turn rotten grains into fresh bread any more. The electric greenhouse now also always outputs fresh food. @ofoxsmith
+- New electric refrigerator with different tiers. You can craft the old one into this new one, but please take your food out of it before upgrading otherwise it will be lost! @ofoxsmith
+- Added many new advanced food items including freeze-dried fruit, calorie paste, and meal bags. @Redeix
+- Quest updates for all of the above. @TomPlop
+### Minor changes
+- Balance changes for water wheels and glowstone blocks @Pyritie
+- Added a second recipe for water flask sides so it doesn't matter if you craft it top-aligned or bottom-aligned @Pyritie
+- More recipes to craft dyes @Pyritie
+- Adjusted the textures of the generated raw ore items @Pyritie
+- Added recipes for AE2's decoration blocks @Pyritie
+- Added warning text to macerators, millstones, and crushing wheels about the no-byproducts-until-HV thing @Pyritie
+- Electric greenhouse now accepts any glass instead of exclusively AE2 quartz glass @Pyritie
+- Added earlier recipes for 1:1 clay bricks @Pyritie
+### Bug fixes
+- Fixed a mud hut structure that had deprecated zinc ingots @Pyritie
+- The electric greenhouse now also allows loose rocks and plants inside, since TFC spawns them on any grass block @Pyritie
+
 ## [Unreleased]
 ### New features
 ### Bug fixes
--- a/config/ad_astra-client.jsonc
+++ b/config/ad_astra-client.jsonc
@ -0,0 +1,23 @@
+{
+    "showOxygenDistributorArea": false,
+    "showGravityNormalizerArea": false,
+    "jetSuitEnabled": true,
+    // Type: Integer
+    "oxygenBarX": 5,
+    // Type: Integer
+    "oxygenBarY": 195,
+    // Type: Float
+    "oxygenBarScale": 0.6,
+    // Type: Integer
+    "energyBarX": 12,
+    // Type: Integer
+    "energyBarY": 265,
+    // Type: Float
+    "energyBarScale": 0.6,
+    "spaceMuffler": true,
+    "radio": {
+        // Range: 0 - 100
+        "volume": 10,
+        "favorites": []
+    }
+}
--- a/config/ad_astra.jsonc
+++ b/config/ad_astra.jsonc
@ -0,0 +1,77 @@
+{
+    // Allow players to set custom flag images for their rockets.
+    "allowFlagImages": true,
+    // Allow rockets to be launched from any dimension, even if it's not considered a planet.
+    "launchAnywhere": false,
+    /*
+     * The random tick speed for breaking plants, torches, freezing water, etc. on planets.
+     * Type: Integer
+     */
+    "planetRandomTickSpeed": 20,
+    // Always tick every planet chunk for things like freezing water, breaking plants, etc., regardless of whether the chunk can tick randomly or not. This has a small performance impact.
+    "forcePlanetTick": false,
+    /*
+     * The y level where rockets should leave the dimension and enter space.
+     * Type: Integer
+     */
+    "atmosphereLeave": 600,
+    // A comma-separated list of planet IDs that should be hidden from the planets screen. e.g. minecraft:overworld,ad_astra:moon,ad_astra:mars,ad_astra:venus,ad_astra:mercury,ad_astra:glacio
+    "disabledPlanets": "ad_astra:earth_orbit,ad_astra:moon_orbit,ad_astra:mars_orbit,ad_astra:venus_orbit,ad_astra:mercury_orbit,ad_astra:glacio_orbit",
+    // Disables oxygen damage.
+    "disableOxygen": false,
+    // Disables temperature damage.
+    "disableTemperature": false,
+    // Uses normal gravity for all planets.
+    "disableGravity": false,
+    // An Air Vortex is created when an oxygenated structure breaks its seal, causing every entity inside to rapidly get sucked out. This setting disables that.
+    "disableAirVortexes": false,
+    "cryoFreezer": {
+        // Type: Long
+        "ironTierMaxEnergyInOut": 100,
+        // Type: Long
+        "steelTierMaxEnergyInOut": 150,
+        // Type: Long
+        "deshTierMaxEnergyInOut": 250,
+        // Type: Long
+        "ostrumTierMaxEnergyInOut": 500,
+        // Type: Long
+        "ironTierEnergyCapacity": 10000,
+        // Type: Long
+        "steelTierEnergyCapacity": 20000,
+        // Type: Long
+        "deshTierEnergyCapacity": 50000,
+        // Type: Long
+        "ostrumTierEnergyCapacity": 100000,
+        // Type: Long
+        "steelTierFluidCapacity": 3000,
+        // Type: Long
+        "deshTierFluidCapacity": 5000,
+        // Type: Long
+        "ostrumTierFluidCapacity": 10000,
+        // Type: Long
+        "coalGeneratorEnergyGenerationPerTick": 20,
+        // Type: Long
+        "etrionicBlastFurnaceBlastingEnergyPerItem": 10,
+        // Type: Long
+        "waterPumpEnergyPerTick": 20,
+        // Type: Long
+        "waterPumpFluidGenerationPerTick": 50,
+        // Type: Long
+        "energizerEnergyCapacity": 2000000,
+        /*
+         * The maximum number of blocks that an oxygen distributor and gravity normalizer can distribute to.
+         * Type: Integer
+         */
+        "maxDistributionBlocks": 6000,
+        /*
+         * The tick rate (20 ticks = 1 second) at which the oxygen distributor and gravity normalizer will recalculate the distribution area.
+         * Type: Integer
+         */
+        "distributionRefreshRate": 100,
+        /*
+         * The tick rate (20 ticks = 1 second) at which cables and fluid pipes will recalculate their connections.
+         * Type: Integer
+         */
+        "pipeRefreshRate": 50
+    }
+}
--- a/config/ad_astra_giselle_addon.ver2.jsonc
+++ b/config/ad_astra_giselle_addon.ver2.jsonc
@ -0,0 +1,147 @@
+{
+    "items": {
+        // Type: Integer
+        "oxygen_chargers_distribution_interval": 20,
+        // Type: Long
+        "oxygen_can_fluid_capacity": 5000,
+        // Type: Long
+        "oxygen_can_fluid_transfer": 125,
+        // Type: Long
+        "netherite_oxygen_can_fluid_capacity": 10000,
+        // Type: Long
+        "netherite_oxygen_can_fluid_transfer": 250
+    },
+    "machines": {
+        // Type: Long
+        "fuel_loader_fluid_capacity": 8000,
+        // Type: Long
+        "fuel_loader_fluid_transfer": 250,
+        /*
+         * Blocks from Fuel Loader to each direction
+         * Type: Integer
+         */
+        "fuel_loader_working_range": 2,
+        // Type: Long
+        "automation_nasa_workbench_energy_capacity": 9600,
+        // Type: Long
+        "automation_nasa_workbench_energy_usage": 24,
+        // Type: Integer
+        "automation_nasa_workbench_cook_time": 200,
+        // Type: Long
+        "gravity_normalizer_energy_capacity": 9600,
+        /*
+         * Blocks = x * y * z
+         * Type: Double
+         */
+        "gravity_normalizer_energy_per_blocks": 0.5,
+        // Type: Integer
+        "gravity_normalizer_max_length": 31,
+        // Type: Integer
+        "gravity_normalizer_proof_duration": 10,
+        /*
+         * Blocks from Rocket Sensor to each direction
+         * Type: Integer
+         */
+        "rocket_sensor_working_range": 2
+    },
+    "enchantments": {
+        // Show tooltip on this mod's enchanted book
+        "tooltip_enabled": true,
+        /*
+         * Tooltip will don't show when 'Enchantment Descriptions' or 'Enchantment Lore' or 'CoFH Core' installed.
+         * but, if this set 'true' show tooltip with ignore that mods.
+         */
+        "tooltip_ignore": false,
+        /*
+         * Energy usage for proof [in every 10 ticks]
+         * Type: Integer
+         */
+        "space_fire_proof_energy_using": 10,
+        /*
+         * Durability usage for proof
+         * Type: Integer
+         */
+        "space_fire_proof_durability_using": 1,
+        /*
+         * Proof duration on using durability [ticks, be multiple of 10]
+         * Type: Integer
+         */
+        "space_fire_proof_durability_duration": 60,
+        /*
+         * Energy usage for proof [in every 10 ticks]
+         * Type: Integer
+         */
+        "acid_rain_proof_energy_using": 10,
+        /*
+         * Durability usage for proof
+         * Type: Integer
+         */
+        "acid_rain_proof_durability_using": 1,
+        /*
+         * Proof duration on using durability [ticks, be multiple of 10]
+         * Type: Integer
+         */
+        "acid_rain_proof_durability_duration": 60,
+        /*
+         * Energy usage for proof [in every 10 ticks]
+         * Type: Integer
+         */
+        "gravity_normalizing_energy_using": 10,
+        /*
+         * Durability usage for proof
+         * Type: Integer
+         */
+        "gravity_normalizing_durability_using": 1,
+        /*
+         * Proof duration on using durability [ticks, be multiple of 10]
+         * Type: Integer
+         */
+        "gravity_normalizing_durability_duration": 60
+    },
+    "compats": {
+        "mekanism": {
+            /*
+             * Energy usage per mb when produce Mekanism oxygen to player in water, rain
+             * Type: Integer
+             */
+            "modules_space_breathing_energy_using_produce": 200,
+            /*
+             * Energy usage for proof in every ticks [in every 10 ticks]
+             * Type: Integer
+             */
+            "modules_space_fire_proof_energy_using": 100,
+            /*
+             * Energy usage for proof in every ticks [in every 10 ticks]
+             * Type: Integer
+             */
+            "modules_acid_rain_proof_energy_using": 100,
+            /*
+             * Energy usage for proof in every ticks [in every 10 ticks]
+             * Type: Integer
+             */
+            "modules_gravity_normalizing_energy_using": 100
+        },
+        "pneumaticcraft": {
+            /*
+             * Air usage for provide oxygen [in every 30 ticks]
+             * Type: Integer
+             */
+            "upgades_space_breathing_air_using": 150,
+            /*
+             * Air usage for proof [in every 10 ticks]
+             * Type: Integer
+             */
+            "upgades_space_fire_proof_air_using": 50,
+            /*
+             * Air usage for proof [in every 10 ticks]
+             * Type: Integer
+             */
+            "upgades_acid_rain_proof_air_using": 50,
+            /*
+             * Air usage for proof [in every 10 ticks]
+             * Type: Integer
+             */
+            "upgades_gravity_normalizing_air_using": 50
+        }
+    }
+}
--- a/config/fallingtrees_common.json
+++ b/config/fallingtrees_common.json
@ -1,104 +1,110 @@
 {
-  "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": []
-      }
-    },
-    "verticalTree": {
-      "filter": {
-        "whitelistedTags": [],
-        "whitelist": [
-          "minecraft:cactus",
-          "minecraft:bamboo"
-        ],
-        "blacklist": []
-      },
-      "enabled": true,
-      "onlyFallWithRequiredTool": false,
-      "allowedToolFilter": {
-        "whitelistedTags": [],
-        "whitelist": [],
-        "blacklist": []
-      }
-    },
-    "chorusTree": {
-      "enabled": false,
-      "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": []
-      }
-    }
-  }
+	"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": []
+			}
+		},
+		"verticalTree": {
+			"filter": {
+				"whitelistedTags": [],
+				"whitelist": [
+					"minecraft:cactus",
+					"minecraft:bamboo"
+				],
+				"blacklist": []
+			},
+			"enabled": true,
+			"onlyFallWithRequiredTool": false,
+			"allowedToolFilter": {
+				"whitelistedTags": [],
+				"whitelist": [],
+				"blacklist": []
+			}
+		},
+		"chorusTree": {
+			"enabled": true,
+			"filter": {
+				"whitelist": [
+					"tfg:lunar_chorus_plant",
+					"tfg:lunar_chorus_flower"
+				]
+			},
+			"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": []
+			}
+		}
+	}
 }
--- a/config/ftbquests/quests/chapters/ae2.snbt
+++ b/config/ftbquests/quests/chapters/ae2.snbt
@ -6,24 +6,14 @@
 	icon: "ae2:controller"
 	id: "09BE9F51822EC180"
 	order_index: 2
-	quest_links: [
-		{
-			id: "3293CB774C1A4DF0"
-			linked_quest: "1D88369409736DC7"
-			shape: "gear"
-			size: 2.0d
-			x: -7.0d
-			y: 0.0d
-		}
-		{
-			id: "6F0C443B72699EFA"
-			linked_quest: "05ABC370D7153350"
-			shape: "gear"
-			size: 2.0d
-			x: -4.0d
-			y: -2.0d
-		}
-	]
+	quest_links: [{
+		id: "6F0C443B72699EFA"
+		linked_quest: "05ABC370D7153350"
+		shape: "gear"
+		size: 2.0d
+		x: -4.0d
+		y: -2.0d
+	}]
 	quests: [
 		{
 			dependencies: ["15B4CB2A3B01C930"]
@ -253,8 +243,8 @@
 		}
 		{
 			dependencies: [
-				"1D88369409736DC7"
 				"3E51DAA2E5CF0422"
+				"27E6D3B21555EEC0"
 			]
 			id: "20AAF0C5177EC3FE"
 			size: 1.0d
@ -1914,8 +1904,10 @@
 			y: 2.0d
 		}
 		{
-			dependencies: ["1D88369409736DC7"]
+			dependencies: ["00A2566109144D7F"]
+			description: ["With your first step on the Moon comes access to your first &bCertus Quartz&r vein.\\nDon't worry <20> they're quite common and should be easy to locate, though having a decent &9Ore Scanner&r wouldn<64>t hurt.\\n\\nWhether you decide to set up a miner or manually dig out a full vein, make sure to gather a &dhefty amount&r <20> you<6F>ll need it to progress through &bAE2&r."]
 			id: "3E51DAA2E5CF0422"
+			subtitle: "A first step for you, a big leap for AE2"
 			tasks: [{
 				id: "2328D90FAE814CEF"
 				item: {
@ -1927,6 +1919,7 @@
 				}
 				type: "item"
 			}]
+			title: "Certus Quartz"
 			x: -7.0d
 			y: 2.0d
 		}
@ -2372,6 +2365,19 @@
 			x: 2.0d
 			y: 3.0d
 		}
+		{
+			dependencies: ["52AD30F04DD5A812"]
+			id: "27E6D3B21555EEC0"
+			shape: "gear"
+			size: 2.0d
+			tasks: [{
+				id: "5490D2074B0AC944"
+				item: "gtceu:hv_polarizer"
+				type: "item"
+			}]
+			x: -7.0d
+			y: 0.0d
+		}
 	]
 	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
@ -520,6 +520,7 @@
 				"478B0D55369C0F7F"
 				"6B08799BCFD01D3D"
 				"30A6EDDF25A5E5F8"
+				"173A04F328414A36"
 			]
 			description: [
 				"&aRuthenium-tungsten-molybdenum (RTM) Alloy Coils&r raise the Heat Capacity to a scorching &d4,500K&r."
@ -541,10 +542,7 @@
 			y: 2.25d
 		}
 		{
-			dependencies: [
-				"2D01E80DE837F6A6"
-				"7FA0ACB7F161F378"
-			]
+			dependencies: ["7FA0ACB7F161F378"]
 			description: [
 				"The &3Diode&r (the block, not the component) accepts energy inputs from 5 sides, but only outputs through a single side."
 				""
@ -1619,6 +1617,17 @@
 			x: 0.0d
 			y: 4.5d
 		}
+		{
+			dependencies: ["478B0D55369C0F7F"]
+			id: "173A04F328414A36"
+			tasks: [{
+				id: "66828E992294F8BD"
+				item: "gtceu:rtm_alloy_ingot"
+				type: "item"
+			}]
+			x: 6.5d
+			y: 1.0d
+		}
 	]
 	subtitle: ["The quests are outdated. They will be update in a later update."]
 	title: "&5EV&r - Extreme Voltage &6(WIP)&r"
--- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt
+++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt
--- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt
+++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt
@ -1401,7 +1401,7 @@
 			subtitle: "{quests.low_voltage.lv_greenhouse.subtitle}"
 			tasks: [{
 				id: "3EB01235ED295080"
-				item: "gtceu:greenhouse"
+				item: "tfg:electric_greenhouse"
 				type: "item"
 			}]
 			title: "{quests.low_voltage.lv_greenhouse.title}"
--- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
+++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
@ -321,7 +321,11 @@
 		}
 		{
 			dependencies: ["22E462070F8B027A"]
-			description: ["{quests.medium_voltage.electrolyzer.desc}"]
+			description: [
+				"{quests.medium_voltage.electrolyzer.desc.1}"
+				"{@pagebreak}"
+				"{quests.medium_voltage.electrolyzer.desc.2}"
+			]
 			icon: "gtceu:mv_electrolyzer"
 			id: "0EFEE489906256AA"
 			shape: "octagon"
--- a/config/ftbquests/quests/chapters/ore_processing.snbt
+++ b/config/ftbquests/quests/chapters/ore_processing.snbt
@ -48,16 +48,6 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.ore_proc.crushed_ores.desc}"]
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "gtceu:crushed_copper_ore"
-			}
 			id: "28419A1010EEE93A"
 			subtitle: "{quests.ore_proc.crushed_ores.subtitle}"
 			tasks: [
@ -233,7 +223,6 @@
 			description: ["{quests.ore_proc.mercury.desc}"]
 			id: "68AC3E2C9093FCFE"
 			optional: true
-			shape: "heart"
 			subtitle: "{quests.ore_proc.mercury.subtitle}"
 			tasks: [
 				{
@ -284,7 +273,6 @@
 			description: ["{quests.ore_proc.sodium_ores.desc}"]
 			id: "0502E478E27D4B73"
 			optional: true
-			shape: "heart"
 			subtitle: "{quests.ore_proc.sodium_ores.subtitle}"
 			tasks: [
 				{
@ -315,29 +303,26 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.ore_proc.purified_ores.desc}"]
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "create:crushed_raw_copper"
-			}
 			id: "544EA7FF98FDCFB7"
 			subtitle: "{quests.ore_proc.purified_ores.subtitle}"
-			tasks: [{
-				id: "4C6F60AC9C803D7B"
-				item: {
-					Count: 1
-					id: "ftbfiltersystem:smart_filter"
-					tag: {
-						"ftbfiltersystem:filter": "or(item_tag(forge:purified_ores))"
+			tasks: [
+				{
+					id: "4C6F60AC9C803D7B"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item_tag(forge:purified_ores))"
+						}
 					}
+					optional_task: true
+					type: "item"
 				}
-				type: "item"
-			}]
+				{
+					id: "3C194AEB554DA4CA"
+					type: "checkmark"
+				}
+			]
 			title: "{quests.ore_proc.purified_ores.title}"
 			x: 0.5d
 			y: -0.5d
@ -355,6 +340,12 @@
 					optional_task: true
 					type: "item"
 				}
+				{
+					id: "0373F4E380F2A0BC"
+					item: "gtceu:indium_concentrate_bucket"
+					optional_task: true
+					type: "item"
+				}
 				{
 					id: "246799A19B9A47B6"
 					item: {
@ -377,15 +368,8 @@
 					type: "item"
 				}
 				{
-					id: "475C90F0EA16C2F9"
-					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "only_one(item(gtceu:indium_concentrate_bucket)nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"gtceu:indium_concentrate\"}}))"
-						}
-					}
-					type: "item"
+					id: "52FCA464BD827E37"
+					type: "checkmark"
 				}
 			]
 			title: "{quests.ore_proc.indium.title}"
@ -643,30 +627,25 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.ore_proc.dust_processed.desc}"]
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "gtceu:copper_dust"
-			}
 			id: "22C1D541452D4AD4"
-			size: 1.5d
 			subtitle: "{quests.ore_proc.dust_processed.subtitle}"
-			tasks: [{
-				id: "3EA3BABECE52085B"
-				item: {
-					Count: 1
-					id: "ftbfiltersystem:smart_filter"
-					tag: {
-						"ftbfiltersystem:filter": "or(item_tag(forge:dusts))"
+			tasks: [
+				{
+					id: "3EA3BABECE52085B"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item_tag(forge:dusts))"
+						}
 					}
+					type: "item"
 				}
-				type: "item"
-			}]
+				{
+					id: "1A1B2762EFD6C6B0"
+					type: "checkmark"
+				}
+			]
 			title: "{quests.ore_proc.dust_processed.title}"
 			x: 0.5d
 			y: 3.5d
--- a/config/ftbquests/quests/chapters/progression.snbt
+++ b/config/ftbquests/quests/chapters/progression.snbt
@ -332,6 +332,26 @@
 			x: 8.5d
 			y: 1.0d
 		}
+		{
+			id: "3644488B52C563F6"
+			linked_quest: "173A04F328414A36"
+			x: 11.0d
+			y: 0.0d
+		}
+		{
+			id: "1824692F2A7A8B43"
+			linked_quest: "7E755297E9685374"
+			x: 11.0d
+			y: -1.0d
+		}
+		{
+			id: "35C2CDE00DEC7D92"
+			linked_quest: "3FBDC8552F7D8008"
+			shape: "none"
+			size: 1.5d
+			x: 13.5d
+			y: -3.0d
+		}
 	]
 	quests: [
 		{
@ -703,6 +723,19 @@
 			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/questsmetallurgy.snbt
+++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt
@ -31,21 +31,10 @@
 			y: -34.0d
 		}
 		{
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "tfc:metal/lamp/blue_steel"
-			}
 			id: "227B6C88FFE99435"
 			linked_quest: "4EBABACAB444244D"
-			shape: "heart"
 			x: 16.5d
-			y: -24.5d
+			y: -23.0d
 		}
 		{
 			id: "19CF6D922179DFF9"
@ -69,7 +58,7 @@
 			}]
 			title: "{quests.metal_age.this_is_a_bucket.title}"
 			x: 13.5d
-			y: -26.0d
+			y: -24.5d
 		}
 		{
 			dependencies: ["56CA2EB7812529C5"]
@ -93,7 +82,7 @@
 			]
 			title: "{quests.metal_age.redblu_buckets.title}"
 			x: 16.5d
-			y: -26.0d
+			y: -24.5d
 		}
 		{
 			dependencies: ["7E0239E9CC73F09F"]
@ -109,11 +98,11 @@
 				weak_nbt_match: true
 			}]
 			title: "{quests.metal_age.black_steel_anvil.title}"
-			x: 26.5d
-			y: -26.0d
+			x: 27.5d
+			y: -24.5d
 		}
 		{
-			dependencies: ["5996A3A0D475B8A6"]
+			dependencies: ["4310B619B57276ED"]
 			description: ["{quests.metal_age.steel_anvil.desc}"]
 			id: "04DE7C58F20B535A"
 			shape: "octagon"
@ -126,11 +115,11 @@
 				weak_nbt_match: true
 			}]
 			title: "{quests.metal_age.steel_anvil.title}"
-			x: 26.5d
+			x: 27.5d
 			y: -32.0d
 		}
 		{
-			dependencies: ["0A92F5C4BB6AF972"]
+			dependencies: ["358571B6E692F198"]
 			description: ["{quests.metal_age.wrought_iron_anvil.desc}"]
 			id: "174DA15847665CF8"
 			shape: "octagon"
@ -274,10 +263,29 @@
 			y: -32.0d
 		}
 		{
+			dependencies: [
+				"0A92F5C4BB6AF972"
+				"021D3DEEB15A3D17"
+			]
+			dependency_requirement: "one_completed"
+			description: ["{quests.metal_age.weld_wrought_iron_ingots.desc}"]
+			id: "358571B6E692F198"
+			subtitle: "{quests.metal_age.weld_wrought_iron_ingots.subtitle}"
+			tasks: [{
+				id: "05AD17F66DFE3C56"
+				item: "gtceu:wrought_iron_double_ingot"
+				type: "item"
+				weak_nbt_match: true
+			}]
+			title: "{quests.metal_age.weld_wrought_iron_ingots.title}"
+			x: 7.0d
+			y: -32.0d
+		}
+		{
+			dependencies: ["48A8E3210B2BAE1C"]
 			description: ["{quests.metal_age.bellows.desc}"]
 			hide_dependency_lines: true
 			id: "021D3DEEB15A3D17"
-			shape: "rsquare"
 			subtitle: "{quests.metal_age.bellows.subtitle}"
 			tasks: [{
 				id: "588EB07E980386F9"
@ -289,12 +297,31 @@
 			y: -34.0d
 		}
 		{
-			dependencies: ["5A936E9BCF30AA3D"]
+			dependencies: ["5996A3A0D475B8A6"]
+			dependency_requirement: "one_completed"
+			description: ["{quests.metal_age.weld_steel_ingots.desc}"]
+			id: "4310B619B57276ED"
+			subtitle: "{quests.metal_age.weld_steel_ingots.subtitle}"
+			tasks: [{
+				id: "0EDB1D851E198274"
+				item: "gtceu:steel_double_ingot"
+				type: "item"
+				weak_nbt_match: true
+			}]
+			title: "{quests.metal_age.weld_steel_ingots.title}"
+			x: 25.5d
+			y: -32.0d
+		}
+		{
+			dependencies: [
+				"061116CF508D54F6"
+				"68B7D07D57A103BE"
+			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.metal_age.kaolin_clay.desc}"]
 			id: "72F1C122FC26229C"
 			shape: "octagon"
-			size: 2.0d
+			size: 3.0d
 			subtitle: "{quests.metal_age.kaolin_clay.subtitle}"
 			tasks: [{
 				id: "673D38EB62FFD65F"
@ -312,8 +339,8 @@
 				weak_nbt_match: true
 			}]
 			title: "{quests.metal_age.kaolin_clay.title}"
-			x: 14.0d
-			y: -33.0d
+			x: 13.5d
+			y: -36.0d
 		}
 		{
 			dependencies: ["5A936E9BCF30AA3D"]
@ -322,24 +349,25 @@
 			icon: "tfc:ore/graphite/gabbro"
 			id: "53E1383F12EC6765"
 			optional: true
-			shape: "diamond"
 			subtitle: "{quests.metal_age.overworld_graphite.subtitle}"
 			tasks: [{
 				id: "25A552657AFA7BC2"
 				type: "checkmark"
 			}]
 			title: "{quests.metal_age.overworld_graphite.title}"
-			x: 11.0d
+			x: 13.0d
 			y: -30.5d
 		}
 		{
-			dependencies: ["5A936E9BCF30AA3D"]
+			dependencies: [
+				"53E1383F12EC6765"
+				"2DB82986FE176CD7"
+			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.metal_age.graphite.desc}"]
-			icon: "tfc:powder/graphite"
 			id: "31CE13462759950C"
 			shape: "octagon"
-			size: 2.0d
+			size: 3.0d
 			subtitle: "{quests.metal_age.graphite.subtitle}"
 			tasks: [{
 				id: "6B0C9D862BFD27BC"
@ -354,13 +382,14 @@
 				type: "item"
 			}]
 			title: "{quests.metal_age.graphite.title}"
-			x: 14.0d
-			y: -31.0d
+			x: 13.5d
+			y: -28.5d
 		}
 		{
 			dependencies: [
 				"72F1C122FC26229C"
 				"31CE13462759950C"
+				"5A936E9BCF30AA3D"
 			]
 			description: ["{quests.metal_age.fire_clay.desc}"]
 			id: "2C76EE197C14B0DC"
@ -374,7 +403,7 @@
 				weak_nbt_match: true
 			}]
 			title: "{quests.metal_age.fire_clay.title}"
-			x: 17.0d
+			x: 17.5d
 			y: -32.0d
 		}
 		{
@ -437,7 +466,6 @@
 			description: ["{quests.metal_age.beneath_kaolin.desc}"]
 			id: "061116CF508D54F6"
 			optional: true
-			shape: "diamond"
 			subtitle: "{quests.metal_age.beneath_kaolin.subtitle}"
 			tasks: [
 				{
@ -464,7 +492,7 @@
 				}
 			]
 			title: "{quests.metal_age.beneath_kaolin.title}"
-			x: 12.0d
+			x: 14.0d
 			y: -33.5d
 		}
 		{
@ -568,7 +596,7 @@
 				}
 			]
 			title: "{quests.metal_age.fire_clay_products.title}"
-			x: 17.0d
+			x: 17.5d
 			y: -34.0d
 		}
 		{
@ -638,14 +666,12 @@
 			}]
 			title: "{quests.metal_age.red_blu.title}"
 			x: 24.0d
-			y: -26.0d
+			y: -24.5d
 		}
 		{
 			dependencies: ["56CA2EB7812529C5"]
 			description: ["{quests.metal_age.red_steel_flask.desc}"]
 			id: "30D49878F3CEB08A"
-			optional: true
-			shape: "heart"
 			subtitle: "{quests.metal_age.red_steel_flask.subtitle}"
 			tasks: [{
 				id: "7394672B4D19B0B2"
@ -654,7 +680,7 @@
 			}]
 			title: "{quests.metal_age.red_steel_flask.title}"
 			x: 16.5d
-			y: -27.5d
+			y: -26.0d
 		}
 		{
 			dependencies: [
@ -680,7 +706,7 @@
 			}]
 			title: "{quests.metal_age.redblu_anvil.title}"
 			x: 18.5d
-			y: -26.0d
+			y: -24.5d
 		}
 		{
 			dependencies: ["3C173357029AB649"]
@ -724,15 +750,13 @@
 				type: "checkmark"
 			}]
 			title: "{quests.metal_age.fire_clay_ingredients.title}"
-			x: 11.5d
+			x: 13.5d
 			y: -32.0d
 		}
 		{
 			dependencies: ["5A936E9BCF30AA3D"]
 			description: ["{quests.metal_age.beneath_graphite.desc}"]
 			id: "2DB82986FE176CD7"
-			optional: true
-			shape: "diamond"
 			subtitle: "{quests.metal_age.beneath_graphite.subtitle}"
 			tasks: [
 				{
@ -752,7 +776,7 @@
 				}
 			]
 			title: "{quests.metal_age.beneath_graphite.title}"
-			x: 12.0d
+			x: 14.0d
 			y: -30.5d
 		}
 		{
@ -760,8 +784,6 @@
 			description: ["{quests.metal_age.overworld_kaolin.desc}"]
 			icon: "tfc:plant/tree_fern"
 			id: "68B7D07D57A103BE"
-			optional: true
-			shape: "diamond"
 			subtitle: "{quests.metal_age.overworld_kaolin.subtitle}"
 			tasks: [{
 				id: "14DF5B1544AB9BA9"
@ -769,7 +791,7 @@
 				type: "checkmark"
 			}]
 			title: "{quests.metal_age.overworld_kaolin.title}"
-			x: 11.0d
+			x: 13.0d
 			y: -33.5d
 		}
 		{
@ -791,8 +813,8 @@
 				weak_nbt_match: true
 			}]
 			title: "{quests.metal_age.blast_furnace_fuel.title}"
-			x: 20.5d
-			y: -32.0d
+			x: 23.5d
+			y: -30.0d
 		}
 		{
 			dependencies: ["04DE7C58F20B535A"]
@ -806,8 +828,8 @@
 				type: "checkmark"
 			}]
 			title: "{quests.metal_age.steel_goodies.title}"
-			x: 26.5d
-			y: -34.0d
+			x: 29.5d
+			y: -30.0d
 		}
 		{
 			dependencies: ["52DAF93E2F3D688A"]
@ -823,8 +845,8 @@
 				type: "checkmark"
 			}]
 			title: "{quests.metal_age.black_steel_goodies.title}"
-			x: 26.5d
-			y: -23.5d
+			x: 25.5d
+			y: -22.5d
 		}
 		{
 			dependencies: [
@ -832,16 +854,6 @@
 				"04DE7C58F20B535A"
 			]
 			description: ["{quests.metal_age.highcarb_black_steel.desc}"]
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "tfc:metal/ingot/black_steel"
-			}
 			id: "7E0239E9CC73F09F"
 			subtitle: "{quests.metal_age.highcarb_black_steel.subtitle}"
 			tasks: [
@ -875,22 +887,12 @@
 				}
 			]
 			title: "{quests.metal_age.highcarb_black_steel.title}"
-			x: 26.5d
+			x: 27.5d
 			y: -30.0d
 		}
 		{
 			dependencies: ["5996A3A0D475B8A6"]
 			description: ["{quests.metal_age.weak_steel.desc}"]
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "tfc:metal/ingot/weak_steel"
-			}
 			id: "1CE0FF455668C145"
 			subtitle: "{quests.metal_age.weak_steel.subtitle}"
 			tasks: [
@ -898,60 +900,53 @@
 					id: "543388DB123E7328"
 					item: {
 						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:nickel_ingot)item(gtceu:nickel_dust))"
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
 						}
+						id: "gtceu:nickel_ingot"
 					}
-					title: "{quests.metal_age.weak_steel.task1}"
 					type: "item"
-					weak_nbt_match: true
 				}
 				{
 					count: 2L
 					id: "7F829BA244BC77D5"
 					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:steel_ingot)item(gtceu:steel_dust))"
+						Count: 2
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
 						}
+						id: "gtceu:steel_ingot"
 					}
-					title: "{quests.metal_age.weak_steel.task2}"
 					type: "item"
-					weak_nbt_match: true
 				}
 				{
 					id: "3271DD5653C52CAB"
 					item: {
 						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:black_bronze_ingot)item(gtceu:black_bronze_dust))"
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
 						}
+						id: "gtceu:black_bronze_ingot"
 					}
-					title: "{quests.metal_age.weak_steel.task3}"
 					type: "item"
-					weak_nbt_match: true
 				}
 			]
 			title: "{quests.metal_age.weak_steel.title}"
-			x: 23.5d
+			x: 25.5d
 			y: -30.0d
 		}
 		{
 			dependencies: ["27FF92982A24BC4E"]
 			description: ["{quests.metal_age.highcarb_red_steel.desc}"]
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "tfc:metal/ingot/red_steel"
-			}
 			id: "5088768AAA28FCBA"
 			subtitle: "{quests.metal_age.highcarb_red_steel.subtitle}"
 			tasks: [
@ -986,21 +981,11 @@
 			]
 			title: "{quests.metal_age.highcarb_red_steel.title}"
 			x: 20.5d
-			y: -27.0d
+			y: -25.5d
 		}
 		{
 			dependencies: ["5792DDAA82895E67"]
 			description: ["{quests.metal_age.weak_red_steel.desc}"]
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "tfc:metal/ingot/weak_red_steel"
-			}
 			id: "27FF92982A24BC4E"
 			subtitle: "{quests.metal_age.weak_red_steel.subtitle}"
 			tasks: [
@ -1008,70 +993,68 @@
 					id: "2A22B3EA8DC577CE"
 					item: {
 						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(create:brass_ingot)item(gtceu:brass_dust))"
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
 						}
+						id: "create:brass_ingot"
 					}
-					title: "{quests.metal_age.weak_red_steel.brass}"
 					type: "item"
 				}
 				{
 					count: 2L
 					id: "2F0648CE3D1723DF"
 					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:steel_ingot)item(gtceu:steel_dust))"
+						Count: 2
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
 						}
+						id: "gtceu:steel_ingot"
 					}
-					title: "{quests.metal_age.weak_red_steel.steel}"
 					type: "item"
 				}
 				{
 					id: "47F346E1C0F41655"
 					item: {
 						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:rose_gold_ingot)item(gtceu:rose_gold_dust))"
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
 						}
+						id: "gtceu:rose_gold_ingot"
 					}
-					title: "{quests.metal_age.weak_red_steel.rose_gold}"
 					type: "item"
 				}
 				{
 					count: 4L
 					id: "21434FAAA69D5BE0"
 					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(tfc:metal/ingot/black_steel)item(gtceu:black_steel_dust))"
+						Count: 4
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
 						}
+						id: "tfc:metal/ingot/black_steel"
 					}
-					title: "{quests.metal_age.weak_red_steel.black_steel}"
 					type: "item"
 				}
 			]
 			title: "{quests.metal_age.weak_red_steel.title}"
 			x: 22.0d
-			y: -27.0d
+			y: -25.5d
 		}
 		{
 			dependencies: ["5792DDAA82895E67"]
 			description: ["{quests.metal_age.weak_blu_steel.desc}"]
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "tfc:metal/ingot/weak_blue_steel"
-			}
 			id: "64F8A358EC3FEF45"
 			subtitle: "{quests.metal_age.weak_blu_steel.subtitle}"
 			tasks: [
@ -1079,70 +1062,68 @@
 					count: 2L
 					id: "5331A323780B4B11"
 					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:steel_ingot)item(gtceu:steel_dust))"
+						Count: 2
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
 						}
+						id: "gtceu:steel_ingot"
 					}
-					title: "{quests.metal_age.weak_blue_steel.steel}"
 					type: "item"
 				}
 				{
 					count: 4L
 					id: "2809FD951B82C54F"
 					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(tfc:metal/ingot/black_steel)item(gtceu:black_steel_dust))"
+						Count: 4
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
 						}
+						id: "tfc:metal/ingot/black_steel"
 					}
-					title: "{quests.metal_age.weak_blue_steel.black_steel}"
 					type: "item"
 				}
 				{
 					id: "401EC1A9FBC759B8"
 					item: {
 						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:bismuth_bronze_ingot)item(gtceu:bismuth_bronze_dust))"
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
 						}
+						id: "gtceu:bismuth_bronze_ingot"
 					}
-					title: "{quests.metal_age.weak_blue_steel.bismuth_bronze}"
 					type: "item"
 				}
 				{
 					id: "7350ECE723ABE8F4"
 					item: {
 						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:sterling_silver_ingot)item(gtceu:sterling_silver_dust))"
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
 						}
+						id: "gtceu:sterling_silver_ingot"
 					}
-					title: "{quests.metal_age.weak_blue_steel.sterling_silver}"
 					type: "item"
 				}
 			]
 			title: "{quests.metal_age.weak_blu_steel.title}"
 			x: 22.0d
-			y: -25.0d
+			y: -23.5d
 		}
 		{
 			dependencies: ["64F8A358EC3FEF45"]
 			description: ["{quests.metal_age.highcarb_blu_steel.desc}"]
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "tfc:metal/ingot/blue_steel"
-			}
 			id: "6D04BAC5B215F90F"
 			subtitle: "{quests.metal_age.highcarb_blu_steel.subtitle}"
 			tasks: [
@ -1177,7 +1158,7 @@
 			]
 			title: "{quests.metal_age.highcarb_blu_steel.title}"
 			x: 20.5d
-			y: -25.0d
+			y: -23.5d
 		}
 		{
 			dependencies: ["3C173357029AB649"]
--- a/config/ftbquests/quests/chapters/questssteam_age.snbt
+++ b/config/ftbquests/quests/chapters/questssteam_age.snbt
@ -1130,8 +1130,13 @@
 			y: -4.0d
 		}
 		{
-			dependencies: ["6AA07588374B59AB"]
+			dependencies: [
+				"6AA07588374B59AB"
+				"45449ECE4F8128E7"
+			]
+			dependency_requirement: "one_completed"
 			description: ["{quests.steam_age.trains.desc}"]
+			hide_dependency_lines: false
 			id: "02854A3E8A5D5043"
 			optional: true
 			shape: "heart"
--- a/config/ftbquests/quests/chapters/questsstoneage.snbt
+++ b/config/ftbquests/quests/chapters/questsstoneage.snbt
@ -684,7 +684,6 @@
 			tasks: [{
 				id: "5A6EF9EBF232601C"
 				item: "gtceu:copper_double_ingot"
-				match_nbt: false
 				type: "item"
 				weak_nbt_match: true
 			}]
--- a/config/ftbquests/quests/chapters/queststfc_tips.snbt
+++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt
@ -1233,7 +1233,7 @@
 			subtitle: "{quests.tfg_tips.refrigerator.subtitle}"
 			tasks: [{
 				id: "2D43E8E907B39B46"
-				item: "tfcea:refrigerator"
+				item: "tfg:mv_food_refrigerator"
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.refrigerator.title}"
@ -1602,26 +1602,12 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.passive_preservation.desc}"]
-			disable_toast: true
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					Parent: {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "tfc:ceramic/vessel"
-				tag: { }
-			}
 			id: "13F7066858E923FF"
 			subtitle: "{quests.tfg_tips.passive_preservation.subtitle}"
 			tasks: [{
-				dimension: "minecraft:overworld"
-				icon: "gtceu:overworld_marker"
-				id: "5BAF5F5343C3E42A"
-				title: "{quests.stone_age.temperature.task}"
-				type: "dimension"
+				id: "54AAB9886964A160"
+				title: "{quests.tasktype.checkmark}"
+				type: "checkmark"
 			}]
 			title: "{quests.tfg_tips.passive_preservation.title}"
 			x: 6.5d
@ -2250,7 +2236,10 @@
 			y: 9.5d
 		}
 		{
-			dependencies: ["2D959136A5FC5F46"]
+			dependencies: [
+				"2D959136A5FC5F46"
+				"56CA2EB7812529C5"
+			]
 			description: ["{quests.tfg_tips.lamps.desc}"]
 			id: "037CDA933FBE2CBE"
 			subtitle: "{quests.tfg_tips.lamps.subtitle}"
@ -2288,8 +2277,8 @@
 				}
 			]
 			title: "{quests.tfg_tips.lamps.title}"
-			x: -5.5d
-			y: 11.5d
+			x: -5.0d
+			y: 11.0d
 		}
 		{
 			dependencies: [
@ -2297,16 +2286,6 @@
 				"56CA2EB7812529C5"
 			]
 			description: ["{quests.tfg_tips.lava_lamp.desc}"]
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
-				}
-				id: "tfc:metal/lamp/blue_steel"
-			}
 			id: "4EBABACAB444244D"
 			optional: true
 			shape: "heart"
@ -2333,8 +2312,8 @@
 				}
 			]
 			title: "{quests.tfg_tips.lava_lamp.title}"
-			x: -5.5d
-			y: 13.0d
+			x: -5.0d
+			y: 12.5d
 		}
 		{
 			dependencies: ["037CDA933FBE2CBE"]
@ -2354,8 +2333,8 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.creosote.title}"
-			x: -6.5d
-			y: 12.5d
+			x: -6.0d
+			y: 12.0d
 		}
 		{
 			dependencies: ["037CDA933FBE2CBE"]
@ -2375,8 +2354,8 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.olive_oil.title}"
-			x: -4.5d
-			y: 12.5d
+			x: -4.0d
+			y: 12.0d
 		}
 		{
 			dependencies: ["2D959136A5FC5F46"]
@ -3483,8 +3462,8 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.tallow.title}"
-			x: -7.0d
-			y: 11.5d
+			x: -6.5d
+			y: 11.0d
 		}
 		{
 			dependencies: ["150B7C5CD152E1BA"]
@ -4620,7 +4599,11 @@
 			y: 4.5d
 		}
 		{
-			dependencies: ["74AE7DB845B88CF3"]
+			dependencies: [
+				"74AE7DB845B88CF3"
+				"6958029B5514D4EC"
+			]
+			dependency_requirement: "one_completed"
 			description: [
 				"This is a guide on how to automatically route &lall&r your Hot Ingots to your Chemical Bath, while keeping everything automated in tip-top shape."
 				""
@ -5397,26 +5380,6 @@
 			x: 7.5d
 			y: -18.0d
 		}
-		{
-			dependencies: ["037CDA933FBE2CBE"]
-			description: ["{quests.tfg_tips.glowstone_lamp.desc}"]
-			id: "61F58B402F1AE40B"
-			subtitle: "{quests.tfg_tips.glowstone_lamp.subtitle}"
-			tasks: [{
-				id: "71D52011F8BE66F0"
-				item: {
-					Count: 1
-					id: "ftbfiltersystem:smart_filter"
-					tag: {
-						"ftbfiltersystem:filter": "only_one(item(gtceu:glowstone_bucket)nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"gtceu:glowstone\"}}))"
-					}
-				}
-				type: "item"
-			}]
-			title: "{quests.tfg_tips.glowstone_lamp.title}"
-			x: -6.5d
-			y: 10.5d
-		}
 	]
 	subtitle: ["{quests.tfg_tips.subtitle}"]
 	title: "{quests.tfg_tips}"
--- a/config/immersive_aircraft.json
+++ b/config/immersive_aircraft.json
@ -1,59 +1,74 @@
 {
-  "enableDropsForNonPlayer": true,
-  "enableCrashExplosion": true,
-  "enableCrashBlockDestruction": false,
-  "enableCrashFire": false,
-  "crashExplosionRadius": 2.0,
-  "crashDamage": 2.0,
-  "preventKillThroughCrash": true,
-  "healthBarRow": 0,
-  "damagePerHealthPoint": 30,
-  "separateCamera": true,
-  "useThirdPersonByDefault": true,
-  "enableTrails": true,
-  "renderDistance": 192.0,
-  "fuelConsumption": 1.0,
-  "windClearWeather": 1.0,
-  "windRainWeather": 3.0,
-  "windThunderWeather": 3.0,
-  "repairSpeed": 0.025,
-  "repairExhaustion": 0.5,
-  "collisionDamage": true,
-  "collisionDamageMultiplier": 40.0,
-  "burnFuelInCreative": false,
-  "acceptVanillaFuel": true,
-  "useCustomKeybindSystem": true,
-  "showHotbarEngineGauge": true,
-  "weaponsAreDestructive": false,
-  "dropAircraft": true,
-  "dropInventory": true,
-  "dropUpgrades": false,
-  "regenerateHealthEveryNTicks": 0,
-  "requireShiftForRepair": false,
-  "bombBayEntity": {
-    "minecraft:egg": "minecraft:chicken"
-  },
-  "rotaryCannonDamage": 5.0,
-  "heavyCrossBowVelocity": 3.0,
-  "fuelList": {
-    "minecraft:blaze_powder": 1200
-  },
-  "validDimensions": {
-    "minecraft:the_end": true,
-    "minecraft:the_nether": true,
-    "minecraft:overworld": true
-  },
-  "gunpowderAmmunition": {
-    "minecraft:gunpowder": 100
-  },
-  "arrowAmmunition": {
-    "minecraft:arrow": 100,
-    "minecraft:spectral_arrow": 100,
-    "minecraft:tipped_arrow": 100
-  },
-  "bombBayAmmunition": {
-    "minecraft:tnt": 100
-  },
-  "version": 1,
-  "name": "immersive_aircraft"
+    "enableDropsForNonPlayer": true,
+    "enableCrashExplosion": true,
+    "enableCrashBlockDestruction": false,
+    "enableCrashFire": false,
+    "crashExplosionRadius": 2.0,
+    "crashDamage": 2.0,
+    "preventKillThroughCrash": true,
+    "healthBarRow": 0,
+    "damagePerHealthPoint": 30,
+    "separateCamera": true,
+    "useThirdPersonByDefault": true,
+    "enableTrails": true,
+    "renderDistance": 192.0,
+    "fuelConsumption": 1.0,
+    "windClearWeather": 1.0,
+    "windRainWeather": 3.0,
+    "windThunderWeather": 3.0,
+    "repairSpeed": 0.025,
+    "repairExhaustion": 0.5,
+    "collisionDamage": true,
+    "collisionDamageMultiplier": 40.0,
+    "burnFuelInCreative": false,
+    "acceptVanillaFuel": true,
+    "useCustomKeybindSystem": true,
+    "showHotbarEngineGauge": true,
+    "weaponsAreDestructive": false,
+    "dropAircraft": true,
+    "dropInventory": true,
+    "dropUpgrades": false,
+    "regenerateHealthEveryNTicks": 0,
+    "requireShiftForRepair": false,
+    "bombBayEntity": {
+        "minecraft:egg": "tfc:chicken"
+    },
+    "rotaryCannonDamage": 5.0,
+    "heavyCrossBowVelocity": 3.0,
+    "fuelList": {
+        "minecraft:blaze_powder": 1200,
+        "gtceu:coke_gem": 1200,
+        "beneath:cursecoal": 1200
+    },
+    "validDimensions": {
+        "minecraft:the_end": true,
+        "minecraft:the_nether": true,
+        "minecraft:overworld": true,
+        "ad_astra:earth_orbit": false,
+        "ad_astra:moon": false,
+        "ad_astra:moon_orbit": false,
+        "ad_astra:mars": false,
+        "ad_astra:mars_orbit": false,
+        "ad_astra:venus_orbit": false,
+        "ad_astra:mercury": false,
+        "ad_astra:mercury_orbit": false,
+        "ad_astra:glacio": false,
+        "ad_astra:glacio_orbit": false
+    },
+    "gunpowderAmmunition": {
+        "minecraft:gunpowder": 100
+    },
+    "arrowAmmunition": {
+        "minecraft:arrow": 100,
+        "minecraft:spectral_arrow": 100,
+        "minecraft:tipped_arrow": 100
+    },
+    "bombBayAmmunition": {
+        "minecraft:tnt": 100,
+        "gtceu:powderbarrel": 80,
+        "gtceu:industrial_tnt": 50,
+        "gtceu:dynamite": 200
+    },
+    "version": 1,
+    "name": "immersive_aircraft"
 }
--- a/config/tfchotornot-common.toml
+++ b/config/tfchotornot-common.toml
@ -31,7 +31,7 @@
 	itemDamageTimeInterval = 60
 	#Durability for wooden tongs.
 	#Range: > 0
-	woodenTongsDurability = 100
+	woodenTongsDurability = 250
 	#Durability for potholders.
 	#Range: > 0
 	potholderDurability = 600
--- a/defaultconfigs/openpartiesandclaims-default-player-config.toml
+++ b/defaultconfigs/openpartiesandclaims-default-player-config.toml
@ -1,466 +0,0 @@
-
-[playerConfig]
-
-	[playerConfig.claims]
-		#The current sub-config ID used for new chunk claims.
-		usedSub = "main"
-		#The current sub-config ID used for new server chunk claims.
-		usedServerSub = "main"
-		#When not empty, used as the name for your claimed chunks.
-		name = ""
-		#Used as the color for your claims. Set to 0 to use the default automatic color.
-		color = 0
-		#When enabled, the mod tries to protect your claimed chunks from other players. Workarounds are possible, especially with mods.
-		protectClaimedChunks = true
-		#The number of additional chunk claims that you can make on top of the normal limit.
-		bonusChunkClaims = 0
-		#The number of additional chunk claim forceloads that you can make on top of the normal limit.
-		bonusChunkForceloads = 0
-
-		[playerConfig.claims.protection]
-			#When enabled, claimed chunk protection includes protection against players from the same party as you.
-			fromParty = false
-			#When enabled, claimed chunk protection includes protection against players from parties who are allied by the party that you are in.
-			fromAllyParties = true
-			#When enabled, claimed chunk protection includes basic protection against players breaking or otherwise interacting with blocks if they don't have access to the chunks. Block placing is usually additionally controlled by the item use protection.
-			#
-			#1) Every - protected from all players that don't have chunk access.
-			#2) Not Party - only players not in the same party as you.
-			#3) Not Ally - only players not in any party allied by yours.
-			blocksFromPlayers = 1
-			#When enabled, claimed chunk protection includes protection against mobs, who don't have access to the chunks, breaking/placing blocks (e.g. endermen). Chunks directly next to the protected chunks are also partially protected when protection is based on the mob griefing rule check. Should work for vanilla mob behavior. Modded mob behavior is likely not to be included. Feel free to set the vanilla game rule for mob griefing for extra safety. Keep in mind that creeper explosions are also affected by the explosion-related options.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			blocksFromMobs = 1
-			#When enabled, claimed chunk protection includes protection against non-living entities, who don't have access to the chunks, breaking/placing blocks. Should work for vanilla entity behavior, unless another mod breaks it. Modded entity behavior is likely not to be included. Keep in mind that explosions use separate explosion-related options.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			blocksFromOther = 1
-			#When enabled, instead of always simply using the direct "Protect Blocks From Mobs/Other" option for block interactions coming from non-player entities, if the entity (e.g. an arrow) has an owner (e.g. a player), then the block protection option corresponding to the owner is used (e.g. "Protect Blocks From Players").
-			#Chunk access is always tested against the owner, whether this is enabled or not.
-			blocksRedirect = true
-			#When enabled, claimed chunk protection includes block protection against explosions. Keep in mind that creeper explosions are also affected by the block mob protection option.
-			blocksFromExplosions = true
-			#When enabled, claimed chunk protection includes protection against fire spread.
-			fromFireSpread = true
-			#When enabled, claimed chunk protection includes protection against frost walking by players/entities who don't have access to the chunks.
-			#
-			#1) Every - protected from all players/entities that don't have chunk access.
-			#2) Not Party - only players/entities not in the same party as you.
-			#3) Not Ally - only players/entities not in any party allied by yours.
-			fromFrostWalking = 1
-			#When enabled, claimed chunk protection includes protection against crop trample (falling on crops destroys them) for entities that don't have access to the chunks.
-			cropTrample = true
-			#When enabled, claimed chunk protection includes protection against fluids (e.g. lava) flowing into the protected chunks from outside. This does not protect wilderness.
-			fluidBarrier = true
-			#When enabled, claimed chunk protection includes protection against being affected by pistons outside of the protected chunks. This does not protect wilderness.
-			pistonBarrier = true
-			#When enabled, claimed chunk protection includes buttons being protected against projectiles not owned by any player who has access to the chunks.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			buttonsFromProjectiles = 1
-			#When enabled, claimed chunk protection includes target blocks being protected against projectiles not owned by any player who has access to the chunks.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			targetsFromProjectiles = 1
-			#When enabled, claimed chunk protection includes pressure plates being protected against players who don't have access to the chunks.
-			#
-			#1) Every - protected from all players that don't have chunk access.
-			#2) Not Party - only players not in the same party as you.
-			#3) Not Ally - only players not in any party allied by yours.
-			platesFromPlayers = 1
-			#When enabled, claimed chunk protection includes pressure plates being protected against mobs who don't have access to the chunks.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			platesFromMobs = 1
-			#When enabled, claimed chunk protection includes pressure plates being protected against non-living entities who don't have access to the chunks.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			platesFromOther = 1
-			#When enabled, claimed chunk protection includes tripwires being protected against players who don't have access to the chunks.
-			#
-			#1) Every - protected from all players that don't have chunk access.
-			#2) Not Party - only players not in the same party as you.
-			#3) Not Ally - only players not in any party allied by yours.
-			tripwireFromPlayers = 1
-			#When enabled, claimed chunk protection includes tripwires being protected against mobs who don't have access to the chunks.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			tripwireFromMobs = 1
-			#When enabled, claimed chunk protection includes tripwires being protected against non-living entities who don't have access to the chunks.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			tripwireFromOther = 1
-			#When enabled, claimed chunk protection includes friendly (+ server configured) entities in the chunks being protected against players who don't have access to the chunks.
-			#
-			#1) Every - protected from all players that don't have chunk access.
-			#2) Not Party - only players not in the same party as you.
-			#3) Not Ally - only players not in any party allied by yours.
-			entitiesFromPlayers = 1
-			#When enabled, claimed chunk protection includes friendly (+ server configured) entities in the chunks being protected against mobs. Chunks directly next to the protected chunks are also partially protected when protection is based on the mob griefing rule check.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			entitiesFromMobs = 1
-			#When enabled, claimed chunk protection includes friendly (+ server configured) entities in the chunks being protected against non-living entities (e.g. arrows, falling anvils, activated TNT).
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			entitiesFromOther = 1
-			#When enabled, instead of always simply using the direct "Protect Entities From Mobs/Other" option for entity attacks/interactions coming from non-player entities, if the attacking entity (e.g. an arrow) has an owner (e.g. a player), then the entity protection option corresponding to the owner is used (e.g. "Protect Entities From Players").
-			#Chunk access is always tested against the owner, whether this is enabled or not.
-			entitiesRedirect = true
-			#When enabled, claimed chunk protection includes friendly (+ server configured) entities in the chunks being protected against all explosions not directly activated by the chunk owner.
-			entitiesFromExplosions = true
-			#When enabled, claimed chunk protection includes friendly (+ server configured) entities in the chunks being protected against fire.
-			entitiesFromFire = true
-			#When enabled, claimed chunk protection includes protection from village raids. It stops raiders from spawning inside the protected chunks, from entering them and from hurting protectable entities, even if entity protection is turned off.
-			raids = true
-			#When enabled, claimed chunk protection includes players being protected from player attacks.
-			playersFromPlayers = false
-			#When enabled, claimed chunk protection includes players being protected from mob attacks.
-			playersFromMobs = false
-			#When enabled, claimed chunk protection includes players being protected against non-living entities.
-			playersFromOther = false
-			#When enabled, instead of always simply using the direct "Protect Players From Mobs/Other" option for entity attacks/iteractions coming from non-player entities, if the attacking entity (e.g. an arrow) has an owner (e.g. a player), then the entity protection option corresponding to the owner is used (e.g. "Protect Players From Players").
-			playersRedirect = true
-			#When enabled, claimed chunk protection includes blocks and entities being protected against lightning directly caused by players who don't have access to the chunks (e.g. with the trident). Chunks directly next to the protected chunks are also partially protected.
-			#
-			#1) Every - protected from all players that don't have chunk access.
-			#2) Not Party - only players not in the same party as you.
-			#3) Not Ally - only players not in any party allied by yours.
-			playerLightning = 1
-			#When enabled, claimed chunk protection includes chorus fruit teleportation prevention for entities/players who don't have access to the chunks.
-			#
-			#1) Every - protected from all players/entities that don't have chunk access.
-			#2) Not Party - only players/entities not in the same party as you.
-			#3) Not Ally - only players/entities not in any party allied by yours.
-			chorusFruitTeleport = 1
-			#When enabled, claimed chunk protection includes nether portal usage prevention for players who don't have access to the chunks. 
-			#
-			#1) Every - protected from all players that don't have chunk access.
-			#2) Not Party - only players not in the same party as you.
-			#3) Not Ally - only players not in any party allied by yours.
-			netherPortalsPlayers = 1
-			#When enabled, claimed chunk protection includes nether portal usage prevention for mobs who don't have access to the chunks. Even after the protection is turned off, a recently stopped entity is still on a short cooldown. You must let it finish without constantly retrying to push it through the portal, which restarts the cooldown.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			netherPortalsMobs = 1
-			#When enabled, claimed chunk protection includes nether portal usage prevention for non-living entities who don't have access to the chunks. Even after the protection is turned off, a recently stopped entity is still on a short cooldown. You must let it finish without constantly retrying to push it through the portal, which restarts the cooldown.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			netherPortalsOther = 1
-			#When enabled, claimed chunk protection includes protection from right-click held item use. On Fabric, allowed item use means being able to place blocks on blocks that you can interact with, e.g. exception blocks, even if block protection is enabled! Right-click item use can also break blocks, if that is the item's right-click mechanic. Some item use in a chunk might also be prevented by neighbor item use protection in neighbor chunks.
-			#
-			#1) Every - protected from all players that don't have chunk access.
-			#2) Not Party - only players not in the same party as you.
-			#3) Not Ally - only players not in any party allied by yours.
-			itemUse = 1
-			#When enabled, the item use protection is extended to some right-click held item use in chunks directly next to the claimed ones. Item use affected by this is usually things that still work while looking at the sky (not block or entity) or item use with custom ray-tracing for blocks/fluids/entities (e.g. placing things on water), but also any item use of "additional banned items" configured on the server. Item use protection exceptions (e.g. food, potions etc) still apply.
-			neighborChunksItemUse = true
-			#When enabled, claimed chunk protection includes protection against dispensers that are "touching" and facing the protected chunks from outside. This does not protect wilderness.
-			dispenserBarrier = true
-			#When enabled, claimed chunk protection includes prevention of item tossing by players that don't have access to the chunks.
-			#Dying can be used to circumvent this, so it is recommended to enable keepInventory or use a gravestone mod.
-			#
-			#1) Every - protected from all players that don't have chunk access.
-			#2) Not Party - only players not in the same party as you.
-			#3) Not Ally - only players not in any party allied by yours.
-			itemTossPlayers = 0
-			#When enabled, claimed chunk protection includes prevention of item tossing by some mobs that don't have access to the chunks. Requires the tossing mob to be set as the item's thrower.
-			#Modded mobs are pretty likely to do it themselves or have it done by this mod. Otherwise, the toss won't be prevented.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			itemTossMobs = 0
-			#When enabled, claimed chunk protection includes prevention of item tossing by non-living entities that don't have access to the chunks. Requires the tossing mob to be set as the item's thrower. Some entities might not that.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			itemTossOther = 0
-			#When enabled, instead of always simply using the direct "Protect Mob/Other Item Toss" option for item tosses coming from non-player entities, if the tossing entity (e.g. a special arrow) has an owner (e.g. a player), then the item toss protection option corresponding to the owner is used (e.g. "Protect Player Item Toss").
-			itemTossRedirect = true
-			#When enabled, claimed chunk protection includes protection from loot being dropped when mobs die unless they are killed by players who have access to the chunks. Any non-living entity spawned on a mob's death is considered loot.
-			#
-			#1) Every - protected from all players that don't have chunk access.
-			#2) Not Party - only players not in the same party as you.
-			#3) Not Ally - only players not in any party allied by yours.
-			mobLoot = 0
-			#When enabled, claimed chunk protection includes protection for items and experience that have been dropped on a player death, even if the standard item pickup protection is disabled. The protected items are only accessible to the player that dropped them and the entity/player that killed the player.
-			#
-			#1) Party - players in the same party as you.
-			#2) Allies - players in parties that are allied by yours.
-			#3) Every - all players.
-			playerDeathLoot = 0
-			#When enabled, claimed chunk protection includes protection from players picking up items, unless they have access to the chunks or own the items.
-			#
-			#1) Every - protected from all players that don't have chunk access.
-			#2) Not Party - only players not in the same party as you.
-			#3) Not Ally - only players not in any party allied by yours.
-			itemPickupPlayers = 0
-			#When enabled, claimed chunk protection includes protection from mobs picking up items, unless they have access to the chunks or own the items. Might not work for some mobs. Chunks directly next to the protected chunks are also partially protected when protection is based on the mob griefing rule check.
-			#
-			#1) Every - protected from all entities not owned by a player that has chunk access.
-			#2) Not Party - all entities, except owned by a player in the same party as you.
-			#3) Not Ally - all entities, except owned by a player in any party allied by yours.
-			itemPickupMobs = 0
-			#When enabled, instead of always simply using the direct "Protect Items From Mobs" option for item pickups coming from mobs, if the mob (e.g. an allay) has an owner (e.g. a player), then the item protection option corresponding to the owner is used (e.g. "Protect Items From Players").
-			itemPickupRedirect = false
-			#When enabled, claimed chunk protection includes protection from players picking up experience orbs, unless they have access to the chunks or own the orbs.
-			#
-			#1) Every - protected from all players that don't have chunk access.
-			#2) Not Party - only players not in the same party as you.
-			#3) Not Ally - only players not in any party allied by yours.
-			xpPickup = 0
-			#Override the value of the vanilla "mob griefing" game rule with either block, entity or dropped item protection in the protected chunks and their neighbors.
-			#By default, all "mob griefing" game rule checks, except for evokers (sheep conversion spell) and for most item pickups, are overridden with the block protection option. By default, the game rule is not overridden for item pickups (e.g. piglins picking up gold) because the basic item protection is already enough for most cases. When using the Forge version of the mod, this can be used for modded mobs. The main server config can be used to change which options are checked (even all 3) for specific mobs. Fabric/Quilt does not fire an event for all mob griefing rule checks. Fabric/Quilt modded mobs would simply check the game rule directly, which cannot be overridden by this mod.
-			overrideMobGriefingRule = true
-			#When enabled, claimed chunk protection disables the natural spawning of hostile mobs.
-			naturalSpawnHostile = false
-			#When enabled, claimed chunk protection disables the natural spawning of friendly mobs.
-			naturalSpawnFriendly = false
-			#When enabled, claimed chunk protection disables hostile mob spawners.
-			spawnersHostile = false
-			#When enabled, claimed chunk protection disables friendly mob spawners.
-			spawnersFriendly = false
-			#When enabled, claimed chunk protection includes protection from projectiles spawning hostile mobs when they land (e.g. endermites). Might not work with projectiles from mods that don't implement this mod's API.
-			#
-			#1) Every - protected from all projectiles not owned by a player that has chunk access.
-			#2) Not Party - all projectiles, except owned by a player in the same party as you.
-			#3) Not Ally - all projectiles, except owned by a player in any party allied by yours.
-			projectileHitHostileSpawn = 1
-			#When enabled, claimed chunk protection includes protection from projectiles spawning non-hostile mobs when they land (e.g. chicken). Might not work with projectiles from mods that don't implement this mod's API.
-			#
-			#1) Every - protected from all projectiles not owned by a player that has chunk access.
-			#2) Not Party - all projectiles, except owned by a player in the same party as you.
-			#3) Not Ally - all projectiles, except owned by a player in any party allied by yours.
-			projectileHitFriendlySpawn = 1
-
-			[playerConfig.claims.protection.exceptionGroups]
-
-				[playerConfig.claims.protection.exceptionGroups.entity]
-
-					[playerConfig.claims.protection.exceptionGroups.entity.barrier]
-						#When enabled, claimed chunk protection prevents the following additional entities from entering the claim (except wilderness): minecraft:player.
-						#
-						#1) Every - protected from all players/entities that don't have chunk access.
-						#2) Not Party - only players/entities not in the same party as you.
-						#3) Not Ally - only players/entities not in any party allied by yours.
-						Players = 0
-						#When enabled, claimed chunk protection prevents the following additional entities from entering the claim (except wilderness): minecraft:ender_pearl.
-						#
-						#1) Every - protected from all players/entities that don't have chunk access.
-						#2) Not Party - only players/entities not in the same party as you.
-						#3) Not Ally - only players/entities not in any party allied by yours.
-						Ender_Pearls = 0
-
-					[playerConfig.claims.protection.exceptionGroups.entity.interact]
-						#When enabled, claimed chunk protection makes an exception for interaction with the following entities: minecraft:villager, minecraft:wandering_trader.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Traders = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following entities: minecraft:armor_stand.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Armor_Stands = 0
-
-					[playerConfig.claims.protection.exceptionGroups.entity.handInteract]
-						#When enabled, claimed chunk protection makes an exception for interaction with an empty hand with the following entities: minecraft:item_frame.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Item_Frames = 0
-
-					[playerConfig.claims.protection.exceptionGroups.entity.break]
-						#When enabled, claimed chunk protection makes an exception for destruction of the following entities: minecraft:cow, minecraft:mooshroom, minecraft:sheep, minecraft:chicken, minecraft:pig, minecraft:rabbit, minecraft:goat.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Livestock = 0
-
-					[playerConfig.claims.protection.exceptionGroups.entity.blockAccess]
-						#When enabled, claimed chunk protection makes an exception for unlimited block access by the following entities: minecraft:villager. If the block protection is based on the mob griefing rule check, then the claimed neighbor chunks must also allow the block access.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Villagers = 0
-
-					[playerConfig.claims.protection.exceptionGroups.entity.entityAccess]
-						#When enabled, claimed chunk protection makes an exception for unlimited entity access by the following entities: minecraft:zombie, minecraft:zombie_villager, minecraft:husk, minecraft:drowned. If the entity protection is based on the mob griefing rule check, then the claimed neighbor chunks must also allow the entity access.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Zombies = 0
-
-					[playerConfig.claims.protection.exceptionGroups.entity.droppedItemAccess]
-						#When enabled, claimed chunk protection makes an exception for unlimited dropped item access by the following entities: minecraft:villager. If the dropped item protection is based on the mob griefing rule check, then the claimed neighbor chunks must also allow the dropped item access.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Villagers = 0
-						#When enabled, claimed chunk protection makes an exception for unlimited dropped item access by the following entities: minecraft:piglin. If the dropped item protection is based on the mob griefing rule check, then the claimed neighbor chunks must also allow the dropped item access.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Piglins = 0
-						#When enabled, claimed chunk protection makes an exception for unlimited dropped item access by the following entities: minecraft:fox. If the dropped item protection is based on the mob griefing rule check, then the claimed neighbor chunks must also allow the dropped item access.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Foxes = 0
-
-				[playerConfig.claims.protection.exceptionGroups.block]
-
-					[playerConfig.claims.protection.exceptionGroups.block.interact]
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: minecraft:lever, #minecraft:buttons.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Controls = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: #minecraft:doors, #minecraft:fence_gates, #forge:fence_gates, #minecraft:trapdoors.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Doors = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: minecraft:chest, minecraft:trapped_chest, #forge:chests/wooden.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Chests = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: minecraft:barrel, #forge:barrels.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Barrels = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: minecraft:ender_chest, #forge:chests/ender.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Ender_Chests = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: #minecraft:shulker_boxes.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Shulker_Boxes = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: minecraft:furnace, minecraft:blast_furnace, minecraft:smoker.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Furnaces = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: minecraft:hopper.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Hoppers = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: minecraft:dispenser, minecraft:dropper.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Dispenser-like = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: #minecraft:anvil.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Anvils = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: #minecraft:beds.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Beds = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: minecraft:beacon.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Beacons = 0
-						#When enabled, claimed chunk protection makes an exception for interaction with the following blocks: minecraft:enchanting_table.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Enchanting_Tables = 0
-
-					[playerConfig.claims.protection.exceptionGroups.block.break]
-						#When enabled, claimed chunk protection makes an exception for destruction of the following blocks: #minecraft:crops.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Crops = 0
-
-				[playerConfig.claims.protection.exceptionGroups.item]
-
-					[playerConfig.claims.protection.exceptionGroups.item.interact]
-						#When enabled, claimed chunk protection makes an exception for interaction with the following items: minecraft:written_book, minecraft:writable_book.
-						#
-						#1) Party - players or entities owned by players in the same party as you.
-						#2) Allies - players or entities owned by players in parties that are allied by yours.
-						#3) Every - all players/entities.
-						Books = 0
-
-		[playerConfig.claims.forceload]
-			#When enabled, the chunks you have marked for forceloading are forceloaded.
-			#If the forceload limit has changed and you have more chunks marked than the new limit, then some of the chunks won't be forceloaded. Unmark any chunks until you are within the limit to ensure that all marked chunks are forceloaded.
-			enabled = false
-			#When enabled, the chunks you have marked for forceloading stay loaded even when you are offline (can significantly affect server performance!).
-			#If your forceload limit is affected by your FTB Ranks rank/permissions, then you need to login at least once after a server (re)launch for it to take effect while you are offline.
-			offlineForceload = false
-
-	[playerConfig.parties]
-		#When not empty, used in some places as the name for the parties that you create.
-		name = ""
-		#When enabled, your position in the game is shared with players from the same party as you, which can be used by other mods, e.g. to display party members on a map.
-		shareLocationWithParty = true
-		#When enabled, your position in the game is shared with the mutual ally parties of the party that you are in, which can be used by other mods, e.g. to display party members on a map.
-		shareLocationWithMutualAllyParties = false
-		#When enabled, the sharable positions of players from the same party as you are shared with your game client, which can be used by other mods, e.g. to display party members on a map.
-		receiveLocationsFromParty = true
-		#When enabled, the sharable positions of players from the mutual ally parties of the party that you are in are shared with your game client, which can be used by other mods, e.g. to display allies on a map.
-		receiveLocationsFromMutualAllyParties = false
-
--- a/defaultconfigs/tfcea-server.toml
+++ b/defaultconfigs/tfcea-server.toml
@ -1,6 +0,0 @@
-
-[general]
-	#The modifier for the 'Refrigerating' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay.
-	#Range: 0.0 ~ 1.7976931348623157E308
-	traitRefrigeratingModifier = 0.125
-
--- a/kubejs/assets/ad_astra/lang/en_us.json
+++ b/kubejs/assets/ad_astra/lang/en_us.json
@ -1,5 +1,6 @@
 {
  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "block.ad_astra.oxygen_distributor": "Breathable Air Distributor",
  "block.ad_astra.moon_sand": "Lunar Sand",
  "block.ad_astra.moon_stone": "Raw Anorthosite",
  "block.ad_astra.moon_cobblestone": "Anorthosite Cobble",
@ -43,7 +44,7 @@
  "block.ad_astra.polished_mars_stone_stairs": "Polished Argillite Stairs",
  "block.ad_astra.conglomerate": "Martian Conglomerate",
  "block.ad_astra.polished_conglomerate": "Polished Martian Conglomerate",
-  "block.ad_astra.venus_sand": "Venusian Sand",
+  "block.ad_astra.venus_sand": "Trachyte Sand",
  "block.ad_astra.venus_stone": "Raw Trachyte",
  "block.ad_astra.venus_cobblestone": "Trachyte Cobble",
  "block.ad_astra.venus_cobblestone_slab": "Trachyte Cobble Slab",
@ -62,6 +63,11 @@
  "block.ad_astra.polished_venus_stone": "Polished Trachyte",
  "block.ad_astra.polished_venus_stone_slab": "Polished Trachyte Slab",
  "block.ad_astra.polished_venus_stone_stairs": "Polished Trachyte Stairs",
+  "block.ad_astra.venus_sandstone": "Trachyte Sandstone",
+  "block.ad_astra.venus_sandstone_bricks": "Trachyte Sandstone Bricks",
+  "block.ad_astra.venus_sandstone_brick_slab": "Trachyte Sandstone Brick Slab",
+  "block.ad_astra.venus_sandstone_brick_stairs": "Trachyte Sandstone Brick Stairs",
+  "block.ad_astra.cracked_venus_sandstone_bricks": "Cracked Trachyte Sandstone Bricks",
  "block.ad_astra.mercury_stone": "Raw Komatiite",
  "block.ad_astra.mercury_cobblestone": "Komatiite Cobble",
  "block.ad_astra.mercury_cobblestone_slab": "Komatiite Cobble Slab",
@ -98,6 +104,12 @@
  "block.ad_astra.polished_glacio_stone": "Polished Phonolite",
  "block.ad_astra.polished_glacio_stone_slab": "Polished Phonolite Slab",
  "block.ad_astra.polished_glacio_stone_stairs": "Polished Phonolite Stairs",
+  "entity.ad_astra.corrupted_lunarian": "Lunar Zombie",
+  "entity.ad_astra.tier_1_rocket": "R-Aluminosteel Rocket",
+  "fluid_type.ad_astra.oxygen": "Breathable Air",
+  "item.ad_astra.steel_cable": "Basic RF Cable",
+  "item.ad_astra.desh_cable": "Advanced RF Cable",
+  "item.ad_astra.tier_1_rocket": "R-Aluminosteel Rocket",
  "tagprefix.moon_stone": "Anorthosite %s Ore",
  "tagprefix.moon_deepslate": "Norite %s Ore",
  "tagprefix.mars_stone": "Argillite %s Ore",
--- a/kubejs/assets/ad_astra/planet_renderers/mars.json
+++ b/kubejs/assets/ad_astra/planet_renderers/mars.json
@ -0,0 +1,92 @@
+{
+	"custom_clouds": true,
+	"custom_sky": true,
+	"custom_weather": false,
+	"dimension": "ad_astra:mars",
+	"has_fog": true,
+	"has_thick_fog": false,
+	"render_in_rain": false,
+	"sky_renderables": [
+		{
+			"back_light_color": -3081481,
+			"back_light_scale": 21.0,
+			"blend": true,
+			"global_rotation": [
+				0.0,
+				0.0,
+				0.0
+			],
+			"local_rotation": [
+				0.0,
+				0.0,
+				0.0
+			],
+			"movement_type": "TIME_OF_DAY",
+			"scale": 7.0,
+			"texture": "ad_astra:textures/environment/blue_sun.png"
+		},
+		{
+			"back_light_color": -4943731,
+			"back_light_scale": 6.0,
+			"blend": true,
+			"global_rotation": [
+				20.0,
+				20.0,
+				180.0
+			],
+			"local_rotation": [
+				0.0,
+				0.0,
+				0.0
+			],
+			"movement_type": "TIME_OF_DAY_REVERSED",
+			"scale": 2.0,
+			"texture": "ad_astra:textures/environment/phobos.png"
+		},
+		{
+			"back_light_color": -1714771,
+			"back_light_scale": 4.5,
+			"blend": true,
+			"global_rotation": [
+				0.0,
+				0.0,
+				180.0
+			],
+			"local_rotation": [
+				0.0,
+				20.0,
+				0.0
+			],
+			"movement_type": "TIME_OF_DAY",
+			"scale": 1.5,
+			"texture": "ad_astra:textures/environment/deimos.png"
+		},
+		{
+			"back_light_color": -12813094,
+			"back_light_scale": 1.2,
+			"blend": true,
+			"global_rotation": [
+				-40.0,
+				0.0,
+				160.0
+			],
+			"local_rotation": [
+				0.0,
+				100.0,
+				0.0
+			],
+			"movement_type": "TIME_OF_DAY",
+			"scale": 0.4,
+			"texture": "ad_astra:textures/environment/earth.png"
+		}
+	],
+	"star_colors": [
+		{
+			"data": -1,
+			"weight": 1
+		}
+	],
+	"stars": 1500,
+	"sunrise_angle": 0,
+	"sunrise_color": 2079743
+}
--- a/kubejs/assets/ad_astra/planet_renderers/mars_orbit.json
+++ b/kubejs/assets/ad_astra/planet_renderers/mars_orbit.json
@ -0,0 +1,93 @@
+{
+	"custom_clouds": true,
+	"custom_sky": true,
+	"custom_weather": false,
+	"dimension": "ad_astra:mars_orbit",
+	"has_fog": false,
+	"has_thick_fog": false,
+	"render_in_rain": true,
+	"sky_renderables": [
+		{
+			"back_light_color": -39,
+			"back_light_scale": 21.0,
+			"blend": false,
+			"global_rotation": [
+				0.0,
+				0.0,
+				0.0
+			],
+			"local_rotation": [
+				0.0,
+				0.0,
+				0.0
+			],
+			"movement_type": "TIME_OF_DAY",
+			"scale": 7.0,
+			"texture": "ad_astra:textures/environment/sun.png"
+		},
+		{
+			"back_light_color": -4827861,
+			"back_light_scale": 240.0,
+			"blend": false,
+			"global_rotation": [
+				180.0,
+				0.0,
+				0.0
+			],
+			"local_rotation": [
+				0.0,
+				0.0,
+				0.0
+			],
+			"movement_type": "STATIC",
+			"scale": 80.0,
+			"texture": "ad_astra:textures/environment/mars.png"
+		}
+	],
+	"star_brightness": 0.6,
+	"star_colors": [
+		{
+			"data": -1447239681,
+			"weight": 3
+		},
+		{
+			"data": -1143472129,
+			"weight": 5
+		},
+		{
+			"data": -726785,
+			"weight": 100
+		},
+		{
+			"data": -3038977,
+			"weight": 80
+		},
+		{
+			"data": -7697665,
+			"weight": 150
+		},
+		{
+			"data": -12254977,
+			"weight": 10
+		},
+		{
+			"data": -2817,
+			"weight": 60
+		},
+		{
+			"data": -464897,
+			"weight": 40
+		},
+		{
+			"data": -256,
+			"weight": 20
+		},
+		{
+			"data": -65536,
+			"weight": 1
+		}
+	],
+	"stars": 13000,
+	"sunrise_angle": 0,
+	"sunrise_color": 0
+}
--- a/kubejs/assets/ad_astra/planet_renderers/moon.json
+++ b/kubejs/assets/ad_astra/planet_renderers/moon.json
@ -0,0 +1,93 @@
+{
+	"custom_clouds": true,
+	"custom_sky": true,
+	"custom_weather": false,
+	"dimension": "ad_astra:moon",
+	"has_fog": true,
+	"has_thick_fog": false,
+	"render_in_rain": true,
+	"sky_renderables": [
+		{
+			"back_light_color": -39,
+			"back_light_scale": 27.0,
+			"blend": false,
+			"global_rotation": [
+				0.0,
+				0.0,
+				0.0
+			],
+			"local_rotation": [
+				0.0,
+				0.0,
+				0.0
+			],
+			"movement_type": "TIME_OF_DAY",
+			"scale": 9.0,
+			"texture": "ad_astra:textures/environment/sun.png"
+		},
+		{
+			"back_light_color": -12813094,
+			"back_light_scale": 42.0,
+			"blend": false,
+			"global_rotation": [
+				80.0,
+				0.0,
+				30.0
+			],
+			"local_rotation": [
+				0.0,
+				-5.0,
+				0.0
+			],
+			"movement_type": "STATIC",
+			"scale": 14.0,
+			"texture": "ad_astra:textures/environment/earth.png"
+		}
+	],
+	"star_brightness": 0.6,
+	"star_colors": [
+		{
+			"data": -1447239681,
+			"weight": 3
+		},
+		{
+			"data": -1143472129,
+			"weight": 5
+		},
+		{
+			"data": -726785,
+			"weight": 100
+		},
+		{
+			"data": -3038977,
+			"weight": 80
+		},
+		{
+			"data": -7697665,
+			"weight": 150
+		},
+		{
+			"data": -12254977,
+			"weight": 10
+		},
+		{
+			"data": -2817,
+			"weight": 60
+		},
+		{
+			"data": -464897,
+			"weight": 40
+		},
+		{
+			"data": -256,
+			"weight": 20
+		},
+		{
+			"data": -65536,
+			"weight": 1
+		}
+	],
+	"stars": 13000,
+	"sunrise_angle": 0,
+	"sunrise_color": 0
+}
--- a/kubejs/assets/ad_astra/planet_renderers/moon_orbit.json
+++ b/kubejs/assets/ad_astra/planet_renderers/moon_orbit.json
@ -0,0 +1,111 @@
+{
+	"custom_clouds": true,
+	"custom_sky": true,
+	"custom_weather": false,
+	"dimension": "ad_astra:moon_orbit",
+	"has_fog": false,
+	"has_thick_fog": false,
+	"render_in_rain": true,
+	"sky_renderables": [
+		{
+			"back_light_color": -39,
+			"back_light_scale": 27.0,
+			"blend": false,
+			"global_rotation": [
+				0.0,
+				0.0,
+				0.0
+			],
+			"local_rotation": [
+				0.0,
+				0.0,
+				0.0
+			],
+			"movement_type": "TIME_OF_DAY",
+			"scale": 9.0,
+			"texture": "ad_astra:textures/environment/sun.png"
+		},
+		{
+			"back_light_color": -5261108,
+			"back_light_scale": 240.0,
+			"blend": false,
+			"global_rotation": [
+				180.0,
+				0.0,
+				0.0
+			],
+			"local_rotation": [
+				0.0,
+				0.0,
+				0.0
+			],
+			"movement_type": "STATIC",
+			"scale": 80.0,
+			"texture": "ad_astra:textures/environment/moon.png"
+		},
+		{
+			"back_light_color": -12813094,
+			"back_light_scale": 42.0,
+			"blend": false,
+			"global_rotation": [
+				80.0,
+				0.0,
+				30.0
+			],
+			"local_rotation": [
+				0.0,
+				-5.0,
+				0.0
+			],
+			"movement_type": "STATIC",
+			"scale": 14.0,
+			"texture": "ad_astra:textures/environment/earth.png"
+		}
+	],
+	"star_brightness": 0.6,
+	"star_colors": [
+		{
+			"data": -1447239681,
+			"weight": 3
+		},
+		{
+			"data": -1143472129,
+			"weight": 5
+		},
+		{
+			"data": -726785,
+			"weight": 100
+		},
+		{
+			"data": -3038977,
+			"weight": 80
+		},
+		{
+			"data": -7697665,
+			"weight": 150
+		},
+		{
+			"data": -12254977,
+			"weight": 10
+		},
+		{
+			"data": -2817,
+			"weight": 60
+		},
+		{
+			"data": -464897,
+			"weight": 40
+		},
+		{
+			"data": -256,
+			"weight": 20
+		},
+		{
+			"data": -65536,
+			"weight": 1
+		}
+	],
+	"stars": 13000,
+	"sunrise_angle": 0,
+	"sunrise_color": 0
+}
--- a/kubejs/assets/ad_astra/textures/block/sky_stone.png
+++ b/kubejs/assets/ad_astra/textures/block/sky_stone.png
--- a/kubejs/assets/ae2/lang/en_us.json
+++ b/kubejs/assets/ae2/lang/en_us.json
@ -0,0 +1,4 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "gui.ae2.inWorldCraftingPresses": "Crafting Presses are obtained by breaking a Mysterious Cube. Mysterious Cubes are in the center of meteorites which can be found on the moon."
+}
--- a/kubejs/assets/beneath/lang/en_us.json
+++ b/kubejs/assets/beneath/lang/en_us.json
@ -12,5 +12,6 @@
  "item.beneath.cursed_hide": "Lavaproof Hide",
  "item.beneath.blackstone_brick": "Pyroxenite Brick",
  "item.beneath.cursecoal": "Anthracite",
-  "item.beneath.crackrack_rock": "Keratophyre Rock"
+  "item.beneath.crackrack_rock": "Keratophyre Rock",
+  "item.beneath.loose_blackstone": "Loose Pyroxenite"
 }
--- a/kubejs/assets/emi/category/properties/ae2_attunement.json
+++ b/kubejs/assets/emi/category/properties/ae2_attunement.json
@ -1 +1 @@
-{"ae2:attunement":{"order":138}}
+{"ae2:attunement":{"order":144}}
--- a/kubejs/assets/emi/category/properties/ae2_condenser.json
+++ b/kubejs/assets/emi/category/properties/ae2_condenser.json
@ -1 +1 @@
-{"ae2:condenser":{"order":127}}
+{"ae2:condenser":{"order":133}}
--- a/kubejs/assets/emi/category/properties/ae2_entropy.json
+++ b/kubejs/assets/emi/category/properties/ae2_entropy.json
@ -1 +1 @@
-{"ae2:entropy":{"order":139}}
+{"ae2:entropy":{"order":145}}
--- 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":116}}
+{"ae2:item_transformation":{"order":122}}
--- a/kubejs/assets/emi/category/properties/afc_tree_tap.json
+++ b/kubejs/assets/emi/category/properties/afc_tree_tap.json
@ -0,0 +1 @@
+{"afc:tree_tap":{"order":26}}
--- a/kubejs/assets/emi/category/properties/create_deploying.json
+++ b/kubejs/assets/emi/category/properties/create_deploying.json
@ -1 +1 @@
-{"create:deploying":{"order":39}}
+{"create:deploying":{"order":44}}
--- a/kubejs/assets/emi/category/properties/create_draining.json
+++ b/kubejs/assets/emi/category/properties/create_draining.json
@ -1 +1 @@
-{"create:draining":{"order":140}}
+{"create:draining":{"order":146}}
--- a/kubejs/assets/emi/category/properties/create_item_application.json
+++ b/kubejs/assets/emi/category/properties/create_item_application.json
@ -1 +1 @@
-{"create:item_application":{"order":40}}
+{"create:item_application":{"order":45}}
--- a/kubejs/assets/emi/category/properties/create_mechanical_crafting.json
+++ b/kubejs/assets/emi/category/properties/create_mechanical_crafting.json
@ -1 +1 @@
-{"create:mechanical_crafting":{"order":4}}
+{"create:mechanical_crafting":{"order":5}}
--- a/kubejs/assets/emi/category/properties/create_sequenced_assembly.json
+++ b/kubejs/assets/emi/category/properties/create_sequenced_assembly.json
@ -1 +1 @@
-{"create:sequenced_assembly":{"order":41}}
+{"create:sequenced_assembly":{"order":46}}
--- 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":141}}
+{"create:spout_filling":{"order":147}}
--- a/kubejs/assets/emi/category/properties/createaddition_rolling.json
+++ b/kubejs/assets/emi/category/properties/createaddition_rolling.json
@ -1 +1 @@
-{"createaddition:rolling":{"order":55}}
+{"createaddition:rolling":{"order":61}}
--- 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":136}}
+{"domum_ornamentum:architects_cutter":{"order":142}}
--- a/kubejs/assets/emi/category/properties/emi_info.json
+++ b/kubejs/assets/emi/category/properties/emi_info.json
@ -1 +1 @@
-{"emi:info":{"order":144}}
+{"emi:info":{"order":150}}
--- a/kubejs/assets/emi/category/properties/emi_tag.json
+++ b/kubejs/assets/emi/category/properties/emi_tag.json
@ -1 +1 @@
-{"emi:tag":{"order":145}}
+{"emi:tag":{"order":151}}
--- 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":130}}
+{"exposure:photograph_printing":{"order":136}}
--- 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":142}}
+{"exposure:photograph_stacking":{"order":148}}
--- a/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json
+++ b/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json
@ -1 +1 @@
-{"firmalife:bowl_pot":{"order":36}}
+{"firmalife:bowl_pot":{"order":40}}
--- a/kubejs/assets/emi/category/properties/firmalife_drying.json
+++ b/kubejs/assets/emi/category/properties/firmalife_drying.json
@ -1 +1 @@
-{"firmalife:drying":{"order":29}}
+{"firmalife:drying":{"order":32}}
--- a/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json
+++ b/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json
@ -1 +1 @@
-{"firmalife:mixing_bowl":{"order":30}}
+{"firmalife:mixing_bowl":{"order":33}}
--- a/kubejs/assets/emi/category/properties/firmalife_oven.json
+++ b/kubejs/assets/emi/category/properties/firmalife_oven.json
@ -1 +1 @@
-{"firmalife:oven":{"order":31}}
+{"firmalife:oven":{"order":34}}
--- a/kubejs/assets/emi/category/properties/firmalife_smoking.json
+++ b/kubejs/assets/emi/category/properties/firmalife_smoking.json
@ -1 +1 @@
-{"firmalife:smoking":{"order":32}}
+{"firmalife:smoking":{"order":36}}
--- a/kubejs/assets/emi/category/properties/firmalife_stomping.json
+++ b/kubejs/assets/emi/category/properties/firmalife_stomping.json
@ -1 +1 @@
-{"firmalife:stomping":{"order":38}}
+{"firmalife:stomping":{"order":42}}
--- a/kubejs/assets/emi/category/properties/firmalife_vat.json
+++ b/kubejs/assets/emi/category/properties/firmalife_vat.json
@ -1 +1 @@
-{"firmalife:vat":{"order":37}}
+{"firmalife:vat":{"order":41}}
--- 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":135}}
+{"framedblocks:framing_saw":{"order":141}}
--- a/kubejs/assets/emi/category/properties/ftbquests_quest.json
+++ b/kubejs/assets/emi/category/properties/ftbquests_quest.json
@ -1 +1 @@
-{"ftbquests:quest":{"order":143}}
+{"ftbquests:quest":{"order":149}}
--- 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":134}}
+{"greate:block_cutting":{"order":140}}
--- a/kubejs/assets/emi/category/properties/greate_crushing.json
+++ b/kubejs/assets/emi/category/properties/greate_crushing.json
@ -1 +1 @@
-{"greate:crushing":{"order":88}}
+{"greate:crushing":{"order":94}}
--- 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":118}}
+{"greate:fan_washing":{"order":124}}
--- a/kubejs/assets/emi/category/properties/greate_milling.json
+++ b/kubejs/assets/emi/category/properties/greate_milling.json
@ -1 +1 @@
-{"greate:milling":{"order":87}}
+{"greate:milling":{"order":93}}
--- a/kubejs/assets/emi/category/properties/greate_mixing.json
+++ b/kubejs/assets/emi/category/properties/greate_mixing.json
@ -1 +1 @@
-{"greate:mixing":{"order":90}}
+{"greate:mixing":{"order":96}}
--- a/kubejs/assets/emi/category/properties/greate_packing.json
+++ b/kubejs/assets/emi/category/properties/greate_packing.json
@ -1 +1 @@
-{"greate:packing":{"order":128}}
+{"greate:packing":{"order":134}}
--- a/kubejs/assets/emi/category/properties/greate_sawing.json
+++ b/kubejs/assets/emi/category/properties/greate_sawing.json
@ -1 +1 @@
-{"greate:sawing":{"order":67}}
+{"greate:sawing":{"order":73}}
--- 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":50}}
+{"gtceu:air_scrubber":{"order":55}}
--- 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":101}}
+{"gtceu:alloy_blast_smelter":{"order":107}}
--- 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":51}}
+{"gtceu:alloy_smelter":{"order":56}}
--- a/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json
+++ b/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json
@ -0,0 +1 @@
+{"gtceu:aqueous_accumulator":{"order":57}}
--- 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":52}}
+{"gtceu:arc_furnace":{"order":58}}
--- 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":124}}
+{"gtceu:arc_furnace_recycling":{"order":130}}
--- a/kubejs/assets/emi/category/properties/gtceu_assembler.json
+++ b/kubejs/assets/emi/category/properties/gtceu_assembler.json
@ -1 +1 @@
-{"gtceu:assembler":{"order":53}}
+{"gtceu:assembler":{"order":59}}
--- 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":102}}
+{"gtceu:assembly_line":{"order":108}}
--- a/kubejs/assets/emi/category/properties/gtceu_autoclave.json
+++ b/kubejs/assets/emi/category/properties/gtceu_autoclave.json
@ -1 +1 @@
-{"gtceu:autoclave":{"order":54}}
+{"gtceu:autoclave":{"order":60}}
--- a/kubejs/assets/emi/category/properties/gtceu_bedrock_ore_diagram.json
+++ b/kubejs/assets/emi/category/properties/gtceu_bedrock_ore_diagram.json
@ -0,0 +1 @@
+{"gtceu:bedrock_ore_diagram":{"order":3}}
--- a/kubejs/assets/emi/category/properties/gtceu_bender.json
+++ b/kubejs/assets/emi/category/properties/gtceu_bender.json
@ -1 +1 @@
-{"gtceu:bender":{"order":57}}
+{"gtceu:bender":{"order":63}}
--- a/kubejs/assets/emi/category/properties/gtceu_brewery.json
+++ b/kubejs/assets/emi/category/properties/gtceu_brewery.json
@ -1 +1 @@
-{"gtceu:brewery":{"order":58}}
+{"gtceu:brewery":{"order":64}}
--- a/kubejs/assets/emi/category/properties/gtceu_canner.json
+++ b/kubejs/assets/emi/category/properties/gtceu_canner.json
@ -1 +1 @@
-{"gtceu:canner":{"order":59}}
+{"gtceu:canner":{"order":65}}
--- a/kubejs/assets/emi/category/properties/gtceu_centrifuge.json
+++ b/kubejs/assets/emi/category/properties/gtceu_centrifuge.json
@ -1 +1 @@
-{"gtceu:centrifuge":{"order":61}}
+{"gtceu:centrifuge":{"order":67}}
--- 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":122}}
+{"gtceu:chem_dyes":{"order":128}}
--- 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":62}}
+{"gtceu:chemical_bath":{"order":68}}
--- 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":63}}
+{"gtceu:chemical_reactor":{"order":69}}
--- 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":65}}
+{"gtceu:circuit_assembler":{"order":71}}
--- 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":44}}
+{"gtceu:coke_oven":{"order":49}}
--- 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":45}}
+{"gtceu:combustion_generator":{"order":50}}
--- a/kubejs/assets/emi/category/properties/gtceu_compressor.json
+++ b/kubejs/assets/emi/category/properties/gtceu_compressor.json
@ -1 +1 @@
-{"gtceu:compressor":{"order":66}}
+{"gtceu:compressor":{"order":72}}
--- a/kubejs/assets/emi/category/properties/gtceu_cracker.json
+++ b/kubejs/assets/emi/category/properties/gtceu_cracker.json
@ -1 +1 @@
-{"gtceu:cracker":{"order":103}}
+{"gtceu:cracker":{"order":109}}
--- a/kubejs/assets/emi/category/properties/gtceu_cutter.json
+++ b/kubejs/assets/emi/category/properties/gtceu_cutter.json
@ -1 +1 @@
-{"gtceu:cutter":{"order":68}}
+{"gtceu:cutter":{"order":74}}
--- 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":70}}
+{"gtceu:distillation_tower":{"order":76}}
--- a/kubejs/assets/emi/category/properties/gtceu_distillery.json
+++ b/kubejs/assets/emi/category/properties/gtceu_distillery.json
@ -1 +1 @@
-{"gtceu:distillery":{"order":69}}
+{"gtceu:distillery":{"order":75}}
--- 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":104}}
+{"gtceu:electric_blast_furnace":{"order":110}}
--- a/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json
+++ b/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json
@ -1 +1 @@
-{"gtceu:electrolyzer":{"order":71}}
+{"gtceu:electrolyzer":{"order":77}}
--- 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":72}}
+{"gtceu:electromagnetic_separator":{"order":78}}
--- a/kubejs/assets/emi/category/properties/gtceu_end_dome.json
+++ b/kubejs/assets/emi/category/properties/gtceu_end_dome.json
@ -1 +1 @@
-{"gtceu:end_dome":{"order":105}}
+{"gtceu:end_dome":{"order":111}}
--- a/kubejs/assets/emi/category/properties/gtceu_evaporation.json
+++ b/kubejs/assets/emi/category/properties/gtceu_evaporation.json
@ -1 +1 @@
-{"gtceu:evaporation":{"order":106}}
+{"gtceu:evaporation":{"order":112}}
--- a/kubejs/assets/emi/category/properties/gtceu_extractor.json
+++ b/kubejs/assets/emi/category/properties/gtceu_extractor.json
@ -1 +1 @@
-{"gtceu:extractor":{"order":74}}
+{"gtceu:extractor":{"order":80}}
--- a/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json
+++ b/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json
@ -1 +1 @@
-{"gtceu:extractor_recycling":{"order":126}}
+{"gtceu:extractor_recycling":{"order":132}}
--- a/kubejs/assets/emi/category/properties/gtceu_extruder.json
+++ b/kubejs/assets/emi/category/properties/gtceu_extruder.json
@ -1 +1 @@
-{"gtceu:extruder":{"order":76}}
+{"gtceu:extruder":{"order":82}}
--- a/kubejs/assets/emi/category/properties/gtceu_fermenter.json
+++ b/kubejs/assets/emi/category/properties/gtceu_fermenter.json
@ -1 +1 @@
-{"gtceu:fermenter":{"order":77}}
+{"gtceu:fermenter":{"order":83}}
--- a/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json
+++ b/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json
@ -1 +1 @@
-{"gtceu:fluid_heater":{"order":78}}
+{"gtceu:fluid_heater":{"order":84}}
--- a/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json
+++ b/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json
@ -1 +1 @@
-{"gtceu:fluid_solidifier":{"order":79}}
+{"gtceu:fluid_solidifier":{"order":85}}
--- a/kubejs/assets/emi/category/properties/gtceu_food_oven.json
+++ b/kubejs/assets/emi/category/properties/gtceu_food_oven.json
@ -0,0 +1 @@
+{"gtceu:food_oven":{"order":35}}
--- a/kubejs/assets/emi/category/properties/gtceu_food_processor.json
+++ b/kubejs/assets/emi/category/properties/gtceu_food_processor.json
@ -0,0 +1 @@
+{"gtceu:food_processor":{"order":43}}
--- a/Show more
+++ b/Show more