merge

.github/workflows/build.yml

@@ -182,7 +182,7 @@ jobs:
       - name: 📄 Format diff
         id: format_diff
         if: ${{ steps.read_diff.outputs.diff != '' }}
-        uses: roamingowl/template-output-with-eta@v1.12.0
+        uses: roamingowl/template-output-with-eta@v1.13.0
         with:
           template: |
             ```markdown
@@ -430,7 +430,7 @@ jobs:
       - name: 📄 Format diff
         id: format_diff
         if: ${{ needs.info.outputs.diff != '' }}
-        uses: roamingowl/template-output-with-eta@v1.12.0
+        uses: roamingowl/template-output-with-eta@v1.13.0
         with:
           template: |
             ```markdown

CHANGELOG.md

@@ -2,23 +2,51 @@
 
 ## [Unreleased]
 ### Changes
+- Added links from quests directly to field guide entries (#854) @Zippity
+- Added a second EBF recipe but from LV furnaces @Pyritie
+- Added GT machine recipes for maple/birch saps (#1524) @BlueBoat29
+- Changed the TFC ratios of bronze and brass to match GregTech's (3:1 instead of 9:1) @Pyritie
+- Added Potin, Cobalt, and Cobalt Brass as TFC metals @Pyritie
+### Bug fixes
+- Fixed chain conveyors not connecting (#1520) @BlueBoat29
+- Fixed a crash when opening a world with a railgun logistics monitor (#1526) @Redeix
+- Fixed a crash when trying to spawn rabbits on the moon (#1528) @Pyritie
+- Fixed duplicate Create recipes @Pyritie
+- Prevented hammers, wrenches, and spades from being placed in chests to match other tools. (#1538) @dimethylene
+
+## [0.10.5] - 03-08-2025
+### Major changes
 - New major GregTech version! Read all about its new changes [here](https://github.com/GregTechCEu/GregTech-Modern/releases), and please report any issues you find! @gustovafing
 - Added initial implementation of interplanetary logistics @gustovafing
+### Known issues
+- Some items have multiple, incorrect recycling recipes
+- Steam machines use twice as much steam as they're supposed to
+### Other changes
+- Added universal compost items, for more efficient storage of compostables @Vazde @Redeix
 - Vanilla moss blocks/carpet are now compostable @Pyritie
 - Added missing mixer recipes for turning medium compost greens/browns into compost @Pyritie
 - Adjusted recipe times of the VI machines @Pyritie
-- Added universal compost items, for more efficient storage of compostables @Vazde
 - Added recipe for backpack feeding upgrade (#1462) @Pyritie
 - Greate shaft recipes are now shapeless (#1453) @Pyritie
 - Added crafting table recipes for matches and the matchbox (#1449) @Pyritie
-- Made "Etched" more accessible (#1473) @Nebby1999
-- Added faster recipes for crafting dough @Pyritie
+- Made "Etched" accessible earlier (#1473) @Nebby1999
+- Added faster recipes for crafting dough until the food processor @Pyritie
 - Black bronze now has a fluid pipe instead of an item pipe, so the drum has proper containment info @Pyritie
 - Added recipes to create basic TFC alcohol in the food processor @Pyritie
-- Added melting recipes for all the TFC metal dusts @Pyritie
+- Added melting recipes for all the TFC metal powders @Pyritie
 - Added mortar and pestle recipes for soybean and olive paste (#1480) @Pyritie
 - Added concrete to the list of valid blocks for GT facades (#1487) @TheAshenWolf
+- Removed Advanced Peripherals' Overpowered End Automata for allowing cheap interdimensional travel
+- Removed Advanced Peripherals' Chunk Controller for allowing too much offline chunkloading, slowing down large servers
+- Added Invar as a TFC-compatible metal (#1496) @Pyritie
+- Added extruder/curving press recipes for Tuyeres (#1499) @Pyritie
+- Added recipes for more train tracks @Pyritie
+- Added a recipe to get Wood Gas for your food processor in LV (#1491) @Pyritie
+- Regular thorium is also now weakly radioactive @Pyritie
+- Added grape trellises to the list of plants harvestable by baskets (#1510) @Redeix
+- Added full PBR material shader support for custom GT machines and casings (#1512) @Redeix
 ### Bug fixes
+- Some bug fixes for the electric refrigerators @gustovafing
 - Fixed not being able to craft fine wire in a coiling machine for materials that didn't also have normal wire @Pyritie
 - Fixed cobalt brass and potin double plates not being obtainable until MV @Pyritie
 - Fixed missing recipe for cooking fox meat @Pyritie
@@ -28,8 +56,10 @@
 - Fixed not being able to make sea water with TFC salt in a barrel (#1476) @Pyritie
 - Fixed the electric greenhouse fruit tree recipes making more saplings instead of fruit (#1445) @Pyritie
 - Fixed missing firmalife jam food processor recipes (#1478) @Pyritie
-### Translations
-- Ukranian @Furryks
+- Book and quill uses any black dye now (#1506) @Pyritie
+- Button recipe unification (mostly) (#1461) @Pyritie
+### Translation updates
+- Ukranian @Furryks & @MetEnBouldry
 
 ## [0.10.4] - 25-07-2025
 ### Changes

config/ftbquests/quests/chapters/create_logistics.snbt

@@ -111,8 +111,6 @@
 				"{quests.create_logistics.nbt_handling.desc.1}"
 				"{@pagebreak}"
 				"{quests.create_logistics.nbt_handling.desc.2}"
-				"{@pagebreak}"
-				"{quests.create_logistics.nbt_handling.desc.3}"
 			]
 			icon: "gtceu:brass_huge_item_pipe"
 			id: "7E97A95EA986C476"

config/ftbquests/quests/chapters/gregtech_energy.snbt

@@ -6,104 +6,6 @@
 	group: "31B01EAD21CA863A"
 	icon: "gtceu:max_battery"
 	id: "6540429F3CA4DA1B"
-	images: [
-		{
-			height: 1.0d
-			image: "tfg:item/universal/lv_universal_circuit"
-			rotation: 0.0d
-			width: 1.0d
-			x: -5.0d
-			y: -3.0d
-		}
-		{
-			height: 1.0d
-			image: "tfg:item/universal/luv_universal_circuit"
-			rotation: 0.0d
-			width: 1.0d
-			x: -9.5d
-			y: -3.0d
-		}
-		{
-			height: 1.0d
-			image: "tfg:item/universal/ev_universal_circuit"
-			rotation: 0.0d
-			width: 1.0d
-			x: -9.5d
-			y: 0.0d
-		}
-		{
-			height: 1.0d
-			image: "tfg:item/universal/hv_universal_circuit"
-			rotation: 0.0d
-			width: 1.0d
-			x: -9.5d
-			y: 3.5d
-		}
-		{
-			height: 1.0d
-			image: "tfg:item/universal/iv_universal_circuit"
-			rotation: 0.0d
-			width: 1.0d
-			x: -9.5d
-			y: -1.5d
-		}
-		{
-			height: 1.0d
-			image: "tfg:item/universal/mv_universal_circuit"
-			rotation: 0.0d
-			width: 1.0d
-			x: -5.0d
-			y: 3.0d
-		}
-		{
-			height: 1.0d
-			image: "ad_astra:textures/painting/moon.png"
-			rotation: 0.0d
-			width: 1.0d
-			x: -9.5d
-			y: 1.5d
-		}
-		{
-			height: 1.0d
-			image: "minecraft:item/clock_00"
-			rotation: 0.0d
-			width: 1.0d
-			x: 6.0d
-			y: -3.0d
-		}
-		{
-			height: 1.0d
-			image: "gtceu:item/material_sets/bright/ingot_hot_overlay"
-			rotation: 0.0d
-			width: 1.0d
-			x: 6.0d
-			y: -1.0d
-		}
-		{
-			height: 2.0d
-			image: "ags_modernmarkings:block/marking_wall_symbol_yellow_electric"
-			rotation: 0.0d
-			width: 2.0d
-			x: 0.0d
-			y: 7.0d
-		}
-		{
-			height: 1.0d
-			image: "gtceu:block/machines/parallel_hatch_mk4/overlay_front_emissive"
-			rotation: 0.0d
-			width: 1.0d
-			x: 6.0d
-			y: 3.0d
-		}
-		{
-			height: 1.0d
-			image: "ftbteams:textures/add.png"
-			rotation: 0.0d
-			width: 1.0d
-			x: 6.0d
-			y: 1.0d
-		}
-	]
 	order_index: 2
 	quest_links: [ ]
 	quests: [
@@ -111,6 +13,8 @@
 			description: ["{quests.gregtech_energy.start.desc}"]
 			icon: "gtceu:uhv_ultimate_battery"
 			id: "06B2E38F7DCF2678"
+			shape: "gear"
+			size: 1.0d
 			subtitle: "{quests.gregtech_energy.start.subtitle}"
 			tasks: [{
 				id: "07E1FA6A1BB796D4"
@@ -119,10 +23,10 @@
 			}]
 			title: "{quests.gregtech_energy.start.title}"
 			x: 0.0d
-			y: 0.0d
+			y: -8.5d
 		}
 		{
-			dependencies: ["06B2E38F7DCF2678"]
+			dependencies: ["4C620105AAC49381"]
 			description: ["{quests.gregtech_energy.moving.desc}"]
 			icon: "gtceu:luv_field_generator"
 			id: "60FF9249376DF9BD"
@@ -133,11 +37,11 @@
 				type: "checkmark"
 			}]
 			title: "{quests.gregtech_energy.moving.title}"
-			x: 0.0d
-			y: 3.0d
+			x: 6.0d
+			y: -7.0d
 		}
 		{
-			dependencies: ["06B2E38F7DCF2678"]
+			dependencies: ["4C620105AAC49381"]
 			description: ["{quests.gregtech_energy.storage.desc}"]
 			icon: "gtceu:uv_field_generator"
 			id: "08C160A0E7BBF39D"
@@ -148,8 +52,8 @@
 				type: "checkmark"
 			}]
 			title: "{quests.gregtech_energy.storage.title}"
-			x: 0.0d
-			y: -3.0d
+			x: 9.0d
+			y: -7.0d
 		}
 		{
 			dependencies: [
@@ -167,11 +71,11 @@
 				type: "checkmark"
 			}]
 			title: "{quests.gregtech_energy.produce_energy.title}"
-			x: -3.0d
-			y: 0.0d
+			x: -1.0d
+			y: -8.5d
 		}
 		{
-			dependencies: ["06B2E38F7DCF2678"]
+			dependencies: ["4C620105AAC49381"]
 			description: [
 				"{quests.gregtech_energy.spending_energy.desc.1}"
 				"{@pagebreak}"
@@ -191,7 +95,7 @@
 			}]
 			title: "{quests.gregtech_energy.spending_energy.title}"
 			x: 3.0d
-			y: 0.0d
+			y: -7.0d
 		}
 		{
 			dependencies: ["60FF9249376DF9BD"]
@@ -225,8 +129,8 @@
 				}
 			]
 			title: "{quests.gregtech_energy.moving_wire.title}"
-			x: 0.0d
-			y: 5.0d
+			x: 7.0d
+			y: -6.0d
 		}
 		{
 			dependencies: ["60FF9249376DF9BD"]
@@ -258,11 +162,14 @@
 				}
 			]
 			title: "{quests.gregtech_energy.moving_amp.title}"
-			x: 2.0d
-			y: 5.0d
+			x: 5.0d
+			y: -6.0d
 		}
 		{
-			dependencies: ["60FF9249376DF9BD"]
+			dependencies: [
+				"60FF9249376DF9BD"
+				"1DB543EFEEB67238"
+			]
 			description: ["{quests.gregtech_energy.transformer.desc}"]
 			icon: "gtceu:active_transformer"
 			id: "6ECAD339C91EF194"
@@ -292,8 +199,8 @@
 				}
 			]
 			title: "{quests.gregtech_energy.transformer.title}"
-			x: -2.0d
-			y: 5.0d
+			x: 6.0d
+			y: 3.0d
 		}
 		{
 			dependencies: ["08C160A0E7BBF39D"]
@@ -326,11 +233,14 @@
 				}
 			]
 			title: "{quests.gregtech_energy.battery_buffer.title}"
-			x: 0.0d
-			y: -5.0d
+			x: 10.0d
+			y: -6.0d
 		}
 		{
-			dependencies: ["08C160A0E7BBF39D"]
+			dependencies: [
+				"08C160A0E7BBF39D"
+				"7AF726555D721DFC"
+			]
 			description: [
 				"{quests.gregtech_energy.pss.desc.1}"
 				"{@pagebreak}"
@@ -357,8 +267,8 @@
 				}
 			]
 			title: "{quests.gregtech_energy.pss.title}"
-			x: 2.0d
-			y: -5.0d
+			x: 9.0d
+			y: -1.0d
 		}
 		{
 			dependencies: ["08C160A0E7BBF39D"]
@@ -382,11 +292,14 @@
 				type: "item"
 			}]
 			title: "{quests.gregtech_energy.tank.title}"
-			x: -2.0d
-			y: -5.0d
+			x: 8.0d
+			y: -6.0d
 		}
 		{
-			dependencies: ["6F80465F0759BECA"]
+			dependencies: [
+				"6F80465F0759BECA"
+				"4D0ADC66D2CF09B1"
+			]
 			description: ["{quests.gregtech_energy.batteries.desc}"]
 			id: "3B94CF569E4A2B26"
 			subtitle: "{quests.gregtech_energy.batteries.subtitle}"
@@ -403,34 +316,11 @@
 				type: "item"
 			}]
 			title: "{quests.gregtech_energy.batteries.title}"
-			x: 0.0d
-			y: -6.5d
+			x: 10.0d
+			y: -3.0d
 		}
 		{
-			dependencies: ["2CDB9778C7A30044"]
-			description: ["{quests.gregtech_energy.first_generator.desc}"]
-			id: "0116158FBDA9DF86"
-			subtitle: "{quests.gregtech_energy.first_generator.subtitle}"
-			tasks: [{
-				disable_toast: true
-				id: "0BCC01540FE7555C"
-				item: {
-					Count: 1
-					id: "ftbfiltersystem:smart_filter"
-					tag: {
-						"ftbfiltersystem:filter": "or(item(gtceu:lv_combustion)item(gtceu:mv_combustion)item(gtceu:hv_combustion)item(gtceu:lv_steam_turbine)item(gtceu:mv_steam_turbine)item(gtceu:hv_steam_turbine)item(gtceu:lv_gas_turbine)item(gtceu:mv_gas_turbine)item(gtceu:hv_gas_turbine))"
-					}
-				}
-				optional_task: true
-				title: "{quests.gregtech_energy.first_generator.task}"
-				type: "item"
-			}]
-			title: "{quests.gregtech_energy.first_generator.title}"
-			x: -5.0d
-			y: 0.0d
-		}
-		{
-			dependencies: ["685CE664E91157C4"]
+			dependencies: ["4D0ADC66D2CF09B1"]
 			description: [
 				"{quests.gregtech_energy.lst.desc.1}"
 				"{@pagebreak}"
@@ -444,11 +334,11 @@
 				type: "item"
 			}]
 			title: "{quests.gregtech_energy.lst.title}"
-			x: -7.5d
-			y: 3.0d
+			x: -4.5d
+			y: -3.0d
 		}
 		{
-			dependencies: ["0116158FBDA9DF86"]
+			dependencies: ["05E2F203DA46A5E8"]
 			description: [
 				"{quests.gregtech_energy.lce.desc.1}"
 				"{@pagebreak}"
@@ -456,24 +346,17 @@
 			]
 			id: "4AC4D681124751EE"
 			subtitle: "{quests.gregtech_energy.lce.subtitle}"
-			tasks: [
-				{
-					id: "31BFE575D15F270A"
-					item: "gtceu:large_combustion_engine"
-					type: "item"
-				}
-				{
-					id: "4B062E5264D4CAC8"
-					item: "gtceu:extreme_combustion_engine"
-					type: "item"
-				}
-			]
+			tasks: [{
+				id: "4B062E5264D4CAC8"
+				item: "gtceu:extreme_combustion_engine"
+				type: "item"
+			}]
 			title: "{quests.gregtech_energy.lce.title}"
-			x: -7.0d
-			y: -1.5d
+			x: -4.5d
+			y: 1.0d
 		}
 		{
-			dependencies: ["0116158FBDA9DF86"]
+			dependencies: ["7AF726555D721DFC"]
 			description: [
 				"{quests.gregtech_energy.lgt.desc.1}"
 				"{@pagebreak}"
@@ -487,11 +370,11 @@
 				type: "item"
 			}]
 			title: "{quests.gregtech_energy.lgt.title}"
-			x: -7.0d
-			y: 0.0d
+			x: -3.0d
+			y: -1.0d
 		}
 		{
-			dependencies: ["0116158FBDA9DF86"]
+			dependencies: ["1DB543EFEEB67238"]
 			description: [
 				"{quests.gregtech_energy.lpt.desc.1}"
 				"{@pagebreak}"
@@ -505,8 +388,8 @@
 				type: "item"
 			}]
 			title: "{quests.gregtech_energy.lpt.title}"
-			x: -7.0d
-			y: -3.0d
+			x: -3.0d
+			y: 3.0d
 		}
 		{
 			dependencies: ["2E57B2B963717893"]
@@ -546,11 +429,14 @@
 				}
 			]
 			title: "{quests.gregtech_energy.blast_oc.title}"
