Merge branch 'TerraFirmaGreg-Team:dev' into dev

.github/workflows/build.yml

@@ -400,7 +400,7 @@ jobs:
 
       - name: 🚀 Create release
         id: release
-        uses: softprops/action-gh-release@v2.2.1
+        uses: softprops/action-gh-release@v2.2.2
         with:
           name: ${{ needs.info.outputs.project_version }}
           tag_name: ${{ needs.info.outputs.project_version }}

CHANGELOG.md

@@ -2,6 +2,44 @@
 
 ## [Unreleased]
 ### Changes
+- Fixed kaolin clay not generating in the overworld
+- Changed some quests based on feedback
+- Added recipes for digger helmet upgrades
+- Updated field guide for 0.9 (oosyrag)
+- Added speed boost to nanosuit leggings (SverhRazum-Nah)
+- Updated max capacity of small vessel and crucible to be multiples of 144 (oosyrag)
+- You can no longer use a blowpipe to hold hot ingots, but tongs have been buffed 6x instead
+- Added a temporary fix for the ULS-MV millstones/crushing wheels voiding poor raw ores
+- Fixed a duping exploit involving metal plated blocks
+- Fixed some recipes that were using the wrong wrench tag
+- Fixed mining machines not working
+- Removed recipes for firmalife sprinklers. Use gt pipes instead, those can go through sprinkler walls now, and put your sprinklers on drums/fluid tanks/barrels
+- Buffed the mixer glowstone recipe
+- Nerfed kapok growth speed a little
+- Added recipes to turn more things into biomass
+- Added recipe to turn saplings into sticks
+- Changed mud brick recipes to not require mortar any more
+- Fixed not being able to pick up spring water or put it in a mixing bowl
+- Buffed hot or not insulation items by x3
+- Nerfed rotation speed controller recipe
+- Now you can put construction wands on tool racks
+- Buffed nether mob loot tables
+- The overworld graphite vein now spawns in every stone type
+- Granitic/basaltic mineral sand is now usable for iron in primitive age
+- Fixed butchery knives missing anvil recipes
+- Added recipes to craft GT's marble blocks
+- Added assembler recipes for create deco's bricks, and made vanilla bricks consistent (4 instead of 1 per craft)
+- Doubled the amount of train tracks you get per craft
+- Fixed red alloy/tin alloy double ingots not needing to be heated for anvil recipes
+- Long distance item/fluid pipes now need HV
+- Kaolin patches now spawn less often in lush cave biomes
+- You can no longer pick up regular ice with a saw to prevent moving around water sources, but you can craft packed ice instead if you need to cool off
+- Hid the xp bar because xp isn't used for anything
+- Fixed visual workbench not working with tfc workbenches
+- Removed adjustable chain gearshift and half of create:connected because they let you get around greate's restrictions
+- Added recipe for vanilla campfire for people who like smoke particles
+- Removed some more duplicate recipes for vanilla items
+- Hid some more things in JEI that aren't craftable
 
 ## [0.9.1] - 18.04.2025
 ### Changes

config/create_connected-common.toml

@@ -8,36 +8,36 @@ migrateCopycatsOnInitialize = false
 #.
 #Enable/disable features. Values on server override clients
 [features]
-	bamboo_window = false
+	bamboo_window = true
 	item_silo = true
 	inverted_clutch = true
 	empty_fan_catalyst = false
-	parallel_gearbox = true
-	cherry_window = false
+	parallel_gearbox = false
+	cherry_window = true
 	centrifugal_clutch = true
-	copycat_slab = false
+	copycat_slab = true
 	overstress_clutch = true
 	brake = true
-	copycat_block = false
-	copycat_fence_gate = false
-	copycat_stairs = false
-	brass_gearbox = true
-	copycat_vertical_step = false
-	copycat_wall = false
-	six_way_gearbox = true
-	encased_chain_cogwheel = true
+	copycat_block = true
+	copycat_fence_gate = true
+	copycat_stairs = true
+	brass_gearbox = false
+	copycat_vertical_step = true
+	copycat_wall = true
+	six_way_gearbox = false
+	encased_chain_cogwheel = false
 	sequenced_pulse_generator = true
 	freewheel_clutch = true
-	shear_pin = true
-	inverted_gearshift = true
+	shear_pin = false
+	inverted_gearshift = false
 	linked_transmitter = true
-	copycat_beam = false
-	copycat_board = false
-	copycat_fence = false
+	copycat_beam = true
+	copycat_board = true
+	copycat_fence = true
 	#.
 	fluid_vessel = true
-	large_crank_wheel = true
-	crank_wheel = true
+	large_crank_wheel = false
+	crank_wheel = false
 	inventory_access_port = true
 	inventory_bridge = true
 

config/createaddition-common.toml

@@ -5,10 +5,10 @@
 [general]
 	#Forge Energy conversion rate (in FE/t at 256 RPM, value is the FE/t generated and consumed is at 256rpm).
 	#Range: > 0
-	fe_at_max_rpm = 512
+	fe_at_max_rpm = 128
 	#Max stress for the Alternator and Electric Motor (in SU at 256 RPM).
 	#Range: > 0
-	max_stress = 256
+	max_stress = 64
 	#If audio should be enabled or not.
 	audio_enabled = true
 

config/ftbquests/quests/chapters/ae2.snbt

@@ -2302,6 +2302,59 @@
 			x: 8.5d
 			y: 4.0d
 		}
+		{
+			dependencies: ["1269F30575599F10"]
+			id: "2D90631147B852D2"
+			tasks: [{
+				id: "4B92CEB19BA7FB49"
+				item: "expatternprovider:oversize_interface"
+				type: "item"
+			}]
+			x: 15.5d
+			y: 4.0d
+		}
+		{
+			dependencies: [
+				"1FB2089C461BD7F5"
+				"6D1FC61E12586D57"
+			]
+			id: "6F9069736E604DB4"
+			tasks: [
+				{
+					id: "0C7898F1DF3EDC06"
+					item: "expatternprovider:assembler_matrix_frame"
+					type: "item"
+				}
+				{
+					id: "4688AE993B97749F"
+					item: "expatternprovider:assembler_matrix_wall"
+					type: "item"
+				}
+				{
+					id: "156E6F2A72944DD1"
+					item: "expatternprovider:assembler_matrix_pattern"
+					type: "item"
+				}
+				{
+					id: "4DDF957C178999AF"
+					item: "expatternprovider:assembler_matrix_crafter"
+					type: "item"
+				}
+				{
+					id: "11BCB5AF876035A2"
+					item: "expatternprovider:assembler_matrix_speed"
+					type: "item"
+				}
+				{
+					id: "19B6A6C5D2A9C3BE"
+					item: "expatternprovider:assembler_matrix_glass"
+					optional_task: true
+					type: "item"
+				}
+			]
+			x: 13.5d
+			y: 6.0d
+		}
 	]
 	title: "&6HV&r - AE2"
 }

config/ftbquests/quests/chapters/cc.snbt

@@ -5,7 +5,7 @@
 	group: "44D0F3E5067B5AB8"
 	icon: "computercraft:computer_advanced"
 	id: "1A6D6B70EC13DDC6"
