Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

config/ftbquests/quests/chapters/applied_energistics_2.snbt

@@ -1288,21 +1288,6 @@
 			x: -2.0d
 			y: -9.0d
 		}
-		{
-			dependencies: ["25007C5E43D28DB2"]
-			description: ["{quests.ae2.stock_bridge.desc}"]
-			id: "0E54B3BCBBA34A00"
-			optional: true
-			shape: "heart"
-			tasks: [{
-				id: "1F8D81C524CE694A"
-				item: "createstockbridge:ae_bridge"
-				type: "item"
-			}]
-			title: "{quests.ae2.stock_bridge.title}"
-			x: 5.0d
-			y: -8.0d
-		}
 	]
 	subtitle: ["{quests.ae2.subtitle}"]
 	title: "{quests.ae2}"

config/ftbquests/quests/chapters/ev__extreme_voltage.snbt

@@ -19,8 +19,8 @@
 		{
 			id: "0D951ADFB3AF2E74"
 			linked_quest: "7B2EE67E37809269"
-			x: 4.5d
-			y: 0.0d
+			x: 8.5d
+			y: -1.0d
 		}
 		{
 			id: "0E76B952D3BA3BDA"
@@ -32,7 +32,7 @@
 			id: "66960076A74E9B79"
 			linked_quest: "0CA5B715B76E4A5B"
 			shape: "diamond"
-			x: 15.5d
+			x: 16.0d
 			y: 2.5d
 		}
 		{
@@ -44,7 +44,7 @@
 		{
 			id: "49FB3507B0FB3000"
 			linked_quest: "155F421FC2F39C3C"
-			x: 12.0d
+			x: 11.5d
 			y: 4.0d
 		}
 		{
@@ -52,21 +52,34 @@
 			linked_quest: "4B1F957EB41A5E9B"
 			shape: "octagon"
 			size: 1.5d
-			x: 5.5d
-			y: 5.5d
+			x: 5.25d
+			y: 2.0d
 		}
 		{
 			id: "7B380A243C2C39FA"
 			linked_quest: "13F2929C1C303A0B"
-			x: -1.0d
-			y: -5.0d
+			x: 4.25d
+			y: -3.5d
 		}
 		{
 			id: "2151F8AA263F1D6E"
 			linked_quest: "6ECAD339C91EF194"
 			shape: "heart"
-			x: 4.0d
-			y: -5.5d
+			x: 17.5d
+			y: 8.0d
+		}
+		{
+			icon: {
+				Count: 1
+				id: "tfg:tbu_232_rod"
+				tag: {
+					Damage: 0
+				}
+			}
+			id: "2DD8555DDAA44979"
+			linked_quest: "0ABD326DC2551CBD"
+			x: 24.5d
+			y: 9.0d
 		}
 	]
 	quests: [
@@ -92,6 +105,7 @@
 		{
 			dependencies: [
 				"601088B7920140B2"
+				"3FBDC8552F7D8008"
 				"3B18DE7395776B41"
 			]
 			description: ["{quests.extreme_voltage.t2_rocket.desc}"]
@@ -140,25 +154,17 @@
 		{
 			dependencies: ["2931F887548A4A64"]
 			description: ["{quests.extreme_voltage.tungsten.desc}"]
-			icon: "gtceu:tungsten_ingot"
+			icon: "gtceu:tungsten_dust"
 			id: "5EC5566546591DEE"
 			subtitle: "{quests.extreme_voltage.tungsten.subtitle}"
-			tasks: [
-				{
-					id: "017BC39C681F5335"
-					item: "gtceu:tungsten_dust"
-					optional_task: true
-					type: "item"
-				}
-				{
-					id: "3A60698FD28B0CC5"
-					item: "gtceu:tungsten_ingot"
-					type: "item"
-				}
-			]
+			tasks: [{
+				id: "017BC39C681F5335"
+				item: "gtceu:tungsten_dust"
+				type: "item"
+			}]
 			title: "{quests.extreme_voltage.tungsten.title}"
-			x: 7.5d
-			y: -2.0d
+			x: 7.0d
+			y: -4.5d
 		}
 		{
 			dependencies: [
@@ -185,8 +191,8 @@
 				}
 			]
 			title: "{quests.extreme_voltage.tunsgten_line_step_1.title}"
-			x: -2.0d
-			y: -2.0d
+			x: -3.75d
+			y: -4.5d
 		}
 		{
 			dependencies: ["4EA8888B12D75BF1"]
@@ -321,8 +327,8 @@
 				item: "gtceu:alloy_blast_smelter"
 				type: "item"
 			}]
-			x: 10.0d
-			y: 1.5d
+			x: 13.0d
+			y: 1.0d
 		}
 		{
 			dependencies: ["4EA8888B12D75BF1"]
@@ -338,13 +344,14 @@
 				type: "item"
 			}]
 			title: "{quests.extreme_voltage.ev_mixer.title}"
-			x: 0.0d
+			x: 5.25d
 			y: 0.0d
 		}
 		{
 			dependencies: [
 				"61D5055F344DDFAD"
 				"42C2B749B61B1FBE"
+				"5EC5566546591DEE"
 			]
 			description: ["{quests.extreme_voltage.rtm.desc}"]
 			icon: "gtceu:rtm_alloy_ingot"
@@ -364,7 +371,7 @@
 				}
 			]
 			title: "{quests.extreme_voltage.rtm.title}"
-			x: 1.5d
+			x: 7.0d
 			y: 0.0d
 		}
 		{
@@ -372,6 +379,7 @@
 				"37B7342CD1B3B76D"
 				"601088B7920140B2"
 				"6B08799BCFD01D3D"
+				"5CF70AC24D269279"
 			]
 			description: ["{quests.extreme_voltage.rtm_coil.desc}"]
 			id: "7F4E529627AD9148"
@@ -381,8 +389,8 @@
 				item: "gtceu:rtm_alloy_coil_block"
 				type: "item"
 			}]
-			x: 1.5d
-			y: 1.5d
+			x: 10.0d
+			y: 3.0d
 		}
 		{
 			dependencies: ["7F4E529627AD9148"]
@@ -436,8 +444,8 @@
 				}
 			]
 			title: "{quests.extreme_voltage.gcym_alloys.title}"
-			x: 8.5d
-			y: 1.5d
+			x: 10.0d
+			y: 1.0d
 		}
 		{
 			dependencies: ["7B2EE67E37809269"]
@@ -471,7 +479,7 @@
 				}
 			]
 			title: "{quests.extreme_voltage.ruthenium.title}"