-			x: 5.0d
-			y: -1.0d
+			x: 3.0d
+			y: -4.0d
 		}
 		{
-			dependencies: ["2E57B2B963717893"]
+			dependencies: [
+				"2E57B2B963717893"
+				"0AF286AA540A82E6"
+			]
 			description: [
 				"{quests.gregtech_energy.overclock.desc.1}"
 				"{@pagebreak}"
@@ -567,11 +453,14 @@
 				type: "checkmark"
 			}]
 			title: "{quests.gregtech_energy.overclock.title}"
-			x: 5.0d
-			y: -3.0d
+			x: 3.0d
+			y: -5.0d
 		}
 		{
-			dependencies: ["2E57B2B963717893"]
+			dependencies: [
+				"2E57B2B963717893"
+				"4D0ADC66D2CF09B1"
+			]
 			description: [
 				"{quests.gregtech_energy.subtick.desc.1}"
 				"{@pagebreak}"
@@ -585,11 +474,14 @@
 				type: "item"
 			}]
 			title: "{quests.gregtech_energy.subtick.title}"
-			x: 5.0d
-			y: 1.0d
+			x: 3.0d
+			y: -3.0d
 		}
 		{
-			dependencies: ["2E57B2B963717893"]
+			dependencies: [
+				"2E57B2B963717893"
+				"05E2F203DA46A5E8"
+			]
 			description: [
 				"{quests.gregtech_energy.parallel_hatch.desc.1}"
 				"{@pagebreak}"
@@ -610,11 +502,11 @@
 				type: "item"
 			}]
 			title: "{quests.gregtech_energy.parallel_hatch.title}"
-			x: 5.0d
-			y: 3.0d
+			x: 3.0d
+			y: 1.0d
 		}
 		{
-			dependencies: ["3467E14C8BB54214"]
+			dependencies: ["4D0ADC66D2CF09B1"]
 			description: [
 				"{quests.gregtech_energy.lgt_fuel.desc.1}"
 				"{@pagebreak}"
@@ -649,8 +541,8 @@
 				}
 			]
 			title: "{quests.gregtech_energy.lgt_fuel.title}"
-			x: -8.5d
-			y: 0.0d
+			x: -11.0d
+			y: -3.0d
 		}
 		{
 			dependencies: ["634EAFA86B3D57A1"]
@@ -682,11 +574,11 @@
 				}
 			]
 			title: "{quests.gregtech_energy.lpt_fuel.title}"
-			x: -8.5d
-			y: -3.0d
+			x: -9.0d
+			y: 3.0d
 		}
 		{
-			dependencies: ["20DA81038C507C90"]
+			dependencies: ["4C620105AAC49381"]
 			description: ["{quests.gregtech_energy.lst_fuel.desc}"]
 			icon: "gtceu:steam_bucket"
 			id: "7D5CA47D0E147922"
@@ -712,8 +604,8 @@
 				}
 			]
 			title: "{quests.gregtech_energy.lst_fuel.title}"
-			x: -8.5d
-			y: 3.0d
+			x: -9.0d
+			y: -7.0d
 		}
 		{
 			dependencies: ["4AC4D681124751EE"]
@@ -763,11 +655,11 @@
 				}
 			]
 			title: "{quests.gregtech_energy.lce_fuel.title}"