-	order_index: 2
+	order_index: 3
 	quest_links: [ ]
 	quests: [
 		{

config/ftbquests/quests/chapters/ev__extreme_voltage.snbt

@@ -340,7 +340,6 @@
 			dependencies: [
 				"40408FFD02134148"
 				"7FA0ACB7F161F378"
-				"4AFD3073C731A1E4"
 			]
 			description: ["You know the drill by now."]
 			icon: "gtceu:ev_assembler"
@@ -389,7 +388,6 @@
 				"3398FC108D9DCB46"
 				"41D32C5178760F47"
 				"40408FFD02134148"
-				"4AFD3073C731A1E4"
 				"6B08799BCFD01D3D"
 				"7FA0ACB7F161F378"
 			]
@@ -582,10 +580,7 @@
 			y: 5.625d
 		}
 		{
-			dependencies: [
-				"4AFD3073C731A1E4"
-				"7FA0ACB7F161F378"
-			]
+			dependencies: ["7FA0ACB7F161F378"]
 			description: [
 				"The &aLarge Titanium Boiler&r is yet another steam boiler. It's even more efficient than the previous ones, and produces more steam too. However, Steam &cbarely scales&r at this voltage."
 				""
@@ -690,7 +685,6 @@
 		{
 			dependencies: [
 				"40408FFD02134148"
-				"4AFD3073C731A1E4"
 				"7FA0ACB7F161F378"
 			]
 			description: [
@@ -714,7 +708,6 @@
 				"73E8283634E5E33A"
 				"3398FC108D9DCB46"
 				"40408FFD02134148"
-				"4AFD3073C731A1E4"
 				"7FA0ACB7F161F378"
 			]
 			description: [
@@ -735,10 +728,7 @@
 			y: 7.875d
 		}
 		{
-			dependencies: [
-				"4AFD3073C731A1E4"
-				"7FA0ACB7F161F378"
-			]
+			dependencies: ["7FA0ACB7F161F378"]
 			description: [
 				"Note that in theory, the &3EV Chemical Reactor&r is skippable by using the &3Large Chemical Reactor&r instead, but we're evil enough to force you to make this."
 				""
@@ -1358,10 +1348,7 @@
 			y: 9.0d
 		}
 		{
-			dependencies: [
-				"4AFD3073C731A1E4"
-				"16A6AE5C770DB83A"
-			]
+			dependencies: ["16A6AE5C770DB83A"]
 			description: [
 				"The &3Distillation Tower&r is a multiblock that will help you extract the most out of fluids. In &3Distilleries&r, you had to pick only one product to output. DTs output &6all of it at once&r!"
 				""

config/ftbquests/quests/chapters/hv__high_voltage.snbt

@@ -5,7 +5,7 @@
 	group: "44D0F3E5067B5AB8"
 	icon: "gtceu:hv_electric_motor"
 	id: "237BDB19A9495869"
-	order_index: 3
+	order_index: 2
 	quest_links: [
 		{
 			id: "2583D0B64E51FAC8"
@@ -14,13 +14,6 @@
 			x: 7.875d
 			y: -5.25d
 		}
-		{
-			id: "47BF469B9B0EB28A"
-			linked_quest: "4AFD3073C731A1E4"
-			size: 0.75d
-			x: 7.875d
-			y: -4.125d
-		}
 		{
 			id: "6C3B2B8F8B6646EA"
 			linked_quest: "6DDDE2268B691F74"
@@ -572,7 +565,6 @@
 			y: -5.25d
 		}
 		{
-			dependencies: ["4AFD3073C731A1E4"]
 			description: [
 				"The &3Vacuum Freezer&r is a multiblock used to cool down &eHot Ingots&r. All ingots made in the EBF with a temperature above &d1750K&r will need it."
 				""
@@ -613,10 +605,7 @@
 			y: -4.125d
 		}
 		{
-			dependencies: [
-				"41D32C5178760F47"
-				"4AFD3073C731A1E4"
-			]
+			dependencies: ["41D32C5178760F47"]
 			description: [
 				"The next &3Circuit Assembler&r. This tier of Circuit Assembler is only required for one type of Circuit - your first ever &aMainframe&r."
 				""
@@ -653,10 +642,7 @@
 			y: -1.875d
 		}
 		{
-			dependencies: [
-				"4AFD3073C731A1E4"
-				"6B1595678ECB7AC8"
-			]
+			dependencies: ["6A451F43F3D7A671"]
 			description: [
 				"The first &1IV&r circuit. Congratulations on making it this far!"
 				""
@@ -1268,6 +1254,62 @@
 			x: 2.25d
 			y: -3.0d
 		}
+		{
+			description: [
+				"&aBlue Alloy&r is an excellent Cable material for &6HV&r power."
+				""
+				"Nothing is preventing you from using it for &bMV&r power too! Make sure that you don't overvolt your machines, though."
+				""
+				"Superconductors for both &bMV&r and &6HV&r are unlocked... later."
+				""
+				"&aElectrotine&r is obtained from the &cNether&r, so don't craft it in the Mixer!"
+				""
+				"Furthermore, &aElectrotine&r can be separated for &dElectrum&r and &dRedstone&r."
+			]
+			icon: "gtceu:blue_alloy_ingot"
+			id: "073F59194B479AA3"
+			rewards: [{
+				id: "6DDC52F547CDE852"
+				item: "gtceu:electrotine_dust"
+				random_bonus: 7
+				type: "item"
+			}]
+			shape: "square"
+			size: 1.0d
+			subtitle: "You're blue now... that's my alloy"
+			tasks: [{
+				id: "6214AC99E4182DD9"
+				item: "gtceu:blue_alloy_ingot"
+				type: "item"
+			}]
+			title: "Blue Alloy"
+			x: 11.0d
+			y: -6.0d
+		}
+		{
+			dependencies: [
+				"5063FDFFBE3E4855"
+				"3568BC9742092FC5"
+			]
+			description: [
+				"Your first &5EV&r Circuit gets a unique texture. If you still consider yourself to be in &bMV&r, &ahold off&r on making too many of these, as they won't benefit you right now. We can't stop you from making these if you &djust wanna flex&r on us, though."
+				""
+				"It'll be needed in &6HV&r."
+			]
+			icon: "gtceu:micro_processor_computer"
+			id: "6A451F43F3D7A671"
+			shape: "square"
+			size: 1.0d
+			subtitle: "Standing out amongst the rest"
+			tasks: [{
+				id: "01FE6BC2780D623B"
+				item: "gtceu:micro_processor_computer"
+				type: "item"
+			}]
+			title: "First EV Circuits!"
+			x: 8.0d
+			y: -4.0d
+		}
 	]
 	subtitle: ["Scale up your power and begin advanced chemistry"]
 	title: "&6HV&r - High Voltage"

config/ftbquests/quests/chapters/lv__low_voltage.snbt

@@ -177,34 +177,6 @@
 			x: 5.5d
 			y: -0.5d
 		}
-		{
-			description: [
-				"In theory, Crates are flat upgrades to Chests. A single block space that stores more items - what more could you ask for?"
-				""
-				"Unfortunately, there's a small downside - Crates do not support item movement shortcuts well. We plan on fixing this in the long-term."
-				""
-				"Where they shine however is the fact that they &6accept Covers&r, making them perfect candidates for buffers in automation."
-			]
-			icon: "gtceu:bronze_crate"
-			id: "7CCC1BDDE0C67F16"
-			shape: "rsquare"
-			size: 1.0d
-			subtitle: "Earlygame buffering"
-			tasks: [{
-				id: "78E120F8EDE2BD3F"
-				item: {
-					Count: 1
-					id: "ftbfiltersystem:smart_filter"
-					tag: {
-						"ftbfiltersystem:filter": "or(item(gtceu:wood_crate)item(gtceu:bronze_crate)item(gtceu:steel_crate)item(gtceu:aluminium_crate)item(gtceu:stainless_steel_crate)item(gtceu:titanium_crate)item(gtceu:tungsten_steel_crate))"
-					}
-				}
-				type: "item"
-			}]
-			title: "GregTech Storage"
-			x: 6.5d
-			y: -0.5d
-		}
 		{
 			dependencies: [
 				"288CE4AA4C5AA8BF"
@@ -384,7 +356,8 @@
 				"{quests.low_voltage.lv_superconductor.desc.2}"
 			]
 			id: "46AD7A6F3B6775F5"
-			shape: "rsquare"
+			optional: true
+			shape: "heart"
 			size: 1.0d
 			subtitle: "{quests.low_voltage.lv_superconductor.subtitle}"
 			tasks: [{
@@ -590,7 +563,10 @@
 			y: 4.5d
 		}
 		{
-			dependencies: ["3E6DC423FE4A99F7"]
+			dependencies: [
+				"3E6DC423FE4A99F7"
+				"02FDECC931B5E8EF"
+			]
 			description: ["{quests.low_voltage.lv_ore_prospector.desc}"]
 			id: "2E36E5755B2F551C"
 			shape: "heart"
@@ -1195,23 +1171,6 @@
 			x: 3.0d
 			y: -0.5d
 		}
-		{
-			dependencies: ["7CCC1BDDE0C67F16"]
-			description: ["With that tape you wil be able to move around the crate. The main advantage? You can put anything in a crate, weight won't be an issue here."]
-			icon: "gtceu:basic_tape"
-			id: "37151F9C4A240041"
-			shape: "rsquare"
-			size: 1.0d
-			subtitle: "Moving stuff around"
-			tasks: [{
-				id: "2FCA41AFFAF08816"
-				item: "gtceu:basic_tape"
-				type: "item"
-			}]
-			title: "Tape for Crate"
-			x: 7.5d
-			y: -0.5d
-		}
 		{
 			dependencies: ["22510C5F2386B453"]
 			description: ["{quests.low_voltage.lv_mixer.desc}"]

config/ftbquests/quests/chapters/ore_processing.snbt

@@ -0,0 +1,836 @@
+{
+	default_hide_dependency_lines: false
+	default_quest_shape: ""
+	filename: "ore_processing"
+	group: "19428C6E7A36D463"
+	icon: {
+		Count: 1
+		ForgeCaps: {
+			"tfc:item_heat": {
+				heat: 0.0f
+				ticks: 0L
+			}
+		}
+		id: "gtceu:crushed_iron_ore"
+	}
+	id: "24C1683140DBB5F2"
+	order_index: 4
+	quest_links: [ ]
+	quests: [
+		{
+			description: ["{quests.ore_proc.native_ore.desc}"]
+			id: "5D09BEE61210DF02"
+			size: 1.5d
+			subtitle: "{quests.ore_proc.native_ore.subtitle}"
+			tasks: [
+				{
+					id: "047DA2872D107BA0"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item_tag(tfc:ore_pieces))"
+						}
+					}
+					optional_task: true
+					title: "{quests.ore_proc.native_ore.task}"
+					type: "item"
+				}
+				{
+					id: "2D0D9226FDB3CAC9"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.native_ore.title}"
+			x: 0.5d
+			y: -8.5d
+		}
+		{
+			dependencies: [
+				"514AEDB447F4AF42"
+				"68A48B07F9489620"
+			]
+			dependency_requirement: "one_completed"
+			description: ["{quests.ore_proc.crushed_ores.desc}"]
+			id: "28419A1010EEE93A"
+			subtitle: "{quests.ore_proc.crushed_ores.subtitle}"
+			tasks: [
+				{
+					id: "321A5E0E6EA03930"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item_tag(forge:crushed_ores))"
+						}
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "4A590589A3C1B57E"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.crushed_ores.title}"
+			x: 0.5d
+			y: -4.5d
+		}
+		{
+			dependencies: ["5D09BEE61210DF02"]
+			description: ["{quests.ore_proc.macerator_byproduct.desc}"]
+			icon: "gtceu:hv_macerator"
+			id: "68A48B07F9489620"
+			subtitle: "{quests.ore_proc.macerator_byproduct.subtitle}"
+			tasks: [
+				{
+					id: "34740ED2B48819BB"
+					item: "gtceu:hv_macerator"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "0A045AAA4BBEF63F"
+					item: "greate:stainless_steel_crushing_wheel"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "0E86067C993E18BF"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.macerator_byproduct.title}"
+			x: 0.0d
+			y: -6.5d
+		}
+		{
+			dependencies: ["5D09BEE61210DF02"]
+			description: ["{quests.ore_proc.macerator_noproduct.desc}"]
+			icon: "greate:steel_millstone"
+			id: "514AEDB447F4AF42"
+			subtitle: "{quests.ore_proc.macerator_noproduct.subtitle}"
+			tasks: [
+				{
+					id: "5EC14F048516D792"
+					item: "greate:steel_millstone"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5D23CEE2220A31FD"
+					item: "tfc:quern"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "3D6010FE11723186"
+					item: "gtceu:hp_steam_forge_hammer"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "79C87A0922F99B91"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.macerator_noproduct.title}"
+			x: 1.0d
+			y: -6.5d
+		}
+		{
+			dependencies: ["28419A1010EEE93A"]
+			description: ["{quests.ore_proc.ore_washer.desc}"]
+			icon: "greate:steel_encased_fan"
+			id: "35995A8DD303B08D"
+			subtitle: "{quests.ore_proc.ore_washer.subtitle}"
+			tasks: [
+				{
+					id: "768C7F10A1490AB7"
+					item: "gtceu:lv_ore_washer"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "58FCB68304F6943D"
+					item: "greate:steel_encased_fan"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "3150FF938CABCC54"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.ore_washer.title}"
+			x: 0.5d
+			y: -2.5d
+		}
+		{
+			dependencies: ["28419A1010EEE93A"]
+			description: ["{quests.ore_proc.mercury_ores.desc}"]
+			icon: "gtceu:mercury_bucket"
+			id: "7C67BAEE68852188"
+			subtitle: "{quests.ore_proc.mercury_ores.subtitle}"
+			tasks: [
+				{
+					id: "1BB9800D737EBEE4"
+					item: "gtceu:lv_chemical_bath"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "0D235407594C22F2"
+					item: "gtceu:mercury_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "09E366F7C581F34F"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.mercury_ores.title}"
+			x: 2.0d
+			y: -2.5d
+		}
+		{
+			dependencies: ["28419A1010EEE93A"]
+			description: ["{quests.ore_proc.sodium_persuflate.desc}"]
+			icon: "gtceu:sodium_persulfate_bucket"
+			id: "3513778F204293CD"
+			subtitle: "{quests.ore_proc.sodium_persuflate.subtitle}"
+			tasks: [
+				{
+					id: "6E0289DE2614FDB2"
+					item: "gtceu:lv_chemical_bath"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5615AC3A2E3F915E"
+					item: "gtceu:sodium_persulfate_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "33B1AD17A68606A6"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.sodium_persuflate.title}"
+			x: -1.0d
+			y: -2.5d
+		}
+		{
+			dependencies: ["7C67BAEE68852188"]
+			description: ["{quests.ore_proc.mercury.desc}"]
+			id: "68AC3E2C9093FCFE"
+			optional: true
+			subtitle: "{quests.ore_proc.mercury.subtitle}"
+			tasks: [
+				{
+					id: "3FC4A7F71B918F68"
+					item: "gtceu:crushed_platinum_ore"
+					type: "item"
+				}
+				{
+					id: "417A27E90C01166E"
+					item: {
+						Count: 1
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
+						}
+						id: "gtceu:crushed_nickel_ore"
+					}
+					type: "item"
+				}
+				{
+					id: "3D85D53762AA09F5"
+					item: "gtceu:crushed_cooperite_ore"
+					type: "item"
+				}
+			]
+			title: "{quests.ore_proc.mercury.title}"
+			x: 3.5d
+			y: -2.5d
+		}
+		{
+			dependencies: ["3513778F204293CD"]
+			description: ["{quests.ore_proc.sodium_ores.desc}"]
+			id: "0502E478E27D4B73"
+			optional: true
+			subtitle: "{quests.ore_proc.sodium_ores.subtitle}"
+			tasks: [
+				{
+					id: "605F3A1BFD554922"
+					item: "gtceu:crushed_aluminium_ore"
+					type: "item"
+				}
+				{
+					id: "5ADFEF5AF8FDD5AF"
+					item: "gtceu:crushed_bauxite_ore"
+					type: "item"
+				}
+				{
+					id: "28A082F6FF520B21"
+					item: "gtceu:crushed_cobalt_ore"
+					type: "item"
+				}
+				{
+					id: "46B6DEFD1A7BEA60"
+					item: {
+						Count: 1
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
+						}
+						id: "gtceu:crushed_tetrahedrite_ore"
+					}
+					type: "item"
+				}
+			]
+			title: "{quests.ore_proc.sodium_ores.title}"
+			x: -2.5d
+			y: -2.5d
+		}
+		{
+			dependencies: [
+				"3513778F204293CD"
+				"7C67BAEE68852188"
+				"35995A8DD303B08D"
+			]
+			dependency_requirement: "one_completed"
+			description: ["{quests.ore_proc.purified_ores.desc}"]
+			id: "544EA7FF98FDCFB7"
+			subtitle: "{quests.ore_proc.purified_ores.subtitle}"
+			tasks: [
+				{
+					id: "4C6F60AC9C803D7B"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item_tag(forge:purified_ores))"
+						}
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "3C194AEB554DA4CA"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.purified_ores.title}"
+			x: 0.5d
+			y: -0.5d
+		}
+		{
+			dependencies: ["544EA7FF98FDCFB7"]
+			description: ["{quests.ore_proc.indium.desc}"]
+			icon: "gtceu:indium_dust"
+			id: "642FD77427A3B2FA"
+			subtitle: "{quests.ore_proc.indium.subtitle}"
+			tasks: [
+				{
+					id: "199F216EDD90F24E"
+					item: "gtceu:indium_dust"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "0373F4E380F2A0BC"
+					item: "gtceu:indium_concentrate_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "246799A19B9A47B6"
+					item: {
+						Count: 1
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
+						}
+						id: "gtceu:purified_sphalerite_ore"
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "54041D4FF39893F5"
+					item: "gtceu:purified_galena_ore"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "52FCA464BD827E37"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.indium.title}"
+			x: -1.0d
+			y: -0.5d
+		}
+		{
+			dependencies: ["544EA7FF98FDCFB7"]
+			description: ["{quests.ore_proc.platline.desc}"]
+			icon: "gtceu:platinum_group_sludge_dust"
+			id: "7B2EE67E37809269"
+			subtitle: "{quests.ore_proc.platline.subtitle}"
+			tasks: [
+				{
+					id: "2CEBE8BC5E3AF11A"
+					item: "gtceu:platinum_group_sludge_dust"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "1F185450C1FF7379"
+					item: {
+						Count: 1
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
+						}
+						id: "gtceu:purified_chalcocite_ore"
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "6140EA15476B4A16"
+					item: {
+						Count: 1
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
+						}
+						id: "gtceu:purified_chalcopyrite_ore"
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "6F239C59DC002095"
+					item: {
+						Count: 1
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
+						}
+						id: "gtceu:purified_bornite_ore"
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "29D38459E25A0D3E"
+					item: {
+						Count: 1
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
+						}
+						id: "gtceu:purified_pentlandite_ore"
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "22DF4DB3FF6976EA"
+					item: "gtceu:purified_cooperite_ore"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "1A8C5E755FE82C59"
+					item: {
+						Count: 1
+						ForgeCaps: {
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
+						}
+						id: "gtceu:purified_tetrahedrite_ore"
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "1637CE96CB926DF2"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.platline.title}"
+			x: 2.0d
+			y: -0.5d
+		}
+		{
+			dependencies: ["544EA7FF98FDCFB7"]
+			description: ["{quests.ore_proc.thermal_centrifuge.desc}"]
+			icon: "gtceu:lv_thermal_centrifuge"
+			id: "6BAC3BE1D4FE0F6B"
+			subtitle: "{quests.ore_proc.thermal_centrifuge.subtitle}"
+			tasks: [
+				{
+					id: "5626010B0878F067"
+					item: "gtceu:lv_thermal_centrifuge"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5C4C3401C72CC768"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.thermal_centrifuge.title}"
+			x: 0.5d
+			y: 1.5d
+		}
+		{
+			dependencies: ["544EA7FF98FDCFB7"]
+			description: ["{quests.ore_proc.sifter.desc}"]
+			icon: "gtceu:lv_sifter"
+			id: "31A6A236B6710B95"
+			subtitle: "{quests.ore_proc.sifter.subtitle}"
+			tasks: [
+				{
+					id: "018A18B6F52ED096"
+					item: "gtceu:lv_sifter"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "019C7598748D30E1"
+					item: "vintageimprovements:vibrating_table"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "1BA3E3F150F2296C"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.sifter.title}"
+			x: 2.0d
+			y: 1.0d
+		}
+		{
+			dependencies: ["31A6A236B6710B95"]
+			description: ["{quests.ore_proc.centrifuge_sifter.desc}"]
+			icon: "vintageimprovements:centrifuge"
+			id: "2F1AFDB17C5FC291"
+			subtitle: "{quests.ore_proc.centrifuge_sifter.subtitle}"
+			tasks: [
+				{
+					id: "7B3C64B98597B573"
+					item: "gtceu:lv_centrifuge"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "288ABE9C064D983F"
+					item: "vintageimprovements:centrifuge"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "54EA71173CCA6298"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.centrifuge_sifter.title}"
+			x: 2.0d
+			y: 2.0d
+		}
+		{
+			dependencies: ["544EA7FF98FDCFB7"]
+			description: ["{quests.ore_proc.macerator_separator.desc}"]
+			icon: "greate:stainless_steel_crushing_wheel"
+			id: "630D44C9BD1D7190"
+			subtitle: "{quests.ore_proc.macerator_separator.subtitile}"
+			tasks: [
+				{
+					id: "57FD0D0741991622"
+					item: "gtceu:hv_macerator"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "473B6D9D44F5CA51"
+					item: "greate:stainless_steel_crushing_wheel"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5DE1F541B6A2C27E"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.macerator_separator.desc}"
+			x: -1.0d
+			y: 1.0d
+		}
+		{
+			dependencies: ["630D44C9BD1D7190"]
+			description: ["{quests.ore_proc.electro_separator.desc}"]
+			icon: "gtceu:lv_electromagnetic_separator"
+			id: "5DC7D0B4E591417D"
+			subtitle: "{quests.ore_proc.electro_separator.subtitle}"
+			tasks: [
+				{
+					id: "2F017A29A979276C"
+					item: "gtceu:hv_electromagnetic_separator"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "6B3DD2CB3874478A"
+					item: "gtceu:pure_bastnasite_dust"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "753028DDF077DCFD"
+					item: "gtceu:pure_naquadah_dust"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "4347664AB3BF5736"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.electro_separator.title}"
+			x: -1.0d
+			y: 2.0d
+		}
+		{
+			dependencies: [
+				"5DC7D0B4E591417D"
+				"6BAC3BE1D4FE0F6B"
+				"2F1AFDB17C5FC291"
+			]
+			dependency_requirement: "one_completed"
+			description: ["{quests.ore_proc.dust_processed.desc}"]
+			id: "22C1D541452D4AD4"
+			subtitle: "{quests.ore_proc.dust_processed.subtitle}"
+			tasks: [
+				{
+					id: "3EA3BABECE52085B"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item_tag(forge:dusts))"
+						}
+					}
+					type: "item"
+				}
+				{
+					id: "1A1B2762EFD6C6B0"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.dust_processed.title}"
+			x: 0.5d
+			y: 3.5d
+		}
+		{
+			dependencies: ["22C1D541452D4AD4"]
+			description: ["{quests.ore_proc.electrolyzer.desc}"]
+			icon: "gtceu:lv_electrolyzer"
+			id: "1BE7400D97562227"
+			subtitle: "{quests.ore_proc.electrolyzer.subtitle}"
+			tasks: [
+				{
+					id: "266A62102285A81F"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(gtceu:lv_electrolyzer)item(gtceu:mv_electrolyzer)item(gtceu:hv_electrolyzer)item(gtceu:ev_electrolyzer)item(gtceu:iv_electrolyzer)item(gtceu:luv_electrolyzer)item(gtceu:zpm_electrolyzer)item(gtceu:uv_electrolyzer))"
+						}
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "63355BE55659968E"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.electrolyzer.title}"
+			x: 0.0d
+			y: 5.5d
+		}
+		{
+			dependencies: ["22C1D541452D4AD4"]
+			description: ["{quests.ore_proc.packer.desc}"]
+			icon: "gtceu:lv_packer"
+			id: "0D75C3A7D69E12C2"
+			subtitle: "{quests.ore_proc.packer.subtitle}"
+			tasks: [
+				{
+					id: "5B4F1397CD746E02"
+					item: "gtceu:lv_packer"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "1652532FFCF3E37A"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.packer.title}"
+			x: 1.0d
+			y: 5.5d
+		}
+		{
+			dependencies: ["5D09BEE61210DF02"]
+			description: ["{quests.ore_proc.gtcy.desc}"]
+			icon: "gtceu:alloy_blast_smelter"
+			id: "335FE15E81D3AB06"
+			shape: "octagon"
+			size: 1.25d
+			subtitle: "{quests.ore_proc.gtcy.subtitle}"
+			tasks: [
+				{
+					id: "5B6E8C5E63F5AF97"
+					item: "gtceu:large_maceration_tower"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "3A25030D00212FC6"
+					item: "gtceu:large_centrifuge"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "4A3FE7BC2DBA8D37"
+					item: "gtceu:large_sifting_funnel"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "4035CEFA54AF8CA7"
+					item: "gtceu:large_chemical_bath"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "757E5A50BE7FDF72"
+					item: "gtceu:large_electromagnet"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "087302FFE78EA9AB"
+					item: "gtceu:large_electrolyzer"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "243D67333DA333D8"
+					item: "gtceu:large_packer"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5C78A0155B10864F"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.gtcy.title}"
+			x: 3.0d
+			y: -8.5d
+		}
+		{
+			dependencies: ["5D09BEE61210DF02"]
+			description: ["{quests.ore_proc.ae2.desc}"]
+			icon: "expatternprovider:tag_storage_bus"
+			id: "4ED1E28BDDE50E6C"
+			shape: "octagon"
+			size: 1.25d
+			subtitle: "{quests.ore_proc.ae2.subtitle}"
+			tasks: [
+				{
+					id: "120F92F5742F409A"
+					item: "ae2:controller"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "32D21FB6D64AB61E"
+					item: "expatternprovider:tag_storage_bus"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "3F6075F8DEA148A6"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.ae2.title}"
+			x: -2.0d
+			y: -8.5d
+		}
+		{
+			dependencies: ["5D09BEE61210DF02"]
+			description: ["{quests.ore_proc.robot_arm.desc}"]
+			icon: "gtceu:item_tag_filter"
+			id: "5AB0C996B1325FDC"
+			shape: "octagon"
+			size: 1.25d
+			subtitle: "{quests.ore_proc.robot_arm.subtitle}"
+			tasks: [
+				{
+					id: "7CB8EAD1E4450C34"
+					item: "gtceu:item_tag_filter"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "028E7DEC8CE595E8"
+					item: "gtceu:item_smart_filter"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "0DCF304790B84769"
+					item: "gtceu:lv_robot_arm"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "208DF030039D27B3"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.ore_proc.robot_arm.title}"
+			x: 0.5d
+			y: -11.0d
+		}
+	]
+	subtitle: ["{quests.ore_proc.subtitle}"]
+	title: "{quest.ore_proc}"
+}

config/ftbquests/quests/chapters/progression.snbt

@@ -70,14 +70,6 @@
 			x: 2.0d
 			y: 2.0d
 		}
-		{
-			id: "0B4D429E3441C906"
-			linked_quest: "4AFD3073C731A1E4"
-			shape: "rsquare"
-			size: 0.8d
-			x: 2.0d
-			y: 3.0d
-		}
 		{
 			id: "2B8FBCD290196265"
 			linked_quest: "14D277A164202FF8"
@@ -310,6 +302,14 @@
 			x: 6.0d
 			y: -4.0d
 		}
+		{
+			id: "713A4F2E798A8BDB"
+			linked_quest: "6A451F43F3D7A671"
+			shape: "rsquare"
+			size: 0.8d
+			x: 2.0d
+			y: 3.0d
+		}
 	]
 	quests: [
 		{
@@ -358,7 +358,6 @@
 				"38DE506FF5B32031"
 				"5063FDFFBE3E4855"
 				"14D277A164202FF8"
-				"4AFD3073C731A1E4"
 				"5E76D4C24026157D"
 			]
 			description: [
@@ -547,7 +546,6 @@
 		{
 			dependencies: [
 				"49C1D61741AA288E"
-				"4AFD3073C731A1E4"
 				"0017FFFAD7CD2EFE"
 			]
 			description: [

config/ftbquests/quests/chapters/questsmetallurgy.snbt

@@ -558,29 +558,20 @@
 		{
 			dependencies: ["3C173357029AB649"]
 			description: ["{quests.metal_age.mining.desc}"]
-			icon: "gtceu:almandine_indicator"
 			id: "234B68E86F72C29E"
 			subtitle: "{quests.metal_age.mining.subtitle}"
-			tasks: [
-				{
-					id: "6BB5900B1E695C61"
-					title: "{quests.tasktype.checkmark}"
-					type: "checkmark"
-				}
-				{
-					id: "42657F198063D88B"
-					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:tools/mining_hammers)"
-						}
+			tasks: [{
+				id: "42657F198063D88B"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:tools/mining_hammers)"
 					}
-					optional_task: true
-					title: "Any #forge:tools/mining_hammers"
-					type: "item"
 				}
-			]
+				title: "Any #forge:tools/mining_hammers"
+				type: "item"
+			}]
 			title: "{quests.metal_age.mining.title}"
 			x: 0.0d
 			y: -32.0d
@@ -1317,4 +1308,4 @@
 	]
 	subtitle: ["{quests.metal_age.subtitle}"]
 	title: "{quests.metal_age}"
-}
+}

config/ftbquests/quests/chapters/questsstoneage.snbt

@@ -1699,7 +1699,6 @@
 			subtitle: "{quests.stone_age.hydration.subtitle}"
 			tasks: [{
 				id: "01CB74D1BA1BC018"
-				optional_task: true
 				title: "{quests.tasktype.checkmark}"
 				type: "checkmark"
 			}]
@@ -2295,4 +2294,4 @@
 	]
 	subtitle: ["{quests.stone_age.subtitle}"]
 	title: "{quests.stone_age}"
-}
+}

config/ftbquests/quests/chapters/queststfc_tips.snbt

@@ -6,7 +6,12 @@
 	icon: "minecraft:apple"
 	id: "5D74D1A68158F29E"
 	order_index: 1
-	quest_links: [ ]
+	quest_links: [{
+		id: "1AD1F9822B738105"
+		linked_quest: "2E36E5755B2F551C"
+		x: 4.0d
+		y: 6.0d
+	}]
 	quests: [
 		{
 			dependencies: ["427814F6E9386772"]
@@ -3912,7 +3917,7 @@
 				}
 				{
 					id: "75FC7712CD89CAD7"
-					item: "minecraft:ice"
+					item: "minecraft:packed_ice"
 					type: "item"
 				}
 			]
@@ -4526,6 +4531,205 @@
 			x: -13.5d
 			y: 6.5d
 		}
+		{
+			dependencies: ["02FDECC931B5E8EF"]
+			description: [
+				"&3Long-Distance Item Pipes&r can be used to send items across great distances. Place one endpoint at each end, and connect them with pipeline blocks."
+				""
+				"These pipes instantly transfer from the input side to the output side."
+				""
+				"They also have a minimum distance between pipe endpoints, so you can't use these for short-range operations."
+			]
+			icon: "gtceu:long_distance_item_pipeline_endpoint"
+			id: "22B0E30FF38145E7"
+			shape: "square"
+			size: 1.0d
+			subtitle: "Wondering how to move those ores around?"
+			tasks: [
+				{
+					count: 2L
+					id: "7D5959A062BEE77C"
+					item: "gtceu:long_distance_item_pipeline_endpoint"
+					type: "item"
+				}
+				{
+					id: "30A1D0C682D0FC2E"
+					item: "gtceu:long_distance_item_pipeline"
+					type: "item"
+				}
+			]
+			title: "Long-Distance Items"
+			x: 4.0d
+			y: 2.0d
+		}
+		{
+			dependencies: ["02FDECC931B5E8EF"]
+			dependency_requirement: "one_completed"
+			description: [
+				"The &aPortable Scanner&r, or &aTricorder&r, is GTCEu's debug tool."
+				""
+				"Using it will show you a block's details, the details of the energy network, its current status and contents, and its impact on performance."
+				""
+				"It'll also display a percentage of fluid remaining in the fluid vein for the &3Fluid Rigs&r."
+				"{@pagebreak}"
+				"&l&3Lore:&r&o This little useful device comes from GregTech 5. It was extremely useful in the early days, because very little information (basically nothing) was given by GUIs or WAILA."
+			]
+			id: "58D40A430654C997"
+			shape: "square"
+			size: 1.0d
+			subtitle: "For the nosiest GregTech players"
+			tasks: [{
+				id: "1E2E112D32893B8D"
+				item: "gtceu:portable_scanner"
+				type: "item"
+			}]
+			title: "Tricorder"
+			x: 6.0d
+			y: 2.0d
+		}
+		{
+			dependencies: ["02FDECC931B5E8EF"]
+			description: [
+				"&3Long-Distance Fluid Pipes&r can be used to send fluids across great distances. Place one endpoint at each end, and connect them with pipeline blocks."
+				""
+				"These pipes instantly transfer from the input side to the output side."
+				""
+				"They also have a minimum distance between pipe endpoints, so you can't use these for short-range operations."
+				"{@pagebreak}"
+				"These pipes have a reputation of being &4buggy&r to set up. If they don't seem to work at first, try rotating the endpoints with a &eWrench&r."
+			]
+			icon: "gtceu:long_distance_fluid_pipeline_endpoint"
+			id: "0B1AA0D4CEBD06A8"
+			optional: true
+			shape: "square"
+			size: 1.0d
+			subtitle: "Wondering how to move that oil around?"
+			tasks: [
+				{
+					count: 2L
+					id: "2B2586817A16F100"
+					item: "gtceu:long_distance_fluid_pipeline_endpoint"
+					type: "item"
+				}
+				{
+					id: "246FB107C0C2B28C"
+					item: "gtceu:long_distance_fluid_pipeline"
+					type: "item"
+				}
+			]
+			title: "Long-Distance Pipeline"
+			x: 5.0d
+			y: 2.0d
+		}
+		{
+			dependencies: ["02FDECC931B5E8EF"]
+			description: [
+				"In this quest, we'll bestow upon you &5cursed wisdom&r... the ability to easily automate the Electrolyzer."
+				""
+				"The &9Smart Item Filter&r is a filter that recognises Recipe Maps. When placed on the side of a machine, you can set it to \"&3Electrolyzer&r\" to allow insertion of electrolyzable items specifically. You heard that right - no need to filter manually!"
+				""
+				"Oh, and it only gets &abetter&r. If you combine this bad boy with a &aRobot Arm&r, it'll only supply the &6exact amount&r of items required for a successful recipe to the machine."
+				"{@pagebreak}"
+				"Place the &aRobot Arm&r on your Electrolyzer, open its GUI, then place the &9Smart Filter&r inside. Ensure that the Smart Filter is set to Electrolyzer."
+				""
+				"Next, configure it to &d&lImport&r and &d&lSupply Exact&r. Finally, attach any inventory &7(a chest will do)&r onto the side where you placed the &aRobot Arm&r. Ta-dah! You've figured out how to handle &6all&r Electrolyzer recipes!"
+				""
+				"What about the output of the &3Electrolyzer&r? You may want to route the Fluids to several Tanks - or even &3Super Tanks&r if you've gotten that far. We highly recommend that you avoid any methods involving voiding Fluids.&7.&8. except for Water for obvious reasons."
+				"{@pagebreak}"
+				"&9Note:&r The Robot Arm has to facilitate the item transfer for its filtering functionality to work! Inserting directly into the machine &7(for instance, pushing with a Hopper!)&r will ignore the Robot Arm's &dSupply Exact&r setting."
+			]
+			icon: "gtceu:item_smart_filter"
+			id: "222295CD03AF00DC"
+			shape: "square"
+			size: 1.0d
+			subtitle: "Knock, knock - who's that? It's MENSA!"
+			tasks: [{
+				id: "11EC9A6D9E2C4B7E"
+				item: "gtceu:item_smart_filter"
+				type: "item"
+			}]
+			title: "200IQ"
+			x: 6.0d
+			y: 3.0d
+		}
+		{
+			dependencies: ["02FDECC931B5E8EF"]
+			description: [
+				"This is a guide on how to automatically route &lall&r your Hot Ingots to your Chemical Bath, while keeping everything automated in tip-top shape."
+				""
+				"The cheap way would be to use filters, and manually add Hot Ingots one by one... which is so boring! Let's try the fun option."
+				""
+				"Install an &aItem Tag Filter&r Cover on the side of your &3Chemical Bath&r, open it and set it to whitelist \"&e&lhot_ingots&r\"."
+				""
+				"From here, you can route with &9any logistics system&r of your choice."
+				"{@pagebreak}"
+				"Connect the output of your &3EBF(s)&r to the input of your &3Chemical Bath&r and the output dump (Chest or Crate)."
+				"You can also have a &dRestrictive Pipe&r in front of the output dump to ensure the Chemical Bath will be prioritized."
+				""
+				"&l&9Note:&r If you wish to know more tags for more automation setups, they will display if you press Shift when hovering over an item. For instance, an item tagged with &e&o#forge:plates/copper&r would be filtered as &e&lplates/copper&r."
+				""
+				"&9Other Note:&r The Item Tag Filter partially supports &dregex&r. Hover over the info icon for more information."
+			]
+			icon: "gtceu:item_tag_filter"
+			id: "7C1FD81C5DCFB74E"
+			shape: "square"
+			size: 1.0d
+			subtitle: "Stop burning your darn hands!"
+			tasks: [{
+				id: "34DEDF3B7F0DB3BC"
+				item: "gtceu:item_tag_filter"
+				type: "item"
+			}]
+			title: "250IQ"
+			x: 6.0d
+			y: 4.0d
+		}
+		{
+			dependencies: ["02FDECC931B5E8EF"]
+			description: [
+				"In theory, Crates are flat upgrades to Chests. A single block space that stores more items - what more could you ask for?"
+				""
+				"Unfortunately, there's a small downside - Crates do not support item movement shortcuts well. We plan on fixing this in the long-term."
+				""
+				"Where they shine however is the fact that they &6accept Covers&r, making them perfect candidates for buffers in automation."
+			]
+			icon: "gtceu:bronze_crate"
+			id: "6702D52922D85C0D"
+			shape: "square"
+			size: 1.0d
+			subtitle: "Earlygame buffering"
+			tasks: [{
+				id: "2F8D9ACDF8EB5B8D"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(gtceu:wood_crate)item(gtceu:bronze_crate)item(gtceu:steel_crate)item(gtceu:aluminium_crate)item(gtceu:stainless_steel_crate)item(gtceu:titanium_crate)item(gtceu:tungsten_steel_crate))"
+					}
+				}
+				type: "item"
+			}]
+			title: "GregTech Storage"
+			x: 5.0d
+			y: 7.0d
+		}
+		{
+			dependencies: ["6702D52922D85C0D"]
+			description: ["With that tape you wil be able to move around the crate. The main advantage? You can put anything in a crate, weight won't be an issue here."]
+			icon: "gtceu:basic_tape"
+			id: "36B64597F76625ED"
+			shape: "square"
+			size: 1.0d
+			subtitle: "Moving stuff around"
+			tasks: [{
+				id: "1257FC299E957859"
+				item: "gtceu:basic_tape"
+				type: "item"
+			}]
+			title: "Tape for Crate"
+			x: 5.0d
+			y: 8.0d
+		}
 	]
 	subtitle: ["{quests.tfg_tips.subtitle}"]
 	title: "{quests.tfg_tips}"

config/tfc-client.toml

@@ -20,7 +20,7 @@
 	enableThirstBar = true
 	#
 	# Allows the vanilla XP bar to render.
-	enableExperienceBar = true
+	enableExperienceBar = false
 	#
 	# Enables squids inking your screen.
 	enableInkSplatter = true
@@ -85,7 +85,7 @@
 	#   BUMP = Move elements closer to the hotbar; when fishing or riding a jumping entity, other elements move to their default positions
 	#   LEFT_HOTBAR = Move elements closer to the hotbar; when fishing or riding a jumping entity, those elements will appear as a vertical bar between the hotbar and offhand slot
 	#Allowed Values: HOVER, BUMP, LEFT_HOTBAR
-	disabledExperienceBarStyle = "HOVER"
+	disabledExperienceBarStyle = "BUMP"
 	#
 	# If prospect information should appear in the space above the hotbar (the actionbar). False will put them in the chat window.
 	sendProspectResultsToActionbar = true

config/tfchotornot-common.toml

@@ -10,7 +10,7 @@
 	yeet = true
 	#This sets the temperature when a hot object should start burning the player (in celsius).
 	#Range: > -2147483648
-	hotTemperature = 300
+	hotTemperature = 500
 	#This sets the temperature when a cold object should add effects to the player (in celsius).
 	#Range: > -2147483648
 	coldTemperature = -20
@@ -25,10 +25,10 @@
 	itemTemperatureModifier = 2.0
 	#How often the heat of your tongs, mittens or potholders should increase. Higher value -> slower. Too high and items won't heat up.
 	#Range: > 1
-	itemHeatTimeInterval = 1
+	itemHeatTimeInterval = 4
 	#How often the durability of your tongs, mittens or potholders should take damage. Higher value -> slower. Holding multiple hot items will damage your insulating items faster!
 	#Range: > 1
-	itemDamageTimeInterval = 10
+	itemDamageTimeInterval = 60
 	#Durability for wooden tongs.
 	#Range: > 0
 	woodenTongsDurability = 250

config/tfcimprovedbadlands-common.toml

@@ -0,0 +1,18 @@
+
+[General]
+	#
+	# Toggles generation of sand layers. Disabling this (false) will shorten world generation time.
+	enableSandLayers = false
+	#
+	# Maximum rainfall for where sand layers can generate. Set to 500 to enable everywhere.
+	#Range: 4.9E-324 ~ 1.7976931348623157E308
+	sandLayerRainfall = 100.0
+	#
+	# The center point (rainfall) at which some biomes will start to turn into sand dunes. Set to any arbitrary large or low number to disable entirely.
+	#Range: > -2147483648
+	duneThreshold = 20
+	#
+	# The center point (rainfall) at which badland biomes will start to turn into their normal terrain. Set to any arbitrary large or low number to disable entirely.
+	#Range: > -2147483648
+	badlandsThreshold = 140
+

config/visual_workbench.json

@@ -1,276 +1,37 @@
 {
-  "__comment": "Crafting table blocks to enable Visual Workbench support for.",
-  "values": [
-    "minecraft:crafting_table",
-    "blue_skies:bluebright_crafting_table",
-    "blue_skies:starlit_crafting_table",
-    "blue_skies:frostbright_crafting_table",
-    "blue_skies:lunar_crafting_table",
-    "blue_skies:dusk_crafting_table",
-    "blue_skies:maple_crafting_table",
-    "blue_skies:cherry_crafting_table",
-    "blocksplus:spruce_crafting_table",
-    "blocksplus:birch_crafting_table",
-    "blocksplus:jungle_crafting_table",
-    "blocksplus:acacia_crafting_table",
-    "blocksplus:dark_oak_crafting_table",
-    "blocksplus:crimson_crafting_table",
-    "blocksplus:warped_crafting_table",
-    "blocksplus:bamboo_crafting_table",
-    "blocksplus:mushroom_crafting_table",
-    "mctb:spruce_crafting_table",
-    "mctb:birch_crafting_table",
-    "mctb:acacia_crafting_table",
-    "mctb:jungle_crafting_table",
-    "mctb:dark_oak_crafting_table",
-    "mctb:warped_crafting_table",
-    "mctb:crimson_crafting_table",
-    "mctb:cherry_crafting_table",
-    "mctb:dead_crafting_table",
-    "mctb:fir_crafting_table",
-    "mctb:hellbark_crafting_table",
-    "mctb:jacaranda_crafting_table",
-    "mctb:magic_crafting_table",
-    "mctb:mahogany_crafting_table",
-    "mctb:palm_crafting_table",
-    "mctb:redwood_crafting_table",
-    "mctb:umbran_crafting_table",
-    "mctb:willow_crafting_table",
-    "mctb:azalea_crafting_table",
-    "mctb:blossom_crafting_table",
-    "betternether:rubeus_crafting_table",
-    "betternether:nether_sakura_crafting_table",
-    "betternether:crafting_table_crimson",
-    "betternether:wart_crafting_table",
-    "betternether:crafting_table_warped",
-    "betternether:anchor_tree_crafting_table",
-    "betternether:willow_crafting_table",
-    "betternether:nether_mushroom_crafting_table",
-    "betternether:stalagnate_crafting_table",
-    "betternether:mushroom_fir_crafting_table",
-    "betternether:nether_reed_crafting_table",
-    "betterend:helix_tree_crafting_table",
-    "betterend:mossy_glowshroom_crafting_table",
-    "betterend:end_lotus_crafting_table",
-    "betterend:pythadendron_crafting_table",
-    "betterend:jellyshroom_crafting_table",
-    "betterend:tenanea_crafting_table",
-    "betterend:dragon_tree_crafting_table",
-    "betterend:lucernia_crafting_table",
-    "betterend:lacugrove_crafting_table",
-    "betterend:umbrella_tree_crafting_table",
-    "betterendforge:helix_tree_crafting_table",
-    "betterendforge:mossy_glowshroom_crafting_table",
-    "betterendforge:end_lotus_crafting_table",
-    "betterendforge:pythadendron_crafting_table",
-    "betterendforge:jellyshroom_crafting_table",
-    "betterendforge:tenanea_crafting_table",
-    "betterendforge:dragon_tree_crafting_table",
-    "betterendforge:lucernia_crafting_table",
-    "betterendforge:lacugrove_crafting_table",
-    "betterendforge:umbrella_tree_crafting_table",
-    "crumbs:spruce_crafting_table",
-    "crumbs:birch_crafting_table",
-    "crumbs:jungle_crafting_table",
-    "crumbs:acacia_crafting_table",
-    "crumbs:dark_oak_crafting_table",
-    "crumbs:crimson_crafting_table",
-    "crumbs:warped_crafting_table",
-    "byg:aspen_crafting_table",
-    "byg:baobab_crafting_table",
-    "byg:blue_enchanted_crafting_table",
-    "byg:cherry_crafting_table",
-    "byg:cika_crafting_table",
-    "byg:cypress_crafting_table",
-    "byg:ebony_crafting_table",
-    "byg:fir_crafting_table",
-    "byg:green_enchanted_crafting_table",
-    "byg:holly_crafting_table",
-    "byg:jacaranda_crafting_table",
-    "byg:mahogany_crafting_table",
-    "byg:mangrove_crafting_table",
-    "byg:maple_crafting_table",
-    "byg:pine_crafting_table",
-    "byg:rainbow_eucalyptus_crafting_table",
-    "byg:redwood_crafting_table",
-    "byg:skyris_crafting_table",
-    "byg:willow_crafting_table",
-    "byg:witch_hazel_crafting_table",
-    "byg:zelkova_crafting_table",
-    "byg:sythian_crafting_table",
-    "byg:embur_crafting_table",
-    "byg:palm_crafting_table",
-    "byg:lament_crafting_table",
-    "byg:bulbis_crafting_table",
-    "byg:nightshade_crafting_table",
-    "byg:ether_crafting_table",
-    "byg:imparius_crafting_table",
-    "vct:spruce_crafting_table",
-    "vct:birch_crafting_table",
-    "vct:jungle_crafting_table",
-    "vct:acacia_crafting_table",
-    "vct:dark_oak_crafting_table",
-    "vct:mangrove_crafting_table",
-    "vct:crimson_crafting_table",
-    "vct:warped_crafting_table",
-    "vct:bop_cherry_crafting_table",
-    "vct:bop_dead_crafting_table",
-    "vct:bop_fir_crafting_table",
-    "vct:bop_hellbark_crafting_table",
-    "vct:bop_jacaranda_crafting_table",
-    "vct:bop_magic_crafting_table",
-    "vct:bop_mahogany_crafting_table",
-    "vct:bop_palm_crafting_table",
-    "vct:bop_redwood_crafting_table",
-    "vct:bop_umbran_crafting_table",
-    "vct:bop_willow_crafting_table",
-    "vct:canopy_crafting_table",
-    "vct:darkwood_crafting_table",
-    "vct:twilight_mangrove_crafting_table",
-    "vct:minewood_crafting_table",
-    "vct:sortingwood_crafting_table",
-    "vct:timewood_crafting_table",
-    "vct:transwood_crafting_table",
-    "vct:twilight_oak_crafting_table",
-    "vct:aspen_crafting_table",
-    "vct:grimwood_crafting_table",
-    "vct:kousa_crafting_table",
-    "vct:morado_crafting_table",
-    "vct:rosewood_crafting_table",
-    "vct:yucca_crafting_table",
-    "vct:maple_crafting_table",
-    "vct:bamboo_crafting_table",
-    "vct:azalea_crafting_table",
-    "vct:poise_crafting_table",
-    "vct:cherry_crafting_table",
-    "vct:willow_crafting_table",
-    "vct:wisteria_crafting_table",
-    "vct:driftwood_crafting_table",
-    "vct:river_crafting_table",
-    "vct:jacaranda_crafting_table",
-    "vct:redbud_crafting_table",
-    "vct:cypress_crafting_table",
-    "vct:brown_mushroom_crafting_table",
-    "vct:red_mushroom_crafting_table",
-    "vct:glowshroom_crafting_table",
-    "vct:twisted_crafting_table",
-    "vct:petrified_crafting_table",
-    "vct:eco_azalea_crafting_table",
-    "vct:eco_flowering_azalea_crafting_table",
-    "vct:eco_coconut_crafting_table",
-    "vct:eco_walnut_crafting_table",
-    "vct:fairy_ring_mushroom_crafting_table",
-    "vct:azure_crafting_table",
-    "vct:araucaria_crafting_table",
-    "vct:heidiphyllum_crafting_table",
-    "vct:liriodendrites_crafting_table",
-    "vct:metasequoia_crafting_table",
-    "vct:protojuniperoxylon_crafting_table",
-    "vct:protopiceoxylon_crafting_table",
-    "vct:zamites_crafting_table",
-    "vct:quark_azalea_crafting_table",
-    "vct:quark_blossom_crafting_table",
-    "vct:grongle_crafting_table",
-    "vct:smogstem_crafting_table",
-    "vct:wigglewood_crafting_table",
-    "vct:congealed_crafting_table",
-    "vct:echo_crafting_table",
-    "vct:ebony_crafting_table",
-    "vct:pream_crafting_table",
-    "vct:verdant_crafting_table",
-    "vct:jaboticaba_crafting_table",
-    "vct:ramboutan_crafting_table",
-    "vct:bm_ancient_oak_crafting_table",
-    "vct:bm_blighted_balsa_crafting_table",
-    "vct:bm_swamp_cypress_crafting_table",
-    "vct:bm_willow_crafting_table",
-    "vct:rue_baobab_crafting_table",
-    "vct:rue_blackwood_crafting_table",
-    "vct:rue_cherry_crafting_table",
-    "vct:rue_cypress_crafting_table",
-    "vct:rue_dead_crafting_table",
-    "vct:rue_eucalyptus_crafting_table",
-    "vct:rue_joshua_crafting_table",
-    "vct:rue_larch_crafting_table",
-    "vct:rue_maple_crafting_table",
-    "vct:rue_mauve_crafting_table",
-    "vct:rue_palm_crafting_table",
-    "vct:rue_pine_crafting_table",
-    "vct:rue_redwood_crafting_table",
-    "vct:rue_willow_crafting_table",
-    "variantcraftingtables:acacia_crafting_table",
-    "variantcraftingtables:birch_crafting_table",
-    "variantcraftingtables:dark_oak_crafting_table",
-    "variantcraftingtables:jungle_crafting_table",
-    "variantcraftingtables:spruce_crafting_table",
-    "variantcraftingtables:mangrove_crafting_table",
-    "variantcraftingtables:crimson_crafting_table",
-    "variantcraftingtables:warped_crafting_table",
-    "variantcraftingtables:rubber_crafting_table",
-    "variantcraftingtables:bamboo_crafting_table",
-    "variantcraftingtables:charred_crafting_table",
-    "variantcraftingtables:legacy_crafting_table",
-    "variantcraftingtables:white_oak_crafting_table",
-    "variantcraftingtables:herringbone_acacia_crafting_table",
-    "variantcraftingtables:herringbone_birch_crafting_table",
-    "variantcraftingtables:herringbone_dark_oak_crafting_table",
-    "variantcraftingtables:herringbone_jungle_crafting_table",
-    "variantcraftingtables:herringbone_oak_crafting_table",
-    "variantcraftingtables:herringbone_spruce_crafting_table",
-    "variantcraftingtables:herringbone_white_oak_crafting_table",
-    "variantcraftingtables:herringbone_bamboo_crafting_table",
-    "variantcraftingtables:herringbone_charred_crafting_table",
-    "variantcraftingtables:herringbone_crimson_crafting_table",
-    "variantcraftingtables:herringbone_warped_crafting_table",
-    "variantcraftingtables:cherry_oak_crafting_table",
-    "variantcraftingtables:dark_amaranth_crafting_table",
-    "variantcraftingtables:palm_crafting_table",
-    "variantcraftingtables:cypress_crafting_table",
-    "variantcraftingtables:dragons_blood_crafting_table",
-    "variantcraftingtables:elder_crafting_table",
-    "variantcraftingtables:juniper_crafting_table",
-    "variantcraftingtables:dreamwood_crafting_table",
-    "variantcraftingtables:livingwood_crafting_table",
-    "variantcraftingtables:mossy_dreamwood_crafting_table",
-    "variantcraftingtables:mossy_livingwood_crafting_table",
-    "variantcraftingtables:shimmerwood_crafting_table",
-    "variantcraftingtables:black_crafting_table",
-    "variantcraftingtables:blue_crafting_table",
-    "variantcraftingtables:brown_crafting_table",
-    "variantcraftingtables:cyan_crafting_table",
-    "variantcraftingtables:gray_crafting_table",
-    "variantcraftingtables:green_crafting_table",
-    "variantcraftingtables:light_blue_crafting_table",
-    "variantcraftingtables:light_gray_crafting_table",
-    "variantcraftingtables:lime_crafting_table",
-    "variantcraftingtables:magenta_crafting_table",
-    "variantcraftingtables:orange_crafting_table",
-    "variantcraftingtables:pink_crafting_table",
-    "variantcraftingtables:purple_crafting_table",
-    "variantcraftingtables:red_crafting_table",
-    "variantcraftingtables:white_crafting_table",
-    "variantcraftingtables:yellow_crafting_table",
-    "variantcraftingtables:ancient_oak_crafting_table",
-    "variantcraftingtables:blighted_balsa_crafting_table",
-    "variantcraftingtables:swamp_cypress_crafting_table",
-    "variantcraftingtables:willow_crafting_table",
-    "variantcraftingtables:mango_crafting_table",
-    "variantcraftingtables:wisteria_crafting_table",
-    "variantcraftingtables:bamboo_crafting_table_ve",
-    "variantcraftingtables:redwood_crafting_table",
-    "variantcraftingtables:azalea_crafting_table",
-    "variantcraftingtables:coconut_crafting_table",
-    "variantcraftingtables:flowering_azalea_crafting_table",
-    "variantcraftingtables:walnut_crafting_table",
-    "variantcraftingtables:stripped_bamboo_crafting_table",
-    "variantcraftingtables:crystal_crafting_table",
-    "variantcraftingtables:golden_oak_crafting_table",
-    "variantcraftingtables:orange_crafting_table_pl",
-    "variantcraftingtables:skyroot_crafting_table",
-    "variantcraftingtables:wisteria_crafting_table_pl",
-    "variantcraftingtables:cinnamon_crafting_table",
-    "variantcraftingtables:jade_crafting_table",
-    "variantcraftingtables:moon_crafting_table",
-    "variantcraftingtables:shadow_crafting_table"
-  ]
+	"__comment": "Crafting table blocks to enable Visual Workbench support for.",
+	"values": [
+		"afc:wood/planks/fig_workbench",
+		"afc:wood/planks/ironwood_workbench",
+		"afc:wood/planks/ipe_workbench",
+		"afc:wood/planks/cypress_workbench",
+		"afc:wood/planks/teak_workbench",
+		"afc:wood/planks/tualang_workbench",
+		"afc:wood/planks/hevea_workbench",
+		"afc:wood/planks/mahogany_workbench",
+		"afc:wood/planks/eucalyptus_workbench",
+		"afc:wood/planks/baobab_workbench",
+		"beneath:wood/planks/crimson_workbench",
+		"beneath:wood/planks/warped_workbench",
+		"tfc:wood/planks/kapok_workbench",
+		"tfc:wood/planks/hickory_workbench",
+		"tfc:wood/planks/douglas_fir_workbench",
+		"tfc:wood/planks/chestnut_workbench",
+		"tfc:wood/planks/blackwood_workbench",
+		"tfc:wood/planks/birch_workbench",
+		"tfc:wood/planks/acacia_workbench",
+		"tfc:wood/planks/ash_workbench",
+		"tfc:wood/planks/aspen_workbench",
+		"tfc:wood/planks/sycamore_workbench",
+		"tfc:wood/planks/spruce_workbench",
+		"tfc:wood/planks/sequoia_workbench",
+		"tfc:wood/planks/rosewood_workbench",
+		"tfc:wood/planks/pine_workbench",
+		"tfc:wood/planks/palm_workbench",
+		"tfc:wood/planks/oak_workbench",
+		"tfc:wood/planks/maple_workbench",
+		"tfc:wood/planks/mangrove_workbench",
+		"tfc:wood/planks/willow_workbench",
+		"tfc:wood/planks/white_cedar_workbench"
+	]
 }

config/visualworkbench-client.toml

@@ -1,7 +1,7 @@
 #Rotate crafting table contents so they always face the closest player.
-rotate_ingredients = true
+rotate_ingredients = false
 #Makes crafting table contents lay flat on the table instead of floating above.
-flat_rendering = false
+flat_rendering = true
 #Render the result of the crafting operation in addition to crafting table contents.
-render_result = true
+render_result = false
 

defaultconfigs/beneath-server.toml

@@ -0,0 +1,6 @@
+
+[general]
+	#
+	# If the sacrifice method should be allowed for getting to the nether, rather than building a portal (requires black steel pickaxe)
+	allowSacrifice = false
+

defaultconfigs/create-server.toml

@@ -130,7 +130,7 @@
 		#.
 		#Game ticks required for a Fan-based processing recipe to take effect.
 		#Range: > 0
-		fanProcessingTime = 150
+		fanProcessingTime = 3200
 
 	#.
 	#Moving Contraptions
@@ -292,7 +292,7 @@
 				gearbox = 0.0
 				hose_pulley = 0.5
 				elevator_pulley = 0.5
-				mechanical_crafter = 0.25
+				mechanical_crafter = 0.125
 
 			#.
 			#[in Stress Units]
@@ -300,10 +300,10 @@
 			[kinetics.stressValues.v2.capacity]
 				copper_valve_handle = 2.0
 				hand_crank = 2.0
-				steam_engine = 32.0
+				steam_engine = 16.0
 				creative_motor = 16384.0
-				large_water_wheel = 32.0
-				water_wheel = 8.0
+				large_water_wheel = 16.0
+				water_wheel = 4.0
 				windmill_bearing = 32.0
 
 #.

defaultconfigs/tfc-server.toml

@@ -159,7 +159,7 @@
 		#
 		# Tank capacity of a crucible (in mB).
 		#Range: 0 ~ 2147483645
-		crucibleCapacity = 4000
+		crucibleCapacity = 4032
 		#
 		# A modifier for how fast fluid containers empty into crucibles. Containers will empty 1 mB every (this) number of ticks.
 		#Range: > 1
@@ -502,7 +502,7 @@
 		#
 		# Tank capacity of a small vessel (in mB).
 		#Range: 0 ~ 2147483645
-		smallVesselCapacity = 3000
+		smallVesselCapacity = 3024
 		#
 		# The largest (inclusive) size of an item that is allowed in a small vessel.
 		#Allowed Values: TINY, VERY_SMALL, SMALL, NORMAL, LARGE, VERY_LARGE, HUGE

kubejs/assets/create/lang/en_us.json

@@ -1,5 +1,7 @@
 {
   "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "block.create.dark_oak_window": "Hickory Window",
+  "block.create.dark_oak_window_pane": "Hickory Window Pane",
   "block.create.andesite_bars": "Metal Bars",
   "block.create.andesite_belt_funnel": "Metal Belt Funnel",
   "block.create.andesite_casing": "Metal Casing",

kubejs/assets/createconnected/lang/en_us.json

@@ -0,0 +1,5 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "create_connected:cherry_window": "Fig Window",
+  "create_connected:cherry_window_pane": "Fig Window Pane"
+}

kubejs/assets/emi/recipe/filters/categories.json

@@ -92,6 +92,9 @@
         },
         {
             "category": "vintageimprovements:auto_curving"
+        },
+        {
+            "category": "vintageimprovements:laser_cutting"
         }
     ]
 }

kubejs/assets/greate/lang/en_us.json

@@ -32,9 +32,7 @@
   "block.greate.large_andesite_alloy_cogwheel": "Large Basic Cogwheel",
   "block.greate.metal_girder_encased_andesite_alloy_shaft": "Metal Girder Encased Basic Shaft",
   "block.greate.powered_andesite_alloy_shaft": "Powered Basic Shaft",
-  "block.greate.rubber_belt_andesite_alloy": "Basic Belt",
-  "block.greate.rubber_belt_steel": "Basic Belt",
-  "item.greate.rubber_belt_connector": "Basic Belt",
+  "item.greate.rubber_belt_connector": "Rubber Belt",
   "item.greate.silicone_rubber_belt_connector": "Silicone Rubber Belt",
   "block.greate.polyethylene_belt_titanium": "Styrene Butadiene Rubber Belt",
   "block.greate.polyethylene_belt_tungsten_steel": "Styrene Butadiene Rubber Belt",

kubejs/assets/gtceu/lang/en_us.json

@@ -2,7 +2,7 @@
   "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
   "block.bud_indicator": "%s Surface Bud",
   "block.gtceu.nether_dome": "Netherarium",
-  "block.gtceu.ender_dome": "Enderarium",
+  "block.gtceu.end_dome": "Enderarium",
   "block.gtceu.greenhouse": "Greenhouse",
   "block.gtceu.steam_bloomery": "Steam Bloomery",
   "block.gtceu.copper_crate": "Copper Crate",
@@ -12,7 +12,7 @@
   "block.gtceu.bismuth_bronze_crate": "Bismuth Bronze Crate",
   "block.gtceu.bismuth_bronze_drum": "Bismuth Bronze Drum",
   "gtceu.nether_dome": "Netherarium",
-  "gtceu.ender_dome": "Enderarium",
+  "gtceu.end_dome": "Enderarium",
   "gtceu.greenhouse": "Electric Greenhouse",
   "gtceu.steam_bloomery": "Steam Bloomery",
   "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp",
@@ -51,8 +51,11 @@
   "item.gtceu.iron_quadruple_cable": "4x Cast Iron Cable",
   "item.gtceu.iron_octal_cable": "8x Cast Iron Cable",
   "item.gtceu.iron_hex_cable": "16x Cast Iron Cable",
+  "item.gtceu.ice_bucket": "Ice Water Bucket",
+  "material.gtceu.ice": "Ice Water",
   "metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust",
   "metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore",
+  "item.gtceu.tool.behavior.silk_ice": "Silk Harvests Packed Ice",
   "tagprefix.sword_head": "%s Sword Head",
   "tagprefix.pickaxe_head": "%s Pickaxe Head",
   "tagprefix.shovel_head": "%s Shovel Head",

kubejs/assets/gtceu/models/item/material_sets/certus/poor_raw_ore.json

@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/certus/poor_raw_ore",
+        "layer1": "gtceu:item/material_sets/certus/poor_raw_ore_secondary"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/certus/raw_ore.json

@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/certus/raw_ore",
+        "layer1": "gtceu:item/material_sets/certus/raw_ore_secondary"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/certus/rich_raw_ore.json

@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/certus/rich_raw_ore",
+        "layer1": "gtceu:item/material_sets/certus/rich_raw_ore_secondary"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/quartz/poor_raw_ore.json

@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/quartz/poor_raw_ore",
+        "layer1": "gtceu:item/material_sets/quartz/poor_raw_ore_secondary"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/quartz/raw_ore.json

@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/quartz/raw_ore",
+        "layer1": "gtceu:item/material_sets/quartz/raw_ore_secondary"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/quartz/rich_raw_ore.json

@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/quartz/rich_raw_ore",
+        "layer1": "gtceu:item/material_sets/quartz/rich_raw_ore_secondary"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/poor_raw_ore.json

@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/tfc_realgar/poor_raw_ore",
+        "layer1": "gtceu:item/material_sets/tfc_realgar/poor_raw_ore_secondary"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/raw_ore.json

@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/tfc_realgar/raw_ore",
+        "layer1": "gtceu:item/material_sets/tfc_realgar/raw_ore_secondary"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/rich_raw_ore.json

@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/tfc_realgar/rich_raw_ore",
+        "layer1": "gtceu:item/material_sets/tfc_realgar/rich_raw_ore_secondary"
+    }
+}

kubejs/assets/kaolinclayze/lang/en_us.json

@@ -0,0 +1,9 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "entity.kaolinclayze.tfc": "Kaolin Klayze",
+  "entity.terramod.tfc": "Kaolin Klayze",
+  "entity.kaolinclayze.golem_2": "Graphite Glayze",
+  "item.kaolinclayze.tfc_spawn_egg": "Kaolin Klayze Spawn Egg",
+  "item.kaolinclayze.golem_2_spawn_egg": "Graphite Glayze Spawn Egg",
+  "item.terramod.tfc_spawn_egg": "Kaolin Klayze Spawn Egg"
+}

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json

@@ -1,62 +1,26 @@
 {
-  "__comment__": "This file was automatically created by mcresources",
-  "name": "Irrigation",
-  "category": "tfc:firmalife",
-  "icon": "firmalife:sprinkler",
-  "pages": [
-    {
-      "type": "patchouli:text",
-      "text": "The $(thing)Sprinkler$() is a device that sprinkles water in a 5x6x5 area centered on the block below the sprinkler block. You know it is working when it drips out water particles. Sprinklers placed facing up irrigate the same 5x6x5 area above."
-    },
-    {
-      "type": "tfc:anvil_recipe",
-      "recipe": "firmalife:anvil/sprinkler",
-      "text": "The sprinkler is made with a $(thing)Copper Plate$()."
-    },
-    {
-      "type": "patchouli:text",
-      "text": "Sprinklers must be connected to a system of pipes that feed it water in order to work. This is done by connecting a series of $(thing)Copper Pipes$() to them. Copper Pipes transport water up to 32 blocks to a sprinkler. They are connected to $(thing)Pumping Stations$()."
-    },
-    {
-      "type": "tfc:anvil_recipe",
-      "recipe": "firmalife:anvil/copper_pipe",
-      "text": "The copper pipe is made with a plate."
-    },
-    {
-      "type": "patchouli:multiblock",
-      "multiblock": {
-        "pattern": [
-          [
-            "X"
-          ],
-          [
-            "0"
-          ]
-        ],
-        "mapping": {
-          "X": "firmalife:pumping_station"
-        }
-      },
-      "name": "",
-      "text": "",
-      "enable_visualize": false
-    },
-    {
-      "type": "patchouli:crafting",
-      "recipe": "tfg:shaped/pumping_station",
-      "text": "Pumping stations must be above a source block of water in order to work. Activate them with a redstone signal."
-    },
-    {
-      "type": "patchouli:crafting",
-      "recipe": "firmalife:crafting/oxidized_copper_pipe",
-      "text": "Oxidized pipes are the same as regular copper pipes, except they do not connect to the other kind of pipe."
-    },
-    {
-      "type": "patchouli:crafting",
-      "recipe": "firmalife:crafting/greenhouse/iron_greenhouse_port",
-      "text": "Greenhouse ports have a single pipe inside of them. They can be used to pass water through the walls of greenhouses!"
-    }
-  ],
-  "read_by_default": true,
-  "sortnum": 8
+	"name": "Irrigation",
+	"category": "tfc:firmalife",
+	"icon": "firmalife:sprinkler",
+	"pages": [
+		{
+			"type": "patchouli:text",
+			"text": "The $(thing)Sprinkler$() is a device that sprinkles water in a 5x6x5 area centered on the block below the sprinkler block. You know it is working when it drips out water particles. Sprinklers placed facing up irrigate the same 5x6x5 area above."
+		},
+		{
+			"type": "tfc:anvil_recipe",
+			"recipe": "firmalife:anvil/sprinkler",
+			"text": "The sprinkler is made with a $(thing)Copper Plate$()."
+		},
+		{
+			"type": "patchouli:text",
+			"text": "Sprinklers must be connected to a system of pipes that feed it water in order to work. This is done by connecting a series of $(thing)Fluid Pipes$() to them. You can pump fluid into them with a $(thing)Mechanical Pump$()."
+		},
+		{
+			"type": "patchouli:text",
+			"text": "You can right-click a pipe with a GregTech Frame (such as a $(thing)Copper Frame$()) to make them flush with the wall. You will need a Drum or Fluid Tank attached to each sprinkler in order for them to work."
+		}
+	],
+	"read_by_default": true,
+	"sortnum": 8
 }

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/introduction.json

@@ -69,7 +69,7 @@
 		},
 		{
 			"type": "patchouli:crafting",
-			"recipe": "tfc:crafting/stone/knife_sedimentary",
+			"recipe": "gtceu:shaped/knife_stone",
 			"text": "All stone tool heads can be crafted with a stick or twig to assemble them into a tool.$(br2)The stone knife can be used to harvest $(thing)Straw$() by breaking plants."
 		},
 		{

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json

@@ -62,7 +62,7 @@
     },
     {
       "type": "tfc:anvil_recipe",
-      "recipe": "tfc:anvil/metal/ingot/wrought_iron",
+      "recipe": "tfc:anvil/wrought_iron_from_bloom",
       "text": "The $(thing)Refined Iron Bloom$() must be worked in a $(l:mechanics/anvils)anvil$() to make $(thing)Wrought Iron Ingots$()."
     },
     {

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/create.json

@@ -1,40 +0,0 @@
-{
-	"name": "Getting Started With Create",
-	"category": "tfc:tfg_tips",
-	"icon": "create:cogwheel",
-	"read_by_default": true,
-	"pages": [
-		{
-			"type": "patchouli:text",
-			"title": "Getting Started With Create",
-			"text": "In TerraFirmaGreg, TFC's own mechanical power system has been replaced with $(thing)Create$().$(br2)You can make a few Create things once you have Wrought Iron, but you can only really get started once you have access to $(l:mechanics/steel)Steel$() and $(thing)Steam Machines$().$(br2)First, you will need a source of $(thing)Mechanical Power$(), either Water Wheels, Windmills, or a Steam Engine. Of these, $(thing)Water Wheels$() are the easiest to start with, just put them in a river!$(br)"
-		},
-		{
-			"type": "patchouli:crafting",
-			"recipe": "create:crafting/kinetics/water_wheel",
-			"recipe2": "create:crafting/kinetics/large_water_wheel"
-		},
-		{
-			"type": "tfc:sealed_barrel_recipe",
-			"recipe": "tfg:barrel/treated_wood_planks",
-			"text": "To move mechanical power around, you will need $(thing)Cogwheels$().$(br)To make these, first put some $(l:tfg_tips/basic_automation)Creosote$() and any $(thing)Wooden Planks$() in a $(l:mechanics/barrels)Sealed Barrel$().$(br)This will give you $(thing)Creosote-Treated Wood Planks$()."
-		},
-		{
-			"type": "patchouli:spotlight",
-			"title": "Treated Wood Pulp",
-			"item": "gtceu:hp_steam_macerator,gtceu:treated_wood_dust",
-			"text": "Next, put those treated planks in a $(thing)Steam Macerator$(). This will produce $(thing)Treated Wood Pulp$()."
-		},
-		{
-			"type": "patchouli:spotlight",
-			"title": "Treated Wood Plank",
-			"item": "gtceu:hp_steam_compressor,gtceu:treated_wood_plate",
-			"text": "Lastly, putting the pulp into a $(thing)Steam Compressor$() will produce a $(thing)Treated Wood Plank$().$(br2)You can then use these to craft $(item)Cogwheels$()!"
-		},
-		{
-			"type": "patchouli:crafting",
-			"recipe": "tfg:create/shapeless/cogwheel",
-			"recipe2": "tfg:create/shaped/large_cogwheel"
-		}
-	]
-}

kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/firmalife/stainless_steel.json

@@ -1,14 +0,0 @@
-{
-    "name": "Acciaio inossidabile",
-    "icon": "firmalife:metal/ingot/stainless_steel",
-    "category": "tfc:firmalife",
-    "read_by_default": true,
-    "pages": [
-        {
-            "type": "patchouli:spotlight",
-            "item": "gtceu:stainless_steel_ingot",
-            "title": "Acciaio inossidabile",
-            "text": "$(thing)Questa pagina serve per sovrascrivere la pagina predefinita di Firmalife per l'acciaio Inossidabile.$(br2)L'Acciaio inossidabile è un materiale di Gregtech sbloccato in $(thing)HV, quindi non è craftabile con attrezzi dell'era primitiva come sarebbe normalmente possibile con Firmalife.$(br)Anche la serra in acciaio inossidabile non è craftabile. Ci dispiace!"
-        }
-    ]
-}

kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/bloomery.json

@@ -1,80 +1,80 @@
 {
-  "__comment__": "This file was automatically created by mcresources",
-  "name": "Fucina",
-  "category": "tfc:mechanics",
-  "icon": "tfc:bloomery",
-  "pages": [
-    {
-      "type": "patchouli:text",
-      "text": "La $(thing)Fucina$() è un dispositivo usato per fondere del$(thing)Minerale di Ferro$() in $(thing)Blumi di Ferro$() che possono essere forgiati in $(thing)Ferro Battuto$(). \nI minerali di ferro sono : $(l:the_world/ores_and_minerals#hematite)Hematite$(), $(l:the_world/ores_and_minerals#limonite)Limonite$(), e $(l:the_world/ores_and_minerals#magnetite)Magnetite$(). Quasti minerali possono essere fusi per creare $(thing)Ghisa$() al posto di $(thing)Ferro Battuto$(). Tutti gli oggetti contenenti ferro, se fusi, daranno Ghisa. Per farli diventare ferro usabile, c'è bisogno della fucina. Ogni oggetto in ferro piò essere usato nella fucina, inclusi attrezzi e lingotti di Ghisa!$(thing)"
-    },
-    {
-      "type": "patchouli:crafting",
-      "recipe": "tfc:crafting/bloomery",
-      "text": "La fucina si crea con 8 $(thing)Doppie Piaste di Bronzo$()."
-    },
-    {
-      "type": "patchouli:multiblock",
-      "multiblock_id": "tfc:bloomery",
-      "name": "Una Fucina",
-      "text": "Una Fucina di grandezza minima. Il blocco della fucina si può aprire e chiudere con $(item)$(k:key.use)$().",
-      "enable_visualize": true
-    },
-    {
-      "type": "patchouli:text",
-      "text": "La fucina può contenere un massimo di 48 $(thing)Input$(), con 16 item per strato della ciminiera. Per aggiungere strati alla ciminiera, piazza altri 2 strati di blocchi di pietra.$(br2)Per aggiungere oggetti alla fucina, arrampicati su di essa e lancia gli oggetti al suo interno. Una pila di minerale grigio dovrebbe comparire."
-    },
-    {
-      "type": "patchouli:image",
-      "images": [
-        "tfc:textures/gui/book/tutorial/bloomery_hole.png"
-      ],
-      "text": "Aggiungere oggetti alla fucina.",
-      "border": true
-    },
-    {
-      "type": "patchouli:text",
-      "text": "Aggiungere oggetti alla fucina."
-    },
-    {
-      "type": "patchouli:multiblock",
-      "multiblock": {
-        "pattern": [
-          [
-            "X"
-          ],
-          [
-            "0"
-          ]
-        ],
-        "mapping": {
-          "X": "tfc:bloom[layers=8]"
-        }
-      },
-      "name": "Blocco di Blumi",
-      "text": "Un grande $(thing)Blumo$().",
-      "enable_visualize": false
-    },
-    {
-      "type": "tfc:anvil_recipe",
-      "recipe": "tfc:anvil/refined_iron_bloom",
-      "text": "Un $(thing)Blumo di Ferro Grezzo$() deve essere forgiato in una $(l:mechanics/anvils)incudine$() per creare  un $(thing)Blumo di Ferro Raffinato$()."
-    },
-    {
-      "type": "tfc:anvil_recipe",
-      "recipe": "tfc:anvil/metal/ingot/wrought_iron",
-      "text": "Un $(thing)Blumi di Ferro Raffinato$()  deve essere forgiato in una $(l:mechanics/anvils)incudine$() per creare $(thing)Ferro Battuto$()."
-    },
-    {
-      "type": "patchouli:text",
-      "text": "$(li)Se la fucina si ritrova con più oggetti di quanti ne può contenere in base alla sua ciminiera, li sputerà fuori dal davanti.$()$(li)Per riprendere i tuoi oggetti da una fucina che non è accesa, non rompere i blocchi al suo interno. Rompi il blocco principale della fucina.$()$(li)I blumi si fondono solo in ghisa e non in ferro battuto. Devono essere lavorati!$()",
-      "title": "Note del Fabbro"
-    }
-  ],
-  "read_by_default": true,
-  "extra_recipe_mappings": {
-    "tfc:bloom": 6,
-    "tfc:raw_iron_bloom": 7,
-    "tfc:refined_iron_bloom": 8
-  }
+	"__comment__": "This file was automatically created by mcresources",
+	"name": "Fucina",
+	"category": "tfc:mechanics",
+	"icon": "tfc:bloomery",
+	"pages": [
+		{
+			"type": "patchouli:text",
+			"text": "La $(thing)Fucina$() è un dispositivo usato per fondere del$(thing)Minerale di Ferro$() in $(thing)Blumi di Ferro$() che possono essere forgiati in $(thing)Ferro Battuto$(). \nI minerali di ferro sono : $(l:the_world/ores_and_minerals#hematite)Hematite$(), $(l:the_world/ores_and_minerals#limonite)Limonite$(), e $(l:the_world/ores_and_minerals#magnetite)Magnetite$(). Quasti minerali possono essere fusi per creare $(thing)Ghisa$() al posto di $(thing)Ferro Battuto$(). Tutti gli oggetti contenenti ferro, se fusi, daranno Ghisa. Per farli diventare ferro usabile, c'è bisogno della fucina. Ogni oggetto in ferro piò essere usato nella fucina, inclusi attrezzi e lingotti di Ghisa!$(thing)"
+		},
+		{
+			"type": "patchouli:crafting",
+			"recipe": "tfc:crafting/bloomery",
+			"text": "La fucina si crea con 8 $(thing)Doppie Piaste di Bronzo$()."
+		},
+		{
+			"type": "patchouli:multiblock",
+			"multiblock_id": "tfc:bloomery",
+			"name": "Una Fucina",
+			"text": "Una Fucina di grandezza minima. Il blocco della fucina si può aprire e chiudere con $(item)$(k:key.use)$().",
+			"enable_visualize": true
+		},
+		{
+			"type": "patchouli:text",
+			"text": "La fucina può contenere un massimo di 48 $(thing)Input$(), con 16 item per strato della ciminiera. Per aggiungere strati alla ciminiera, piazza altri 2 strati di blocchi di pietra.$(br2)Per aggiungere oggetti alla fucina, arrampicati su di essa e lancia gli oggetti al suo interno. Una pila di minerale grigio dovrebbe comparire."
+		},
+		{
+			"type": "patchouli:image",
+			"images": [
+				"tfc:textures/gui/book/tutorial/bloomery_hole.png"
+			],
+			"text": "Aggiungere oggetti alla fucina.",
+			"border": true
+		},
+		{
+			"type": "patchouli:text",
+			"text": "Aggiungere oggetti alla fucina."
+		},
+		{
+			"type": "patchouli:multiblock",
+			"multiblock": {
+				"pattern": [
+					[
+						"X"
+					],
+					[
+						"0"
+					]
+				],
+				"mapping": {
+					"X": "tfc:bloom[layers=8]"
+				}
+			},
+			"name": "Blocco di Blumi",
+			"text": "Un grande $(thing)Blumo$().",
+			"enable_visualize": false
+		},
+		{
+			"type": "tfc:anvil_recipe",
+			"recipe": "tfc:anvil/refined_iron_bloom",
+			"text": "Un $(thing)Blumo di Ferro Grezzo$() deve essere forgiato in una $(l:mechanics/anvils)incudine$() per creare  un $(thing)Blumo di Ferro Raffinato$()."
+		},
+		{
+			"type": "tfc:anvil_recipe",
+			"recipe": "tfc:anvil/wrought_iron_from_bloom",
+			"text": "Un $(thing)Blumi di Ferro Raffinato$()  deve essere forgiato in una $(l:mechanics/anvils)incudine$() per creare $(thing)Ferro Battuto$()."
+		},
+		{
+			"type": "patchouli:text",
+			"text": "$(li)Se la fucina si ritrova con più oggetti di quanti ne può contenere in base alla sua ciminiera, li sputerà fuori dal davanti.$()$(li)Per riprendere i tuoi oggetti da una fucina che non è accesa, non rompere i blocchi al suo interno. Rompi il blocco principale della fucina.$()$(li)I blumi si fondono solo in ghisa e non in ferro battuto. Devono essere lavorati!$()",
+			"title": "Note del Fabbro"
+		}
+	],
+	"read_by_default": true,
+	"extra_recipe_mappings": {
+		"tfc:bloom": 6,
+		"tfc:raw_iron_bloom": 7,
+		"tfc:refined_iron_bloom": 8
+	}
 }

kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/glassworking.json

@@ -1,82 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "name": "Glassworking",
-  "category": "tfc:mechanics",
-  "icon": "tfc:silica_glass_bottle",
-  "pages": [
-    {
-      "type": "patchouli:text",
-      "text": "Glassworking is the process of turning sand into glass. To start, you must create a $(thing)Glass Batch$(), of which there are four types:$(br)$(br) 1. $(thing)Silica$(), from white sand.$(br) 2. $(thing)Hematitic$(), from yellow, red, or pink sand.$(br) 3. $(thing)Olivine$(), from green or brown sand.$(br) 4. $(thing)Volcanic$(), from black sand."
-    },
-    {
-      "type": "patchouli:crafting",
-      "title": "Silica Glass Batch",
-      "recipe": "tfc:crafting/silica_glass_batch",
-      "text": "Glass batches can then be crafted using one of the aforementioned colors of sand, plus $(l:mechanics/glassworking#lime)Lime$() and a type of $(l:mechanics/glassworking#potash)Potash$()."
-    },
-    {
-      "type": "patchouli:smelting",
-      "anchor": "lime",
-      "recipe": "tfg:smelting/lime",
-      "text": "$(thing)Lime$() is one of the ingredients required to make glass batches. It is a powder obtained by $(l:mechanics/heating)heating$() $(l:mechanics/flux)Flux$()."
-    },
-    {
-      "type": "patchouli:smelting",
-      "anchor": "potash",
-      "recipe": "tfg:smelting/dried_seaweed_to_soda",
-      "recipe2": "tfg:smelting/dried_kelp_to_soda",
-      "text": "A type of $(thing)Potash$() or equivalent is also required for glass batches. $(thing)Soda Ash$() can be used, which is a powder made from heating $(thing)Dried Seaweed$() or $(thing)Kelp$(). $(l:the_world/ores_and_minerals#saltpeter)Saltpeter$() can be used as well."
-    },
-    {
-      "type": "patchouli:text",
-      "text": "Glassworking is done by starting with a glass batch, and then completing a series of steps. These steps may require specific tools:$(br)$(li)A $(l:mechanics/glassworking#blowpipe)Blowpipe$(), to $(thing)Blow$() and $(thing)Stretch$()$(li)A $(l:mechanics/glassworking#paddle)Paddle$(), to $(thing)Flatten$()$(li)$(l:mechanics/glassworking#jacks)Jacks$(), to $(thing)Pinch$()$(li)A $(l:mechanics/glassworking#saw)Gem Saw$(), to $(thing)Saw$()",
-      "title": "Tools of the Trade"
-    },
-    {
-      "type": "tfc:knapping_recipe",
-      "anchor": "blowpipe",
-      "recipe": "tfc:clay_knapping/blowpipe",
-      "text": "The most important tool is the $(thing)Blowpipe$(). It can be $(thing)knapped$() from clay, and then fired into a $(thing)Ceramic Blowpipe$()."
-    },
-    {
-      "type": "tfc:anvil_recipe",
-      "recipe": "tfc:anvil/blowpipe",
-      "text": "Ceramic blowpipes are brittle, and have a chance to to break when used. A more sturdy blowpipe can be $(l:mechanics/anvils#working)worked$() from a $(thing)Brass Rod$() on an anvil."
-    },
-    {
-      "type": "patchouli:crafting",
-      "anchor": "paddle",
-      "recipe": "tfc:crafting/paddle",
-      "text": "The $(thing)Flatten$() operation can be done with a $(thing)Paddle$(), which is crafted from wood."
-    },
-    {
-      "type": "tfc:welding_recipe",
-      "anchor": "jacks",
-      "recipe": "tfc:welding/jacks",
-      "text": "The $(thing)Pinch$() operation can be done with $(thing)Jacks$(), made from welding two brass rods together."
-    },
-    {
-      "type": "patchouli:crafting",
-      "anchor": "saw",
-      "recipe": "tfc:crafting/gem_saw",
-      "text": "The $(thing)Saw$() operation can be done with a $(thing)Gem Saw$(). The gem saw is also used to break both $(thing)Glass Blocks$() and $(thing)Glass Panes$() and obtain them."
-    },
-    {
-      "type": "patchouli:text",
-      "text": "First, glass on the blowpipe must be heated to $(4)$(bold)Faint Red$(). Then, hold the blowpipe in your $(thing)offhand$() and hold $(item)$(k:key.use)$() to perform each step$().$(br)Use $(item)$(k:key.swapOffhand)$() to pick up a hot blowpipe into your offhand.$(br2)$(bold)Blow$()$(br)Use the $(thing)Blowpipe$() while facing straight ahead.$(br2)$(bold)Stretch$()$(br)Use the $(thing)Blowpipe$() while facing straight down.",
-      "title": "How to Glass"
-    },
-    {
-      "type": "patchouli:text",
-      "text": "$(bold)Flatten$()$(br)Use the $(thing)Blowpipe$() while holding a $(l:mechanics/glassworking#paddle)Paddle$() in your main hand.$(br2)$(bold)Pinch$()$(br)Use the $(thing)Blowpipe$() while holding $(l:mechanics/glassworking#jacks)Jacks$() in your main hand.$(br2)$(bold)Saw$()$(br)Use the $(thing)Blowpipe$() while holding a $(l:mechanics/glassworking#saw)Gem Saw$() in your main hand.$(br2)$(bold)Roll$()$(br)Use the $(thing)Blowpipe$() with a $(l:mechanics/weaving#wool_cloth)Wool Cloth$() in your main hand."
-    }
-  ],
-  "read_by_default": true,
-  "extra_recipe_mappings": {
-    "tfc:powder/lime": 2,
-    "tfc:powder/soda_ash": 3,
-    "tfc:paddle": 7,
-    "tfc:jacks": 8,
-    "tfc:gem_saw": 9
-  }
-}

kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/glassworking_applications.json

@@ -1,433 +0,0 @@
-{
-  "__comment__": "This file was automatically created by mcresources",
-  "name": "Glass Products",
-  "category": "tfc:mechanics",
-  "icon": "minecraft:glass",
-  "pages": [
-    {
-      "type": "patchouli:text",
-      "text": "The most simple glass products are $(thing)Glass Panes$() and $(thing)Glass Blocks$(). In order to craft them, you must start with a $(l:mechanics/glassworking#blowpipe)Blowpipe$() with a $(thing)Glass Batch$(), and then perform a $(thing)Pour$().$(br)$(li)$(bold)Table Pours$() are used to create $(thing)Glass Panes$()$(li)$(bold)Basin Pours$() are used to create $(thing)Glass Blocks$()"
-    },
-    {
-      "type": "patchouli:text",
-      "text": "Glass can also be $(thing)dyed$() before it is poured to create colored glass. The color is dependent on the type of glass batch, and any powders that have been added.$(br2)Each type of $(thing)Glass Batch$() has a different natural color of glass that they will create. $(thing)Silica$() glass batches can be made into many colors, $(thing)Olivine$(), and $(thing)Volcanic$() glass can be made into relatively few colors."
-    },
-    {
-      "type": "patchouli:text",
-      "text": "$(thing)Glass Panes$() are made with a $(thing)Table Pour$(). A pouring table is made by placing up to sixteen $(thing)Kaolin Clay Blocks$() or $(thing)Brass Blocks$() in a continuous area.$(br2) 1. Add a $(l:mechanics/glassworking)Glass Batch$() to a $(thing)Blowpipe$().$(br) 2. Heat the blowpipe to $(4)$(bold)Faint Red$().$(br) 3. $()$(item)$(k:key.use)$() the $(thing)Blowpipe$() on the top of the table.$(br) 4. Finally $(item)$(k:key.use)$() with a $(l:mechanics/glassworking#paddle)Paddle$() to flatten the glass.",
-      "title": "Table Pour"
-    },
-    {
-      "type": "patchouli:multiblock",
-      "multiblock": {
-        "mapping": {
-          "C": "#tfc:glass_pouring_table",
-          "0": "#tfc:glass_pouring_table"
-        },
-        "pattern": [
-          [
-            "CCCC",
-            "CCC0",
-            "CCCC",
-            "CCCC"
-          ]
-        ]
-      },
-      "text": "Once the glass is cooled, it can be broken with a $(l:mechanics/glassworking#saw)Gem Saw$() to obtain.",
-      "border": true
-    },
-    {
-      "type": "patchouli:text",
-      "text": "$(thing)Glass Blocks$() are made with a $(thing)Basin Pour$(). A basin is made by surrounding all sides of an air block except the top with $(thing)Kaolin Clay Blocks$() or $(thing)Brass Blocks$().$(br2) 1. Add a $(l:mechanics/glassworking)Glass Batch$() to a $(thing)Blowpipe$().$(br) 2. Heat the blowpipe to $(4)$(bold)Faint Red$().$(br) 3. $(item)$(k:key.use)$() the $(thing)Blowpipe$() on the top of the table.",
-      "title": "Basin Pour"
-    },
-    {
-      "type": "patchouli:multiblock",
-      "multiblock": {
-        "mapping": {
-          "C": "#tfc:glass_basin_blocks",
-          "0": "#tfc:glass_basin_blocks"
-        },
-        "pattern": [
-          [
-            " C ",
-            "C C",
-            " C "
-          ],
-          [
-            "   ",
-            " 0 ",
-            "   "
-          ]
-        ]
-      },
-      "text": "Once the glass is cooled, it can be broken with a $(l:mechanics/glassworking#saw)Gem Saw$() to obtain.",
-      "border": true
-    },
-    {
-      "type": "patchouli:text",
-      "anchor": "coloring",
-      "text": "Glass has a natural color based on the type of $(l:mechanics/glassworking)Glass Batch$() that was used. Other colors can be made using a $(l:mechanics/bowls)Bowl$().$(br2)To use, place the $(l:mechanics/bowls)Bowl$() on the ground, then $(item)$(k:key.use)$() the required $(thing)Powder$(). Before $(thing)Pouring$(), use the $(thing)Blowpipe$() on the bowl to add the powder to the batch.",
-      "title": "Coloring Glass"
-    },
-    {
-      "type": "patchouli:text",
-      "text": "$(br2)The next pages show the different combinations of glass types and powder materials to create each color."
-    },
-    {
-      "type": "patchouli:text",
-      "text": "$(li)$(bold)$(7)White$(): Silica or Hematitic Glass + $(thing)Soda Ash$()$(li)$(bold)$(0)Black$(): Any Glass + $(thing)Graphite$()$(li)$(bold)$(8)Gray$(): Any + $(thing)Graphite$() + $(thing)Soda Ash$()$(li)$(bold)$(7)Light Gray$(): Any + $(thing)Graphite$() + 2x $(thing)Soda Ash$()$(li)$(bold)$(5)Purple$(): Any + $(thing)Iron$() + $(thing)Copper$()$(li)$(bold)$(#964b00)Brown$(): Any + $(thing)Nickel$()$(li)$(bold)$(3)Cyan$(): Non-Volcanic Glass + $(thing)Copper$() + $(thing)Sapphire$()$(li)$(bold)$(2)Green$(): Silica or Hematitic Glass + $(thing)Iron$()",
-      "title": "Dye Colors"
-    },
-    {
-      "type": "patchouli:text",
-      "text": "$(li)$(bold)$(a)Lime$(): Silica or Hematitic Glass + $(thing)Iron$() + $(thing)Soda Ash$()$(li)$(bold)$(b)Light Blue$(): Silica Glass + $(thing)Lapis Lazuli$()$(li)$(bold)$(1)Blue$(): Silica Glass + $(thing)Copper$()$(li)$(bold)$(4)Red$(): Silica or Hematitic Glass + $(thing)Tin$()$(li)$(bold)$(6)Yellow$(): Silica or Hematitic Glass + $(thing)Silver$()$(li)$(bold)$(#ef8e38)Orange$(): Silica Glass + $(thing)Pyrite$()$(li)$(bold)$(5)Magenta$(): Silica or Hematitic Glass + $(thing)Ruby$()$(li)$(bold)$(d)Pink$(): Silica Glass + $(thing)Gold$()$(li)$(bold)$(0)Tinted$(): Non-Silica Glass + $(thing)Amethyst$()"
-    },
-    {
-      "type": "tfc:table_small",
-      "strings": [
-        {
-          "text": ""
-        },
-        {
-          "text": "C"
-        },
-        {
-          "text": "T"
-        },
-        {
-          "fill": "0xff42f2"
-        },
-        {
-          "fill": "0x8af3ff"
-        },
-        {
-          "fill": "0x526cff"
-        },
-        {
-          "fill": "0xe3e3e3"
-        },
-        {
-          "fill": "0xe69407"
-        },
-        {
-          "fill": "0xc738c9"
-        },
-        {
-          "fill": "0xffe81c"
-        },
-        {
-          "fill": "0x48ff1f"
-        },
-        {
-          "fill": "0xe01414"
-        },
-        {
-          "fill": "0x0c9400"
-        },
-        {
-          "fill": "0x188a9e"
-        },
-        {
-          "fill": "0x7d4f00"
-        },
-        {
-          "fill": "0x6e059c"
-        },
-        {
-          "fill": "0x7d7d7d"
-        },
-        {
-          "fill": "0xbdbdbd"
-        },
-        {
-          "fill": "0x000000"
-        },
-        {
-          "text": "Silica"
-        },
-        {
-          "fill": "0x3d42a8"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "text": "Hematitic"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3d42a8"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "text": "Olivine"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0x3d42a8"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "text": "Volcanic"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0x3d42a8"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0xb33e3e"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        },
-        {
-          "fill": "0x3eb340"
-        }
-      ],
-      "text": "The availability of glass colors. 'C' is clear, 'T' is tinted. Colors can only be crafted with certain glass batches.",
-      "title": "Glass Color Availability",
-      "legend": [
-        {
-          "text": "Can be Crafted",
-          "color": "0x3eb340"
-        },
-        {
-          "text": "Cannot be Crafted",
-          "color": "0xb33e3e"
-        },
-        {
-          "text": "Default Color",
-          "color": "0x3d42a8"
-        }
-      ],
-      "columns": 18,
-      "first_column_width": 35,
-      "column_width": 10,
-      "row_height": 10,
-      "left_buffer": 5,
-      "top_buffer": 15,
-      "draw_background": true
-    },
-    {
-      "type": "patchouli:empty",
-      "draw_filler": false
-    },
-    {
-      "type": "tfc:glassworking_recipe",
-      "anchor": "lamp_glass",
-      "recipe": "tfc:glassworking/lamp_glass",
-      "text": "$(thing)Lamp Glass$() is a necessary component to craft $(l:mechanics/lamps)Lamps$()."
-    },
-    {
-      "type": "tfc:glassworking_recipe",
-      "anchor": "jar",
-      "recipe": "tfc:glassworking/empty_jar",
-      "text": "$(l:mechanics/jarring)Jars$() are also made from blown glass, but only silica or hematitic glass."
-    },
-    {
-      "type": "tfc:glassworking_recipe",
-      "anchor": "glass_bottle",
-      "recipe": "tfc:glassworking/silica_glass_bottle",
-      "text": "$(thing)Glass Bottles$() can also be made. The quality of the glass bottle depends on the type of glass used to make it."
-    },
-    {
-      "type": "tfc:glassworking_recipe",
-      "recipe": "tfc:glassworking/lens",
-      "text": "The $(thing)Lens$() is used for crafting the spyglass, compasses, and other things."
-    }
-  ],
-  "read_by_default": true,
-  "extra_recipe_mappings": {
-    "tag:tfc:glass_batches": 1,
-    "tag:c:glass_panes": 2,
-    "tag:c:glass_blocks": 4
-  }
-}

kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/mechanical_power.json

@@ -1,38 +0,0 @@
-{
-	"name": "Basic Automation",
-	"category": "tfc:mechanics",
-	"icon": "gtceu:coke_oven",
-	"pages": [
-		{
-			"type": "patchouli:text",
-			"title": "Basic Automation",
-			"text": "Tired of making charcoal in huge pits? Once you've got $(l:mechanics/bloomery)Wrought Iron$(), you'll be able to make your first GregTech multiblock, the $(item)Coke Oven$().$(br)It will turn logs into $(thing)charcoal$() automatically, as well as upgrade any $(thing)Coal$() into $(thing)Coke$() which burns twice as long in a $(l:mechanics/charcoal_forge)Forge$().$(br)All recipes output $(thing)Creosote$(), which can be used as a lamp fuel and is required for $(l:mechanics/pumps)Create$()."
-		},
-		{
-			"type": "patchouli:spotlight",
-			"title": "Coke Oven",
-			"item": "gtceu:coke_oven,gtceu:coke_oven_bricks,gtceu:coke_oven_hatch",
-			"text": "Use JEI for a multiblock preview by looking at the $(thing)Coke Oven$() and pressing $(item)$(k:jei.showUses)$(). You can click individual blocks to see what's valid there.$(br2)Note that the center is hollow, and up to 5 $(thing)Coke Oven Hatches$() can be placed anywhere instead of bricks."
-		},
-		{
-			"type": "patchouli:spotlight",
-			"item": "gtceu:tin_small_item_pipe",
-			"title": "Item Pipes",
-			"text": "Hatches will automatically pull items into them and push fluids and items out, so you can put $(l:mechanics/crankshaft#crates)Crates$(), $(l:mechanics/crankshaft#drums)Drums$(), and $(l:mechanics/barrels)Barrels$() right up against them, but if you'd like to have more control, you'll want to use GregTech's pipes.$(br2)$(item)Item Pipes$() will not pull from any inventory they're attached to, so you'll want to use a $(thing)Chute$() or $(thing)Hopper$() to pull from the inventory and push into the pipe."
-		},
-		{
-			"type": "patchouli:text",
-			"text": "Different tiers of pipes will move different amounts of items, but the cheapest to start with is the $(item)Small Tin Item Pipe$().$(br2)Item pipes move items instantly, prioritizing closest inventories first. You can make pipes one-way by $(thing)Sneak-Right-Clicking$() them with a $(thing)Wrench$() and en empty offhand.$(br2)You can also control how items move with $(thing)Item Filters$(), $(thing)Item Tag Filters$(), and $(thing)Restricted Item Pipes$()."
-		},
-		{
-			"type": "patchouli:spotlight",
-			"item": "gtceu:wood_normal_fluid_pipe,gtceu:bronze_normal_fluid_pipe",
-			"title": "Fluid Pipes",
-			"text": "$(item)Fluid Pipes$() unsurprisingly are for moving fluids. Unlike item pipes, fluid pipes do not move fluids instantly, and will \"slosh\" back and forth, so it's a good idea to make them all one-way by $(thing)Sneak-Right-Clicking$() with a $(thing)Wrench$() and an empty offhand."
-		},
-		{
-			"type": "patchouli:text",
-			"text": "Different kinds of pipes can hold different things. $(thing)Wooden pipes$() can't hold gases, for example, and will burn if you try to put something hot in them. Other metal pipes like $(thing)Bronze$() can handle some hot things like Steam and Lava, but not acids.$(br2)Hold shift over a fluid pipe to see what it can handle."
-		}
-	]
-}

kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/mechanics/pumps.json

@@ -1,39 +0,0 @@
-{
-	"name": "Getting Started With Create",
-	"category": "tfc:mechanics",
-	"icon": "create:cogwheel",
-	"pages": [
-		{
-			"type": "patchouli:text",
-			"title": "Getting Started With Create",
-			"text": "In TerraFirmaGreg, TFC's own mechanical power system has been replaced with $(thing)Create$().$(br2)You can make a few Create things once you have Wrought Iron, but you can only really get started once you have access to $(l:mechanics/steel)Steel$() and $(thing)Steam Machines$().$(br2)First, you will need a source of $(thing)Mechanical Power$(), either Water Wheels, Windmills, or a Steam Engine. Of these, $(thing)Water Wheels$() are the easiest to start with, just put them in a river!$(br)"
-		},
-		{
-			"type": "patchouli:crafting",
-			"recipe": "create:crafting/kinetics/water_wheel",
-			"recipe2": "create:crafting/kinetics/large_water_wheel"
-		},
-		{
-			"type": "tfc:sealed_barrel_recipe",
-			"recipe": "tfg:barrel/treated_wood_planks",
-			"text": "To move mechanical power around, you will need $(thing)Cogwheels$().$(br)To make these, first put some $(l:mechanics/mechanical_power)Creosote$() and any $(thing)Wooden Planks$() in a $(l:mechanics/barrels)Sealed Barrel$().$(br)This will give you $(thing)Creosote-Treated Wood Planks$()."
-		},
-		{
-			"type": "patchouli:spotlight",
-			"title": "Treated Wood Pulp",
-			"item": "gtceu:hp_steam_macerator,gtceu:treated_wood_dust",
-			"text": "Next, put those treated planks in a $(thing)Steam Macerator$(). This will produce $(thing)Treated Wood Pulp$()."
-		},
-		{
-			"type": "patchouli:spotlight",
-			"title": "Treated Wood Plank",
-			"item": "gtceu:hp_steam_compressor,gtceu:treated_wood_plate",
-			"text": "Lastly, putting the pulp into a $(thing)Steam Compressor$() will produce a $(thing)Treated Wood Plank$().$(br2)You can then use these to craft $(item)Cogwheels$()!"
-		},
-		{
-			"type": "patchouli:crafting",
-			"recipe": "tfg:create/shapeless/cogwheel",
-			"recipe2": "tfg:create/shaped/large_cogwheel"
-		}
-	]
-}

kubejs/assets/tfc/patchouli_books/field_guide/it_it/entries/tfg_tips/inventory_management.json

@@ -1,6 +1,6 @@
 {
 	"name": "Gestione dell'inventario",
-	"category": "tfc:mechanics",
+	"category": "tfc:tfg_tips",
 	"icon": "minecraft:chest",
 	"pages": [
 		{

kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/firmalife/stainless_steel.json

@@ -1,14 +0,0 @@
-{
-    "name": "Нержавеющая сталь",
-    "icon": "firmalife:metal/ingot/stainless_steel",
-    "category": "tfc:firmalife",
-    "read_by_default": true,
-    "pages": [
-        {
-            "type": "patchouli:spotlight",
-			"item": "gtceu:stainless_steel_ingot",
-			"title": "Нержавеющая сталь",
-            "text": "Эта страница не используется.$(br2)Нержавеющая сталь - Грегтеховский материал $(thing)HV$(), поэтому в примитивной эре он не создаётся.$(br)Теплицу из нержавеющей стали так же сделать невозможно, приносим свои извинения!"
-        }
-    ]
-}

kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/getting_started/introduction.json

@@ -69,7 +69,7 @@
 		},
 		{
 			"type": "patchouli:crafting",
-			"recipe": "tfc:crafting/stone/knife_sedimentary",
+			"recipe": "gtceu:shaped/knife_stone",
 			"text": "Все головки каменных инструментов можно собрать с палкой или веткой, чтобы собрать их в инструмент.$(br2)Каменный нож можно использовать для сбора $(thing)Соломы$(), разбивая растения."
 		},
 		{

kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/crops.json

@@ -14,17 +14,16 @@
     },
     {
       "type": "tfc:rock_knapping_recipe",
-      "recipes": [
-        "tfc:rock_knapping/hoe_head_sedimentary",
-        "tfc:rock_knapping/hoe_head_metamorphic",
-        "tfc:rock_knapping/hoe_head_igneous_extrusive",
-        "tfc:rock_knapping/hoe_head_igneous_intrusive"
-      ],
+        "recipes": [
+            "tfg:rock_knapping/stone_hoe_head",
+            "tfg:rock_knapping/stone_hoe_head_1",
+            "tfg:rock_knapping/stone_hoe_head_2"
+        ],
       "text": "Чтобы начать, $(thing)Каменную мотыгу$() можно $(thing)выколотить$(), как показано выше."
     },
     {
       "type": "patchouli:crafting",
-      "recipe": "tfc:crafting/stone/hoe_sedimentary",
+      "recipe": "gtceu:shaped/hoe_stone",
       "text": "После того как головка мотыги выколота, ее можно скрафтить в мотыгу.$(br2)Мотыги работают как в ванили, позволяя правым кликом превращать блоки земли в $(thing)пашню$(). Они также могут использоваться для превращения $(thing)корнистой земли$() в обычную $(thing)землю$()."
     },
     {

kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/decay.json

@@ -56,7 +56,7 @@
     },
     {
       "type": "tfc:quern_recipe",
-      "recipe": "tfc:quern/salt",
+      "recipe": "tfg:quern/salt_powder",
       "text": "Один из способов получить соль - это $(l:mechanics/quern)измельчение$() $(l:the_world/ores_and_minerals#halite)галита$(), который является минералом."
     },
     {

kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/pumps.json

@@ -1,40 +0,0 @@
-{
-	"name": "Первые шаги с модом Create",
-	"category": "tfc:mechanics",
-	"icon": "create:cogwheel",
-	"pages":
-	[
-		{
-			"type": "patchouli:text",
-			"title": "Первые шаги с модом Create",
-			"text": "В TFG, кинетика мода TFC упразднена в пользу мода $(thing)Create$().$(br2)Кованое железо даёт доступ к небольшой части мода, однако полноценно к нему приступить получится только по получению $(l:mechanics/steel)Стали$() и $(thing)Паровых машин$().$(br2)Перво-наперво вам потребуется $(thing)Механическая энергия$()- водяное колесо, ветряная мельница или паровой двигатель. Самое просто из трёх - это $(thing)Водяное колесо$(), его достаточно просто поставить над рекой и вуаля!$(br)"
-		},
-		{
-			"type": "patchouli:crafting",
-			"recipe": "create:crafting/kinetics/water_wheel",
-			"recipe2": "create:crafting/kinetics/large_water_wheel"
-		},
-		{
-			"type": "tfc:sealed_barrel_recipe",
-			"recipe": "tfg:barrel/treated_wood_planks",
-			"text": "Для передачи кинетической энергии используют $(thing)Шестерни$().$(br)Чтобы их сделать, необходим $(l:mechanics/mechanical_power)Креозот$() и любые $(thing)Доски$(), запечатанные в $(l:mechanics/barrels)Бочке из TFC$().$(br)Через 8 минут вас будут ждать $(thing)Доски из обработанного креозотом дерева$()."
-		},
-		{
-			"type": "patchouli:spotlight",
-			"title": "Кучка обработанной древесной массы",
-			"item": "gtceu:hp_steam_macerator,gtceu:treated_wood_dust",
-			"text": "После этого, доски необходимо измельчить в $(thing)Паровом измельчителе$()."
-		},
-		{
-			"type": "patchouli:spotlight",
-			"title": "Обработанная доска",
-			"item": "gtceu:hp_steam_compressor,gtceu:treated_wood_plate",
-			"text": "И, наконец, положив эту кучку в $(thing)Паровой компрессор$(), вы получите сами $(thing)обработанные доски$().$(br2)И уже с их помощью можно создавать $(item)Шестерни$()!"
-		},
-		{
-			"type": "patchouli:crafting",
-			"recipe": "tfg:create/shapeless/cogwheel",
-			"recipe2": "tfg:create/shaped/large_cogwheel"
-		}
-	]
-}

kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/basic_automation.json

@@ -1,6 +1,6 @@
 {
 	"name": "Примитивная автоматизация",
-	"category": "tfc:mechanics",
+	"category": "tfc:tfg_tips",
 	"icon": "gtceu:coke_oven",
 	"pages":
 	[

kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/inventory_management.json

@@ -1,6 +1,6 @@
 {
 	"name": "Хранение предметов",
-	"category": "tfc:mechanics",
+	"category": "tfc:tfg_tips",
 	"icon": "minecraft:chest",
 	"pages":
 	[

kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/firmalife/stainless_steel.json

@@ -1,14 +0,0 @@
-{
-    "name": "Нержавіюча сталь",
-    "icon": "firmalife:metal/ingot/stainless_steel",
-    "category": "tfc:firmalife",
-    "read_by_default": true,
-    "pages": [
-        {
-            "type": "patchouli:spotlight",
-            "item": "gtceu:stainless_steel_ingot",
-            "title": "Нержавіюча сталь",
-            "text": "Ця сторінка замінює сторінку Firmalife з нержавіючої сталі за замовчуванням.$(br2)Нержавіюча сталь - це матеріал GregTech $(thing)HV$(), тому її неможливо виготовити за допомогою примітивних інструментів, як це зазвичай робиться з Firmalife.$(br)Теплицю з нержавіючої сталі також неможливо виготовити. Вибачте!"
-        }
-    ]
-}

kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/getting_started/introduction.json

@@ -69,7 +69,7 @@
 		},
 		{
 			"type": "patchouli:crafting",
-			"recipe": "tfc:crafting/stone/knife_sedimentary",
+			"recipe": "gtceu:shaped/knife_stone",
 			"text": "До леза або кам’яної головки інструменту треба додати палицю або гілку, щоб отримати готовий інструмент.$(br2)Кам'яний ніж можна використовувати для збору $(thing)соломи$(), просто зрізавши траву ножем."
 		},
 		{

kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/bloomery.json

@@ -1,80 +1,80 @@
 {
-  "__comment__": "This file was automatically created by mcresources",
-  "name": "Сиродутне горно",
-  "category": "tfc:mechanics",
-  "icon": "tfc:bloomery",
-  "pages": [
-    {
-      "type": "patchouli:text",
-      "text": "$(thing)Сиродутне Горно$() це пристрій, що використовується для переплавлення $(thing)Залізної Руди$() на $(thing)Крицю$(), які можна переробити на $(thing)Ковке Залізо$(). Залізні руди - це $(l:the_world/ores_and_minerals#hematite)Гематит$(), $(l:the_world/ores_and_minerals#limonite)Лимоніт$(), та $(l:the_world/ores_and_minerals#magnetite)Магнетит$(). Ці руди плавляться на $(thing)Чавун$() а не на $(thing)Ковке Залізо$(). Усі залізовмісні предмети плавляться на чавун. Щоб перетворити їх на придатне для використання залізо, потрібна ковальська майстерня. Будь-який залізний предмет може бути використаний в сиродутному горні, включаючи залізні інструменти і чавунні злитки!"
-    },
-    {
-      "type": "patchouli:crafting",
-      "recipe": "tfc:crafting/bloomery",
-      "text": "Сиродутне горно зроблене з 8 $(thing)Бронзових Подвійних Листів$()."
-    },
-    {
-      "type": "patchouli:multiblock",
-      "multiblock_id": "tfc:bloomery",
-      "name": "Сиродутне горно",
-      "text": "Мінімальний розмір сиродутного горна. Блок сиродутного горна буде відкриватися і закриватися за допомогою $(item)$(k:key.use)$().",
-      "enable_visualize": true
-    },
-    {
-      "type": "patchouli:text",
-      "text": "Сиродутне горно може містити максимум 48 $(thing)Вхідних$(), по 16 предметів на один шар димаря. Щоб додати шари до димаря, викладіть ще два шари кам'яних блоків.$(br2)Щоб додати предмети до сиродутного горна, підніміться на вершину і кидайте предмети всередину. Повинна утворитися вежа з сірої руди."
-    },
-    {
-      "type": "patchouli:image",
-      "images": [
-        "tfc:textures/gui/book/tutorial/bloomery_hole.png"
-      ],
-      "text": "Додавання елементів до сиродутного горна.",
-      "border": true
-    },
-    {
-      "type": "patchouli:text",
-      "text": "На виробництво однієї $(thing)Криці$() витрачається $(thing)1 Деревинне Вугілля$() та $(thing)144 mB Чавуну$(). Після того, як ви заповнили сирудутне горно комбінацією $(thing)Деревинне Вугілля$() та $(thing)Руди$(), запаліть блок сиродутного горна і зачекайте 15 годин, поки руда розплавиться. Коли піч вимкнеться, вона залишить по собі блок $(thing)Криці$(). Він містить $(thing)Сире Кричне Залізо$(), який можна отримати, видобуваючи блок $(thing)Крицю$() кілька разів киркою."
-    },
-    {
-      "type": "patchouli:multiblock",
-      "multiblock": {
-        "pattern": [
-          [
-            "X"
-          ],
-          [
-            "0"
-          ]
-        ],
-        "mapping": {
-          "X": "tfc:bloom[layers=8]"
-        }
-      },
-      "name": "Блок Криці",
-      "text": "Велика $(thing)Криця$().",
-      "enable_visualize": false
-    },
-    {
-      "type": "tfc:anvil_recipe",
-      "recipe": "tfc:anvil/refined_iron_bloom",
-      "text": "Щоб перетворити $(thing)Сире Кричне Залізо$(), потрібно обробити її на $(l:mechanics/anvils)ковадлі$() щоб отримати $(thing)Очищену Залізну Крицю$()."
-    },
-    {
-      "type": "tfc:anvil_recipe",
-      "recipe": "tfc:anvil/metal/ingot/wrought_iron",
-      "text": "Щоб перетворити $(thing)Очищену Залізну Крицю $() потрібно обробити її на $(l:mechanics/anvils)ковадлі$() щоб отримати $(thing)Злитки Ковкого Заліза$()."
-    },
-    {
-      "type": "patchouli:text",
-      "text": "$(li)Якщо у сиродутному горні виявиться більше предметів, ніж може вмістити її димар, вона спробує виплюнути їх назовні.$()$(li)Щоб дістати предмети з сиродутного горна, яка не горить, не розбивайте вежу з розплавлених блоків. Розбийте блок сиродутного горна.$()$(li)Криця переплавляється лише на чавун, а не на коване залізо. З ними треба працювати!$()",
-      "title": "Нотатки Сміта"
-    }
-  ],
-  "read_by_default": true,
-  "extra_recipe_mappings": {
-    "tfc:bloom": 6,
-    "tfc:raw_iron_bloom": 7,
-    "tfc:refined_iron_bloom": 8
-  }
+	"__comment__": "This file was automatically created by mcresources",
+	"name": "Сиродутне горно",
+	"category": "tfc:mechanics",
+	"icon": "tfc:bloomery",
+	"pages": [
+		{
+			"type": "patchouli:text",
+			"text": "$(thing)Сиродутне Горно$() це пристрій, що використовується для переплавлення $(thing)Залізної Руди$() на $(thing)Крицю$(), які можна переробити на $(thing)Ковке Залізо$(). Залізні руди - це $(l:the_world/ores_and_minerals#hematite)Гематит$(), $(l:the_world/ores_and_minerals#limonite)Лимоніт$(), та $(l:the_world/ores_and_minerals#magnetite)Магнетит$(). Ці руди плавляться на $(thing)Чавун$() а не на $(thing)Ковке Залізо$(). Усі залізовмісні предмети плавляться на чавун. Щоб перетворити їх на придатне для використання залізо, потрібна ковальська майстерня. Будь-який залізний предмет може бути використаний в сиродутному горні, включаючи залізні інструменти і чавунні злитки!"
+		},
+		{
+			"type": "patchouli:crafting",
+			"recipe": "tfc:crafting/bloomery",
+			"text": "Сиродутне горно зроблене з 8 $(thing)Бронзових Подвійних Листів$()."
+		},
+		{
+			"type": "patchouli:multiblock",
+			"multiblock_id": "tfc:bloomery",
+			"name": "Сиродутне горно",
+			"text": "Мінімальний розмір сиродутного горна. Блок сиродутного горна буде відкриватися і закриватися за допомогою $(item)$(k:key.use)$().",
+			"enable_visualize": true
+		},
+		{
+			"type": "patchouli:text",
+			"text": "Сиродутне горно може містити максимум 48 $(thing)Вхідних$(), по 16 предметів на один шар димаря. Щоб додати шари до димаря, викладіть ще два шари кам'яних блоків.$(br2)Щоб додати предмети до сиродутного горна, підніміться на вершину і кидайте предмети всередину. Повинна утворитися вежа з сірої руди."
+		},
+		{
+			"type": "patchouli:image",
+			"images": [
+				"tfc:textures/gui/book/tutorial/bloomery_hole.png"
+			],
+			"text": "Додавання елементів до сиродутного горна.",
+			"border": true
+		},
+		{
+			"type": "patchouli:text",
+			"text": "На виробництво однієї $(thing)Криці$() витрачається $(thing)1 Деревинне Вугілля$() та $(thing)144 mB Чавуну$(). Після того, як ви заповнили сирудутне горно комбінацією $(thing)Деревинне Вугілля$() та $(thing)Руди$(), запаліть блок сиродутного горна і зачекайте 15 годин, поки руда розплавиться. Коли піч вимкнеться, вона залишить по собі блок $(thing)Криці$(). Він містить $(thing)Сире Кричне Залізо$(), який можна отримати, видобуваючи блок $(thing)Крицю$() кілька разів киркою."
+		},
+		{
+			"type": "patchouli:multiblock",
+			"multiblock": {
+				"pattern": [
+					[
+						"X"
+					],
+					[
+						"0"
+					]
+				],
+				"mapping": {
+					"X": "tfc:bloom[layers=8]"
+				}
+			},
+			"name": "Блок Криці",
+			"text": "Велика $(thing)Криця$().",
+			"enable_visualize": false
+		},
+		{
+			"type": "tfc:anvil_recipe",
+			"recipe": "tfc:anvil/refined_iron_bloom",
+			"text": "Щоб перетворити $(thing)Сире Кричне Залізо$(), потрібно обробити її на $(l:mechanics/anvils)ковадлі$() щоб отримати $(thing)Очищену Залізну Крицю$()."
+		},
+		{
+			"type": "tfc:anvil_recipe",
+			"recipe": "tfc:anvil/wrought_iron_from_bloom",
+			"text": "Щоб перетворити $(thing)Очищену Залізну Крицю $() потрібно обробити її на $(l:mechanics/anvils)ковадлі$() щоб отримати $(thing)Злитки Ковкого Заліза$()."
+		},
+		{
+			"type": "patchouli:text",
+			"text": "$(li)Якщо у сиродутному горні виявиться більше предметів, ніж може вмістити її димар, вона спробує виплюнути їх назовні.$()$(li)Щоб дістати предмети з сиродутного горна, яка не горить, не розбивайте вежу з розплавлених блоків. Розбийте блок сиродутного горна.$()$(li)Криця переплавляється лише на чавун, а не на коване залізо. З ними треба працювати!$()",
+			"title": "Нотатки Сміта"
+		}
+	],
+	"read_by_default": true,
+	"extra_recipe_mappings": {
+		"tfc:bloom": 6,
+		"tfc:raw_iron_bloom": 7,
+		"tfc:refined_iron_bloom": 8
+	}
 }

kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/mechanics/pumps.json

@@ -1,39 +0,0 @@
-{
-	"name": "Початок роботи з Create",
-	"category": "tfc:mechanics",
-	"icon": "create:cogwheel",
-	"pages": [
-		{
-			"type": "patchouli:text",
-			"title": "Початок роботи з Create",
-			"text": "У TerraFirmaGreg власну механічну систему TFC замінено на $(thing)Create$().$(br2)Ви можете створити кілька речей Create, коли у вас є Коване залізо, але по-справжньому почати можна лише тоді, коли у вас є доступ до $(l:mechanics/steel)Сталі$() і $(thing)Парових Машин$().$(br2)По-перше, вам знадобиться джерело $(thing)Механічної енергії$(), Водяні колеса, Вітряки або Парова машина. З них найпростіше почати з $(thing)Водяних Коліс$(), просто помістіть їх у річку!$(br)"
-		},
-		{
-			"type": "patchouli:crafting",
-			"recipe": "create:crafting/kinetics/water_wheel",
-			"recipe2": "create:crafting/kinetics/large_water_wheel"
-		},
-		{
-			"type": "tfc:sealed_barrel_recipe",
-			"recipe": "tfg:barrel/treated_wood_planks",
-			"text": "Для переміщення механічної енергії вам знадобляться $(thing)Зубчасті колеса$().$(br)Щоб виготовити їх, спочатку покладіть трохи $(l:mechanics/mechanical_power)Креозота$() та Будь-які $(thing)Дерев'яні Дошки$() в $(l:mechanics/barrels)Герметичну Діжку$().$(br)Це дасть вам $(thing)Дерев'яні Дошки, Оброблені Креозотом$()."
-		},
-		{
-			"type": "patchouli:spotlight",
-			"title": "Оброблена деревна целюлоза",
-			"item": "gtceu:hp_steam_macerator,gtceu:treated_wood_dust",
-			"text": "Далі покладіть оброблені дошки в $(thing)Паровий Подрібнювач$(). результаті ви отримаєте $(thing)Оброблену деревну целюлозу$()."
-		},
-		{
-			"type": "patchouli:spotlight",
-			"title": "Оброблена дерев'яна дошка",
-			"item": "gtceu:hp_steam_compressor,gtceu:treated_wood_plate",
-			"text": "Нарешті, помістивши целюлозу у $(thing)Паровий Компресор$(), ви отримаєте$(thing)Оброблену дерев'яну дошку$().$(br2)Потім ви можете використати її для виготовлення $(item)Шестерні$()!"
-		},
-		{
-			"type": "patchouli:crafting",
-			"recipe": "tfg:create/shapeless/cogwheel",
-			"recipe2": "tfg:create/shaped/large_cogwheel"
-		}
-	]
-}

kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/basic_automation.json

@@ -1,6 +1,6 @@
 {
 	"name": "Базова автоматизація",
-	"category": "tfc:mechanics",
+	"category": "tfc:tfg_tips",
 	"icon": "gtceu:coke_oven",
 	"pages": [
 		{

kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_tips/inventory_management.json

@@ -1,6 +1,6 @@
 {
 	"name": "Управління Інвентарем",
-	"category": "tfc:mechanics",
+	"category": "tfc:tfg_tips",
 	"icon": "minecraft:chest",
 	"pages": [
 		{

kubejs/assets/tfg/lang/en_us.json

@@ -203,9 +203,6 @@
   "material.gtceu.hardwood": "Hardwood",
   "tfg.disabled_portal": "Portal magic seems to be blocked by an unknown force, try reaching another dimension by going down or up",
   "item.treetap.tap": "Deprecated Item, Craft to Upgrade",
-  "tfc.jei.flint_knapping": "Flint Knapping",
-  "tfc.recipe.barrel.tfg.barrel.soak_hardwood_strip": "Soaking Hardwood Strips",
-  "tfc.recipe.barrel.tfc.barrel.treated_wood_planks": "Treating Wood Planks",
   "item.gtceu.zinc_ingot": "Deprecated Item, Craft to Upgrade",
   "item.gtceu.brass_ingot": "Deprecated Item, Craft to Upgrade",
   "item.gtceu.vanadium_ingot": "Deprecated Item, Craft to Upgrade",
@@ -374,6 +371,7 @@
   "quests..st": "",
   "quests..d1": "",
   "quests..t1": "",
+  "tfc.jei.flint_knapping": "Flint Knapping",
   "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing",
   "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.gray": "Dyeing",
   "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.light_gray": "Dyeing",
@@ -422,7 +420,14 @@
   "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_orange_block": "Dyeing",
   "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_red_block": "Dyeing",
   "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_brown_block": "Dyeing",
-  "tfg.grapplemod.repair": "Repair recipe, keeps your upgrades. §lNEVER combine two grapples or you'll loose ALL your upgrades!§r",
+  "tfc.recipe.barrel.tfg.barrel.soak_hardwood_strip": "Soaking Hardwood Strips",
+  "tfc.recipe.barrel.tfc.barrel.treated_wood_planks": "Treating Wood Planks",
+  "tfc.recipe.barrel.tfg.barrel.packed_ice": "Freezing Ice",
+  "tfc.recipe.barrel.tfg.barrel.cooling_water_1": "Cooling Water",
+  "tfc.recipe.barrel.tfg.barrel.cooling_water_2": "Cooling Water",
+  "tfc.recipe.barrel.tfg.barrel.cooling_water_3": "Cooling Water",
+  "tfc.recipe.barrel.tfg.barrel.cooling_water_4": "Cooling Water",
+  "tfg.grapplemod.repair": "Repair recipe, keeps your upgrades. §lNEVER combine two grapples or you'll lose ALL your upgrades!§r",
   "tfg.grapplemod.upgrades.maxlen": "Increases §lMax Length§r by 20, up to 200.",
   "tfg.grapplemod.downgrades.maxlen": "Decreases §lMax Length§r by 20, down to 20. (Jute Rope is Returned).",
   "tfg.grapplemod.upgrades.motor.lv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1\n§lMotorAcceleration§r set to 0.125",
@@ -1539,7 +1544,7 @@
   "quests.tfg_tips.arborfirmacraft.desc": "ArborFirmaCraft is a mod that adds multiple new trees, some are Variants of existing TFC trees, such as Ancient Kapok, while others are completely new, such as Baobab and Hevea. Some of the colors of the trees may remind you of vanilla tree colors, such as Baobab.\n\nThis part will go all over Tree Tapping.\nAs a bonus, all ArborFirmaCraft woods are compatible with FirmaLife, and FirmaCiv.",
   "quests.tfg_tips.treetap.title": "Treetap",
   "quests.tfg_tips.treetap.subtitle": "Now with less jank!",
-  "quests.tfg_tips.treetap.desc": "To begin tapping trees, you'll need to craft a Tree Tap, you'll need to at least know how to work Copper Ingots into these taps.\n\nFor returning players, you may recall the existence of the old \"Tap\" item from the \"Treetap\" mod, this item has been disabled and no longer does anything, however, you can convert it &lfor free&r into an ArborFirmaCraft Tree Tap!\n\nThe process of tapping requires finding a tree, there's a dedicated &oTapping Index&r in the Field Guide's section on ArborFirmaCraft that'll tell you how to find the trees. There's also the \"Tapping Trees\" entry, which can be used to learn how to actually tap the trees.",
+  "quests.tfg_tips.treetap.desc": "To begin tapping trees, you'll need to craft a Tree Tap, you'll need to at least know how to work Copper Ingots into these taps.\n\nThe process of tapping requires finding a tree, there's a dedicated &oTapping Index&r in the Field Guide's section on ArborFirmaCraft that'll tell you how to find the trees. There's also the \"Tapping Trees\" entry, which can be used to learn how to actually tap the trees.",
   "quests.tfg_tips.find_rosin_tree.title": "Rosin Trees",
   "quests.tfg_tips.find_rosin_tree.subtitle": "It's going to be chilly...",
   "quests.tfg_tips.find_rosin_tree.desc": "Rosin Trees can be found in cold areas of the world that receive moderate to large amounts of rainfall. It can be tapped to obtain Pitch. Pitch can be used to create both Sticky Resin and Conifer Rosin\n\nTo complete this quest, you need to look at a block that has the tag \"#tfg:rosin_logs\", you can use JEI to learn which blocks have this tag.",
@@ -1548,7 +1553,7 @@
   "quests.tfg_tips.find_latex_tree.desc": "Latex Trees can be found in temperate areas of the world that receive large amounts of rainfall. It can be tapped to obtain Latex. Latex can be used to create both Sticky Resin, and Vulcanized Latex. Vulcanized Latex is used in the creation of Rubber Gloves, which protect you from poisonous materials on contact.\n\nTo complete this quest, you need to look at a block that has the tag \"#tfg:latex_logs\", you can use JEI to learn which blocks have this tag.",
   "quests.tfg_tips.find_syrup_tree.title": "Syrup Trees",
   "quests.tfg_tips.find_syrup_tree.subtitle": "Diabetes is Skyrocketing",
-  "quests.tfg_tips.find_syrup_tree.desc": "Syrup Trees can be found in moderate climates of the world that receive moderate amounts of rainfall. It can be tapped to obtain Syrup. Syrup can be used to create Tree Sugars, which works for sweetning food among other uses.To complete this quest, you need to look at a block that has the tag \"#tfg:latex_logs\", you can use JEI to learn which blocks have this tag.",
+  "quests.tfg_tips.find_syrup_tree.desc": "Syrup Trees can be found in moderate climates of the world that receive moderate amounts of rainfall. It can be tapped to obtain Syrup. Syrup can be used to create Tree Sugars, which works for sweetning food among other uses.To complete this quest, you need to look at a block that has the tag \"#tfg:syrup_logs\", you can use JEI to learn which blocks have this tag.",
   "quests.tfg_tips.create_conifer_rosin.title": "Conifer Rosin",
   "quests.tfg_tips.create_conifer_rosin.subtitle": "No, it's not Resin",
   "quests.tfg_tips.create_conifer_rosin.desc": "Conifer Rosin can be utilized as a Wax, letting you create Candles and other items.\n\nTo create the Conifer Rosin, you need to boil Confier Pitch in a vat mixed with Charcoal Powder.",
@@ -1805,7 +1810,7 @@
   "quests.tfg_tips.beneath_prep.desc": "The Beneath is a very, VERY hostile environment, due to it being very deep underground the average temperature is always above 15°C, going higher as you go deeper. Not to mention the amount of hostile creatures overall.\nThe quests below this one provide basic preparations for your adventure.",
   "quests.tfg_tips.beneath_temp_management.title": "Temperature Management: Active",
   "quests.tfg_tips.beneath_temp_management.subtitle": "Things to cool off quickly",
-  "quests.tfg_tips.beneath_temp_management.desc": "In the beneath, while the temperature is relatively high, its not high enough to immediatly evaporate nearby sources of Water. As such, you should bring some Water to cool off on demand, or some Ice.\n\nYou can harvest Ice using a regular Saw.",
+  "quests.tfg_tips.beneath_temp_management.desc": "In the beneath, while the temperature is relatively high, its not high enough to immediatly evaporate nearby sources of Water. As such, you should bring some Water to cool off on demand, or some Packed Ice.\n\nYou can harvest Packed Ice using a Saw, or obtain it by cooling water down in a barrel.",
   "quests.tfg_tips.beneath_clothes.title": "Temperature Management: Passive",
   "quests.tfg_tips.beneath_clothes.subtitle": "Things to passively cool off",
   "quests.tfg_tips.beneath_clothes.desc": "Clothes can also play an important role to cool off. The easiest cloth type to craft before going to the Beneath are Burlap Clothes.\n\nSilk Clothes require String, which can be found inside a Beneath Biome called the Webbed Lair.\n\nThere is a better alternative if you have access to Blue Steel however.",

kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json

@@ -11,16 +11,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 3.0,
+								"min": 1.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 2.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -41,16 +41,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 3.0,
-								"min": 0.0
+								"max": 4.0,
+								"min": 2.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 2.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -71,16 +71,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 3.0,
-								"min": 0.0
+								"max": 4.0,
+								"min": 2.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 2.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -101,7 +101,37 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 3.0,
+								"max": 4.0,
+								"min": 2.0
+							},
+							"function": "minecraft:set_count"
+						},
+						{
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 2.0,
+								"min": 1.0
+							},
+							"enchantment": "minecraft:looting",
+							"function": "minecraft:looting_enchant"
+						}
+					],
+					"name": "tfc:ore/normal_native_copper"
+				}
+			],
+			"rolls": 1.0
+		},
+		{
+			"bonus_rolls": 0.0,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 1.0,
 								"min": 0.0
 							},
 							"function": "minecraft:set_count"
@@ -116,7 +146,7 @@
 							"function": "minecraft:looting_enchant"
 						}
 					],
-					"name": "tfc:ore/normal_native_copper"
+					"name": "endermanoverhaul:summoner_pearl"
 				}
 			],
 			"rolls": 1.0

kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json

@@ -11,16 +11,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 2.0,
+								"min": 1.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 2.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -42,15 +42,15 @@
 							"count": {
 								"type": "minecraft:uniform",
 								"max": 8.0,
-								"min": 0.0
+								"min": 4.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 2.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -72,6 +72,36 @@
 							"count": {
 								"type": "minecraft:uniform",
 								"max": 8.0,
+								"min": 4.0
+							},
+							"function": "minecraft:set_count"
+						},
+						{
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 2.0,
+								"min": 1.0
+							},
+							"enchantment": "minecraft:looting",
+							"function": "minecraft:looting_enchant"
+						}
+					],
+					"name": "minecraft:charcoal"
+				}
+			],
+			"rolls": 1.0
+		},
+		{
+			"bonus_rolls": 0.0,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 1.0,
 								"min": 0.0
 							},
 							"function": "minecraft:set_count"
@@ -86,7 +116,7 @@
 							"function": "minecraft:looting_enchant"
 						}
 					],