-			x: 3.0d
+			x: 8.5d
 			y: 0.0d
 		}
 		{
@@ -484,8 +492,8 @@
 				item: "gtceu:large_centrifuge"
 				type: "item"
 			}]
-			x: 17.0d
-			y: 1.5d
+			x: 17.5d
+			y: 1.0d
 		}
 		{
 			dependencies: [
@@ -510,14 +518,14 @@
 				}
 			]
 			title: "{quests.extreme_voltage.tungsten_steel.title}"
-			x: 0.0d
-			y: -4.0d
+			x: 5.25d
+			y: -2.5d
 		}
 		{
 			dependencies: [
-				"2979AFD231E5B37B"
-				"5EC5566546591DEE"
 				"0E2E93BE3364722D"
+				"4AD96212525517CD"
+				"37B7342CD1B3B76D"
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.extreme_voltage.nuclear_fuel_factory.desc}"]
@@ -529,7 +537,7 @@
 				type: "item"
 			}]
 			title: "{quests.extreme_voltage.nuclear_fuel_factory.title}"
-			x: 7.5d
+			x: 7.0d
 			y: 7.0d
 		}
 		{
@@ -547,7 +555,9 @@
 			y: 6.0d
 		}
 		{
+			dependencies: ["2979AFD231E5B37B"]
 			description: ["{quests.extreme_voltage.heavy_water.desc}"]
+			hide_dependency_lines: true
 			icon: "tfg:heavy_water_bucket"
 			id: "4AD41E9FA7814EA1"
 			subtitle: "{quests.extreme_voltage.heavy_water.subtitle}"
@@ -582,6 +592,8 @@
 				"{quests.extreme_voltage.thorium_rod.desc.2}"
 				"{@pagebreak}"
 				"{quests.extreme_voltage.thorium_rod.desc.3}"
+				"{@pagebreak}"
+				"{quests.extreme_voltage.thorium_rod.desc.4}"
 			]
 			id: "77CB4AE5B3AF5263"
 			subtitle: "{quests.extreme_voltage.thorium_rod.subtitle}"
@@ -703,8 +715,12 @@
 			y: 8.0d
 		}
 		{
-			dependencies: ["00004BE1D77EA003"]
+			dependencies: [
+				"00004BE1D77EA003"
+				"4EA8888B12D75BF1"
+			]
 			description: ["{quests.extreme_voltage.uraninite_dust.desc}"]
+			hide_dependency_lines: true
 			icon: "gtceu:uraninite_dust"
 			id: "2814C6FA71B07C95"
 			subtitle: "{quests.extreme_voltage.uraninite_dust.subtitle}"
@@ -766,6 +782,8 @@
 				item: "gtceu:machine_controller_cover"
 				type: "item"
 			}]
+			shape: "octagon"
+			size: 1.5d
 			subtitle: "{quests.extreme_voltage.heat_exchanger.subtitle}"
 			tasks: [{
 				id: "67CB661D4F20EC3A"
@@ -777,7 +795,9 @@
 			y: 5.5d
 		}
 		{
+			dependencies: ["4EA8888B12D75BF1"]
 			description: ["{quests.extreme_voltage.ammonium_formate.desc}"]
+			hide_dependency_lines: true
 			icon: "gtceu:ammonium_formate_bucket"
 			id: "075434DAB3D9F0EA"
 			subtitle: "{quests.extreme_voltage.ammonium_formate.subtitle}"
@@ -801,7 +821,7 @@
 				}
 			]
 			title: "{quests.extreme_voltage.ammonium_formate.title}"
-			x: 13.5d
+			x: 12.5d
 			y: 5.5d
 		}
 		{
@@ -824,7 +844,7 @@
 				}
 			]
 			title: "{quests.extreme_voltage.formamide.title}"
-			x: 15.5d
+			x: 16.0d
 			y: 5.5d
 		}
 		{
@@ -857,7 +877,7 @@
 				}
 			]
 			title: "{quests.extreme_voltage.nuclear_residue_dust.title}"
-			x: 17.0d
+			x: 17.5d
 			y: 5.5d
 		}
 		{
@@ -883,11 +903,13 @@
 				}
 			]
 			title: "{quests.extreme_voltage.martian_sludge.title}"
-			x: 17.0d
+			x: 17.5d
 			y: 3.5d
 		}
 		{
+			dependencies: ["4EA8888B12D75BF1"]
 			description: ["{quests.extreme_voltage.hexafluorosilic_acid.desc}"]
+			hide_dependency_lines: true
 			icon: "gtceu:dirty_hexafluorosilicic_acid_bucket"
 			id: "05FED2FF1BEA05F1"
 			subtitle: "{quests.extreme_voltage.hexafluorosilic_acid.subtitle}"
@@ -911,7 +933,7 @@
 				}
 			]
 			title: "{quests.extreme_voltage.hexafluorosilic_acid.title}"
-			x: 18.5d
+			x: 19.0d
 			y: 3.5d
 		}
 		{
@@ -928,7 +950,7 @@
 				item: "tfg:oxidized_nuclear_residue_dust"
 				type: "item"
 			}]
-			x: 18.5d
+			x: 19.0d
 			y: 5.5d
 		}
 		{
@@ -941,7 +963,7 @@
 				item: "tfg:refined_nuclear_residue_dust"
 				type: "item"
 			}]
-			x: 18.5d
+			x: 19.0d
 			y: 7.0d
 		}
 		{
@@ -967,7 +989,7 @@
 				}
 				type: "item"
 			}]
-			x: 18.5d
+			x: 19.0d
 			y: 10.5d
 		}
 		{
@@ -990,7 +1012,7 @@
 				}
 			]
 			title: "{quests.extreme_voltage.radioactive_concoction.title}"
-			x: 21.5d
+			x: 22.0d
 			y: 5.5d
 		}
 		{
@@ -1013,7 +1035,7 @@
 				}
 			]
 			title: "{quests.extreme_voltage.tritiated_water.title}"
-			x: 16.0d
+			x: 12.5d
 			y: 10.5d
 		}
 		{
@@ -1226,10 +1248,10 @@
 				type: "item"
 			}]
 			x: 1.5d
-			y: -5.5d
+			y: -2.5d
 		}
 		{
-			dependencies: ["2C000B45C23752D0"]
+			dependencies: ["2B666F65B5F196E6"]
 			description: ["{quests.extreme_voltage.ev_superconductor.desc}"]
 			icon: "gtceu:uranium_triplatinum_single_wire"
 			id: "2BE373381980C85F"
@@ -1255,8 +1277,8 @@
 				}
 			]
 			title: "{quests.extreme_voltage.ev_superconductor.title}"