-			x: -8.5d
-			y: -1.5d
+			x: -10.0d
+			y: 1.0d
 		}
 		{
-			dependencies: ["0116158FBDA9DF86"]
+			dependencies: ["4C620105AAC49381"]
 			description: [
 				"{quests.gregtech_energy.lv_generator.desc.1}"
 				"{@pagebreak}"
@@ -779,39 +671,25 @@
 			]
 			id: "7F92FDAB9A04C58B"
 			subtitle: "{quests.gregtech_energy.lv_generator.subtitle}"
-			tasks: [
-				{
-					disable_toast: true
-					id: "4DF2BE3846DB01B9"
-					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:lv_steam_turbine)item(gtceu:lv_combustion))"
-						}
+			tasks: [{
+				disable_toast: true
+				id: "4DF2BE3846DB01B9"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(gtceu:lv_steam_turbine)item(gtceu:lv_combustion))"
 					}
-					title: "{quests.gregtech_energy.mv_generator.task}"
-					type: "item"
 				}
-				{
-					id: "6E2ED41B94F13051"
-					item: "gtceu:steam_bucket"
-					optional_task: true
-					type: "item"
-				}
-				{
-					id: "38180F22E14D0CDF"
-					item: "gtceu:bio_diesel_bucket"
-					optional_task: true
-					type: "item"
-				}
-			]
+				title: "{quests.gregtech_energy.mv_generator.task}"
+				type: "item"
+			}]
 			title: "{quests.gregtech_energy.lv_generator.title}"
-			x: -5.0d
-			y: -2.0d
+			x: -3.0d
+			y: -7.0d
 		}
 		{
-			dependencies: ["0116158FBDA9DF86"]
+			dependencies: ["0AF286AA540A82E6"]
 			description: ["{quests.gregtech_energy.mv_generator.desc}"]
 			id: "54562DEA1717A819"
 			subtitle: "{quests.gregtech_energy.mv_generator.subtitle}"
@@ -829,11 +707,11 @@
 				type: "item"
 			}]
 			title: "{quests.gregtech_energy.mv_generator.title}"
-			x: -5.0d
-			y: 2.0d
+			x: -3.0d
+			y: -5.0d
 		}
 		{
-			dependencies: ["0116158FBDA9DF86"]
+			dependencies: ["4D0ADC66D2CF09B1"]
 			description: ["{quests.gregtech_energy.solar_panel.desc}"]
 			id: "109C57B63EE95E35"
 			subtitle: "{quests.gregtech_energy.solar_panel.subtitle}"
@@ -843,13 +721,14 @@
 				item: "ad_astra:solar_panel"
 				type: "item"
 			}]
-			x: -7.0d
-			y: 1.5d
+			x: -6.0d
+			y: -3.0d
 		}
 		{
 			dependencies: [
 				"109C57B63EE95E35"
 				"5826EC76931359B8"
+				"7AF726555D721DFC"
 			]
 			dependency_requirement: "one_completed"
 			description: [
@@ -860,84 +739,17 @@
 			icon: "gtceu:large_solar_panel"
 			id: "0585527D1854628B"
 			subtitle: "{quests.gregtech_energy.large_solar.subtitle}"
-			tasks: [
-				{
-					disable_toast: true
-					id: "198E956830F835B2"
-					item: "gtceu:large_solar_panel"
-					type: "item"
-				}
-				{
-					id: "794BF3FC434ACB5B"
-					item: "gtceu:lv_input_bus"
-					type: "item"
-				}
-				{
-					id: "43C2823947C4AE47"
-					item: "gtceu:auto_maintenance_hatch"
-					type: "item"
-				}
-				{
-					id: "07B517D79E7CDAF0"
-					item: "gtceu:ev_energy_input_hatch"
-					type: "item"
-				}
-				{
-					count: 54L
-					id: "120C887A59B89D66"
-					item: "tfg:casings/machine_casing_iron_desh"
-					type: "item"
-				}
-				{
-					count: 24L
-					id: "166503BF54649F4A"
-					item: "tfg:casings/machine_casing_red_solar_panel"
-					type: "item"
-				}
-				{
-					id: "3E71E1F848336782"
-					item: "ad_astra:iron_plating"
-					type: "item"
-				}
-				{
-					count: 16L
-					id: "294567EB2BE47456"
-					item: { Count: 16, id: "gtceu:cleanroom_glass" }
-					type: "item"
-				}
-				{
-					count: 20L
-					id: "516481695EBA7FCD"
-					item: { Count: 20, id: "ad_astra:iron_plateblock" }
-					type: "item"
-				}
-				{
-					count: 3L
-					id: "1764824C0C01F914"
-					item: { Count: 3, id: "ad_astra:glowing_iron_pillar" }
-					type: "item"
-				}
-			]
-			title: "{quests.gregtech_energy.large_solar.title}"
-			x: -8.5d
-			y: 1.5d
-		}
-		{
-			dependencies: ["0116158FBDA9DF86"]
-			description: ["{quests.gregtech_energy.hv_choice.desc}"]
-			id: "685CE664E91157C4"
-			subtitle: "{quests.gregtech_energy.hv_choice.subtitle}"
 			tasks: [{
-				id: "5BAFEAE94802DBFF"
-				title: "{quests.gregtech_energy.hv_choice.task}"
-				type: "checkmark"
+				disable_toast: true
+				id: "198E956830F835B2"
+				item: "gtceu:large_solar_panel"
+				type: "item"
 			}]
-			title: "{quests.gregtech_energy.hv_choice.title}"
-			x: -6.5d
-			y: 3.5d
+			x: -6.0d
+			y: -1.0d
 		}
 		{
-			dependencies: ["685CE664E91157C4"]
+			dependencies: ["4D0ADC66D2CF09B1"]
 			description: ["{quests.gregtech_energy.hv_single_generator.desc}"]
 			id: "1A0672F4FA88DF74"
 			subtitle: "{quests.gregtech_energy.hv_single_generator.subtitle}"
@@ -954,8 +766,8 @@
 				type: "item"
 			}]
 			title: "{quests.gregtech_energy.hv_single_generator.title}"
-			x: -7.5d
-			y: 4.0d
+			x: -3.0d
+			y: -3.0d
 		}
 		{
 			dependencies: ["1A0672F4FA88DF74"]
@@ -988,8 +800,257 @@
 				}
 			]
 			title: "{quests.gregtech_energy.hv_fuel.title}"
-			x: -8.5d
-			y: 4.0d
+			x: -12.0d
+			y: -3.0d
+		}
+		{
+			description: ["{quests.ore_proc.lv_tier.desc}"]
+			disable_toast: true
+			icon: "tfg:lv_universal_circuit"
+			id: "4C620105AAC49381"
+			shape: "none"
+			size: 2.0d
+			tasks: [{
+				disable_toast: true
+				id: "2D012C52C576A887"
+				item: "gtceu:lv_machine_hull"
+				type: "item"
+			}]
+			title: "Low Voltage Tier"
+			x: 0.0d
+			y: -7.0d
+		}
+		{
+			description: ["{quests.ore_proc.lv_tier.desc}"]
+			disable_toast: true
+			icon: "tfg:mv_universal_circuit"
+			id: "0AF286AA540A82E6"
+			shape: "none"
+			size: 2.0d
+			tasks: [{
+				disable_toast: true
+				id: "4EBE57B96E37CE23"
+				item: "gtceu:mv_machine_hull"
+				type: "item"
+			}]
+			title: "Medium Voltage Tier"
+			x: 0.0d
+			y: -5.0d
+		}
+		{
+			description: ["{quests.ore_proc.lv_tier.desc}"]
+			disable_toast: true
+			icon: "tfg:hv_universal_circuit"
+			id: "4D0ADC66D2CF09B1"
+			shape: "none"
+			size: 2.0d
+			tasks: [{
+				disable_toast: true
+				id: "5EA11ADD82D6BED4"
+				item: "gtceu:hv_machine_hull"
+				type: "item"
+			}]
+			title: "High Voltage Tier"
+			x: 0.0d
+			y: -3.0d
+		}
+		{
+			description: ["{quests.ore_proc.lv_tier.desc}"]
+			disable_toast: true
+			icon: "tfg:ev_universal_circuit"
+			id: "7AF726555D721DFC"
+			shape: "none"
+			size: 2.0d
+			tasks: [{
+				disable_toast: true
+				id: "4228B9AA7EE9248F"
+				item: "gtceu:ev_machine_hull"
+				type: "item"
+			}]
+			title: "Extreme Voltage Tier"
+			x: 0.0d
+			y: -1.0d
+		}
+		{
+			description: ["{quests.ore_proc.lv_tier.desc}"]
+			disable_toast: true
+			icon: "tfg:iv_universal_circuit"
+			id: "05E2F203DA46A5E8"
+			shape: "none"
+			size: 2.0d
+			tasks: [{
+				disable_toast: true
+				id: "073653D00E581030"
+				item: "gtceu:iv_machine_hull"
+				type: "item"
+			}]
+			title: "Insane Voltage Tier"
+			x: 0.0d
+			y: 1.0d
+		}
+		{
+			description: ["{quests.ore_proc.lv_tier.desc}"]
+			disable_toast: true
+			icon: "tfg:luv_universal_circuit"
+			id: "1DB543EFEEB67238"
+			shape: "none"
+			size: 2.0d
+			tasks: [{
+				disable_toast: true
+				id: "2C1907215939619E"
+				item: "gtceu:luv_machine_hull"
+				type: "item"
+			}]
+			title: "Ludicrous Voltage Tier"
+			x: 0.0d
+			y: 3.0d
+		}
+		{
+			description: ["{quests.ore_proc.lv_tier.desc}"]
+			disable_toast: true
+			icon: "tfg:zpm_universal_circuit"
+			id: "39019EF278D09DF7"
+			shape: "none"
+			size: 2.0d
+			tasks: [{
+				disable_toast: true
+				id: "685F3DAA2D955502"
+				item: "gtceu:zpm_machine_hull"
+				type: "item"
+			}]
+			title: "Zero Point Module Tier"
+			x: 0.0d
+			y: 5.0d
+		}
+		{
+			description: ["{quests.ore_proc.lv_tier.desc}"]
+			disable_toast: true
+			icon: "tfg:uv_universal_circuit"
+			id: "7ECA77DFEE2F6F20"
+			shape: "none"
+			size: 2.0d
+			tasks: [{
+				disable_toast: true
+				id: "1DF572E729BB8B8A"
+				item: "gtceu:uv_machine_hull"
+				type: "item"
+			}]
+			title: "Ultimate Voltage Tier"
+			x: 0.0d
+			y: 7.0d
+		}
+		{
+			dependencies: ["0AF286AA540A82E6"]
+			id: "3630849A7B0818C8"
+			tasks: [{
+				id: "0CF9D6042C16265A"
+				item: "gtceu:benzene_bucket"
+				type: "item"
+			}]
+			x: -11.0d
+			y: -5.0d
+		}
+		{
+			dependencies: ["0AF286AA540A82E6"]
+			id: "79AA7691F398A8C7"
+			tasks: [{
+				id: "36219BC854303490"
+				item: "gtceu:diesel_bucket"
+				type: "item"
+			}]
+			x: -10.0d
+			y: -5.0d
+		}
+		{
+			dependencies: ["05E2F203DA46A5E8"]
+			id: "4512E5DE7A84F809"
+			tasks: [{
+				id: "4BAECE3F4EC86920"
+				item: "gtceu:fission_reactor"
+				type: "item"
+			}]
+			x: -3.0d
+			y: 1.0d
+		}
+		{
+			dependencies: ["4C620105AAC49381"]
+			id: "139C7DF629329753"
+			tasks: [{
+				id: "7BA9FDD1F45B53F6"
+				item: "gtceu:bio_diesel_bucket"
+				type: "item"
+			}]
+			x: -10.0d
+			y: -7.0d
+		}
+		{
+			dependencies: ["4D0ADC66D2CF09B1"]
+			id: "376BFF92714C5012"
+			tasks: [{
+				id: "22F9A3ED193CB252"
+				item: "gtceu:cetane_boosted_diesel_bucket"
+				type: "item"
+			}]
+			x: -10.0d
+			y: -3.0d
+		}
+		{
+			dependencies: ["7AF726555D721DFC"]
+			id: "7134DB013B34593E"
+			tasks: [{
+				id: "008341509483BB23"
+				item: "gtceu:high_octane_gasoline_bucket"
+				type: "item"
+			}]
+			x: -10.0d
+			y: -1.0d
+		}
+		{
+			dependencies: ["7AF726555D721DFC"]
+			id: "351AED1612D00EF8"
+			tasks: [{
+				id: "6A35D4E3C93A70FC"
+				item: "gtceu:large_combustion_engine"
+				type: "item"
+			}]
+			x: -4.5d
+			y: -1.0d
+		}
+		{
+			dependencies: [
+				"0585527D1854628B"
+				"05E2F203DA46A5E8"
+			]
+			description: [
+				"{quests.gregtech_energy.large_solar_t2.desc.1}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.large_solar_t2.desc.2}"
+			]
+			id: "3AEAB1930F4CC034"
+			subtitle: "{quests.gregtech_energy.large_solar_t2.subtitle}"
+			tasks: [{
+				id: "149BF93064D121D3"
+				item: "gtceu:large_solar_panel_tier2"
+				type: "item"
+			}]
+			x: -6.0d
+			y: 1.0d
+		}
+		{
+			dependencies: [
+				"3AEAB1930F4CC034"
+				"1DB543EFEEB67238"
+			]
+			description: ["{quests.gregtech_energy.large_solar_t3.desc}"]
+			id: "7CA3A5EFE3D5B688"
+			subtitle: "{quests.gregtech_energy.large_solar_t3.subtitle}"
+			tasks: [{
+				id: "612817A7FA759E03"
+				item: "gtceu:large_solar_panel_tier3"
+				type: "item"
+			}]
+			x: -6.0d
+			y: 3.0d
 		}
 	]
 	subtitle: ["{quests.gregtech_energy.subtitle}"]