-					"name": "minecraft:charcoal"
+					"name": "endermanoverhaul:corrupted_pearl"
 				}
 			],
 			"rolls": 1.0

kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json

@@ -11,16 +11,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 3.0,
+								"min": 1.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 3.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -41,16 +41,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 3.0,
-								"min": 0.0
+								"max": 4.0,
+								"min": 2.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 4.0,
+								"min": 2.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -71,7 +71,37 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 3.0,
+								"max": 4.0,
+								"min": 2.0
+							},
+							"function": "minecraft:set_count"
+						},
+						{
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 4.0,
+								"min": 2.0
+							},
+							"enchantment": "minecraft:looting",
+							"function": "minecraft:looting_enchant"
+						}
+					],
+					"name": "minecraft:brown_mushroom"
+				}
+			],
+			"rolls": 1.0
+		},
+		{
+			"bonus_rolls": 0.0,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 1.0,
 								"min": 0.0
 							},
 							"function": "minecraft:set_count"
@@ -86,7 +116,7 @@
 							"function": "minecraft:looting_enchant"
 						}
 					],
-					"name": "minecraft:brown_mushroom"
+					"name": "endermanoverhaul:summoner_pearl"
 				}
 			],
 			"rolls": 1.0

kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json

@@ -1,66 +0,0 @@
-{
-	"type": "minecraft:entity",
-	"pools": [
-		{
-			"bonus_rolls": 0.0,
-			"entries": [
-				{
-					"type": "minecraft:item",
-					"functions": [
-						{
-							"add": false,
-							"count": {
-								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
-							},
-							"function": "minecraft:set_count"
-						},
-						{
-							"count": {
-								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
-							},
-							"enchantment": "minecraft:looting",
-							"function": "minecraft:looting_enchant"
-						}
-					],
-					"name": "ae2:ender_dust"
-				}
-			],
-			"rolls": 1.0
-		},
-		{
-			"bonus_rolls": 0.0,
-			"entries": [
-				{
-					"type": "minecraft:item",
-					"functions": [
-						{
-							"add": false,
-							"count": {
-								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
-							},
-							"function": "minecraft:set_count"
-						},
-						{
-							"count": {
-								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
-							},
-							"enchantment": "minecraft:looting",
-							"function": "minecraft:looting_enchant"
-						}
-					],
-					"name": "endermanoverhaul:summoner_pearl"
-				}
-			],
-			"rolls": 1.0
-		}
-	],
-	"random_sequence": "endermanoverhaul:entities/nether_wastes_enderman"
-}

kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json

@@ -11,16 +11,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 3.0,
+								"min": 1.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 3.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -31,6 +31,66 @@
 			],
 			"rolls": 1.0
 		},
+		{
+			"bonus_rolls": 0.0,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 4.0,
+								"min": 2.0
+							},
+							"function": "minecraft:set_count"
+						},
+						{
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 4.0,
+								"min": 2.0
+							},
+							"enchantment": "minecraft:looting",
+							"function": "minecraft:looting_enchant"
+						}
+					],
+					"name": "minecraft:glow_berries"
+				}
+			],
+			"rolls": 1.0
+		},
+		{
+			"bonus_rolls": 0.0,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 2.0,
+								"min": 1.0
+							},
+							"function": "minecraft:set_count"
+						},
+						{
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 2.0,
+								"min": 1.0
+							},
+							"enchantment": "minecraft:looting",
+							"function": "minecraft:looting_enchant"
+						}
+					],
+					"name": "tfc:wood/sapling/mangrove"
+				}
+			],
+			"rolls": 1.0
+		},
 		{
 			"bonus_rolls": 0.0,
 			"entries": [

kubejs/data/minecraft/loot_tables/blocks/cobweb.json

@@ -0,0 +1,53 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"bonus_rolls": 0.0,
+			"entries": [
+				{
+					"type": "minecraft:alternatives",
+					"children": [
+						{
+							"type": "minecraft:item",
+							"conditions": [
+								{
+									"condition": "minecraft:any_of",
+									"terms": [
+										{
+											"condition": "minecraft:match_tool",
+											"predicate": {
+												"tag": "tfc:shears"
+											}
+										}
+									]
+								}
+							],
+							"name": "minecraft:cobweb"
+						},
+						{
+							"type": "minecraft:item",
+							"name": "minecraft:string",
+							"conditions": [
+								{
+									"condition": "minecraft:survives_explosion"
+								}
+							],
+							"functions": [
+								{
+									"function": "minecraft:set_count",
+									"count": {
+										"min": 1,
+										"max": 3,
+										"type": "minecraft:uniform"
+									}
+								}
+							]
+						}
+					]
+				}
+			],
+			"rolls": 1.0
+		}
+	],
+	"random_sequence": "minecraft:blocks/cobweb"
+}

kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json

@@ -47,7 +47,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -66,7 +66,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -85,7 +85,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -104,7 +104,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -123,7 +123,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -141,7 +141,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -160,7 +160,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -179,7 +179,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -198,7 +198,26 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
+						}
+					],
+					"weight": 100
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:black_bronze_axe",
+					"functions": [
+						{
+							"function": "minecraft:set_damage",
+							"damage": {
+								"type": "minecraft:uniform",
+								"min": 0.1,
+								"max": 0.9
+							}
+						},
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -217,7 +236,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -236,7 +255,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -294,21 +313,6 @@
 					"name": "minecraft:snout_armor_trim_smithing_template",
 					"weight": 30
 				},
-				{
-					"type": "minecraft:item",
-					"name": "gtceu:damascus_steel_ingot",
-					"functions": [
-						{
-							"function": "minecraft:set_count",
-							"count": {
-								"min": 1,
-								"max": 3,
-								"type": "minecraft:uniform"
-							}
-						}
-					],
-					"weight": 30
-				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_hammer",
@@ -316,7 +320,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -327,7 +331,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -338,7 +342,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -349,18 +353,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
-						}
-					]
-				},
-				{
-					"type": "minecraft:item",
-					"name": "gtceu:damascus_steel_butchery_knife",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -371,7 +364,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -382,7 +375,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -393,7 +386,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -404,7 +397,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -415,7 +408,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -426,7 +419,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -437,7 +430,29 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_mortar",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_file",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -448,7 +463,18 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_hoe",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -459,7 +485,18 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_axe",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				}
@@ -660,8 +697,8 @@
 						{
 							"function": "minecraft:set_count",
 							"count": {
-								"min": 2,
-								"max": 5,
+								"min": 1,
+								"max": 4,
 								"type": "minecraft:uniform"
 							}
 						}