-			x: 13.5d
-			y: 8.0d
+			x: 17.5d
+			y: 7.0d
 		}
 		{
 			dependencies: ["017019EB38F7A18C"]
@@ -1479,8 +1501,8 @@
 				type: "item"
 			}]
 			title: "{quests.extreme_voltage.me_part.title}"
-			x: 5.5d
-			y: 3.0d
+			x: 2.5d
+			y: 1.0d
 		}
 		{
 			dependencies: ["70ABD1E3FC1CA672"]
@@ -1505,8 +1527,8 @@
 				type: "item"
 			}]
 			title: "{quests.extreme_voltage.building_gadgets.title}"
-			x: 4.5d
-			y: 4.0d
+			x: 1.5d
+			y: 1.0d
 		}
 		{
 			dependencies: ["70ABD1E3FC1CA672"]
@@ -1534,8 +1556,8 @@
 				}
 			]
 			title: "{quests.ae2.wireless_access.title}"
-			x: 5.5d
-			y: 4.0d
+			x: 3.5d
+			y: 2.0d
 		}
 		{
 			dependencies: ["601088B7920140B2"]
@@ -1548,8 +1570,8 @@
 				type: "checkmark"
 			}]
 			title: "{quests.extreme_voltage.new_qol.title}"
-			x: 4.5d
-			y: 3.0d
+			x: 1.5d
+			y: 2.0d
 		}
 		{
 			dependencies: ["55FB2776B724FB63"]
@@ -1594,28 +1616,43 @@
 				}
 			]
 			title: "{quests.extreme_voltage.plutonium.title}"
-			x: 18.5d
+			x: 19.0d
 			y: 9.0d
 		}
 		{
-			dependencies: ["617CF3335584DC8D"]
+			dependencies: ["26AA29016BA23396"]
 			description: ["{quests.extreme_voltage.ostrum_linear.desc}"]
+			icon: "tfg:ostrum_linear_accelerator"
 			id: "691A36800DC755C1"
 			shape: "octagon"
 			size: 2.0d
 			subtitle: "{quests.extreme_voltage.ostrum_linear.subtitle}"
-			tasks: [{
-				id: "130FE3E2CE8735F8"
-				item: "tfg:ostrum_linear_accelerator"
-				type: "item"
-			}]
-			x: 21.5d
+			tasks: [
+				{
+					id: "130FE3E2CE8735F8"
+					item: "tfg:ostrum_linear_accelerator"
+					type: "item"
+				}
+				{
+					id: "5D1A52502962C948"
+					item: "deafission:battery_heat_port_ev"
+					type: "item"
+				}
+				{
+					id: "0FEF42CB8A6DC0F6"
+					item: "deafission:heat_input_hatch_ev"
+					type: "item"
+				}
+			]
+			x: 22.0d
 			y: 9.0d
 		}
 		{
 			dependencies: ["691A36800DC755C1"]
+			description: ["{quests.extreme_voltage.ostrum_vapor.desc}"]
 			icon: "gtceu:ostrum_vapor_bucket"
 			id: "58264E007C2D7CC6"
+			subtitle: "{quests.extreme_voltage.ostrum_vapor.subtitle}"
 			tasks: [
 				{
 					id: "5399332E050D8560"
@@ -1629,13 +1666,20 @@
 					type: "checkmark"
 				}
 			]
-			x: 21.5d
-			y: 12.5d
+			title: "{quests.extreme_voltage.ostrum_vapor.title}"
+			x: 20.5d
+			y: 9.0d
 		}
 		{
-			dependencies: ["691A36800DC755C1"]
+			dependencies: [
+				"691A36800DC755C1"
+				"3E0ABDFCC0FC6928"
+			]
+			dependency_requirement: "one_completed"
+			description: ["{quests.extreme_voltage.light_ostrum_vapor.desc}"]
 			icon: "gtceu:lightweight_ostrum_vapor_bucket"
 			id: "4F647D6A4949EDF7"
+			subtitle: "{quests.extreme_voltage.light_ostrum_vapor.subtitle}"
 			tasks: [
 				{
 					id: "3529CF130C73746E"
@@ -1649,16 +1693,16 @@
 					type: "checkmark"
 				}
 			]
-			x: 22.5d
-			y: 12.5d
+			title: "{quests.extreme_voltage.light_ostrum_vapor.title}"
+			x: 22.0d
+			y: 12.0d
 		}
 		{
-			dependencies: [
-				"691A36800DC755C1"
-				"3E0ABDFCC0FC6928"
-			]
+			dependencies: ["691A36800DC755C1"]
+			description: ["{quests.extreme_voltage.dense_ostrum_vapor.desc}"]
 			icon: "gtceu:dense_ostrum_vapor_bucket"
 			id: "4C29DDE89AE8D6EE"
+			subtitle: "{quests.extreme_voltage.dense_ostrum_vapor.subtitle}"
 			tasks: [
 				{
 					id: "24641F2651FFBE44"
@@ -1672,21 +1716,33 @@
 					type: "checkmark"
 				}
 			]
-			x: 20.5d
-			y: 12.5d
+			title: "{quests.extreme_voltage.dense_ostrum_vapor.title}"
+			x: 23.5d
+			y: 9.0d
 		}
 		{
 			dependencies: ["4F647D6A4949EDF7"]
 			id: "6ABD72F1C1971EE3"
+			optional: true
 			shape: "heart"
 			tasks: [
 				{
-					id: "02963B7E2699E185"
-					item: "gtceu:tricalcium_phosphate_dust"
+					id: "500E6AD918D6F37A"
+					item: "gtceu:thorium_dust"
 					type: "item"
 				}
 				{
-					id: "0202E05696C78841"
+					id: "3F961A11EFDFA246"
+					item: "gtceu:pitchblende_dust"
+					type: "item"
+				}
+				{
+					id: "02A251EBEF64897C"
+					item: "gtceu:aluminium_dust"
+					type: "item"
+				}
+				{
+					id: "1CDA9E72C0CF6707"
 					item: {
 						Count: 1
 						ForgeCaps: {
@@ -1700,26 +1756,7 @@
 					type: "item"
 				}
 				{
-					id: "07372F88634076C6"
-					item: "gtceu:pitchblende_dust"
-					type: "item"
-				}
-			]
-			x: 22.5d
-			y: 13.5d
-		}
-		{
-			dependencies: ["58264E007C2D7CC6"]
-			id: "27804B847EE2CFF2"
-			shape: "heart"
-			tasks: [
-				{
-					id: "19277D14081DE23B"
-					item: "gtceu:aluminium_dust"
-					type: "item"
-				}
-				{
-					id: "552DAD2E001E8D83"
+					id: "1F2D23F66866AFB4"
 					item: {
 						Count: 1
 						ForgeCaps: {
@@ -1733,46 +1770,13 @@
 					type: "item"
 				}
 				{
-					id: "6AFCA6EE597B7F67"
-					item: "gtceu:beryllium_dust"
+					id: "4D619272F96C7EF6"
+					item: "gtceu:tricalcium_phosphate_dust"
 					type: "item"
 				}
 			]
-			x: 21.5d
-			y: 13.5d
-		}
-		{
-			dependencies: ["4C29DDE89AE8D6EE"]
-			id: "09A85FAD0786E667"
-			shape: "heart"
-			tasks: [
-				{
-					id: "06B67B195C0429D5"
-					item: "gtceu:thorium_dust"
-					type: "item"
-				}
-				{
-					id: "0496A5C65EA6EA17"
-					item: "gtceu:uraninite_dust"
-					type: "item"
-				}
-				{
-					id: "43E02B6BE521142B"
-					item: {
-						Count: 1
-						ForgeCaps: {
-							"tfc:item_heat": {
-								heat: 0.0f
-								ticks: 0L
-							}
-						}
-						id: "gtceu:hematite_dust"
-					}
-					type: "item"
-				}
-			]
-			x: 20.5d
-			y: 13.5d
+			x: 22.0d
+			y: 13.0d
 		}
 		{
 			dependencies: ["3A2E442E4D84C891"]
@@ -1863,18 +1867,27 @@
 			y: 9.0d
 		}
 		{
-			dependencies: ["601088B7920140B2"]
+			dependencies: ["58264E007C2D7CC6"]
 			description: ["{quests.extreme_voltage.refrigerant_pellet.desc}"]
-			hide_dependency_lines: true
+			icon: "tfg:terrafirmaguard_pa6"
 			id: "08195E9FA1396936"
+			shape: "hexagon"
 			subtitle: "{quests.extreme_voltage.refrigerant_pellet.subtitle}"
-			tasks: [{
-				id: "1B4C7B8C2EDFE595"
-				item: "tfg:refrigerant_pellet"
-				type: "item"
-			}]
+			tasks: [
+				{
+					id: "1B4C7B8C2EDFE595"
+					item: "tfg:refrigerant_pellet"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "0AEA0612B833D029"
+					item: "tfg:terrafirmaguard_pa6"
+					type: "item"
+				}
+			]
 			title: "{quests.extreme_voltage.refrigerant_pellet.title}"
-			x: 19.5d
+			x: 20.5d
 			y: 10.5d
 		}
 		{
@@ -1947,8 +1960,8 @@
 				type: "item"
 			}]
 			title: "{quests.extreme_voltage.large_miner.title}"
-			x: 7.5d
-			y: -3.5d
+			x: 10.0d
+			y: -4.5d
 		}
 		{
 			dependencies: ["2979AFD231E5B37B"]
@@ -1973,7 +1986,9 @@
 			y: 8.0d
 		}
 		{
+			dependencies: ["4EA8888B12D75BF1"]
 			description: ["{quests.extreme_voltage.dense_lead.desc}"]
+			hide_dependency_lines: true
 			id: "0E2E93BE3364722D"
 			shape: "circle"
 			subtitle: "{quests.extreme_voltage.dense_lead.subtitle}"
@@ -1983,7 +1998,7 @@
 				type: "item"
 			}]
 			title: "{quests.extreme_voltage.dense_lead.title}"
-			x: 6.5d
+			x: 6.0d
 			y: 8.0d
 		}
 		{
@@ -2011,25 +2026,6 @@
 			x: 14.5d
 			y: 4.0d
 		}