config/ftbquests/quests/chapters/hv__high_voltage.snbt

@@ -854,13 +854,20 @@
 			dependencies: ["52AD30F04DD5A812"]
 			dependency_requirement: "all_started"
 			description: ["{quests.high_voltage.hv_mixer.desc}"]
+			icon: "gtceu:hv_mixer"
 			id: "05ABC370D7153350"
 			shape: "octagon"
 			size: 1.5d
 			subtitle: "{quests.high_voltage.hv_mixer.subtitle}"
 			tasks: [{
 				id: "6D522B2EF097AA95"
-				item: "gtceu:hv_mixer"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(gtceu:hv_mixer)item(greate:stainless_steel_mechanical_mixer))"
+					}
+				}
 				type: "item"
 			}]
 			title: "{quests.high_voltage.hv_mixer.title}"

config/ftbquests/quests/chapters/questssteam_age.snbt

@@ -1391,7 +1391,6 @@
 			y: 6.0d
 		}
 		{
-			dependencies: ["4CD3F04793CE47A2"]
 			description: ["{quests.steam_age.paper.desc}"]
 			disable_toast: true
 			id: "16CF5A9012EF4B27"

config/ftbquests/quests/chapters/space_survival.snbt

@@ -171,7 +171,7 @@
 				type: "item"
 			}]
 			title: "{quests.space_survival.bedrock_mining.title}"
-			x: 0.5d
+			x: -1.0d
 			y: 1.0d
 		}
 		{
@@ -460,27 +460,24 @@
 				"5826EC76931359B8"
 				"3C92063DE5B9D5E9"
 			]
-			description: ["{quests.space_survival.railgun.desc}"]
-			icon: "tfg:interplanetary_item_launcher"
+			description: [
+				"{quests.space_survival.railgun.desc.1}"
+				"{@pagebreak}"
+				"{quests.space_survival.railgun.desc.2}"
+			]
+			icon: "tfg:electromagnetic_accelerator"
 			id: "1A9A5F55F1F0AC58"
 			shape: "gear"
 			size: 2.0d
 			subtitle: "{quests.space_survival.railgun.subtitle}"
-			tasks: [
-				{
-					id: "14EEFF310A3179A8"
-					item: "tfg:interplanetary_item_launcher"
-					type: "item"
-				}
-				{
-					id: "5F95946B3B0E38B9"
-					item: "tfg:interplanetary_item_reciever"
-					type: "item"
-				}
-			]
+			tasks: [{
+				id: "5009A382342496F7"
+				title: "{quests.space_survival.railgun.task}"
+				type: "checkmark"
+			}]
 			title: "{quests.space_survival.railgun.title}"
 			x: 2.0d
-			y: -0.5d
+			y: 1.0d
 		}
 		{
 			dependencies: ["72BD27FEEB34C7B0"]
@@ -522,6 +519,188 @@
 			x: -7.0d
 			y: -5.5d
 		}
+		{
+			dependencies: ["1A9A5F55F1F0AC58"]
+			description: [
+				"{quests.space_survival.raiinterplanetary_railgunlgun.desc.1}"
+				"{@pagebreak}"
+				"{quests.space_survival.raiinterplanetary_railgunlgun.desc.2}"
+			]
+			id: "783BB3FC5702DA8C"
+			subtitle: "{quests.space_survival.interplanetary_railgun.subtitle}"
+			tasks: [{
+				id: "71326452986A7C0F"
+				item: "tfg:interplanetary_item_launcher"
+				type: "item"
+			}]
+			title: "{quests.space_survival.interplanetary_railgun.title}"
+			x: 4.5d
+			y: -1.5d
+		}
+		{
+			dependencies: ["1A9A5F55F1F0AC58"]
+			description: [
+				"{quests.space_survival.monitor_railgun.desc.1}"
+				"{@pagebreak}"
+				"{quests.space_survival.monitor_railgun.desc.2}"
+			]
+			id: "498E559B9C37D2CA"
+			subtitle: "{quests.space_survival.monitor_railgun.subtitle}"
+			tasks: [{
+				id: "43304A46FD2DFB41"
+				item: "tfg:interplanetary_logistics_monitor"
+				type: "item"
+			}]
+			title: "{quests.space_survival.monitor_railgun.title}"
+			x: 4.5d
+			y: 1.0d
+		}
+		{
+			dependencies: ["1A9A5F55F1F0AC58"]
+			description: [
+				"{quests.space_survival.receiver_railgun.desc.1}"
+				"{@pagebreak}"
+				"{quests.space_survival.receiver_railgun.desc.2}"
+			]
+			id: "71AD0B9C1FB7CE03"
+			subtitle: "{quests.space_survival.receiver_railgun.subtitle}"
+			tasks: [{
+				id: "4A43C3AAFA69E286"
+				item: "tfg:interplanetary_item_receiver"
+				type: "item"
+			}]
+			title: "{quests.space_survival.receiver_railgun.title}"
+			x: 4.5d
+			y: 3.5d
+		}
+		{
+			dependencies: [
+				"783BB3FC5702DA8C"
+				"498E559B9C37D2CA"
+			]
+			description: [
+				"{quests.space_survival.input_bus_railgun.desc.1}"
+				"{@pagebreak}"
+				"{quests.space_survival.input_bus_railgun.desc.2}"
+			]
+			id: "4FF2809A81DD4122"
+			subtitle: "{quests.space_survival.input_bus_railgun.subtitle}"
+			tasks: [{
+				id: "1F97F1BAE1DF7ADC"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(tfg:ulv_railgun_item_loader_in)item(tfg:lv_railgun_item_loader_in)item(tfg:mv_railgun_item_loader_in)item(tfg:hv_railgun_item_loader_in)item(tfg:ev_railgun_item_loader_in)item(tfg:iv_railgun_item_loader_in)item(tfg:luv_railgun_item_loader_in)item(tfg:zpm_railgun_item_loader_in)item(tfg:uv_railgun_item_loader_in)item(tfg:uhv_railgun_item_loader_in))"
+					}
+				}
+				title: "{quests.space_survival.input_bus_railgun.task}"
+				type: "item"
+			}]
+			title: "{quests.space_survival.input_bus_railgun.title}"
+			x: 6.0d
+			y: -1.0d
+		}
+		{
+			dependencies: ["783BB3FC5702DA8C"]
+			description: [
+				"{quests.space_survival.ammo_railgun.desc.1}"
+				"{@pagebreak}"
+				"{quests.space_survival.ammo_railgun.desc.2}"
+			]
+			id: "3BEEB11C8621772D"
+			subtitle: "{quests.space_survival.ammo_railgun.subtitle}"
+			tasks: [
+				{
+					id: "5E7152C67A1E685D"
+					item: "tfg:railgun_ammo_loader"
+					type: "item"
+				}
+				{
+					id: "36471CA165196EC9"
+					item: "tfg:railgun_ammo_shell"
+					type: "item"
+				}
+			]
+			title: "{quests.space_survival.ammo_railgun.title}"
+			x: 6.0d
+			y: -2.0d
+		}
+		{
+			dependencies: ["498E559B9C37D2CA"]
+			description: ["{quests.space_survival.redstone_railgun.desc}"]
+			icon: "minecraft:redstone_torch"
+			id: "0538DCD4D4811574"
+			subtitle: "{quests.space_survival.redstone_railgun.subtitle}"
+			tasks: [{
+				id: "63FFA0CBDDD635B9"
+				title: "{quests.space_survival.redstone_railgun.task}"
+				type: "checkmark"
+			}]
+			title: "{quests.space_survival.redstone_railgun.title}"
+			x: 6.5d
+			y: 0.0d
+		}
+		{
+			dependencies: ["498E559B9C37D2CA"]
+			description: ["{quests.space_survival.robot_arm_railgun.desc}"]
+			icon: "gtceu:hv_robot_arm"
+			id: "7118634C06AE1141"
+			subtitle: "{quests.space_survival.robot_arm_railgun.subtitle}"
+			tasks: [{
+				id: "6C995E2B46963E1E"
+				title: "{quests.space_survival.robot_arm_railgun.task}"
+				type: "checkmark"
+			}]
+			title: "{quests.space_survival.robot_arm_railgun.title}"
+			x: 6.5d
+			y: 1.0d
+		}
+		{
+			dependencies: [
+				"498E559B9C37D2CA"
+				"71AD0B9C1FB7CE03"
+			]
+			description: [
+				"{quests.space_survival.output_bus_railgun.desc.1}"
+				"{@pagebreak}"
+				"{quests.space_survival.output_bus_railgun.desc.2}"
+				"{@pagebreak}"
+				"{quests.space_survival.output_bus_railgun.desc.3}"
+			]
+			id: "5FB814261B0993C5"
+			subtitle: "{quests.space_survival.output_bus_railgun.subtitle}"
+			tasks: [{
+				id: "72D587D69470709E"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(tfg:ulv_railgun_item_loader_out)item(tfg:lv_railgun_item_loader_out)item(tfg:mv_railgun_item_loader_out)item(tfg:hv_railgun_item_loader_out)item(tfg:ev_railgun_item_loader_out)item(tfg:iv_railgun_item_loader_out)item(tfg:luv_railgun_item_loader_out)item(tfg:zpm_railgun_item_loader_out)item(tfg:uv_railgun_item_loader_out)item(tfg:uhv_railgun_item_loader_out))"
+					}
+				}
+				title: "{quests.space_survival.output_bus_railgun.task}"
+				type: "item"
+			}]
+			title: "{quests.space_survival.output_bus_railgun.title}"
+			x: 6.0d
+			y: 3.0d
+		}
+		{
+			dependencies: ["498E559B9C37D2CA"]
+			description: ["{quests.space_survival.delay_railgun.desc}"]
+			icon: "create:cuckoo_clock"
+			id: "183AC1085D558086"
+			subtitle: "{quests.space_survival.delay_railgun.subtitle}"
+			tasks: [{
+				id: "119FD14202435E03"
+				title: "{quests.space_survival.delay_railgun.task}"
+				type: "checkmark"
+			}]
+			title: "{quests.space_survival.delay_railgun.title}"
+			x: 6.5d
+			y: 2.0d
+		}
 	]
 	subtitle: ["{quests.space_survival.subtitle}"]
 	title: "{quests.space_survival}"