@@ -922,6 +959,36 @@
 						}
 					],
 					"weight": 50
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:dynamite",
+					"functions": [
+						{
+							"function": "minecraft:set_count",
+							"count": {
+								"min": 5,
+								"max": 10,
+								"type": "minecraft:uniform"
+							}
+						}
+					],
+					"weight": 30
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:powderbarrel",
+					"functions": [
+						{
+							"function": "minecraft:set_count",
+							"count": {
+								"min": 2,
+								"max": 5,
+								"type": "minecraft:uniform"
+							}
+						}
+					],
+					"weight": 30
 				}
 			]
 		}

kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json

@@ -47,7 +47,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -66,7 +66,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -85,7 +85,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -104,7 +104,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -123,7 +123,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -141,7 +141,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -160,7 +160,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -179,7 +179,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -198,7 +198,26 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
+						}
+					],
+					"weight": 100
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:black_bronze_axe",
+					"functions": [
+						{
+							"function": "minecraft:set_damage",
+							"damage": {
+								"type": "minecraft:uniform",
+								"min": 0.1,
+								"max": 0.9
+							}
+						},
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -217,7 +236,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -236,7 +255,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -294,21 +313,6 @@
 					"name": "minecraft:snout_armor_trim_smithing_template",
 					"weight": 30
 				},