-		{
-			dependencies: ["691A36800DC755C1"]
-			description: [
-				"In a future update coming before Venus, the recipes within the Linear Accelerator will be change. Expect your recipes to break."
-				""
-				"The multiblock itself won't so you are safe to use it for now."
-			]
-			icon: "createdeco:decal_warning"
-			id: "3F59CD5ABE4E7510"
-			size: 1.5d
-			tasks: [{
-				id: "2CCA527404CECA8C"
-				title: "Okay I understand this will break"
-				type: "checkmark"
-			}]
-			title: "Breaking changes in next update"
-			x: 24.0d
-			y: 9.0d
-		}
 		{
 			dependencies: ["04682CD04FE0A56E"]
 			description: [
@@ -2058,8 +2054,8 @@
 				}
 			]
 			title: "{quests.extreme_voltage.tunsgten_line_step.title}"
-			x: -2.0d
-			y: -3.0d
+			x: -3.75d
+			y: -5.5d
 		}
 		{
 			dependencies: ["04682CD04FE0A56E"]
@@ -2072,8 +2068,8 @@
 				type: "item"
 			}]
 			title: "{quests.extreme_voltage.tunsgten_line_step_2.title}"
-			x: -1.0d
-			y: -2.0d
+			x: -2.75d
+			y: -4.5d
 		}
 		{
 			dependencies: ["3A2E442E4D84C891"]
@@ -2128,6 +2124,7 @@
 			y: 5.5d
 		}
 		{
+			dependencies: ["2979AFD231E5B37B"]
 			description: [
 				"{quests.extreme_voltage.radiation.desc.1}"
 				"{@pagebreak}"
@@ -2171,12 +2168,16 @@
 				type: "item"
 			}]
 			title: "{quests.extreme_voltage.advanced_fluid_rig.title}"
-			x: 9.0d
-			y: -2.0d
+			x: 7.0d
+			y: -6.0d
 		}
 		{
 			dependencies: ["5CF58F7CBE255585"]
-			description: ["{quests.extreme_voltage.large_generators.desc}"]
+			description: [
+				"{quests.extreme_voltage.large_generators.desc}"
+				""
+				"{ \"text\": \"▶▶▶▶▶▶▶\", \"underlined\": \"true\", \"clickEvent\": { \"action\": \"change_page\", \"value\": \"2CDB9778C7A30044\" } }"
+			]
 			disable_toast: true
 			id: "40CBACE41B71C011"
 			shape: "octagon"
@@ -2239,8 +2240,8 @@
 				type: "item"
 			}]
 			title: "{quests.extreme_voltage.btx_catalyser.title}"