config/immersive_optimization.json

@@ -24,7 +24,8 @@
     "minecraft:player": false,
     "minecraft:arrow": false,
     "create": false,
-    "minecraft:ender_dragon": false
+    "minecraft:ender_dragon": false,
+	"sandworm_mod": false
   },
   "version": 2,
   "name": "immersive_optimization"

config/xaeroworldmap.txt

@@ -38,7 +38,7 @@ displayStainedGlass:true
 caveModeDepth:30
 caveModeStart:2147483647
 autoCaveMode:-1
-legibleCaveMaps:false
+legibleCaveMaps:true
 displayCaveModeStart:true
 caveModeToggleTimer:1000
 defaultCaveModeType:1

kubejs/assets/ad_astra/lang/en_us.json

@@ -108,21 +108,51 @@
   "entity.ad_astra.corrupted_lunarian": "Lunar Zombie",
   "entity.ad_astra.tier_1_rocket": "R-Aluminosteel Rocket",
   "entity.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket",
+  "entity.ad_astra.tier_3_rocket": "45-Ti Tungstensteel Rocket",
   "entity.ad_astra.tier_1_rover": "Rover",
   "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",
   "item.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket",
+  "item.ad_astra.tier_3_rocket": "45-Ti Tungstensteel Rocket",
   "item.ad_astra.oxygen_bucket": "Breathable Air Bucket",
   "item.ad_astra.tier_1_rover": "Rover",
-  "item.ad_astra.photovoltaic_etrium_cell": "Basic Photovoltaic Cell",
+  "item.ad_astra.photovoltaic_etrium_cell": "Advanced Photovoltaic Cell",
   "item.ad_astra.photovoltaic_vesnium_cell": "Energium Photovoltaic Cell",
+  "item.ad_astra.ostrum_tank": "Ostrum Booster Tank",
+  "item.ad_astra.steel_engine": "Steel Rocket Engine",
+  "item.ad_astra.desh_engine": "Desh Rocket Engine",
+  "item.ad_astra.ostrum_engine": "Ostrum Rocket Engine",
+  "item.ad_astra.netherite_space_helmet": "§bTungstensteel Space Helmet",
+  "item.ad_astra.netherite_space_suit": "§bTungstensteel Space Suit",
+  "item.ad_astra.netherite_space_pants": "§bTungstensteel Space Pants",
+  "item.ad_astra.netherite_space_boots": "§bTungstensteel Space Boots",
   "item.ad_astra.cheese": "Moon Cheese",
   "tagprefix.moon_stone": "Anorthosite %s Ore",
   "tagprefix.moon_deepslate": "Norite %s Ore",
   "tagprefix.mars_stone": "Argillite %s Ore",
   "tagprefix.venus_stone": "Trachyte %s Ore",
   "tagprefix.mercury_stone": "Komatiite %s Ore",
-  "tagprefix.glacio_stone": "Phonolite %s Ore"
+  "tagprefix.glacio_stone": "Phonolite %s Ore",
+  "info.ad_astra.solar_panel": "Generates energy from the sun during the day. Note that the energy generated is dependent on the planet.",
+  "tooltip.ad_astra.energy": "%s FE / %s FE",
+  "tooltip.ad_astra.energy_generation_per_tick": "Generates %s FE per tick",
+  "tooltip.ad_astra.energy_in": "In: %s FE/t",
+  "tooltip.ad_astra.energy_out": "Out: %s FE/t",
+  "tooltip.ad_astra.energy_per_tick": "%s FE/t",
+  "tooltip.ad_astra.energy_transfer_tick": "Transfer: %s FE/t",
+  "tooltip.ad_astra.energy_use_per_tick": "Uses %s FE per tick",
+  "tooltip.ad_astra.max_energy_in": "Max In: %s FE/t",
+  "tooltip.ad_astra.max_energy_out": "Max Out: %s FE/t",
+  "tooltip.ad_astra.max_generation": "Max: %s FE/t",
+  "tooltip.ad_astra.max_fluid_in": "Max In: %s mB/t",
+  "tooltip.ad_astra.max_fluid_out": "Max Out: %s mB/t",
+  "tooltip.ad_astra.fluid": "%s mB / %s mB %s",
+  "tooltip.ad_astra.fluid_generation_per_iteration": "Generates %s mB per iteration",
+  "tooltip.ad_astra.fluid_in": "In: %s mB/t",
+  "tooltip.ad_astra.fluid_out": "Out: %s mB/t",
+  "tooltip.ad_astra.fluid_per_tick": "%s mB/t",
+  "tooltip.ad_astra.fluid_transfer_tick": "Transfer: %s mB/t",
+  "tooltip.ad_astra.fluid_use_per_iteration": "Uses %s mB per iteration"
 }

kubejs/assets/ad_astra/lang/uk_ua.json

@@ -106,21 +106,33 @@
   "block.ad_astra.polished_glacio_stone_slab": "Оброблена фонолітова плита",
   "block.ad_astra.polished_glacio_stone_stairs": "Оброблені Фонолітові сходи",
   "entity.ad_astra.corrupted_lunarian": "Місячний Зомбі",
-  "entity.ad_astra.tier_1_rocket": "Р-алюміносталева ракета",
+  "entity.ad_astra.tier_1_rocket": "R-Алюміносталева Ракета",
+  "entity.ad_astra.tier_2_rocket": "Титанова ракета ASM 4914",
+  "entity.ad_astra.tier_3_rocket": "Ракета з вольфрамової сталі 45-Ti",
   "entity.ad_astra.tier_1_rover": "Ровер",
   "fluid_type.ad_astra.oxygen": "Придатне Повітря",
-  "item.ad_astra.steel_cable": "Базовий RF-кабель",
-  "item.ad_astra.desh_cable": "Покращений RF-кабель",
-  "item.ad_astra.tier_1_rocket": "Р-алюміносталева ракета",
-  "item.ad_astra.oxygen_bucket": "Відро з вдиханим повітрям",
+  "item.ad_astra.steel_cable": "Базовий RF Кабель",
+  "item.ad_astra.desh_cable": "Покращений RF Кабель",
+  "item.ad_astra.tier_1_rocket": "R-Алюміносталева Ракета",
+  "item.ad_astra.tier_2_rocket": "Титанова ракета ASM 4914",
+  "item.ad_astra.tier_3_rocket": "Ракета з вольфрамової сталі 45-Ti",
+  "item.ad_astra.oxygen_bucket": "Відро з Дихальним Повітрям",
   "item.ad_astra.tier_1_rover": "Ровер",
-  "item.ad_astra.photovoltaic_etrium_cell": "Базова фотоелектрична капсула",
-  "item.ad_astra.photovoltaic_vesnium_cell": "Вдосконалена фотоелектрична капсула",
+  "item.ad_astra.photovoltaic_etrium_cell": "Базова Фотоелектрична Капсула",
+  "item.ad_astra.photovoltaic_vesnium_cell": "Капсула Фотоелементу Енергіюму",
+  "item.ad_astra.ostrum_tank": "Бак прискорювача з Оструму",
+  "item.ad_astra.steel_engine": "Ракетний двигун зі сталі",
+  "item.ad_astra.desh_engine": "Ракетний двигун із Дешу",
+  "item.ad_astra.ostrum_engine": "Ракетний двигун з Оструму",
+  "item.ad_astra.netherite_space_helmet": "§bКосмічний шолом з вольфрамової сталі",
+  "item.ad_astra.netherite_space_suit": "§bКосмічний скафандр з вольфрамової сталі",
+  "item.ad_astra.netherite_space_pants": "§bКосмічні штани з вольфрамової сталі",
+  "item.ad_astra.netherite_space_boots": "§bКосмічні черевики з вольфрамової сталі",
   "item.ad_astra.cheese": "Місячний сир",
   "tagprefix.moon_stone": "Анорто́зитова %s Руда",
   "tagprefix.moon_deepslate": "Норитова %s Руда",
   "tagprefix.mars_stone": "Аргілітова %s Руда",