-				{
-					"type": "minecraft:item",
-					"name": "gtceu:damascus_steel_ingot",
-					"functions": [
-						{
-							"function": "minecraft:set_count",
-							"count": {
-								"min": 1,
-								"max": 3,
-								"type": "minecraft:uniform"
-							}
-						}
-					],
-					"weight": 30
-				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_hammer",
@@ -316,7 +320,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -327,7 +331,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -338,7 +342,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -349,18 +353,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
-						}
-					]
-				},
-				{
-					"type": "minecraft:item",
-					"name": "gtceu:damascus_steel_butchery_knife",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -371,7 +364,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -382,7 +375,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -393,7 +386,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -404,7 +397,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -415,7 +408,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -426,7 +419,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -437,7 +430,29 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_mortar",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_file",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -448,7 +463,18 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_hoe",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -459,7 +485,18 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_axe",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				}
@@ -660,8 +697,8 @@
 						{
 							"function": "minecraft:set_count",
 							"count": {
-								"min": 2,
-								"max": 5,
+								"min": 1,
+								"max": 4,
 								"type": "minecraft:uniform"
 							}
 						}
@@ -922,6 +959,36 @@
 						}
 					],
 					"weight": 50
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:dynamite",
+					"functions": [
+						{
+							"function": "minecraft:set_count",
+							"count": {
+								"min": 5,
+								"max": 10,
+								"type": "minecraft:uniform"
+							}
+						}
+					],
+					"weight": 30
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:powderbarrel",
+					"functions": [
+						{
+							"function": "minecraft:set_count",
+							"count": {
+								"min": 2,
+								"max": 5,
+								"type": "minecraft:uniform"
+							}
+						}
+					],
+					"weight": 30
 				}
 			]
 		}