-			x: -4.0d
-			y: -4.5d
+			x: -5.5d
+			y: -6.0d
 		}
 		{
 			dependencies: ["3EC1D337D9FC3F1B"]
@@ -2256,8 +2257,52 @@
 				item: "gtceu:rhenium_dust"
 				type: "item"
 			}]
-			x: -4.0d
-			y: -5.5d
+			x: -5.5d
+			y: -7.0d
+		}
+		{
+			dependencies: ["617CF3335584DC8D"]
+			description: ["{quests.extreme_voltage.heat_battery.desc}"]
+			id: "26AA29016BA23396"
+			shape: "octagon"
+			size: 1.5d
+			subtitle: "{quests.extreme_voltage.heat_battery.subtitle}"
+			tasks: [{
+				id: "5C9A37E905A4030F"
+				item: "tfg:heat_battery_mk1"
+				type: "item"
+			}]
+			x: 22.0d
+			y: 7.0d
+		}
+		{
+			dependencies: ["155F421FC2F39C3C"]
+			description: ["{quests.extreme_voltage.nichromium_iode.desc}"]
+			icon: "tfg:nichromium_iodomethylate_bucket"
+			id: "5CF70AC24D269279"
+			subtitle: "{quests.extreme_voltage.nichromium_iode.subtitle}"
+			tasks: [
+				{
+					id: "29015E8328231929"
+					item: "tfg:iodomethane_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "195713F766EF130A"
+					item: "tfg:nichromium_iodomethylate_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "20D7CE8211E091A6"
+					title: "{quests.tasktype.checkmark}"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.extreme_voltage.nichromium_iode.title}"
+			x: 11.5d
+			y: 3.0d
 		}
 	]
 	subtitle: ["{quests.extreme_voltage.subtitle}"]

config/ftbquests/quests/chapters/gregtech_energy.snbt

@@ -232,7 +232,7 @@
 			dependencies: [
 				"60FF9249376DF9BD"
 				"05E2F203DA46A5E8"
-				"3EC8D58DB73CEFE5"
+				"2BE373381980C85F"
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.gregtech_energy.transformer.desc}"]
@@ -1016,8 +1016,8 @@
 		}
 		{
 			dependencies: [
-				"0AF286AA540A82E6"
 				"0C718329245D9619"
+				"4C620105AAC49381"
 			]
 			description: [
 				"{quests.medium_voltage.mv_diesel.desc.1}"
@@ -1034,8 +1034,8 @@
 				type: "item"
 			}]
 			title: "{quests.medium_voltage.mv_diesel.title}"
-			x: -9.0d
-			y: -5.0d
+			x: -8.5d
+			y: -7.0d
 		}
 		{
 			dependencies: ["7AF726555D721DFC"]
@@ -1089,7 +1089,7 @@
 				type: "item"
 			}]
 			title: "{quests.low_voltage.lv_biodiesel.title}"
-			x: -9.0d
+			x: -9.5d
 			y: -7.0d
 		}
 		{
@@ -1236,16 +1236,65 @@
 				"05E2F203DA46A5E8"
 				"0ABD326DC2551CBD"
 			]
-			description: ["{quests.gregtech_energy.smr.desc.1}"]
+			description: [
+				"{quests.gregtech_energy.smr.desc.1}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.smr.desc.2}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.smr.desc.3}"
+			]
+			icon: "tfg:smr_generator"
 			id: "4659447C85CDC058"
 			subtitle: "{quests.gregtech_energy.smr.subtitle}"
-			tasks: [{
-				id: "1D02468DD9869C72"
-				item: "deafission:fission_reactor_smr1"
-				type: "item"
-			}]
+			tasks: [
+				{
+					id: "1D02468DD9869C72"
+					item: "deafission:fission_reactor_smr1"
+					type: "item"
+				}
+				{
+					id: "4DA2451D673DABE3"
+					item: "tfg:smr_generator"
+					type: "item"
+				}
+				{
+					id: "7647ABCBC805E3B3"
+					item: "tfg:uv_smr_fluid_import_hatch"
+					type: "item"
+				}
+				{
+					id: "4BDA2F8B0D5B310D"
+					item: "gtceu:lubricant_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5C5003050BCE8601"
+					item: "tfg:polyalkylene_lubricant_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "79126D47F1236F45"
+					item: "tfg:ozone_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5075B6C62A7AB675"
+					item: "tfg:cyclohex_diperoxide_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "28AAB372882C8996"
+					item: "tfg:ticl4_doped_supercritical_co2_bucket"
+					optional_task: true
+					type: "item"
+				}
+			]
 			title: "{quests.gregtech_energy.smr.title}"
-			x: -7.5d
+			x: -7.0d
 			y: 1.0d
 		}
 		{
@@ -1266,21 +1315,64 @@
 			y: -7.0d
 		}
 		{
-			dependencies: ["4512E5DE7A84F809"]
-			description: ["{quests.gregtech_energy.fission_rod.desc.1}"]
+			dependencies: [
+				"4512E5DE7A84F809"
+				"4C29DDE89AE8D6EE"
+			]
+			dependency_requirement: "one_completed"
+			description: [
+				"{quests.gregtech_energy.fission_rod.desc.1}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.fission_rod.desc.2}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.fission_rod.desc.3}"
+			]
+			icon: {
+				Count: 1
+				id: "tfg:tbu_232_rod"
+				tag: {
+					Damage: 0
+				}
+			}
 			id: "0ABD326DC2551CBD"
 			subtitle: "{quests.gregtech_energy.fission_rod.subtitle}"
-			tasks: [{
-				id: "68E3EE04F4931EFE"
-				item: {
-					Count: 1
-					id: "tfg:tbu_232_rod"
-					tag: {
-						Damage: 0
+			tasks: [
+				{
+					id: "68E3EE04F4931EFE"
+					item: {
+						Count: 1
+						id: "tfg:tbu_232_rod"
+						tag: {
+							Damage: 0
+						}
 					}
+					type: "item"
 				}
-				type: "item"
-			}]
+				{
+					id: "21383A5C0CF976DD"
+					item: {
+						Count: 1
+						id: "tfg:americium_241_rod"
+						tag: {
+							Damage: 0
+						}
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5B22DEC6694CDCCB"
+					item: {
+						Count: 1
+						id: "tfg:neptunium_237_rod"
+						tag: {
+							Damage: 0
+						}
+					}
+					optional_task: true
+					type: "item"
+				}
+			]
 			title: "{quests.gregtech_energy.fission_rod.title}"
 			x: -7.5d
 			y: 0.0d
@@ -1320,6 +1412,41 @@
 			x: -9.0d
 			y: -1.0d
 		}
+		{
+			dependencies: [
+				"05E2F203DA46A5E8"
+				"0ABD326DC2551CBD"
+			]
+			description: [
+				"{quests.gregtech_energy.cooling_tower.desc.1}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.cooling_tower.desc.2}"
+			]
+			icon: "tfg:cooling_tower"
+			id: "7F2F435C727C7AB3"
+			subtitle: "{quests.gregtech_energy.cooling_tower.subtitle}"
+			tasks: [
+				{
+					id: "0347D107FEC9761B"
+					item: "tfg:cooling_tower"
+					type: "item"
+				}
+				{
+					id: "7CD0D40C08CC42D2"
+					item: "tfg:boron_enriched_coolant_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "23C1F8FEFBD23A5C"
+					item: "tfg:warm_water_bucket"
+					optional_task: true
+					type: "item"
+				}
+			]
+			x: -8.0d
+			y: 1.0d
+		}
 	]
 	subtitle: ["{quests.gregtech_energy.subtitle}"]
 	title: "{quests.gregtech_energy}"

config/ftbquests/quests/chapters/hv__high_voltage.snbt

@@ -1698,6 +1698,21 @@
 			x: -2.25d
 			y: -11.0d
 		}
+		{
+			dependencies: ["41D32C5178760F47"]
+			description: ["{quests.high_voltage.multi_structure_terminal.desc}"]
+			id: "3FC6D346B3EE4A92"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.high_voltage.multi_structure_terminal.subtitle}"
+			tasks: [{
+				id: "32C53F040A2F0AD8"
+				item: "gtceuterminal:multi_structure_manager"
+				type: "item"
+			}]
+			x: 5.0d
+			y: 1.0d
+		}
 	]
 	subtitle: ["{quests.high_voltage.subtitle}"]
 	title: "{quests.high_voltage}"