-  "tagprefix.venus_stone": "ТрахітовАа %s Руда",
+  "tagprefix.venus_stone": "Трахітова %s Руда",
   "tagprefix.mercury_stone": "Коматієва %s Руда",
   "tagprefix.glacio_stone": "Фонолітова %s Руда"
 }

kubejs/assets/ae2/lang/uk_ua.json

@@ -1,6 +1,6 @@
 {
   "__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": "Прес-форми для крафту здобуваються шляхом руйнування Таємничого куба. Таємничі куби розташовані в центрі метеоритів, які можна знайти на Місяці.",
+  "gui.ae2.inWorldCraftingPresses": "Пресформи для крафту здобуваються шляхом руйнування Таємничого куба. Таємничі куби розташовані в центрі метеоритів, які можна знайти на Місяці.",
   "gui.advanced_ae.AdvPatternProvider": "",
   "gui.expandedae.exp_pattern_provider": ""
 }

kubejs/assets/beneath/lang/uk_ua.json

@@ -9,6 +9,8 @@
   "block.beneath.ore.blackstone_sylvite": "Руда Сильвіну",
   "block.beneath.crackrack": "Кератофір",
   "block.beneath.soul_clay": "Брудна Глина",
+  "block.beneath.wood.fallen_leaves.crimson": "Занепала червона ламела",
+  "block.beneath.wood.fallen_leaves.warped": "Занепала викривлена ламела",
   "item.beneath.cursed_hide": "Лавостійка Шкіра",
   "item.beneath.blackstone_brick": "Цегла з Піроксеніту",
   "item.beneath.cursecoal": "Антрацит",

kubejs/assets/betterend/blockstates/cave_pumpkin_plant.json

@@ -1,82 +0,0 @@
-{
-	"multipart": [
-		{
-			"when": {
-				"age": 0
-			},
-			"apply": [
-				{ "model": "betterend:block/cave_pumpkin_vine_1" },
-				{ "model": "betterend:block/cave_pumpkin_vine_2" }
-			]
-		},
-		{
-			"when": {
-				"age": 1
-			},
-			"apply": [
-				{ "model": "betterend:block/cave_pumpkin_vine_3" },
-				{ "model": "betterend:block/cave_pumpkin_vine_4" }
-			]
-		},
-		{
-			"when": {
-				"age": 2
-			},
-			"apply": [
-				{ "model": "betterend:block/cave_pumpkin_vine_5" },
-				{ "model": "betterend:block/cave_pumpkin_vine_6" }
-			]
-		},
-		{
-			"when": {
-				"age": 3
-			},
-			"apply": [
-				{ "model": "betterend:block/cave_pumpkin_vine_7" }
-			]
-		},
-		{
-			"when": {
-				"east": true
-			},
-			"apply": [
-				{
-					"model": "betterend:block/cave_pumpkin_vine_8",
-					"y": 90
-				}
-			]
-		},
-		{
-			"when": {
-				"north": true
-			},
-			"apply": [
-				{
-					"model": "betterend:block/cave_pumpkin_vine_8"
-				}
-			]
-		},
-		{
-			"when": {
-				"south": true
-			},
-			"apply": [
-				{
-					"model": "betterend:block/cave_pumpkin_vine_8",
-					"y": 180
-				}
-			]
-		},
-		{
-			"when": {
-				"west": true
-			},
-			"apply": [
-				{
-					"model": "betterend:block/cave_pumpkin_vine_8",
-					"y": 270
-				}
-			]
-		}
-	]
-}

kubejs/assets/betterend/lang/en_us.json

@@ -11,7 +11,9 @@
   "block.betterend.blossom_berry": "Blossom Berry",
   "block.betterend.blossom_berry_wild": "Wild Blossom Berry",
   "block.betterend.blossom_berry_dead": "Dead Blossom Berry",
-  "block.betterend.bolux_mushroom": "Bolux Mushroom",
+  "block.betterend.bolux_mushroom": "Bolux Mushroom Colony",
+  "block.betterend.bolux_mushroom_wild": "Wild Bolux Mushroom Colony",
+  "block.betterend.bolux_mushroom_dead": "Dead Bolux Mushroom Colony",
   "block.betterend.bushy_grass": "Novagrass",
   "block.betterend.cave_bush": "Carmine Bush",
   "block.betterend.cave_grass": "Vermilligma",
@@ -27,9 +29,9 @@
   "block.betterend.charnia_red": "Red Charnia",
   "block.betterend.chorus_grass": "Chorus Grass",
   "block.betterend.chorus_lily": "Chorus Lily",
-  "block.betterend.chorus_mushroom": "Chalmie Mushroom",
-  "block.betterend.chorus_mushroom_wild": "Wild Chalmie Mushroom",
-  "block.betterend.chorus_mushroom_dead": "Dead Chalmie Mushroom",
+  "block.betterend.chorus_mushroom": "Chalmie Mushroom Colony",
+  "block.betterend.chorus_mushroom_wild": "Wild Chalmie Mushroom Colony",
+  "block.betterend.chorus_mushroom_dead": "Dead Chalmie Mushroom Colony",
   "block.betterend.clawfern": "Clawfern",
   "block.betterend.crystal_grass": "Crystal Grass",
   "block.betterend.end_lily": "Deimos Lily",
@@ -59,9 +61,9 @@
   "block.betterend.rubinea": "Rubinea",
   "block.betterend.ruscus": "Ruscus Grass",
   "block.betterend.salteago": "Salteago",
-  "block.betterend.shadow_berry": "Nox Berry",
-  "block.betterend.shadow_berry_wild": "Wild Nox Berry",
-  "block.betterend.shadow_berry_dead": "Dead Nox Berry",
+  "block.betterend.shadow_berry": "Nox Berries",
+  "block.betterend.shadow_berry_wild": "Wild Nox Berries",
+  "block.betterend.shadow_berry_dead": "Dead Nox Berries",
   "block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom",
   "block.betterend.twisted_moss": "Twisted Moss",
   "block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss",
@@ -74,10 +76,17 @@
   "item.betterend.amber_root_seeds": "Amber Shoots Seeds",
   "item.betterend.blossom_berry_product": "Blossom Berry",
   "item.betterend.blossom_berry_seeds": "Blossom Berry Seeds",
+  "item.betterend.bolux_mushroom_cooked": "Cooked Bolux Mushroom",
+  "item.betterend.bolux_mushroom_product": "Bolux Mushroom",
+  "item.betterend.bolux_mushroom_seeds": "Bolux Mushroom Spores",
+  "item.betterend.cave_pumpkin_chunks": "Bulbkin Chunks",
   "item.betterend.cave_pumpkin_product": "Bulbkin",
   "item.betterend.cave_pumpkin_plant_seeds": "Bulbkin Seeds",
+  "item.betterend.cave_pumpkin_pie": "Bulbkin Pie",
+  "item.betterend.chorus_mushroom_cooked": "Cooked Chalmie Mushroom",
   "item.betterend.chorus_mushroom_product": "Chalmie Mushroom",
   "item.betterend.chorus_mushroom_seeds": "Chalmie Mushroom Spores",
+  "item.betterend.shadow_berry_cooked": "Cooked Nox Berry",
   "item.betterend.shadow_berry_product": "Nox Berry",
   "item.betterend.shadow_berry_seeds": "Nox Berry Seeds"
 }

kubejs/assets/betterend/lang/uk_ua.json