kubejs/data/minecraft/loot_tables/chests/bastion_other.json

@@ -47,7 +47,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -66,7 +66,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -85,7 +85,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -104,7 +104,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -123,7 +123,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					]
 				},
@@ -141,7 +141,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -160,7 +160,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -179,7 +179,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -198,7 +198,26 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
+						}
+					],
+					"weight": 100
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:black_bronze_axe",
+					"functions": [
+						{
+							"function": "minecraft:set_damage",
+							"damage": {
+								"type": "minecraft:uniform",
+								"min": 0.1,
+								"max": 0.9
+							}
+						},
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -217,7 +236,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -236,7 +255,7 @@
 						},
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 3}"
 						}
 					],
 					"weight": 100
@@ -294,21 +313,6 @@
 					"name": "minecraft:snout_armor_trim_smithing_template",
 					"weight": 30
 				},
-				{
-					"type": "minecraft:item",
-					"name": "gtceu:damascus_steel_ingot",
-					"functions": [
-						{
-							"function": "minecraft:set_count",
-							"count": {
-								"min": 1,
-								"max": 3,
-								"type": "minecraft:uniform"
-							}
-						}
-					],
-					"weight": 30
-				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_hammer",
@@ -316,7 +320,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -327,7 +331,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -338,7 +342,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -349,18 +353,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
-						}
-					]
-				},
-				{
-					"type": "minecraft:item",
-					"name": "gtceu:damascus_steel_butchery_knife",
-					"weight": 10,
-					"functions": [
-						{
-							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -371,7 +364,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -382,7 +375,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -393,7 +386,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -404,7 +397,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -415,7 +408,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -426,7 +419,7 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -437,7 +430,29 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_mortar",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_file",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -448,7 +463,18 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_hoe",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -459,7 +485,18 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_axe",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				}
@@ -660,8 +697,8 @@
 						{
 							"function": "minecraft:set_count",
 							"count": {
-								"min": 2,
-								"max": 5,
+								"min": 1,
+								"max": 4,
 								"type": "minecraft:uniform"
 							}
 						}
@@ -922,6 +959,36 @@
 						}
 					],
 					"weight": 50
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:dynamite",
+					"functions": [
+						{
+							"function": "minecraft:set_count",
+							"count": {
+								"min": 5,
+								"max": 10,
+								"type": "minecraft:uniform"
+							}
+						}
+					],
+					"weight": 30
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:powderbarrel",
+					"functions": [
+						{
+							"function": "minecraft:set_count",
+							"count": {
+								"min": 2,
+								"max": 5,
+								"type": "minecraft:uniform"
+							}
+						}
+					],
+					"weight": 30
 				}
 			]
 		}

kubejs/data/minecraft/loot_tables/chests/bastion_treasure.json

@@ -5,106 +5,80 @@
 			"name": "loot_pool",
 			"rolls": 2,
 			"entries": [
-				{
-					"type": "minecraft:item",
-					"name": "gtceu:damascus_steel_ingot",
-					"functions": [
-						{
-							"function": "minecraft:set_count",
-							"count": {
-								"min": 1,
-								"max": 3,
-								"type": "minecraft:uniform"
-							}
-						}
-					],
-					"weight": 20
-				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_hammer",
-					"weight": 10,
+					"weight": 20,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_pickaxe",
-					"weight": 10,
+					"weight": 20,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_sword",
-					"weight": 5,
+					"weight": 10,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_knife",
-					"weight": 10,
+					"weight": 20,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
-						}
-					]
-				},
-				{
-					"type": "minecraft:item",
-					"name": "gtceu:damascus_steel_butchery_knife",
-					"weight": 5,
-					"functions": [
-						{
-							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_mining_hammer",
-					"weight": 5,
+					"weight": 10,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_shovel",
-					"weight": 10,
+					"weight": 20,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_spade",
-					"weight": 5,
+					"weight": 10,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":1, \"MaxAoERow\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
@@ -115,73 +89,106 @@
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"MaxAoEColumn\":5, \"MaxAoERow\":5, \"MaxAoELayer\":3}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_wire_cutter",
-					"weight": 15,
+					"weight": 20,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_wrench",
-					"weight": 15,
+					"weight": 20,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_crowbar",
-					"weight": 15,
+					"weight": 20,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_mortar",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_file",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_screwdriver",
-					"weight": 15,
+					"weight": 20,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
+						}
+					]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:damascus_steel_hoe",
+					"weight": 20,
+					"functions": [
+						{
+							"function": "minecraft:set_nbt",
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
 					"name": "gtceu:damascus_steel_saw",
-					"weight": 15,
+					"weight": 20,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				},
 				{
 					"type": "minecraft:item",
-					"name": "minecraft:crossbow",
-					"weight": 5,
+					"name": "gtceu:damascus_steel_axe",
+					"weight": 20,
 					"functions": [
 						{
 							"function": "minecraft:set_nbt",
-							"tag": "{\"tfc:forging_bonus\": 4}"
+							"tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}"
 						}
 					]
 				}

kubejs/data/minecraft/loot_tables/entities/enderman.json

@@ -12,16 +12,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 3.0,
+								"min": 1.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 3.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -42,16 +42,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 4.0,
+								"min": 2.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 4.0,
+								"min": 2.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"

kubejs/data/minecraft/loot_tables/entities/phantom.json

@@ -12,16 +12,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 3.0,
+								"min": 1.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 3.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -36,16 +36,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 2.0,
+								"min": 1.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 2.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"

kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json

@@ -12,16 +12,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 2.0,
-								"min": 1.0
+								"max": 4.0,
+								"min": 2.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 2.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -42,16 +42,16 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 2.0,
-								"min": 1.0
+								"max": 5.0,
+								"min": 2.0
 							},
 							"function": "minecraft:set_count"
 						},
 						{
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 1.0,
-								"min": 0.0
+								"max": 2.0,
+								"min": 1.0
 							},
 							"enchantment": "minecraft:looting",
 							"function": "minecraft:looting_enchant"
@@ -60,6 +60,36 @@
 					"name": "beneath:cursecoal"
 				}
 			]
+		},
+		{
+			"name": "loot_pool",
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 5.0,
+								"min": 2.0
+							},
+							"function": "minecraft:set_count"
+						},
+						{
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 2.0,
+								"min": 1.0
+							},
+							"enchantment": "minecraft:looting",
+							"function": "minecraft:looting_enchant"
+						}
+					],
+					"name": "gtceu:rich_raw_coal"
+				}
+			]
 		}
 	]
 }

kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json

@@ -65,6 +65,7 @@
 			"tfg:nether/surface/pumice_patch",
 			"tfg:nether/surface/beneath_mushrooms",
 			"tfg:nether/surface/guano_patch",
+			"tfg:nether/surface/stick_patch",
 			"tfg:glow_lichen"
 		],
 		[