config/ftbquests/quests/chapters/lv__low_voltage.snbt

@@ -245,7 +245,7 @@
 			]
 			icon: "gtceu:storage_cover"
 			id: "1C767009F505A813"
-			shape: "square"
+			shape: "circle"
 			size: 1.0d
 			subtitle: "{quests.low_voltage.cover_behaviour.subtitle}"
 			tasks: [{
@@ -399,7 +399,7 @@
 			}]
 			title: "{quests.low_voltage.lbb.title}"
 			x: 0.0d
-			y: -5.5d
+			y: -6.0d
 		}
 		{
 			dependencies: ["1E9BE8D3F8A602DC"]
@@ -1711,7 +1711,7 @@
 				}
 				{
 					id: "34153032225B76BB"
-					item: "gtceu:light_fuel_bucket"
+					item: "gtceu:diesel_bucket"
 					optional_task: true
 					type: "item"
 				}

config/ftbquests/quests/chapters/mv__medium_voltage.snbt

@@ -1325,7 +1325,7 @@
 			}]
 			title: "{quests.medium_voltage.mv_jetpack_2.title}"
 			x: 1.5d
-			y: 5.0d
+			y: 4.5d
 		}
 		{
 			dependencies: [
@@ -1700,6 +1700,21 @@
 			x: -5.0d
 			y: 4.0d
 		}
+		{
+			dependencies: ["75F38905DEA60F15"]
+			description: ["{quests.medium_voltage.terminal_dismantler.desc}"]
+			id: "0053E98892F910BF"
+			shape: "heart"
+			subtitle: "{quests.medium_voltage.terminal_dismantler.subtitle}"
+			tasks: [{
+				id: "6AE4D07F675A23D0"
+				item: "gtceuterminal:dismantler"
+				type: "item"
+			}]
+			title: "{quests.medium_voltage.terminal_dismantler.title}"
+			x: 1.5d
+			y: 5.5d
+		}
 	]
 	subtitle: ["{quests.medium_voltage.subtitle}"]
 	title: "{quests.medium_voltage}"

kubejs/assets/gtceu/textures/block/fluids/fluid.dense_steam.png.mcmeta

@@ -1,45 +1,5 @@
 {
   "animation": {
-    "frametime": 1,
-    "frames": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9,
-      10,
-      11,
-      12,
-      13,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      18,
-      17,
-      16,
-      15,
-      14,
-      13,
-      12,
-      11,
-      10,
-      9,
-      8,
-      7,
-      6,
-      5,
-      4,
-      3,
-      2,
-      1
-    ]
+    "frametime": 1
   }
 }

kubejs/assets/gtceu/textures/block/fluids/fluid.irradiated_steam.png.mcmeta

@@ -1,45 +1,5 @@
 {
   "animation": {
-    "frametime": 1,
-    "frames": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9,
-      10,
-      11,
-      12,
-      13,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      18,
-      17,
-      16,
-      15,
-      14,
-      13,
-      12,
-      11,
-      10,
-      9,
-      8,
-      7,
-      6,
-      5,
-      4,
-      3,
-      2,
-      1
-    ]
+    "frametime": 1
   }
 }

kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_steam.png.mcmeta

@@ -1,45 +1,5 @@
 {
   "animation": {
-    "frametime": 1,
-    "frames": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9,
-      10,
-      11,
-      12,
-      13,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      18,
-      17,
-      16,
-      15,
-      14,
-      13,
-      12,
-      11,
-      10,
-      9,
-      8,
-      7,
-      6,
-      5,
-      4,
-      3,
-      2,
-      1
-    ]
+    "frametime": 1
   }
 }

kubejs/assets/gtceu/textures/block/fluids/fluid.radioactive_waste.png.mcmeta

@@ -1,69 +1,5 @@
 {
   "animation": {
-    "frametime": 2,
-    "frames": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9,
-      10,
-      11,
-      12,
-      13,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24,
-      25,
-      26,
-      27,
-      28,
-      29,
-      30,
-      31,
-      30,
-      29,
-      28,
-      27,
-      26,
-      25,
-      24,
-      23,
-      22,
-      21,
-      20,
-      19,
-      18,
-      17,
-      16,
-      15,
-      14,
-      13,
-      12,
-      11,
-      10,
-      9,
-      8,
-      7,
-      6,
-      5,
-      4,
-      3,
-      2,
-      1
-    ]
+    "frametime": 2
   }
 }

kubejs/assets/gtceu/textures/block/fluids/fluid.tritiated_water.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

kubejs/assets/gtceu/textures/block/fluids/fluid.uranium_waste.png.mcmeta