@@ -0,0 +1,92 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "block.betterend.aeridium": "Аерідій",
+  "block.betterend.amaranita_stem": "Стебло амаранити",
+  "block.betterend.amber_grass": "Бурштинова трава",
+  "block.betterend.amber_root_wild": "Паростки дикої бурштинової трави",
+  "block.betterend.amber_root_dead": "Засохлі паростки бурштинової трави",
+  "block.betterend.amber_root": "Бурштинові паростки",
+  "block.betterend.aurant_polypore": "Поліпор Ауранта",
+  "block.betterend.blooming_cooksonia": "Квітуча куксонія",
+  "block.betterend.blossom_berry": "Цвіт ягод",
+  "block.betterend.blossom_berry_wild": "Цвітіння дикої ягоди",
+  "block.betterend.blossom_berry_dead": "Мертве цвітіння ягоди",
+  "block.betterend.bolux_mushroom": "Колонія грибів Болукса",
+  "block.betterend.bolux_mushroom_wild": "Дика колонія грибів Болукса",
+  "block.betterend.bolux_mushroom_dead": "Мертва колонія грибів Болукса",
+  "block.betterend.bushy_grass": "Новаграс",
+  "block.betterend.cave_bush": "Кущ Карміну",
+  "block.betterend.cave_grass": "Вермілігма",
+  "block.betterend.cave_pumpkin": "Балбкін",
+  "block.betterend.cave_pumpkin_wild": "Стебло дикого Булбкіна",
+  "block.betterend.cave_pumpkin_dead": "Мертве стебло Булбкіна",
+  "block.betterend.cave_pumpkin_plant": "Стебло Булбкіна",
+  "block.betterend.charnia_cyan": "Блакитна Чарнія",
+  "block.betterend.charnia_green": "Зелена Чарнія",
+  "block.betterend.charnia_light_blue": "Бірюзова Чарнія",
+  "block.betterend.charnia_orange": "Помаранчева Чарнія",
+  "block.betterend.charnia_purple": "Фіолетова Чарнія",
+  "block.betterend.charnia_red": "Червона Чарнія",
+  "block.betterend.chorus_grass": "Трава Хоруса",
+  "block.betterend.chorus_lily": "Хорусова лілія",
+  "block.betterend.chorus_mushroom": "Колонія грибів Чалмі",
+  "block.betterend.chorus_mushroom_wild": "Дика колонія грибів Чалмі",
+  "block.betterend.chorus_mushroom_dead": "Мертва колонія грибів Чалмі",
+  "block.betterend.clawfern": "Кігтевий папороть",
+  "block.betterend.crystal_grass": "Кристалічна трава",
+  "block.betterend.end_lily": "Лілія Деймоса",
+  "block.betterend.end_lily_seed": "Паросток лілії Деймоса",
+  "block.betterend.end_lotus_flower": "Квітка лотоса Фобоса",
+  "block.betterend.end_lotus_leaf": "Лист лотоса Фобоса",
+  "block.betterend.end_lotus_stem": "Стебло лотоса Фобоса",
+  "block.betterend.end_lotus_seed": "Паросток лотоса Фобоса",
+  "block.betterend.filalux_wings": "Крила Філалюкса",
+  "block.betterend.flamaea": "Гриб Фламаеа",
+  "block.betterend.flammalix": "Гриб Фламмалікс",
+  "block.betterend.fracturn": "Фрактурн",
+  "block.betterend.globulagus": "Глобулагус",
+  "block.betterend.hydralux": "Гідралюкс",
+  "block.betterend.hydralux_sapling": "Паросток Гідралюкса",
+  "block.betterend.inflexia": "Інфлексія",
+  "block.betterend.lamellarium": "Ламелларіум",
+  "block.betterend.lanceleaf": "Ланцелист",
+  "block.betterend.lanceleaf_seed": "Кинджал Ланцелиста",
+  "block.betterend.large_amaranita_mushroom": "Великий гриб Амараніта",
+  "block.betterend.lutebus": "Лутебус",
+  "block.betterend.magnula": "Магнула",
+  "block.betterend.nightshade_moss": "Мох Нокс",
+  "block.betterend.orango": "Оранго",
+  "block.betterend.pond_anemone": "Анемона",
+  "block.betterend.purple_polypore": "Фіолетовий поліпор",
+  "block.betterend.rubinea": "Рубінеа",
+  "block.betterend.ruscus": "Трава Рускус",
+  "block.betterend.salteago": "Сальтеаго",
+  "block.betterend.shadow_berry": "Ягоди Нокс",
+  "block.betterend.shadow_berry_wild": "Дикі ягоди Нокс",
+  "block.betterend.shadow_berry_dead": "Мертві ягоди Нокс",
+  "block.betterend.small_amaranita_mushroom": "Малий гриб Амаранита",
+  "block.betterend.twisted_moss": "Викривлений мох",
+  "block.betterend.twisted_umbrella_moss": "Викривлений парасольковий мох",
+  "block.betterend.twisted_umbrella_moss_tall": "Викривлений парасольковий мох",
+  "block.betterend.twisted_vine": "Викривлена лоза",
+  "block.betterend.umbrella_moss": "Парасолькоподібний мох",
+  "block.betterend.umbrella_moss_tall": "Парасолькоподібний мох",
+  "block.betterend.vaiolush_fern": "Папороть Вайолаш",
+  "item.betterend.amber_root_product": "Бурштинові паростки",
+  "item.betterend.amber_root_seeds": "Насіння бурштинових пагонів",
+  "item.betterend.blossom_berry_product": "Цвіт ягод",
+  "item.betterend.blossom_berry_seeds": "Цвітіння насінини ягоди",
+  "item.betterend.bolux_mushroom_cooked": "Приготований гриб Болукс",
+  "item.betterend.bolux_mushroom_product": "Гриб Болукс",
+  "item.betterend.bolux_mushroom_seeds": "Спори гриба Болукс",
+  "item.betterend.cave_pumpkin_chunks": "Шматки Балбкіна",
+  "item.betterend.cave_pumpkin_product": "Балбкін",
+  "item.betterend.cave_pumpkin_plant_seeds": "Насіння Балбкіна",
+  "item.betterend.cave_pumpkin_pie": "Пиріг із Балбкіна",
+  "item.betterend.chorus_mushroom_cooked": "Приготований гриб Чалмі",
+  "item.betterend.chorus_mushroom_product": "Гриб Чалмі",
+  "item.betterend.chorus_mushroom_seeds": "Спори гриба Чалмі",
+  "item.betterend.shadow_berry_cooked": "Приготована ягода Нокс",
+  "item.betterend.shadow_berry_product": "Нокс ягода",
+  "item.betterend.shadow_berry_seeds": "Насіння нокс ягоди"
+}

kubejs/assets/betterend/models/block/bolux_mushroom_0.json

@@ -7,38 +7,38 @@
 	"elements": [ 	 
 		{
 			"__comment": "Box1",
-			"from": [ 1, 3, 1 ],
-			"to": [ 9, 7, 9 ],
+			"from": [ 6, 0, 8 ],
+			"to": [ 8, 2, 10 ],
 			"faces": {
-				"down": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" },
-				"up": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" },
-				"north": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" },
-				"south": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" },
-				"west": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" },
-				"east": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }
+				"north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" },
+				"south": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" },
+				"west": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" },
+				"east": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }
 			}
 		},
 		{
 			"__comment": "Box1",
-			"from": [ 2, 7, 2 ],
-			"to": [ 8, 8, 8 ],
+			"from": [ 5, 2, 7 ],
+			"to": [ 9, 4, 11 ],
 			"faces": {
-				"up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" },
-				"north": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" },
-				"south": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" },
-				"west": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" },
-				"east": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }
+				"down": { "uv": [ 2, 10, 6, 14 ], "texture": "#texture" },
+				"up": { "uv": [ 4, 4, 8, 8 ], "texture": "#texture" },
+				"north": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" },
+				"south": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" },
+				"west": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" },
+				"east": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" }
 			}
 		},
 		{
 			"__comment": "Box1",
-			"from": [ 4, 0, 4 ],
-			"to": [ 6, 3, 6 ],
+			"from": [ 6, 4, 8 ],
+			"to": [ 8, 5, 10 ],
 			"faces": {
-				"north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" },
-				"west": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" },
-				"east": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" }
+				"up": { "uv": [ 5, 5, 7, 7 ], "texture": "#texture" },
+				"north": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" },
+				"south": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" },
+				"west": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" },
+				"east": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" }
 			}
 		}
 	]

kubejs/assets/betterend/models/block/cave_pumpkin_vine_1.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "betterend:block/cave_pumpkin_stem_0"
-    }
-}

kubejs/assets/betterend/models/block/cave_pumpkin_vine_2.json

@@ -1,6 +0,0 @@
-{
-    "parent": "betterend:block/cross_inverted",
-    "textures": {
-        "cross": "betterend:block/cave_pumpkin_stem_0"
-    }
-}

kubejs/assets/betterend/models/block/cave_pumpkin_vine_3.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "betterend:block/cave_pumpkin_stem_1"
-    }
-}

kubejs/assets/betterend/models/block/cave_pumpkin_vine_4.json

@@ -1,6 +0,0 @@
-{
-    "parent": "betterend:block/cross_inverted",
-    "textures": {
-        "cross": "betterend:block/cave_pumpkin_stem_1"
-    }
-}

kubejs/assets/betterend/models/block/cave_pumpkin_vine_5.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "betterend:block/cave_pumpkin_stem_2"
-    }
-}

kubejs/assets/betterend/models/block/cave_pumpkin_vine_6.json

@@ -1,6 +0,0 @@
-{
-    "parent": "betterend:block/cross_inverted",
-    "textures": {
-        "cross": "betterend:block/cave_pumpkin_stem_2"
-    }
-}

kubejs/assets/betterend/models/block/cave_pumpkin_vine_7.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "betterend:block/cave_pumpkin_stem_3"
-    }
-}

kubejs/assets/betterend/models/block/cave_pumpkin_vine_8.json

@@ -1,6 +0,0 @@
-{
-    "parent": "minecraft:block/cross",
-    "textures": {
-        "cross": "betterend:block/cave_pumpkin_stem_3_side"
-    }
-}

kubejs/assets/create/lang/uk_ua.json