@@ -1,87 +1,5 @@
 {
   "animation": {
-    "frametime": 2,
-    "frames": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9,
-      10,
-      11,
-      12,
-      13,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24,
-      25,
-      26,
-      27,
-      28,
-      29,
-      30,
-      31,
-      32,
-      33,
-      34,
-      35,
-      36,
-      37,
-      38,
-      39,
-      40,
-      39,
-      38,
-      37,
-      36,
-      35,
-      34,
-      33,
-      32,
-      31,
-      30,
-      29,
-      28,
-      27,
-      26,
-      25,
-      24,
-      23,
-      22,
-      21,
-      20,
-      19,
-      18,
-      17,
-      16,
-      15,
-      14,
-      13,
-      12,
-      11,
-      10,
-      9,
-      8,
-      7,
-      6,
-      5,
-      4,
-      3,
-      2,
-      1
-    ]
+    "frametime": 2
   }
 }

kubejs/assets/tfg/blockstates/heat_battery_mk1.json

@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "tfg:block/machines/heat_battery_mk1",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "tfg:block/machines/heat_battery_mk1"
+    },
+    "facing=south": {
+      "model": "tfg:block/machines/heat_battery_mk1",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "tfg:block/machines/heat_battery_mk1",
+      "y": 270
+    }
+  }
+}

kubejs/assets/tfg/blockstates/uv_smr_fluid_import_hatch.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch"
+    },
+    "facing=south": {
+      "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch",
+      "y": 180
+    },
+    "facing=up": {
+      "gtceu:z": 180,
+      "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "tfg:block/machines/ports/uv_smr_fluid_import_hatch",
+      "y": 270
+    }
+  }
+}

kubejs/assets/tfg/models/block/machines/heat_battery_mk1.json

@@ -0,0 +1,90 @@
+{
+  "parent": "minecraft:block/block",
+  "loader": "gtceu:machine",
+  "machine": "tfg:heat_battery_mk1",
+  "texture_overrides": {
+    "all": "tfg:block/casings/machine_casing_mars"
+  },
+  "variants": {
+    "is_formed=false,recipe_logic_status=idle": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "tfg:block/casings/machine_casing_mars",
+          "overlay_front": "tfg:block/machines/bioreactor/overlay_front",
+          "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive"
+        }
+      }
+    },
+    "is_formed=false,recipe_logic_status=suspend": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "tfg:block/casings/machine_casing_mars",
+          "overlay_front": "tfg:block/machines/bioreactor/overlay_front",
+          "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive"
+        }
+      }
+    },
+    "is_formed=false,recipe_logic_status=waiting": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "tfg:block/casings/machine_casing_mars",
+          "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active",
+          "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_active_emissive"
+        }
+      }
+    },
+    "is_formed=false,recipe_logic_status=working": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "tfg:block/casings/machine_casing_mars",
+          "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active",
+          "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_active_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=idle": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "tfg:block/casings/machine_casing_mars",
+          "overlay_front": "tfg:block/machines/bioreactor/overlay_front",
+          "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=suspend": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "tfg:block/casings/machine_casing_mars",
+          "overlay_front": "tfg:block/machines/bioreactor/overlay_front",
+          "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=waiting": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "tfg:block/casings/machine_casing_mars",
+          "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active",
+          "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_active_emissive"
+        }
+      }
+    },
+    "is_formed=true,recipe_logic_status=working": {
+      "model": {
+        "parent": "gtceu:block/machine/template/cube_all/sided",
+        "textures": {
+          "all": "tfg:block/casings/machine_casing_mars",
+          "overlay_front": "tfg:block/machines/bioreactor/overlay_front_active",
+          "overlay_front_emissive": "tfg:block/machines/bioreactor/overlay_front_active_emissive"
+        }
+      }
+    }
+  }
+}

kubejs/assets/tfg/models/block/machines/ports/uv_smr_fluid_import_hatch.json

@@ -0,0 +1,60 @@
+{
+  "parent": "minecraft:block/block",
+  "loader": "gtceu:machine",
+  "machine": "tfg:uv_smr_fluid_import_hatch",
+  "replaceable_textures": [
+    "bottom",
+    "top",
+    "side"
+  ],
+"variants": {
+    "is_formed=false,is_painted=false": {
+      "model": {
+        "parent": "gtceu:block/machine/template/part/hatch_machine_emissive",
+        "textures": {
+          "bottom": "tfg:block/casings/machine_casing_desh_ptfe",
+          "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input",
+          "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive",
+          "side": "tfg:block/casings/machine_casing_desh_ptfe",
+          "top": "tfg:block/casings/machine_casing_desh_ptfe"
+        }
+      }
+    },
+    "is_formed=false,is_painted=true": {
+      "model": {
+        "parent": "gtceu:block/machine/template/part/hatch_machine_emissive_color_ring",
+        "textures": {
+          "bottom": "tfg:block/casings/machine_casing_desh_ptfe",
+          "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input",
+          "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive",
+          "side": "tfg:block/casings/machine_casing_desh_ptfe",
+          "top": "tfg:block/casings/machine_casing_desh_ptfe"
+        }
+      }
+    },
+    "is_formed=true,is_painted=false": {
+      "model": {
+        "parent": "gtceu:block/machine/template/part/hatch_machine_emissive",
+        "textures": {
+          "bottom": "tfg:block/casings/machine_casing_desh_ptfe",
+          "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input",
+          "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive",
+          "side": "tfg:block/casings/machine_casing_desh_ptfe",
+          "top": "tfg:block/casings/machine_casing_desh_ptfe"
+        }
+      }
+    },
+    "is_formed=true,is_painted=true": {
+      "model": {
+        "parent": "gtceu:block/machine/template/part/hatch_machine_emissive_color_ring",
+        "textures": {
+          "bottom": "tfg:block/casings/machine_casing_desh_ptfe",
+          "overlay": "gtceu:block/overlay/machine/overlay_fluid_hatch_input",
+          "overlay_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive",
+          "side": "tfg:block/casings/machine_casing_desh_ptfe",
+          "top": "tfg:block/casings/machine_casing_desh_ptfe"
+        }
+      }
+    }
+  }
+}

kubejs/assets/tfg/models/block/machines/smr_generator.json

@@ -11,8 +11,8 @@
         "parent": "gtceu:block/machine/template/cube_all/sided",
         "textures": {
           "all": "tfg:block/casings/machine_casing_desh_ptfe",
-          "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front",
-          "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_emissive"
+          "overlay_front": "tfg:block/machines/smr/overlay_front",
+          "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_emissive"
         }
       }
     },
@@ -21,8 +21,8 @@
         "parent": "gtceu:block/machine/template/cube_all/sided",
         "textures": {
           "all": "tfg:block/casings/machine_casing_desh_ptfe",
-          "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused",
-          "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused_emissive"
+          "overlay_front": "tfg:block/machines/smr/overlay_front_paused",
+          "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_paused_emissive"
         }
       }
     },
@@ -31,8 +31,8 @@
         "parent": "gtceu:block/machine/template/cube_all/sided",
         "textures": {
           "all": "tfg:block/casings/machine_casing_desh_ptfe",
-          "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active",
-          "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive"
+          "overlay_front": "tfg:block/machines/smr/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive"
         }
       }
     },
@@ -41,8 +41,8 @@
         "parent": "gtceu:block/machine/template/cube_all/sided",
         "textures": {
           "all": "tfg:block/casings/machine_casing_desh_ptfe",
-          "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active",
-          "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive"
+          "overlay_front": "tfg:block/machines/smr/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive"
         }
       }
     },
@@ -51,8 +51,8 @@
         "parent": "gtceu:block/machine/template/cube_all/sided",
         "textures": {
           "all": "tfg:block/casings/machine_casing_desh_ptfe",
-          "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front",
-          "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_emissive"
+          "overlay_front": "tfg:block/machines/smr/overlay_front",
+          "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_emissive"
         }
       }
     },
@@ -61,8 +61,8 @@
         "parent": "gtceu:block/machine/template/cube_all/sided",
         "textures": {
           "all": "tfg:block/casings/machine_casing_desh_ptfe",
-          "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused",
-          "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_paused_emissive"
+          "overlay_front": "tfg:block/machines/smr/overlay_front_paused",
+          "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_paused_emissive"
         }
       }
     },
@@ -71,8 +71,8 @@
         "parent": "gtceu:block/machine/template/cube_all/sided",
         "textures": {
           "all": "tfg:block/casings/machine_casing_desh_ptfe",
-          "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active",
-          "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive"
+          "overlay_front": "tfg:block/machines/smr/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive"
         }
       }
     },
@@ -81,8 +81,8 @@
         "parent": "gtceu:block/machine/template/cube_all/sided",
         "textures": {
           "all": "tfg:block/casings/machine_casing_desh_ptfe",
-          "overlay_front": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active",
-          "overlay_front_emissive": "gtceu:block/multiblock/gcym/large_centrifuge/overlay_front_active_emissive"
+          "overlay_front": "tfg:block/machines/smr/overlay_front_active",
+          "overlay_front_emissive": "gtceu:block/multiblock/generator/large_gas_turbine/overlay_front_active_emissive"
         }
       }
     }

kubejs/assets/tfg/models/item/americium_241_rod.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tfg:item/fission_rod/americium_241_rod"
+  }
+}

kubejs/assets/tfg/models/item/californium_252_rod.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tfg:item/fission_rod/californium_252_rod"
+  }
+}

kubejs/assets/tfg/models/item/depleted_americium_241_rod.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tfg:item/fission_rod/americium_241_rod_depleted"
+  }
+}

kubejs/assets/tfg/models/item/depleted_californium_252_rod.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tfg:item/fission_rod/californium_252_rod_depleted"
+  }
+}

kubejs/assets/tfg/models/item/depleted_neptunium_237_rod.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tfg:item/fission_rod/neptunium_237_rod_depleted"
+  }
+}

kubejs/assets/tfg/models/item/depleted_plutonium_rod.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tfg:item/fission_rod/plutonium_rod_depleted"
+  }
+}

kubejs/assets/tfg/models/item/depleted_tbu_232_rod.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tfg:item/fission_rod/tbu_rod_depleted"
+  }
+}

kubejs/assets/tfg/models/item/depleted_thorium_rod.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tfg:item/fission_rod/thorium_rod_depleted"
+  }
+}

kubejs/assets/tfg/models/item/depleted_uranium_rod.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tfg:item/fission_rod/uranium_rod_depleted"
+  }
+}

kubejs/assets/tfg/models/item/empty_rod.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "tfg:item/fuel_rod_empty"
+    "layer0": "tfg:item/fission_rod/fuel_rod_empty"
   }
 }

kubejs/assets/tfg/models/item/heat_battery_mk1.json

@@ -0,0 +1,3 @@
+{
+  "parent": "tfg:block/machines/heat_battery_mk1"
+}

kubejs/assets/tfg/models/item/neptunium_237_rod.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tfg:item/fission_rod/neptunium_237_rod"
+  }
+}

kubejs/assets/tfg/models/item/plutonium_rod.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "tfg:item/fuel_rod_p_1"
+    "layer0": "tfg:item/fission_rod/plutonium_rod"
   }
 }

kubejs/assets/tfg/models/item/tbu_232_rod.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "tfg:item/fuel_rod_t_1"
+    "layer0": "tfg:item/fission_rod/tbu_rod"
   }
 }

kubejs/assets/tfg/models/item/thorium_rod.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "tfg:item/fuel_rod_tbu_1"
+    "layer0": "tfg:item/fission_rod/thorium_rod"
   }
 }

kubejs/assets/tfg/models/item/uranium_rod.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "tfg:item/fuel_rod_u_1"
+    "layer0": "tfg:item/fission_rod/uranium_rod"
   }
 }

kubejs/assets/tfg/models/item/uv_smr_fluid_import_hatch.json

@@ -0,0 +1,3 @@
+{
+  "parent": "tfg:block/machines/ports/uv_smr_fluid_import_hatch"
+}

kubejs/assets/tfg/textures/block/fluids/fluid.boron_enriched_coolant.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.critical_steam.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.degraded_high_grade_isotopic_solvent.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.degraded_solvent_stream.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.flibe.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.heavy_water.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.high_grade_isotopic_solvent.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.hot_boron_enriched_coolant.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.hot_flibe.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.isotopic_solvent.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.spent_ticl4_doped_supercritical_co2.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.tbu_waste.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

kubejs/assets/tfg/textures/block/fluids/fluid.ticl4_doped_supercritical_co2.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/assets/tfg/textures/block/machines/smr/overlay_front_active.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

kubejs/assets/tfg/textures/item/fission_rod/americium_241_rod_depleted.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

kubejs/assets/tfg/textures/item/fission_rod/californium_252_rod_depleted.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

kubejs/assets/tfg/textures/item/fission_rod/neptunium_237_rod_depleted.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

kubejs/assets/tfg/textures/item/fission_rod/plutonium_rod_depleted.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

kubejs/assets/tfg/textures/item/fission_rod/tbu_rod_depleted.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

kubejs/assets/tfg/textures/item/fission_rod/thorium_rod_depleted.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}