@@ -1,8 +1,8 @@
 {
   "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
   "block.create.netherite_backtank": "Рюкзак із синьої сталі",
-  "block.create.industrial_iron_block": "Промисловий сталевий блок",
-  "block.create.weathered_iron_block": "Блок вивітреної сталі",
+  "block.create.industrial_iron_block": "Промисловий Сталевий Блок",
+  "block.create.weathered_iron_block": "Блок Вивітреної Сталі",
   "block.create.industrial_iron_window": "Промислове сталеве вікно",
   "block.create.weathered_iron_window": "Вікно з вивітреної сталі",
   "block.create.industrial_iron_window_pane": "Панель промислового сталевого вікна",

kubejs/assets/createdeco/lang/en_us.json

@@ -63,6 +63,7 @@
   "block.createdeco.locked_industrial_iron_door": "Locked Steel Door",
   "block.createdeco.industrial_iron_trapdoor": "Steel Trapdoor",
   "block.createdeco.industrial_iron_ladder": "Steel Ladder",
+  "block.createdeco.industrial_iron_facade": "Steel Facade",
   "item.createdeco.iron_coin": "Wrought Iron Coin",
   "item.createdeco.netherite_coin": "Blue Steel Coin",
   "item.createdeco.industrial_iron_coin": "Steel Coin",

kubejs/assets/createhorsepower/lang/uk_ua.json

@@ -1,4 +1,4 @@
 {
   "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
-  "blocks.createhorsepower.horse_crank": "Тваринний Привід"
+  "block.createhorsepower.horse_crank": "Тваринний Привід"
 }

kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json

@@ -1 +1 @@
-{"ad_astra:oxygen_loading":{"order":157}}
+{"ad_astra:oxygen_loading":{"order":159}}

kubejs/assets/emi/category/properties/ae2_attunement.json

@@ -1 +1 @@
-{"ae2:attunement":{"order":154}}
+{"ae2:attunement":{"order":156}}

kubejs/assets/emi/category/properties/ae2_condenser.json

@@ -1 +1 @@
-{"ae2:condenser":{"order":144}}
+{"ae2:condenser":{"order":146}}

kubejs/assets/emi/category/properties/ae2_item_transformation.json

@@ -1 +1 @@
-{"ae2:item_transformation":{"order":133}}
+{"ae2:item_transformation":{"order":135}}

kubejs/assets/emi/category/properties/create_draining.json

@@ -1 +1 @@
-{"create:draining":{"order":155}}
+{"create:draining":{"order":157}}

kubejs/assets/emi/category/properties/create_spout_filling.json

@@ -1 +1 @@
-{"create:spout_filling":{"order":156}}
+{"create:spout_filling":{"order":158}}

kubejs/assets/emi/category/properties/createaddition_rolling.json

@@ -1 +1 @@
-{"createaddition:rolling":{"order":67}}
+{"createaddition:rolling":{"order":69}}

kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json

@@ -1 +1 @@
-{"domum_ornamentum:architects_cutter":{"order":153}}
+{"domum_ornamentum:architects_cutter":{"order":155}}

kubejs/assets/emi/category/properties/emi_info.json

@@ -1 +1 @@
-{"emi:info":{"order":162}}
+{"emi:info":{"order":164}}

kubejs/assets/emi/category/properties/emi_tag.json

@@ -1 +1 @@
-{"emi:tag":{"order":163}}
+{"emi:tag":{"order":165}}

kubejs/assets/emi/category/properties/exposure_photograph_printing.json

@@ -1 +1 @@
-{"exposure:photograph_printing":{"order":149}}
+{"exposure:photograph_printing":{"order":151}}

kubejs/assets/emi/category/properties/exposure_photograph_stacking.json

@@ -1 +1 @@
-{"exposure:photograph_stacking":{"order":158}}
+{"exposure:photograph_stacking":{"order":160}}

kubejs/assets/emi/category/properties/framedblocks_framing_saw.json

@@ -1 +1 @@
-{"framedblocks:framing_saw":{"order":152}}
+{"framedblocks:framing_saw":{"order":154}}

kubejs/assets/emi/category/properties/greate_automatic_packing.json

@@ -1 +1 @@
-{"greate:automatic_packing":{"order":147}}
+{"greate:automatic_packing":{"order":149}}

kubejs/assets/emi/category/properties/greate_automatic_shaped.json

@@ -1 +1 @@
-{"greate:automatic_shaped":{"order":145}}
+{"greate:automatic_shaped":{"order":147}}

kubejs/assets/emi/category/properties/greate_automatic_shapeless.json

@@ -1 +1 @@
-{"greate:automatic_shapeless":{"order":146}}
+{"greate:automatic_shapeless":{"order":148}}

kubejs/assets/emi/category/properties/greate_block_cutting.json

@@ -1 +1 @@
-{"greate:block_cutting":{"order":151}}
+{"greate:block_cutting":{"order":153}}

kubejs/assets/emi/category/properties/greate_crushing.json

@@ -1 +1 @@
-{"greate:crushing":{"order":102}}
+{"greate:crushing":{"order":104}}

kubejs/assets/emi/category/properties/greate_fan_washing.json

@@ -1 +1 @@
-{"greate:fan_washing":{"order":135}}
+{"greate:fan_washing":{"order":137}}

kubejs/assets/emi/category/properties/greate_milling.json

@@ -1 +1 @@
-{"greate:milling":{"order":101}}
+{"greate:milling":{"order":103}}

kubejs/assets/emi/category/properties/greate_mixing.json

@@ -1 +1 @@
-{"greate:mixing":{"order":104}}
+{"greate:mixing":{"order":106}}

kubejs/assets/emi/category/properties/greate_pressing.json

@@ -1 +1 @@
-{"greate:pressing":{"order":92}}
+{"greate:pressing":{"order":94}}

kubejs/assets/emi/category/properties/greate_sawing.json

@@ -1 +1 @@
-{"greate:sawing":{"order":79}}
+{"greate:sawing":{"order":81}}

kubejs/assets/emi/category/properties/gtceu_air_scrubber.json

@@ -1 +1 @@
-{"gtceu:air_scrubber":{"order":61}}
+{"gtceu:air_scrubber":{"order":63}}

kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json

@@ -1 +1 @@
-{"gtceu:alloy_blast_smelter":{"order":115}}
+{"gtceu:alloy_blast_smelter":{"order":117}}

kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json

@@ -1 +1 @@
-{"gtceu:alloy_smelter":{"order":62}}
+{"gtceu:alloy_smelter":{"order":64}}

kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json

@@ -1 +1 @@
-{"gtceu:aqueous_accumulator":{"order":63}}
+{"gtceu:aqueous_accumulator":{"order":65}}

kubejs/assets/emi/category/properties/gtceu_arc_furnace.json

@@ -1 +1 @@
-{"gtceu:arc_furnace":{"order":64}}
+{"gtceu:arc_furnace":{"order":66}}

kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json

@@ -1 +1 @@
-{"gtceu:arc_furnace_recycling":{"order":141}}
+{"gtceu:arc_furnace_recycling":{"order":143}}

kubejs/assets/emi/category/properties/gtceu_assembler.json

@@ -1 +1 @@
-{"gtceu:assembler":{"order":65}}
+{"gtceu:assembler":{"order":67}}

kubejs/assets/emi/category/properties/gtceu_assembly_line.json

@@ -1 +1 @@
-{"gtceu:assembly_line":{"order":116}}
+{"gtceu:assembly_line":{"order":118}}

kubejs/assets/emi/category/properties/gtceu_autoclave.json

@@ -1 +1 @@
-{"gtceu:autoclave":{"order":66}}
+{"gtceu:autoclave":{"order":68}}

kubejs/assets/emi/category/properties/gtceu_bender.json

@@ -1 +1 @@
-{"gtceu:bender":{"order":69}}
+{"gtceu:bender":{"order":71}}

kubejs/assets/emi/category/properties/gtceu_brewery.json

@@ -1 +1 @@
-{"gtceu:brewery":{"order":70}}
+{"gtceu:brewery":{"order":72}}

kubejs/assets/emi/category/properties/gtceu_canner.json

@@ -1 +1 @@
-{"gtceu:canner":{"order":71}}
+{"gtceu:canner":{"order":73}}

kubejs/assets/emi/category/properties/gtceu_centrifuge.json

@@ -1 +1 @@
-{"gtceu:centrifuge":{"order":73}}
+{"gtceu:centrifuge":{"order":75}}

kubejs/assets/emi/category/properties/gtceu_chem_dyes.json

@@ -1 +1 @@
-{"gtceu:chem_dyes":{"order":139}}
+{"gtceu:chem_dyes":{"order":141}}

kubejs/assets/emi/category/properties/gtceu_chemical_bath.json

@@ -1 +1 @@
-{"gtceu:chemical_bath":{"order":74}}
+{"gtceu:chemical_bath":{"order":76}}

kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json

@@ -1 +1 @@
-{"gtceu:chemical_reactor":{"order":75}}
+{"gtceu:chemical_reactor":{"order":77}}

kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json

@@ -1 +1 @@
-{"gtceu:circuit_assembler":{"order":77}}
+{"gtceu:circuit_assembler":{"order":79}}

kubejs/assets/emi/category/properties/gtceu_compressor.json

@@ -1 +1 @@
-{"gtceu:compressor":{"order":78}}
+{"gtceu:compressor":{"order":80}}

kubejs/assets/emi/category/properties/gtceu_cracker.json

@@ -1 +1 @@
-{"gtceu:cracker":{"order":117}}
+{"gtceu:cracker":{"order":119}}

kubejs/assets/emi/category/properties/gtceu_cutter.json

@@ -1 +1 @@
-{"gtceu:cutter":{"order":80}}
+{"gtceu:cutter":{"order":82}}

kubejs/assets/emi/category/properties/gtceu_distillation_tower.json

@@ -1 +1 @@
-{"gtceu:distillation_tower":{"order":82}}
+{"gtceu:distillation_tower":{"order":84}}

kubejs/assets/emi/category/properties/gtceu_distillery.json

@@ -1 +1 @@
-{"gtceu:distillery":{"order":81}}
+{"gtceu:distillery":{"order":83}}

kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json

@@ -1 +1 @@
-{"gtceu:electric_blast_furnace":{"order":118}}
+{"gtceu:electric_blast_furnace":{"order":120}}

kubejs/assets/emi/category/properties/gtceu_electrolyzer.json

@@ -1 +1 @@
-{"gtceu:electrolyzer":{"order":83}}
+{"gtceu:electrolyzer":{"order":85}}

kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json

@@ -1 +1 @@
-{"gtceu:electromagnetic_separator":{"order":84}}
+{"gtceu:electromagnetic_separator":{"order":86}}

kubejs/assets/emi/category/properties/gtceu_end_dome.json

@@ -1 +1 @@
-{"gtceu:end_dome":{"order":119}}
+{"gtceu:end_dome":{"order":121}}

kubejs/assets/emi/category/properties/gtceu_evaporation_tower.json

@@ -1 +1 @@
-{"gtceu:evaporation_tower":{"order":120}}
+{"gtceu:evaporation_tower":{"order":122}}

kubejs/assets/emi/category/properties/gtceu_extractor.json

@@ -1 +1 @@
-{"gtceu:extractor":{"order":86}}
+{"gtceu:extractor":{"order":88}}

kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json

@@ -1 +1 @@
-{"gtceu:extractor_recycling":{"order":143}}
+{"gtceu:extractor_recycling":{"order":145}}

kubejs/assets/emi/category/properties/gtceu_extruder.json

@@ -1 +1 @@
-{"gtceu:extruder":{"order":88}}
+{"gtceu:extruder":{"order":90}}

kubejs/assets/emi/category/properties/gtceu_fermenter.json

@@ -1 +1 @@
-{"gtceu:fermenter":{"order":89}}
+{"gtceu:fermenter":{"order":91}}

kubejs/assets/emi/category/properties/gtceu_fission_reactor.json

@@ -1 +1 @@
-{"gtceu:fission_reactor":{"order":121}}
+{"gtceu:fission_reactor":{"order":123}}

kubejs/assets/emi/category/properties/gtceu_fluid_heater.json

@@ -1 +1 @@
-{"gtceu:fluid_heater":{"order":90}}
+{"gtceu:fluid_heater":{"order":92}}

kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json

@@ -1 +1 @@
-{"gtceu:fluid_solidifier":{"order":91}}
+{"gtceu:fluid_solidifier":{"order":93}}

kubejs/assets/emi/category/properties/gtceu_forge_hammer.json

@@ -1 +1 @@
-{"gtceu:forge_hammer":{"order":93}}
+{"gtceu:forge_hammer":{"order":95}}

kubejs/assets/emi/category/properties/gtceu_forming_press.json

@@ -1 +1 @@
-{"gtceu:forming_press":{"order":94}}
+{"gtceu:forming_press":{"order":96}}

kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json

@@ -1 +1 @@
-{"gtceu:fusion_reactor":{"order":122}}
+{"gtceu:fusion_reactor":{"order":124}}

kubejs/assets/emi/category/properties/gtceu_gas_collector.json

@@ -1 +1 @@
-{"gtceu:gas_collector":{"order":95}}
+{"gtceu:gas_collector":{"order":97}}

kubejs/assets/emi/category/properties/gtceu_gas_pressurizer.json

@@ -1 +1 @@
-{"gtceu:gas_pressurizer":{"order":96}}
+{"gtceu:gas_pressurizer":{"order":98}}

kubejs/assets/emi/category/properties/gtceu_greenhouse.json

@@ -1 +1 @@
-{"gtceu:greenhouse":{"order":123}}
+{"gtceu:greenhouse":{"order":125}}

kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json

@@ -1 +1 @@
-{"gtceu:heat_exchanger":{"order":124}}
+{"gtceu:heat_exchanger":{"order":126}}

kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json

@@ -1 +1 @@
-{"gtceu:implosion_compressor":{"order":125}}
+{"gtceu:implosion_compressor":{"order":127}}

kubejs/assets/emi/category/properties/gtceu_ingot_molding.json

@@ -1 +1 @@
-{"gtceu:ingot_molding":{"order":140}}
+{"gtceu:ingot_molding":{"order":142}}