Merge pull request #1156 from TerraFirmaGreg-Team/dev

Release: 0.9.11

CHANGELOG.md

@@ -1,7 +1,30 @@
 # Changelog
+
 ## [Unreleased]
+### New features
+### Bug fixes
 ### Changes
 
+## [0.9.11] - 13.06.2025
+### New features
+- Added back the vanilla stonecutter @Pyritie
+- Added our own recipes for crafting GregTech facades - 3 cast iron plates for 8 facades, or 3 titanium plates for 32 facades (#1145) @BlueBoat29
+- Added create conductor recipes (#1144) @JeanRdSz
+- Added lunch boxes! They keep your food cool and you can even eat right out of them! @Thomasx0
+### Changes
+- Added cinnabar to piglin bartering and changed the deep cave enderman loot table to raw gold instead of coal @Pyritie
+- Nerfed extraction of latex from logs to encourage tree taps instead @Pyritie
+- Adjusted temperature tolerance of latex trees, check the field guide for specifics @Pyritie
+### Bug fixes
+- Fixed trowel being consumed on use (#1143) @Redeix
+- Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie
+- Fixed ultimate battery recipe stack size issue (#1149) @Pyritie
+- Fixed assembler recipe conflicts with certain wrought iron create items (#1142) @TomPlop & @Pyritie
+- Quest fixes (#1119, #1142) @TomPlop
+- Fixed recipe conflicts with scaffolding and paintings, and wine glasses and jars (#1141) @JeanRdSz
+- Fixed piglin disguise loot table giving the wrong item (#1151) @Redeix
+- Fixed create encased large cogwheel drops (#1148) @Taskeren
+
 ## [0.9.10] - 05.06.2025
 ### New features
 - Added Trowel tool to randomly place blocks from hotbar (#1106) @Redeix

config/emi.css

@@ -141,7 +141,7 @@
 	/**
 	 * Whether recipes should have a button to set as default.
 	 */
-	recipe-default-button: false;
+	recipe-default-button: true;
 
 	/**
 	 * Whether recipes should have a button to show the recipe tree.

config/ftbquests/quests/chapters/lv__low_voltage.snbt

@@ -117,7 +117,7 @@
 			description: ["{quests.low_voltage.lv_amp_explanation.desc}"]
 			id: "7B0FF43022F6C2EC"
 			optional: true
-			shape: "rsquare"
+			shape: "heart"
 			size: 1.0d
 			subtitle: "{quests.low_voltage.lv_amp_explanation.subtitle}"
 			tasks: [{
@@ -673,7 +673,8 @@
 			]
 			icon: "gtceu:fluid_cell"
 			id: "292938760AB9A12B"
-			shape: "square"
+			optional: true
+			shape: "heart"
 			size: 1.0d
 			subtitle: "{quests.low_voltage.universal_cell.subtitle}"
 			tasks: [{
@@ -691,6 +692,7 @@
 			icon: "gtceu:rotor_casting_mold"
 			id: "115C4226F6473F0C"
 			optional: true
+			shape: "heart"
 			size: 1.0d
 			subtitle: "{quests.low_voltage.mold_rotor.subtitle}"
 			tasks: [
@@ -1112,6 +1114,7 @@
 			icon: "gtceu:lv_rock_crusher"
 			id: "1F2359106FC95603"
 			optional: true
+			shape: "heart"
 			size: 1.0d
 			subtitle: "{quests.low_voltage.lv_rock_crusher.subtitle}"
 			tasks: [{
@@ -1139,6 +1142,7 @@
 			icon: "gtceu:lv_charger_4x"
 			id: "2DB259568F347C0E"
 			optional: true
+			shape: "heart"
 			size: 1.0d
 			subtitle: "{quests.low_voltage.lv_turbo_charge.subtitle}"
 			tasks: [{
@@ -1166,6 +1170,7 @@
 			icon: "gtceu:lv_fisher"
 			id: "3B26CA44EA955B07"
 			optional: true
+			shape: "heart"
 			size: 1.0d
 			subtitle: "{quests.low_voltage.lv_fisher.subtitle}"
 			tasks: [{
@@ -1409,6 +1414,7 @@
 			icon: "tfg:lv_aqueous_accumulator"
 			id: "47E6F8AC20D51814"
 			optional: true
+			shape: "heart"
 			subtitle: "{quests.low_voltage.lv_aqueous_accumulator.subtitle}"
 			tasks: [{
 				id: "685FCAE71ECE04BC"

config/ftbquests/quests/chapters/mv__medium_voltage.snbt

@@ -1268,12 +1268,12 @@
 		{
 			dependencies: ["45769156F4253C86"]
 			dependency_requirement: "one_completed"
-			description: ["{quests.medium_voltage.mv_.desc}"]
+			description: ["{quests.medium_voltage.mv_jetpack.desc}"]
 			id: "6FA956DAA72D6139"
 			optional: true
 			shape: "heart"
 			size: 1.0d
-			subtitle: "{quests.medium_voltage.mv_.subtitle}"
+			subtitle: "{quests.medium_voltage.mv_jetpack.subtitle}"
 			tasks: [{
 				id: "022324F9630960C6"
 				item: {

config/ftbquests/quests/chapters/queststfc_tips.snbt

@@ -1228,6 +1228,7 @@
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.refrigerator.desc}"]
 			id: "58EC77A796979E68"
+			shape: "gear"
 			size: 2.0d
 			subtitle: "{quests.tfg_tips.refrigerator.subtitle}"
 			tasks: [{
@@ -1236,8 +1237,8 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.refrigerator.title}"
-			x: 9.0d
+			x: 5.5d
-			y: -17.0d
+			y: -18.0d
 		}
 		{
 			dependencies: ["2EFB241490502DB3"]
@@ -1269,6 +1270,7 @@
 							Damage: 0
 						}
 					}
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -1280,6 +1282,7 @@
 							Damage: 0
 						}
 					}
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -1291,6 +1294,7 @@
 							Damage: 0
 						}
 					}
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -1302,6 +1306,7 @@
 							Damage: 0
 						}
 					}
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -1394,8 +1399,7 @@
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.cellar.desc}"]
 			id: "3D1FF501DE2E56FE"
-			shape: "gear"
+			size: 1.5d
-			size: 4.0d
 			subtitle: "{quests.tfg_tips.cellar.subtitle}"
 			tasks: [
 				{
@@ -1418,8 +1422,8 @@
 				}
 			]
 			title: "{quests.tfg_tips.cellar.title}"
-			x: 3.5d
+			x: 3.0d
-			y: -17.0d
+			y: -16.0d
 		}
 		{
 			dependencies: ["3D1FF501DE2E56FE"]
@@ -1439,8 +1443,8 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.cellar_blocks.title}"
-			x: 3.5d
+			x: 3.0d
-			y: -20.0d
+			y: -17.5d
 		}
 		{
 			dependencies: ["2EFB241490502DB3"]
@@ -1607,25 +1611,32 @@
 			}]
 			title: "{quests.tfg_tips.passive_preservation.title}"
 			x: 6.5d
-			y: -15.5d
+			y: -16.0d
 		}
 		{
 			dependencies: ["4047EE998BC4CD03"]
 			description: ["{quests.tfg_tips.get_milk.desc}"]
 			id: "3C7F170E065B60E1"
 			subtitle: "{quests.tfg_tips.get_milk.subtitle}"
-			tasks: [{
+			tasks: [
-				id: "5ADFB5FC06EAED6C"
+				{
-				item: {
+					id: "5ADFB5FC06EAED6C"
-					Count: 1
+					item: {
-					id: "ftbfiltersystem:smart_filter"
+						Count: 1
-					tag: {
+						id: "ftbfiltersystem:smart_filter"
-						"ftbfiltersystem:filter": "or(only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"minecraft:milk\"}})item(minecraft:milk_bucket))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:yak_milk\"}})item(firmalife:bucket/yak_milk))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:goat_milk\"}})item(firmalife:bucket/goat_milk)))"
+						tag: {
+							"ftbfiltersystem:filter": "or(only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"minecraft:milk\"}})item(minecraft:milk_bucket))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:yak_milk\"}})item(firmalife:bucket/yak_milk))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:goat_milk\"}})item(firmalife:bucket/goat_milk)))"
+						}
 					}
+					optional_task: true
+					title: "{quests.tfg_tips.get_milk.task}"
+					type: "item"
 				}
-				title: "{quests.tfg_tips.get_milk.task}"
+				{
-				type: "item"
+					id: "26460F400A280214"
-			}]
+					type: "checkmark"
+				}
+			]
 			title: "{quests.tfg_tips.get_milk.title}"
 			x: 4.5d
 			y: -8.5d
@@ -1996,7 +2007,7 @@
 						Count: 1
 						id: "ftbfiltersystem:smart_filter"
 						tag: {
-							"ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)custom(HasPreservation/tfc:brined)"
+							"ftbfiltersystem:filter": "custom(HasPreservation/firmalife:smoked)custom(HasPreservation/tfc:brined)"
 						}
 					}
 					title: "{quests.tfg_tips.smoke_meat.task}"
@@ -3626,8 +3637,8 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.vessel_preservation.title}"
-			x: 6.5d
+			x: 8.0d
-			y: -16.5d
+			y: -16.0d
 		}
 		{
 			dependencies: ["173F6FA60A5B280B"]
@@ -5269,7 +5280,7 @@
 						Count: 1
 						id: "ftbfiltersystem:smart_filter"
 						tag: {
-							"ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)item(tfc:food/pork)"
+							"ftbfiltersystem:filter": "custom(HasPreservation/firmalife:smoked)item(tfc:food/pork)"
 						}
 					}
 					title: "{quests.tfg_tips.bacon.task}"
@@ -5303,6 +5314,68 @@
 			x: 4.75d
 			y: -12.5d
 		}
+		{
+			dependencies: ["13F7066858E923FF"]
+			description: ["{quests.tfg_tips.lunchbox.desc}"]
+			icon: {
+				Count: 1
+				id: "tfclunchbox:lunchbox"
+				tag: {
+					SelectedSlot: 0
+				}
+			}
+			id: "6C18E8F79A841620"
+			shape: "gear"
+			size: 2.0d
+			subtitle: "{quests.tfg_tips.lunchbox.subtitle}"
+			tasks: [
+				{
+					id: "33971FCF02C81741"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(tfclunchbox:lunchbox)item(tfclunchbox:cooling_lunchbox))"
+						}
+					}
+					title: "{quests.tfg_tips.lunchbox.task}"
+					type: "item"
+				}
+				{
+					id: "5439AF9F5493A3D1"
+					item: {
+						Count: 1
+						id: "tfclunchbox:universal_capsule"
+						tag: {
+							Damage: 0
+							Durability: 10
+							display: {
+								Name: "{\"translate\":\"item.tfclunchbox.universal_capsule.filled\"}"
+							}
+						}
+					}
+					match_nbt: false
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "134E8B8345E6DEE2"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfclunchbox:ice)"
+						}
+					}
+					optional_task: true
+					title: "Any #tfclunchbox:ice"
+					type: "item"
+				}
+			]
+			title: "{quests.tfg_tips.lunchbox.title}"
+			x: 7.5d
+			y: -18.0d
+		}
 	]
 	subtitle: ["{quests.tfg_tips.subtitle}"]
 	title: "{quests.tfg_tips}"

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

@@ -1 +1 @@
-{"ae2:attunement":{"order":137}}
+{"ae2:attunement":{"order":138}}

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

@@ -1 +1 @@
-{"ae2:entropy":{"order":138}}
+{"ae2:entropy":{"order":139}}

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

@@ -1 +1 @@
-{"create:draining":{"order":139}}
+{"create:draining":{"order":140}}

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

@@ -1 +1 @@
-{"create:spout_filling":{"order":140}}
+{"create:spout_filling":{"order":141}}

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

@@ -1 +1 @@
-{"domum_ornamentum:architects_cutter":{"order":135}}
+{"domum_ornamentum:architects_cutter":{"order":136}}

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

@@ -1 +1 @@
-{"emi:info":{"order":143}}
+{"emi:info":{"order":144}}

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

@@ -1 +1 @@
-{"emi:tag":{"order":144}}
+{"emi:tag":{"order":145}}

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

@@ -1 +1 @@
-{"exposure:photograph_stacking":{"order":141}}
+{"exposure:photograph_stacking":{"order":142}}

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

@@ -1 +1 @@
-{"framedblocks:framing_saw":{"order":134}}
+{"framedblocks:framing_saw":{"order":135}}

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

@@ -1 +1 @@
-{"ftbquests:quest":{"order":142}}
+{"ftbquests:quest":{"order":143}}

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

@@ -1 +1 @@
-{"greate:block_cutting":{"order":133}}
+{"greate:block_cutting":{"order":134}}

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

@@ -1 +1 @@
-{"gtceu:programmed_circuit":{"order":136}}
+{"gtceu:programmed_circuit":{"order":137}}

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

@@ -0,0 +1 @@
+{"minecraft:stonecutting":{"order":133}}

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

@@ -6,9 +6,6 @@
         {
             "category": "minecraft:brewing"
         },
-        {
-            "category": "minecraft:stonecutting"
-        },
         {
             "category": "minecraft:blasting"
         },

kubejs/assets/gtceu/lang/en_us.json

@@ -74,7 +74,8 @@
   "material.gtceu.vitrified_asbestos": "Vitrified Asbestos",
   "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",
+  "item.gtceu.tool.behavior.silk_ice": "Silk harvests Packed Ice",
+  "item.gtceu.tool.butchery_knife.tooltip": "Butchers animals for more meat",
   "block.gtceu.overworld_marker": "Earth",
   "block.gtceu.the_nether_marker": "The Beneath",
   "tagprefix.sword_head": "%s Sword Head",

kubejs/assets/railways/lang/en_us.json

@@ -3,5 +3,22 @@
   "block.railways.track_create_andesite_wide": "Wide Train Track",
   "block.railways.track_create_andesite_narrow": "Narrow Train Track",
   "item.railways.track_incomplete_create_andesite_wide": "Incomplete Wide Track",
-  "item.railways.track_incomplete_create_andesite_narrow": "Incomplete Narrow Track"
+  "item.railways.track_incomplete_create_andesite_narrow": "Incomplete Narrow Track",
+  "tfc.recipe.barrel.railways.barrel.dyeing.cap_decolor": "Decoloring",
+  "tfc.recipe.barrel.railways.barrel.dyeing.black_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.gray_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.light_conductor_gray_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.white_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.pink_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.magenta_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.purple_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.blue_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.light_conductor_blue_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.cyan_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.green_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.lime_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.yellow_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.orange_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.red_conductor_cap": "Dyeing",
+  "tfc.recipe.barrel.railways.barrel.dyeing.brown_conductor_cap": "Dyeing"
 }

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json

@@ -47,7 +47,7 @@
 			"title": "Hevea",
 			"item": "afc:wood/log/hevea,afc:wood/wood/hevea,afc:wood/leaves/hevea,afc:wood/sapling/hevea",
 			"link_recipe": false,
-			"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 26.2°C$(br)$(thing)Minimum Rainfall$(): 390$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 22°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 3mb"
+			"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 26.2°C$(br)$(thing)Minimum Rainfall$(): 390$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 8°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 2mb"
 		},
 		{
 			"type": "patchouli:image",
@@ -61,7 +61,7 @@
 			"title": "Rubber Fig",
 			"item": "afc:wood/log/rubber_fig,afc:wood/wood/rubber_fig,afc:wood/leaves/rubber_fig,afc:wood/sapling/rubber_fig",
 			"link_recipe": false,
-			"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 9.8°C$(br)$(thing)Maximum Temperature$(): 20.7°C$(br)$(thing)Minimum Rainfall$(): 290$(br)$(thing)Maximum Rainfall$(): 400$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 12°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 2mb"
+			"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 9.8°C$(br)$(thing)Maximum Temperature$(): 20.7°C$(br)$(thing)Minimum Rainfall$(): 290$(br)$(thing)Maximum Rainfall$(): 400$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 4°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 1mb"
 		},
 		{
 			"type": "patchouli:image",
@@ -75,7 +75,7 @@
 			"title": "Kapok",
 			"item": "tfc:wood/log/kapok,tfc:wood/wood/kapok,tfc:wood/leaves/kapok,tfc:wood/sapling/kapok",
 			"link_recipe": false,
-			"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 38°C$(br)$(thing)Minimum Rainfall$(): 320$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 1°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 1mb"
+			"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 38°C$(br)$(thing)Minimum Rainfall$(): 320$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 12°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 3mb"
 		},
 		{
 			"type": "patchouli:image",

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json

@@ -18,11 +18,11 @@
 		{
 			"type": "patchouli:text",
 			"title": "Trade Results",
-			"text": "$(li)1 Copper Ingot$(li)1 Tin Ingot$(li)1 Silver Ingot$(li)1 Bronze Ingot$(li)1 Bismuth Bronze Ingot$(li)1 Cast Iron Ingot$(li)1 Zinc Ingot$(li)1 Brass Ingot$(li)1 Bismuth Ingot$(li)1 Nickel Ingot$(li)4-6 Sulfur Powder"
+			"text": "$(li)1 Copper Ingot$(li)1 Tin Ingot$(li)1 Silver Ingot$(li)1 Bronze Ingot$(li)1 Bismuth Bronze Ingot$(li)1 Cast Iron Ingot$(li)1 Zinc Ingot$(li)1 Brass Ingot$(li)1 Bismuth Ingot$(li)1 Nickel Ingot$(li)1 Cinnabar Gem"
 		},
 		{
 			"type": "patchouli:text",
-			"text": "$(li)1-2 Leather$(li)6-12 String$(li)6-12 Nether Quartz$(li)12-18 Mangrove Lumber$(li)6-8 Mangrove Logs$(li)4-6 Cooked Venison$(li)4-6 Ghost Peppers$(li)4-6 Gunpowder$(li)4-8 Charcoal$(li)6-12 Arrows$(li)6-12 Flux$(li)8-12 Blackstone Bricks$(li)8-12 Deepslate Bricks$(li)8-16 Sticks"
+			"text": "$(li)4-6 Sulfur Powder$(li)1-2 Leather$(li)6-12 String$(li)6-12 Nether Quartz$(li)12-18 Mangrove Lumber$(li)6-8 Mangrove Logs$(li)4-6 Cooked Venison$(li)4-6 Ghost Peppers$(li)4-6 Gunpowder$(li)4-8 Charcoal$(li)6-12 Arrows$(li)6-12 Flux$(li)8-12 Blackstone Bricks$(li)8-12 Deepslate Bricks$(li)8-16 Sticks"
 		},
 		{
 			"type": "patchouli:text",

kubejs/assets/tfg/lang/en_us.json

@@ -2411,5 +2411,9 @@
   "quests.tfg_tips.piglin_disguise.desc": "Do you feel like you don't belong?\n Do the &4Piglin&r attack you at your school because of your appearance?\n Try wearing a &aPiglin Disguise&r to ward off unwanted attention and blend right in.",
   "quests.tfg_tips.trowel.title": "Trowel",
   "quests.tfg_tips.trowel.subtitle": "Inspired by Quark!",
-  "quests.tfg_tips.trowel.desc": "A &4Trowel&r is a tool for builders that can &brandomly place blocks&r located in the hotbar. Trowels can also use bricks and other useable items to randomize tiles for &5RNR Roads&r."
+  "quests.tfg_tips.trowel.desc": "A &4Trowel&r is a tool for builders that can &brandomly place blocks&r located in the hotbar. Trowels can also use bricks and other useable items to randomize tiles for &5RNR Roads&r.",
+  "quests.tfg_tips.lunchbox.title": "Lunch Box",
+  "quests.tfg_tips.lunchbox.subtitle": "A refrigerator in your pocket!",
+  "quests.tfg_tips.lunchbox.desc": "Lunch boxes have 9 slots for food, keeping it cold and longer lasting.\nThe Cooling Lunchbox has a stronger effect than the regular one, but needs to be provided with ice or capsules that will thaw over time.",
+  "quests.tfg_tips.lunchbox.task": "Any Lunch Box"
 }

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

@@ -31,7 +31,7 @@
 							"function": "minecraft:set_count"
 						}
 					],
-					"name": "gtceu:raw_coal"
+					"name": "tfc:ore/normal_native_gold"
 				},
 				{
 					"type": "minecraft:item",

kubejs/data/greate/loot_tables/blocks/andesite_encased_large_aluminium_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_aluminium_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/andesite_encased_large_aluminium_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/andesite_encased_large_andesite_alloy_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_andesite_alloy_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/andesite_encased_large_andesite_alloy_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/andesite_encased_large_darmstadtium_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_darmstadtium_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/andesite_encased_large_darmstadtium_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/andesite_encased_large_naquadah_alloy_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_naquadah_alloy_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/andesite_encased_large_naquadah_alloy_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/andesite_encased_large_neutronium_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_neutronium_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/andesite_encased_large_neutronium_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_rhodium_plated_palladium_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/andesite_encased_large_stainless_steel_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_stainless_steel_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/andesite_encased_large_stainless_steel_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/andesite_encased_large_steel_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_steel_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/andesite_encased_large_steel_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/andesite_encased_large_titanium_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_titanium_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/andesite_encased_large_titanium_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/andesite_encased_large_tungsten_steel_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_tungsten_steel_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/andesite_encased_large_tungsten_steel_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/brass_encased_large_aluminium_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_aluminium_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/brass_encased_large_aluminium_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/brass_encased_large_andesite_alloy_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_andesite_alloy_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/brass_encased_large_andesite_alloy_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/brass_encased_large_darmstadtium_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_darmstadtium_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/brass_encased_large_darmstadtium_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/brass_encased_large_naquadah_alloy_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_naquadah_alloy_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/brass_encased_large_naquadah_alloy_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/brass_encased_large_neutronium_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_neutronium_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/brass_encased_large_neutronium_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/brass_encased_large_rhodium_plated_palladium_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_rhodium_plated_palladium_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/brass_encased_large_rhodium_plated_palladium_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/brass_encased_large_stainless_steel_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_stainless_steel_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/brass_encased_large_stainless_steel_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/brass_encased_large_steel_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_steel_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/brass_encased_large_steel_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/brass_encased_large_titanium_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_titanium_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/brass_encased_large_titanium_cogwheel"
+}

kubejs/data/greate/loot_tables/blocks/brass_encased_large_tungsten_steel_cogwheel.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "greate:large_tungsten_steel_cogwheel"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "greate:blocks/brass_encased_large_tungsten_steel_cogwheel"
+}

kubejs/data/minecraft/loot_tables/gameplay/piglin_bartering.json

@@ -115,6 +115,11 @@
 					"name": "gtceu:nickel_ingot",
 					"weight": 100
 				},
+				{
+					"type": "minecraft:item",
+					"name": "gtceu:cinnabar_gem",
+					"weight": 100
+				},
 				{
 					"type": "minecraft:item",
 					"name": "minecraft:leather",

kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json

@@ -7,7 +7,7 @@
 			"entries": [
 				{
 					"type": "minecraft:item",
-					"name": "tfg:piglin_disguise_block"
+					"name": "tfg:piglin_disguise"
 				}
 			],
 			"conditions": [
@@ -17,4 +17,4 @@
 			]
 		}
 	]
-}
+}

kubejs/server_scripts/ae2/tags.js

@@ -5,7 +5,7 @@ const registerAE2ItemTags = (event) => {
     global.AE2_DISABLED_ITEMS.forEach(item => {
         event.removeAllTagsFrom(item)
         event.add('c:hidden_from_recipe_viewers', item)
-    })
+    })  	
 }
 
 const registerAE2BlockTags = (event) => {

kubejs/server_scripts/afc/recipes.js

@@ -86,39 +86,36 @@ const registerAFCRecipes = (event) => {
 		.id('tfg:heating/tree_tap')
 
 	//Custom rubber and hevea tappings
-	//Hevea is the most efficient but requires the warmest temperatures
-	//Rubber fig requires average temperatures and its mildly efficient
-	event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/hevea"))
-		.resultFluid(Fluid.of("tfg:latex", 3))
-		.minTemp(22)
-		.requiresNaturalLog(true)
-		.id("tfg:tree_tapping/latex/hevea")
-	event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_hevea"))
-		.resultFluid(Fluid.of("tfg:latex", 3))
-		.minTemp(22)
-		.requiresNaturalLog(true)
-		.id("tfg:tree_tapping/latex/ancient_hevea")
-
 	event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/rubber_fig"))
-		.resultFluid(Fluid.of("tfg:latex", 2))
+		.resultFluid(Fluid.of("tfg:latex", 1))
-		.minTemp(12)
+		.minTemp(4)
 		.requiresNaturalLog(true)
 		.id("tfg:tree_tapping/latex/rubber_fig")
 	event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_rubber_fig"))
-		.resultFluid(Fluid.of("tfg:latex", 2))
+		.resultFluid(Fluid.of("tfg:latex", 1))
-		.minTemp(12)
+		.minTemp(4)
 		.requiresNaturalLog(true)
 		.id("tfg:tree_tapping/latex/ancient_rubber_fig")
 
-	//Kapok Grandfathered, least efficient but works as long as the temperature is not freezing
+	event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/hevea"))
+		.resultFluid(Fluid.of("tfg:latex", 2))
+		.minTemp(8)
+		.requiresNaturalLog(true)
+		.id("tfg:tree_tapping/latex/hevea")
+	event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_hevea"))
+		.resultFluid(Fluid.of("tfg:latex", 2))
+		.minTemp(8)
+		.requiresNaturalLog(true)
+		.id("tfg:tree_tapping/latex/ancient_hevea")
+
 	event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/kapok"))
-		.resultFluid(Fluid.of("tfg:latex", 1))
+		.resultFluid(Fluid.of("tfg:latex", 3))
-		.minTemp(1)
+		.minTemp(12)
 		.requiresNaturalLog(true)
 		.id("tfg:tree_tapping/kapok_latex")
 	event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/ancient_kapok"))
-		.resultFluid(Fluid.of("tfg:latex", 1))
+		.resultFluid(Fluid.of("tfg:latex", 3))
-		.minTemp(1)
+		.minTemp(12)
 		.requiresNaturalLog(true)
 		.id("tfg:tree_tapping/ancient_kapok_latex")
 

kubejs/server_scripts/create/recipes.js

@@ -373,6 +373,7 @@ const registerCreateRecipes = (event) => {
 		.itemOutputs('create:rope_pulley')
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
+		.circuit(22)
 
 	// Шкиф подъемника
 	event.shaped('create:elevator_pulley', [
@@ -411,6 +412,7 @@ const registerCreateRecipes = (event) => {
 		.itemOutputs('create:cart_assembler')
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
+		.circuit(21)
 
 	// Контроллер рельсы
 	event.shaped('create:controller_rail', [
@@ -477,6 +479,7 @@ const registerCreateRecipes = (event) => {
 		.itemOutputs('create:mechanical_drill')
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
+		.circuit(19)
 
 	event.shaped('create:mechanical_roller', [
 		'GBG',
@@ -497,6 +500,7 @@ const registerCreateRecipes = (event) => {
 		.itemOutputs('create:mechanical_roller')
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
+		.circuit(20)
 
 	// Редстоуновый контакт
 	event.shaped('2x create:redstone_contact', [
@@ -555,7 +559,7 @@ const registerCreateRecipes = (event) => {
 
 	event.recipes.gtceu.assembler('tfg:create/mechanical_plough')
 		.itemInputs('3x #forge:hoe_heads', '2x #forge:plates/wrought_iron', '#tfg:small_cogwheels', 'create:andesite_casing')
-		.circuit(4)
+		.circuit(5)
 		.itemOutputs('create:mechanical_plough')
 		.duration(200)
 		.EUt(20)
@@ -715,7 +719,7 @@ const registerCreateRecipes = (event) => {
 	event.recipes.gtceu.assembler('create:andesite_funnel')
 		.itemInputs('#forge:plates/wrought_iron', '#forge:foils/rubber')
 		.itemOutputs('create:andesite_funnel')
-		.circuit(4)
+		.circuit(6)
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
 
@@ -732,7 +736,7 @@ const registerCreateRecipes = (event) => {
 	event.recipes.gtceu.assembler('create:andesite_funnel_leather')
 		.itemInputs('#forge:plates/wrought_iron', '#forge:leather')
 		.itemOutputs('create:andesite_funnel')
-		.circuit(4)
+		.circuit(7)
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
 
@@ -752,7 +756,7 @@ const registerCreateRecipes = (event) => {
 	event.recipes.gtceu.assembler('create:brass_funnel')
 		.itemInputs('2x #forge:plates/brass', '2x #forge:foils/rubber', 'create:electron_tube')
 		.itemOutputs('2x create:brass_funnel')
-		.circuit(6)
+		.circuit(8)
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
 
@@ -771,7 +775,7 @@ const registerCreateRecipes = (event) => {
 	event.recipes.gtceu.assembler('create:brass_funnel_leather')
 		.itemInputs('2x #forge:plates/brass', '2x #forge:leather', 'create:electron_tube')
 		.itemOutputs('2x create:brass_funnel')
-		.circuit(6)
+		.circuit(9)
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
 
@@ -789,7 +793,7 @@ const registerCreateRecipes = (event) => {
 	event.recipes.gtceu.assembler('create:andesite_tunnel')
 		.itemInputs('#forge:plates/wrought_iron', '#forge:foils/rubber')
 		.itemOutputs('create:andesite_tunnel')
-		.circuit(5)
+		.circuit(10)
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
 
@@ -806,7 +810,7 @@ const registerCreateRecipes = (event) => {
 	event.recipes.gtceu.assembler('create:andesite_tunnel_leather')
 		.itemInputs('#forge:plates/wrought_iron', '#forge:leather')
 		.itemOutputs('create:andesite_tunnel')
-		.circuit(5)
+		.circuit(11)
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
 
@@ -825,7 +829,7 @@ const registerCreateRecipes = (event) => {
 	event.recipes.gtceu.assembler('create:brass_tunnel')
 		.itemInputs('2x #forge:plates/brass', '2x #forge:foils/rubber', 'create:electron_tube')
 		.itemOutputs('2x create:brass_tunnel')
-		.circuit(5)
+		.circuit(12)
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
 
@@ -843,7 +847,7 @@ const registerCreateRecipes = (event) => {
 	event.recipes.gtceu.assembler('create:brass_tunnel_leather')
 		.itemInputs('2x #forge:plates/brass', '2x #forge:leather', 'create:electron_tube')
 		.itemOutputs('2x create:brass_tunnel')
-		.circuit(5)
+		.circuit(13)
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
 
@@ -863,6 +867,7 @@ const registerCreateRecipes = (event) => {
 		.itemInputs('2x #forge:plates/wrought_iron', '2x #forge:rings/wrought_iron', '#forge:small_gears')
 		.itemOutputs('create:display_board')
 		.duration(50)
+		.circuit(14)
 		.EUt(GTValues.VA[GTValues.ULV])
 
 	// Латунная рука
@@ -913,6 +918,7 @@ const registerCreateRecipes = (event) => {
 		.itemOutputs('2x create:electron_tube')
 		.duration(50)
 		.EUt(7)
+		.circuit(14)
 
 	event.shaped('4x create:electron_tube', [
 		'FAG',
@@ -1687,6 +1693,7 @@ const registerCreateRecipes = (event) => {
 		.itemOutputs('create:contraption_controls')
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
+		.circuit(18)
 
 	event.shaped('create:wrench', [
 		' BB',
@@ -1757,6 +1764,7 @@ const registerCreateRecipes = (event) => {
 		.itemOutputs('create:redstone_link')
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
+		.circuit(17)
 
 	event.shaped('create:display_link', [
 		'FED',
@@ -1833,6 +1841,7 @@ const registerCreateRecipes = (event) => {
 		.itemOutputs('create:mechanical_bearing')
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
+		.circuit(15)
 
 	event.shaped('create:gantry_carriage', [
 		'DCE',
@@ -1871,6 +1880,7 @@ const registerCreateRecipes = (event) => {
 		.itemOutputs('create:weighted_ejector')
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
+		.circuit(16)
 
 	event.shaped('create:turntable', [
 		'DA ',

kubejs/server_scripts/greate/recipes.js

@@ -186,18 +186,19 @@ function registerGreateRecipes(event) {
 	event.shaped('greate:steel_millstone', [
 		'FBF',
 		'DCE',
-		'AAA'
+		'AGA'
 	], {
 		A: '#forge:smooth_stone',
 		B: 'gtceu:treated_wood_slab',
-		C: '#forge:small_gears/wrought_iron',
+		C: '#forge:small_gears/steel',
 		D: '#forge:tools/hammers',
 		E: '#forge:tools/wrenches',
-		F: '#forge:dusts/diamond'
+		F: '#forge:dusts/diamond',
+		G: 'greate:steel_shaft'
 	}).id('greate:shaped/steel_millstone')
 
 	event.recipes.gtceu.assembler('greate:steel_millstone')
-		.itemInputs('3x #forge:smooth_stone', 'gtceu:treated_wood_slab', '#forge:small_gears/wrought_iron', '2x #forge:dusts/diamond')
+		.itemInputs('2x #forge:smooth_stone', 'gtceu:treated_wood_slab', '#forge:small_gears/steel', '2x #forge:dusts/diamond', 'greate:steel_shaft')
 		.itemOutputs('greate:steel_millstone')
 		.duration(200)
 		.EUt(GTValues.VA[GTValues.ULV])

kubejs/server_scripts/greate/recipes.recycling.js

@@ -103,19 +103,20 @@ function registerGreateRecyclingRecipes(event) {
 	event.recipes.gtceu.macerator('greate:steel_millstone')
 		.itemInputs('greate:steel_millstone')
 		.itemOutputs(
-			ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 3),
+			ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Steel, 10),
-			ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 1),
+			ChemicalHelper.get(TagPrefix.dust, GTMaterials.Stone, 2),
+			ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2),
 			ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.TreatedWood, 2))
-		.duration(GTMaterials.Steel.getMass() * 4)
+		.duration(GTMaterials.Stone.getMass() * 4)
 		.category(GTRecipeCategories.MACERATOR_RECYCLING)
 		.EUt(GTValues.VA[GTValues.ULV])
 
 	event.recipes.gtceu.arc_furnace('greate:steel_millstone')
 		.itemInputs('greate:steel_millstone')
 		.itemOutputs(
-			ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 3),
+			ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 10),
-			ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 1))
+			ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2))
-		.duration(GTMaterials.Steel.getMass() * 4)
+		.duration(GTMaterials.Stone.getMass() * 4)
 		.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
 		.EUt(GTValues.VA[GTValues.LV])
 

kubejs/server_scripts/gregtech/recipes.js

@@ -1132,7 +1132,31 @@ const registerGTCEURecipes = (event) => {
 		.EUt(2)
 
 	//#endregion
-
+	
+	//#region GT Facades
+	event.shapeless(Item.of('gtceu:facade_cover', 8, '{Facade: {Count:1b,id:"minecraft:stone"}}'), ['3x #forge:plates/iron', "#tfg:whitelisted/facades"])
+    .modifyResult((craftingGrid, result) =>
+    {
+       let blockID = craftingGrid.find(Ingredient.of("#tfg:whitelisted/facades")).id
+	   
+		console.log(blockID)
+		let facadeNBT = "{Facade: {Count:1b,id:" + "'" + blockID + "'" + "}}"
+        result.nbt = facadeNBT
+        return result;
+    }).id('gtceu:facade_cover');
+	
+	event.shapeless(Item.of('gtceu:facade_cover', 32, '{Facade: {Count:1b,id:"minecraft:stone"}}'), ['3x #forge:plates/titanium', "#tfg:whitelisted/facades"])
+    .modifyResult((craftingGrid, result) =>
+    {
+       let blockID = craftingGrid.find(Ingredient.of("#tfg:whitelisted/facades")).id
+	   
+		console.log(blockID)
+		let facadeNBT = "{Facade: {Count:1b,id:" + "'" + blockID + "'" + "}}"
+        result.nbt = facadeNBT
+        return result;
+    }).id('gtceu:facade_cover32');
+	//#endregion
+	
 	event.recipes.gtceu.laser_engraver('tfg:diamond_gear')
 		.itemInputs('4x #forge:plates/diamond')
 		.itemOutputs('#forge:gears/diamond')

kubejs/server_scripts/gregtech/recipes.machines.js

@@ -718,6 +718,30 @@ function registerGTCEuMachineRecipes(event) {
 		.EUt(GTValues.VA[GTValues.ZPM])
 		.stationResearch(b => b.researchStack(Item.of('gtceu:me_pattern_buffer')).EUt(GTValues.VA[GTValues.LuV]).CWUt(32))
 
+	event.remove({ id: 'gtceu:assembly_line/ultimate_battery' })
+	event.recipes.gtceu.assembly_line('ultimate_battery')
+		.itemInputs('16x #forge:double_plates/darmstadtium',
+			'4x #gtceu:circuits/uhv',
+			'16x gtceu:energy_cluster',
+			'4x gtceu:uv_field_generator',
+			'64x gtceu:uhpic_wafer',
+			'64x gtceu:uhpic_wafer',
+			'64x gtceu:advanced_smd_diode',
+			'64x gtceu:advanced_smd_capacitor',
+			'64x gtceu:advanced_smd_resistor',
+			'64x gtceu:advanced_smd_transistor',
+			'64x gtceu:advanced_smd_inductor',
+			'32x gtceu:enriched_naquadah_trinium_europium_duranide_double_wire',
+			'64x #forge:bolts/neutronium')
+		.inputFluids(
+			Fluid.of('gtceu:soldering_alloy', 5760),
+			Fluid.of('gtceu:polybenzimidazole', 2304),
+			Fluid.of('gtceu:naquadria', 2592))
+		.itemOutputs('gtceu:max_battery')
+		.duration(100 * 20)
+		.EUt(300000)
+		.stationResearch(b => b.researchStack(Item.of('gtceu:energy_cluster')).EUt(GTValues.VA[GTValues.UHV]).CWUt(144))
+
 	// #endregion
 
 	// Контроллер теплицы

kubejs/server_scripts/gregtech/recipes.materials.js

@@ -221,7 +221,7 @@ function registerGTCEUMetalRecipes(event) {
 				.outputFluids(Fluid.of(material.getFluid(), 288))
 				.duration(material.getMass())
 				.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
-				.EUt(GTValues.VA[GTValues.ULV])
+				.EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
 		}
 
 		if (material.hasProperty(PropertyKey.DUST)) {
@@ -666,7 +666,7 @@ function registerGTCEUMetalRecipes(event) {
 
 		event.recipes.gtceu.arc_furnace(`tfg:arc_${material.getName()}_unfinished_lamp`)
 			.itemInputs(unfinishedLampStack)
-			.itemOutputs([materialIngotStack, glassDustStack])
+			.itemOutputs(materialIngotStack)
 			.duration(material.getMass() * 8)
 			.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
 			.EUt(GTValues.VA[GTValues.ULV])
@@ -843,7 +843,6 @@ function registerGTCEUMetalRecipes(event) {
 			.itemOutputs(barsStack)
 			.duration(100)
 			.EUt(GTValues.VA[GTValues.LV])
-			.circuit(1)
 	}
 
 	forEachMaterial(material => {

kubejs/server_scripts/gregtech/recipes.removes.js

@@ -644,4 +644,11 @@ function removeGTCEURecipes(event) {
 	event.remove({ id: 'gtceu:smelting/sticky_resin_from_slime' })
 
 	event.remove({ id: 'gtceu:wiremill/string_from_polycaprolactam' })
+
+	event.remove({ id: 'gtceu:chemical_bath/black_steel_cool_down' })
+	event.remove({ id: 'gtceu:chemical_bath/black_steel_cool_down_distilled_water' })
+	event.remove({ id: 'gtceu:chemical_bath/red_steel_cool_down' })
+	event.remove({ id: 'gtceu:chemical_bath/red_steel_cool_down_distilled_water' })
+	event.remove({ id: 'gtceu:chemical_bath/blue_steel_cool_down' })
+	event.remove({ id: 'gtceu:chemical_bath/blue_steel_cool_down_distilled_water' })
 }

kubejs/server_scripts/gregtech/tags.js

@@ -118,4 +118,7 @@ const registerGTCEUFluidTags = (event) => {
 
 	event.add('c:hidden_from_recipe_viewers', /gtceu.*potion.*/)
 
+	event.add('c:hidden_from_recipe_viewers', 'gtceu:molten_black_steel')
+	event.add('c:hidden_from_recipe_viewers', 'gtceu:molten_red_steel')
+	event.add('c:hidden_from_recipe_viewers', 'gtceu:molten_blue_steel')
 }

kubejs/server_scripts/main_server_script.js

@@ -126,8 +126,10 @@ TFCEvents.data(event => {
     registerTFCDataForChalk(event);
     registerTFCDataForGTCEU(event)
     registerTFCDataForImmersiveAircraft(event);
+    registerTFCDataForSophisticatedBackpacks(event)
     registerTFCDataForTFC(event)
     registerTFCDataForTFCBetterBF(event)
+    registerTFCDataForTFCLunchbox(event)
     registerTFCDataForWaterFlasks(event)
     registerTFCDataForFirmalife(event)
 })
@@ -207,6 +209,7 @@ ServerEvents.recipes(event => {
     registerTfceaRecipes(event)
     registerTFCRecipes(event)
     registerTFCBetterBFRecipes(event)
+    registerTFCLunchBoxRecipes(event)
     registerTFGRecipes(event)
     registerTFCGroomingStationRecipes(event)
     registerTFCTextileRecipes(event)

kubejs/server_scripts/minecraft/recipes.js

@@ -1010,4 +1010,22 @@ const registerMinecraftRecipes = (event) => {
 		.itemOutputs('minecraft:shroomlight')
 		.duration(200)
 		.EUt(GTValues.VA[GTValues.ULV])
+
+	// Stonecutter
+
+	event.shaped('minecraft:stonecutter',
+		[
+			' E ',
+			'CAC',
+			'BDB'
+		],
+		{
+			A: '#forge:plates/wrought_iron',
+			B: '#tfc:lumber',
+			C: '#forge:plates/brass',
+			D: '#forge:small_gears',
+			E: '#forge:buzz_saw_heads'
+		}).id('tfg:shaped/stonecutter');
+
+	event.stonecutting('minecraft:smooth_quartz', 'minecraft:quartz_block')
 }

kubejs/server_scripts/minecraft/recipes.removes.js

@@ -689,6 +689,7 @@ function removeMinecraftRecipes(event) {
 
 	event.remove({ id: 'minecraft:quartz' })
 	event.remove({ id: 'minecraft:quartz_from_blasting' })
+	event.remove({ id: 'minecraft:smooth_quartz' })
 
 	//#endregion
 

kubejs/server_scripts/railways/recipes.js

@@ -4,7 +4,7 @@ const registerRailWaysRecipes = (event) => {
 
 	// Удаление рецептов мода railways 
 	event.remove({ mod: 'railways' });
-	
+
 	registerRailwaysLocometalRecipes(event)
 
 	// Семафор
@@ -48,40 +48,80 @@ const registerRailWaysRecipes = (event) => {
 		.EUt(28)
 
 	//#region Couplers and Buffers
-    event.recipes.gtceu.assembler(`tfg:railways/screwlink_coupler`)
+	event.recipes.gtceu.assembler(`tfg:railways/screwlink_coupler`)
-        .itemInputs(`minecraft:tripwire_hook`, `#forge:plates/steel`, '#forge:screws/steel')
+		.itemInputs(`minecraft:tripwire_hook`, `#forge:plates/steel`, '#forge:screws/steel')
-        .circuit(1)
+		.circuit(1)
-        .itemOutputs(`railways:screwlink_coupler`)
+		.itemOutputs(`railways:screwlink_coupler`)
-        .duration(200)
+		.duration(200)
-        .EUt(28)
+		.EUt(28)
 
-    event.recipes.gtceu.assembler(`tfg:railways/copycat_headstock_screwlink_coupler`)
+	event.recipes.gtceu.assembler(`tfg:railways/copycat_headstock_screwlink_coupler`)
-        .itemInputs(`railways:screwlink_coupler`, `create:copycat_panel`)
+		.itemInputs(`railways:screwlink_coupler`, `create:copycat_panel`)
-        .circuit(1)
+		.circuit(1)
-        .itemOutputs(`railways:copycat_headstock_screwlink_coupler`)
+		.itemOutputs(`railways:copycat_headstock_screwlink_coupler`)
-        .duration(200)
+		.duration(200)
-        .EUt(28)
+		.EUt(28)
 
-	 event.recipes.gtceu.assembler(`tfg:railways/buffer`)
+	event.recipes.gtceu.assembler(`tfg:railways/buffer`)
-        .itemInputs(`6x #forge:rods/long/steel`, `2x railways:small_buffer`)
+		.itemInputs(`6x #forge:rods/long/steel`, `2x railways:small_buffer`)
-        .circuit(1)
+		.circuit(1)
-        .itemOutputs(`railways:buffer`)
+		.itemOutputs(`railways:buffer`)
-        .duration(200)
+		.duration(200)
-        .EUt(28)
+		.EUt(28)
 
-    event.recipes.gtceu.assembler(`tfg:railways/small_buffer`)
+	event.recipes.gtceu.assembler(`tfg:railways/small_buffer`)
-        .itemInputs(`railways:screwlink_coupler`, `#forge:ingots/steel`)
+		.itemInputs(`railways:screwlink_coupler`, `#forge:ingots/steel`)
-        .circuit(1)
+		.circuit(1)
-        .itemOutputs(`railways:small_buffer`)
+		.itemOutputs(`railways:small_buffer`)
-        .duration(200)
+		.duration(200)
-        .EUt(28)
+		.EUt(28)
 
-    event.recipes.gtceu.assembler(`tfg:railways/big_buffer`)
+	event.recipes.gtceu.assembler(`tfg:railways/big_buffer`)
-        .itemInputs(`railways:small_buffer`, `#forge:ingots/steel`)
+		.itemInputs(`railways:small_buffer`, `#forge:ingots/steel`)
-        .circuit(1)
+		.circuit(1)
-        .itemOutputs(`railways:big_buffer`)
+		.itemOutputs(`railways:big_buffer`)
-        .duration(200)
+		.duration(200)
-        .EUt(28)
+		.EUt(28)
+
+	//#endregion
+
+	//#region conductor
+	event.recipes.gtceu.assembler(`tfg:railways/conductor_cap`)
+		.itemInputs('#gtceu:circuits/lv', '#gtceu:electric_motors', '2x #forge:string', '#tfc:high_quality_cloth')
+		.circuit(15)
+		.itemOutputs('railways:white_conductor_cap')
+		.duration(80)
+		.inputFluids(Fluid.of('gtceu:glue', 200))
+		.EUt(16)
+
+	event.recipes.tfc.barrel_sealed(1000)
+		.inputs('#tfg:colored_caps', Fluid.of(`tfc:lye`, 288))
+		.outputItem(`railways:white_conductor_cap`)
+		.id(`railways:barrel/cap_decolor`)
+
+	event.recipes.gtceu.chemical_bath(`tfg:cap_decolor_bath`)
+		.itemInputs('#tfg:colored_caps')
+		.inputFluids(Fluid.of('gtceu:chlorine', 20))
+		.itemOutputs('railways:white_conductor_cap')
+		.duration(80)
+		.EUt(4)
+		.category(GTRecipeCategories.CHEM_DYES)
+
+	global.MINECRAFT_DYE_NAMES.forEach(dye => {
+		event.recipes.gtceu.chemical_bath(`railways/${dye}_conductor_cap`)
+			.itemInputs('railways:white_conductor_cap')
+			.inputFluids(Fluid.of(`tfc:${dye}_dye`, 288))
+			.itemOutputs(`railways:${dye}_conductor_cap`)
+			.duration(200)
+			.EUt(4)
+			.category(GTRecipeCategories.CHEM_DYES)
+		if (dye != "white") {
+			event.recipes.tfc.barrel_sealed(1000)
+				.inputs(`railways:white_conductor_cap`, Fluid.of(`tfc:${dye}_dye`, 288))
+				.outputItem(`railways:${dye}_conductor_cap`)
+				.id(`railways:barrel/dyeing/${dye}_conductor_cap`)
+		}
+	})
 
 	//#endregion
 

kubejs/server_scripts/railways/tags.js

@@ -7,8 +7,12 @@ const registerRailWaysItemTags = (event) => {
         event.removeAllTagsFrom(item)
         event.add('c:hidden_from_recipe_viewers', item)
     })
+    // Adding Conductor tags
+    global.MINECRAFT_DYE_NAMES.forEach(dye => {
+		if (dye != 'white') event.add('tfg:colored_caps', `railways:${dye}_conductor_cap`)
+		event.remove('c:hidden_from_recipe_viewers',`railways:${dye}_conductor_cap`)
+	})
 }
-
 const registerRailWaysBlockTags = (event) => {
     
     // Удаление тегов у отключенных предметов

kubejs/server_scripts/sophisticated_backpacks/data.js

@@ -0,0 +1,11 @@
+// priority: 0
+
+function registerTFCDataForSophisticatedBackpacks(event) {
+
+    event.itemSize('sophisticatedbackpacks:backpack', 'very_large', 'very_heavy', 'backpack_size')
+    event.itemSize('sophisticatedbackpacks:iron_backpack', 'very_large', 'very_heavy', 'iron_backpack_size')
+    event.itemSize('sophisticatedbackpacks:gold_backpack', 'very_large', 'very_heavy', 'gold_backpack_size')
+    event.itemSize('sophisticatedbackpacks:diamond_backpack', 'very_large', 'very_heavy', 'diamond_backpack_size')
+    event.itemSize('sophisticatedbackpacks:netherite_backpack', 'very_large', 'very_heavy', 'netherite_backpack_size')
+
+}

kubejs/server_scripts/sophisticated_backpacks/recipes.js

@@ -422,4 +422,16 @@ const registerSophisticatedBackpacksRecipes = (event) => {
         F: '#forge:tools/wrenches',
         G: 'gtceu:aluminium_drum',
     }).id('tfg:sophisticated_backpacks/shaped/tank_upgrade')
+
+    // Stonecutter upgrade
+    event.shaped('sophisticatedbackpacks:stonecutter_upgrade', [
+        'ABA',
+        'CDC',
+        'ACA'
+    ], {
+        A: '#forge:rods/steel',
+        B: 'minecraft:stonecutter',
+        C: '#forge:plates/steel',
+        D: 'sophisticatedbackpacks:upgrade_base',
+    }).id('tfg:sophisticated_backpacks/shaped/stonecutter_upgrade')
 }

kubejs/server_scripts/tfc/data.js

@@ -186,11 +186,6 @@ const registerTFCKnappingTypes = (event) => {
 
 //#region registerTFCItemSize
 const registerTFCItemSize = (event) => {
-    event.itemSize('sophisticatedbackpacks:backpack', 'very_large', 'very_heavy', 'backpack_size')
-    event.itemSize('sophisticatedbackpacks:iron_backpack', 'very_large', 'very_heavy', 'iron_backpack_size')
-    event.itemSize('sophisticatedbackpacks:gold_backpack', 'very_large', 'very_heavy', 'gold_backpack_size')
-    event.itemSize('sophisticatedbackpacks:diamond_backpack', 'very_large', 'very_heavy', 'diamond_backpack_size')
-    event.itemSize('sophisticatedbackpacks:netherite_backpack', 'very_large', 'very_heavy', 'netherite_backpack_size')
 
     global.MINECRAFT_DYE_NAMES.forEach (color => {
         event.itemSize(`tfg:decorative_vase/${color}`, 'normal', 'medium', `decorative_vase/${color}`)

kubejs/server_scripts/tfc/recipes.machines.js

@@ -355,7 +355,7 @@ function registerTFCMachineRecipes(event) {
 	// Empty Jar
 	event.recipes.gtceu.alloy_smelter('tfc:jar_alloying')
 		.itemInputs('#tfc:glass_batches_tier_2')
-		.notConsumable('gtceu:cylinder_casting_mold')
+		.notConsumable('gtceu:ball_casting_mold')
 		.itemOutputs('tfc:empty_jar')
 		.duration(100)
 		.EUt(2)

kubejs/server_scripts/tfclunchbox/data.js

@@ -0,0 +1,8 @@
+// priority: 0
+
+function registerTFCDataForTFCLunchbox(event) {
+
+    event.itemSize('tfclunchbox:lunchbox', 'large', 'heavy', 'lunchbox_size')
+    event.itemSize('tfclunchbox:cooling_lunchbox', 'large', 'heavy', 'cooling_lunchbox_size')
+
+}

kubejs/server_scripts/tfclunchbox/recipes.js

@@ -0,0 +1,59 @@
+// priority: 0
+
+function registerTFCLunchBoxRecipes(event) {
+
+	event.shaped('tfclunchbox:lunchbox', [
+		' CE',
+		'ABA',
+		'DAD'
+	], {
+		A: '#forge:plates/sterling_silver',
+		B: '#forge:chests/wooden',
+		C: '#forge:bolts/brass',
+		D: '#forge:screws/wrought_iron',
+		E: '#forge:tools/hammers'
+	}).id('tfclunchbox:lunchbox')
+
+	event.shaped('tfclunchbox:cooling_lunchbox', [
+		' CE',
+		'ABA',
+		'DAD'
+	], {
+		A: '#forge:plates/red_steel',
+		B: '#forge:chests/wooden',
+		C: '#forge:bolts/brass',
+		D: '#forge:screws/steel',
+		E: '#forge:tools/hammers'
+	}).id('tfclunchbox:cooling_lunchbox')
+
+	event.shaped('tfclunchbox:cooling_lunchbox', [
+		' C ',
+		'ABA'
+	], {
+		A: '#forge:plates/red_steel',
+		B: 'tfclunchbox:lunchbox',
+		C: '#forge:tools/hammers'
+	}).id('tfclunchbox:upgrade_to_cooling_lunchbox')
+
+	event.remove({ id: 'tfclunchbox:universal_capsule' })
+	event.remove({ id: 'tfclunchbox:fill_capsule_with_ice' })
+
+	event.recipes.gtceu.assembler('tfclunchbox:universal_capsule')
+		.itemInputs('1x #forge:foils/red_steel', '1x #forge:rings/sterling_silver')
+		.itemOutputs('tfclunchbox:universal_capsule')
+		.duration(100)
+		.EUt(GTValues.VA[GTValues.LV])
+
+	event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice')
+		.itemInputs('tfclunchbox:universal_capsule')
+		.inputFluids(Fluid.of('gtceu:ice', 45 * 144))
+		.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
+		.duration(100)
+		.EUt(GTValues.VA[GTValues.LV])
+
+	event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice_solid')
+		.itemInputs('tfclunchbox:universal_capsule', '5x minecraft:packed_ice')
+		.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
+		.duration(100)
+		.EUt(GTValues.VA[GTValues.LV])
+}

kubejs/server_scripts/tfg/recipes.miscellaneous.js

@@ -124,7 +124,7 @@ function registerTFGMiscellaneousRecipes(event) {
 		.outputFluids(Fluid.of('firmalife:curdled_goat_milk', 1000))
 		.duration(300)
 		.EUt(GTValues.VA[GTValues.LV])
-
+	
 	//Scaffolding Frame
 	event.shaped('tfg:scaffolding_frame',
 		[
@@ -136,13 +136,7 @@ function registerTFGMiscellaneousRecipes(event) {
 			A: '#forge:rods/wood',
 			B: '#forge:cloth'
 		}).id('tfg:shaped/scaffolding_frame');
-
+	
-	event.recipes.gtceu.assembler('tfg:assembler/scaffolding_frame')
-		.itemInputs('4x #forge:rods/wood', '#forge:cloth')
-		.itemOutputs('tfg:scaffolding_frame')
-		.duration(10)
-		.EUt(GTValues.VA[GTValues.ULV]);
-
 	//Airship Hull
 	event.shaped('tfg:airship_hull', [
 		'A B',
@@ -259,6 +253,13 @@ function registerTFGMiscellaneousRecipes(event) {
 		.duration(20)
 		.EUt(GTValues.VA[GTValues.ULV])
 
+	event.recipes.gtceu.fluid_solidifier('tfg:ice')
+		.inputFluids(Fluid.of('minecraft:water', 144))
+		.notConsumable('gtceu:block_casting_mold')
+		.itemOutputs('minecraft:ice')
+		.duration(200)
+		.EUt(GTValues.VA[GTValues.LV])
+
 	event.shapeless('4x firmalife:ice_shavings', ['#forge:dusts/ice', '#forge:tools/hammers'])
 
 	// Cooling water
@@ -485,4 +486,4 @@ function registerTFGMiscellaneousRecipes(event) {
         .duration(40)
         .circuit(4)
         .EUt(GTValues.VA[GTValues.ULV])
-}
+}

kubejs/server_scripts/tfg/tags.facades.js

@@ -0,0 +1,324 @@
+// priority: 0
+
+function registerFacadeWhitelistTags(event) {
+    
+    const facade_materials = [
+		//tags
+		'#tfc:rock/bricks',
+		'#tfc:rock/smooth',
+		'#tfc:rock/gravel',
+		'#tfc:rock/cracked_bricks',
+		'#tfc:rock/chiseled',
+		'#tfc:rock/raw',
+		'#tfc:metal_plated_blocks',
+		
+		'#tfc:colored_raw_alabaster',
+		'#tfc:colored_bricks_alabaster',
+		'#tfc:colored_polished_alabaster',
+		'#tfc:mud_bricks',
+		'#forge:sandstone',
+		'#forge:storage_blocks',
+		'#forge:glass',
+		'#minecraft:terracotta',
+		'#create:casing',
+		'#dormum_ornamentum:brick_items',
+		'#simplylight:any_lamp_on',
+		'#simplylight:any_lamp_off',
+		'#minecraft:planks',
+		'#minecraft:logs',
+		//rnr shingles
+		'rnr:ceramic_roof',
+		'rnr:terracotta_roof',
+		
+		//tfc blocks
+		'tfc:fire_bricks',
+		'tfc:aggregate',
+		'tfc:alabaster/raw',
+		'tfc:alabaster/bricks',
+		'tfc:alabaster/polished',
+		
+		//firmalife blocks
+		'firmalife:metal/blocks/stainless_steel',
+		'firmalife:metal/blocks/chromium',
+		'firmalife:sealed_bricks',
+		'firmalife:chiseled_sealed_bricks',
+		'firmalife:polished_sealed_bricks',
+		
+		//gtceu blocks
+		'gtceu:coke_oven_bricks',
+		'gtceu:firebricks',
+		'gtceu:wood_wall',
+		'gtceu:tempered_glass',
+		'gtceu:laminated_glass',
+		'gtceu:plascrete',
+		'gtceu:cleanroom_glass',
+		
+		//gtceu casing
+		'gtceu:steam_machine_casing',
+		'gtceu:heatproof_machine_casing',
+		'gtceu:frostproof_machine_casing',
+		'gtceu:solid_machine_casing',
+		'gtceu:clean_machine_casing',
+		'gtceu:stable_machine_casing',
+		'gtceu:robust_machine_casing',
+		'gtceu:inert_machine_casing',
+		'gtceu:sturdy_machine_casing',
+		'gtceu:stainless_evaporation_casing',
+		'gtceu:nonconducting_casing',
+		'gtceu:vibration_safe_casing',
+		'gtceu:watertight_casing',
+		'gtceu:secure_maceration_casing',
+		'gtceu:high_temperature_smelting_casing',
+		'gtceu:laser_safe_engraving_casing',
+		'gtceu:large_scale_assembler_casing',
+		'gtceu:shock_proof_cutting_casing',
+		'gtceu:stress_proof_casing',
+		'gtceu:corrosion_proof_casing',
+		'gtceu:reaction_safe_mixing_casing',
+		'gtceu:assembly_line_casing',
+		'gtceu:titanium_turbine_casing',
+		'gtceu:stainless_turbine_casing',
+		'gtceu:tungstensteel_turbine_casing',
+		'gtceu:computer_casing',
+		'gtceu:advanced_computer_casing',
+		'gtceu:high_power_casing',
+		
+		//gtceu hazard signs
+		'gtceu:acid_hazard_sign_block',
+		'gtceu:antimatter_hazard_sign_block',
+		'gtceu:bio_hazard_sign_block',
+		'gtceu:boss_hazard_sign_block',
+		'gtceu:causality_hazard_sign_block',
+		'gtceu:explosion_hazard_sign_block',
+		'gtceu:fire_hazard_sign_block',
+		'gtceu:frost_hazard_sign_block',
+		'gtceu:generic_hazard_sign_block',
+		'gtceu:gregification_hazard_sign_block',
+		'gtceu:high_pressure_hazard_sign_block',
+		'gtceu:high_voltage_hazard_sign_block',
+		'gtceu:laser_hazard_sign_block',
+		'gtceu:magic_hazard_sign_block',
+		'gtceu:magnetic_hazard_sign_block',
+		'gtceu:mob_infestation_hazard_sign_block',
+		'gtceu:mob_spawner_hazard_sign_block',
+		'gtceu:noise_hazard_sign_block',
+		'gtceu:radioactive_hazard_sign_block',
+		'gtceu:spatial_storage_hazard_sign_block',
+		'gtceu:turret_hazard_sign_block',
+		'gtceu:void_hazard_sign_block',
+		'gtceu:yellow_stripes_block_a',
+		'gtceu:yellow_stripes_block_b',
+		
+		//windows
+		'create:dark_oak_window',
+		'create:mangrove_window',
+		'create:ornate_iron_window',
+		'create_connected:cherry_window',
+		'create_connected:bamboo_window',
+		'createdeco:andesite_window',
+		'createdeco:copper_window',
+		'createdeco:iron_window',
+		'createdeco:industrial_iron_window',
+		'createdeco:brass_window',
+		'createdeco:zinc_window',
+		'everycomp:c/domum_ornamentum/cactus_window',
+		'everycomp:c/domum_ornamentum/cactus_extra_window',
+		'ae2:quartz_glass',
+		
+		//create deco
+		'createdeco:andesite_sheet_metal',
+		'createdeco:brass_sheet_metal',
+		'createdeco:iron_sheet_metal',
+		'createdeco:copper_sheet_metal',
+		'createdeco:industrial_iron_sheet_metal',
+		'createdeco:zinc_sheet_metal'
+	];
+	
+	const mc_colors =
+	[
+	'white',
+	'orange',
+	'magenta',
+	'light_blue',
+	'yellow',
+	'lime',
+	'pink',
+	'gray',
+	'light_gray',
+	'cyan',
+	'purple',
+	'blue',
+	'brown',
+	'green',
+	'red',
+	'black'
+	]
+	
+	const wood_types_tfc = 
+	[
+	'acacia',
+	'ash',
+	'aspen',
+	'birch',
+	'blackwood',
+	'chestnut',
+	'douglas_fir',
+	'hickory',
+	'kapok',
+	'mangrove',
+	'maple',
+	'oak',
+	'palm',
+	'pine',
+	'rosewood',
+	'sequoia',
+	'spruce',
+	'sycamore',
+	'white_cedar',
+	'willow'
+	]
+	
+	const wood_types_afc =
+	[
+	'baobao',
+	'eucalyptus',
+	'mahogany',
+	'heavea',
+	'tualang',
+	'teak',
+	'cypress',
+	'fig',
+	'ironwood',
+	'ipe'
+	]
+	
+	const createdeco_bricks_fm = 
+	[
+	'pearl_bricks',
+	'verdant_bricks',
+	'red_bricks',
+	'dean_bricks',
+	'umber_bricks',
+	'dusk_bricks',
+	'blue_bricks',
+	'scarlet_bricks'
+	]
+	
+	const gtceu_stonelike_fm = 
+	[
+	'light_concrete', 
+	'dark_concrete',
+	'red_granite',
+	'marble'
+	]
+	
+	const create_copper_fm = 
+	[
+	'copper',
+	'exposed_copper',
+	'weathered_copper',
+	'oxidized_copper'
+	]
+	
+	const create_rock_types_fm = 
+	[
+	'granite',
+	'diorite',
+	'andesite',
+	'calcite',
+	'dripstone',
+	'deepslate',
+	'limestone'
+	//'ochrum',
+	//'scoria',
+	//'scorchia',
+	//'veridium'
+	//'tuff',
+	//'asurine',
+	//'crimsite',
+	]
+	
+	//misc blocks
+	facade_materials.forEach(facade_material => {
+		event.add('tfg:whitelisted/facades', `${facade_material}`)
+	});
+	
+	//gtceu stonelike stuff
+	gtceu_stonelike_fm.forEach(facade_material => {
+		if(facade_material != 'marble') 
+		{
+			event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_cobblestone')
+			event.add('tfg:whitelisted/facades', 'gtceu:mossy_' + facade_material + '_cobblestone')
+			event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_bricks')
+			event.add('tfg:whitelisted/facades', 'gtceu:cracked_' + facade_material + '_bricks')
+			event.add('tfg:whitelisted/facades', 'gtceu:mossy_' + facade_material + '_bricks')
+		}
+		
+		event.add('tfg:whitelisted/facades', 'gtceu:polished_' + facade_material)
+		event.add('tfg:whitelisted/facades', 'gtceu:chiseled' + facade_material)
+		
+		event.add('tfg:whitelisted/facades', 'gtceu:small_' + facade_material + '_bricks')
+		event.add('tfg:whitelisted/facades', 'gtceu:square_' + facade_material + '_bricks')
+		
+		event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_tile')
+		event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_small_tile')
+		event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_windmill_a')
+		event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_windmill_b')
+	});
+	
+	//gtceu misc colored blocks
+	mc_colors.forEach(facade_material => {
+		event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_metal_sheet')
+		event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_large_metal_sheet')
+		event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_studs')
+	});
+	
+	//create copper
+	create_copper_fm.forEach(facade_material => {
+		event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_shingles')
+		event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_tiles')
+	});
+	
+	//create rocks
+	create_rock_types_fm.forEach(facade_material => {
+		
+		if(facade_material == 'limestone')
+		{
+			event.add('tfg:whitelisted/facades', 'create:' + facade_material)
+		}
+		
+		event.add('tfg:whitelisted/facades', 'create:cut_' + facade_material)
+		event.add('tfg:whitelisted/facades', 'create:polished_cut_' + facade_material)
+		event.add('tfg:whitelisted/facades', 'create:cut_' + facade_material + '_bricks')
+		event.add('tfg:whitelisted/facades', 'create:small_' + facade_material + '_bricks')
+		event.add('tfg:whitelisted/facades', 'create:layered_' + facade_material)
+		event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_pillar')
+	});
+	
+	//rnr shingles
+	wood_types_tfc.concat(wood_types_afc).forEach(facade_material => {
+		event.add('tfg:whitelisted/facades', 'rnr:wood/shingles/' + facade_material)
+	});
+	
+	//createdeco bricks
+	createdeco_bricks_fm.forEach(facade_material => {
+		if (facade_material != 'red_bricks') 
+		{
+			event.add('tfg:whitelisted/facades', 'createdeco:' + facade_material)
+		}
+		event.add('tfg:whitelisted/facades', 'createdeco:short_' + facade_material)
+		event.add('tfg:whitelisted/facades', 'createdeco:long_' + facade_material)
+		event.add('tfg:whitelisted/facades', 'createdeco:tiled_' + facade_material)
+		event.add('tfg:whitelisted/facades', 'createdeco:corner_' + facade_material)
+		event.add('tfg:whitelisted/facades', 'createdeco:cracked_' + facade_material)
+		event.add('tfg:whitelisted/facades', 'createdeco:mossy_' + facade_material)
+	});
+	
+	//everycomp windows
+	wood_types_tfc.forEach(facade_material => {
+		event.add('tfg:whitelisted/facades', 'everycomp:c/tfc/' + facade_material + '_window')
+	});
+	wood_types_afc.forEach(facade_material => {
+		event.add('tfg:whitelisted/facades', 'everycomp:c/afc/' + facade_material + '_window')
+	});
+}

kubejs/server_scripts/tfg/tags.js

@@ -1,6 +1,7 @@
 const registerTFGItemTags = (event) => {
 
 	registerTFGTrimTags(event)
+	registerFacadeWhitelistTags(event)
 
 	//temporary hidden items
 	event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source_small')

kubejs/server_scripts/vintage_improvements/recipes.js

@@ -575,21 +575,21 @@ function registerVintageImprovementsRecipes(event) {
 	event.custom({
 		type: 'vintageimprovements:vacuumizing',
 		ingredients: [{ tag: 'tfg:latex_logs' }],
-		results: [{ fluid: 'tfg:latex', amount: 250 }],
+		results: [{ fluid: 'tfg:latex', amount: 100 }],
 		processingTime: 600
 	}).id('tfg:vi/vacuumizing/latex_from_rubber_logs')
 
 	event.custom({
 		type: 'vintageimprovements:vacuumizing',
 		ingredients: [{ tag: 'tfg:rubber_saplings' }],
-		results: [{ fluid: 'tfg:latex', amount: 100 }],
+		results: [{ fluid: 'tfg:latex', amount: 25 }],
 		processingTime: 300
 	}).id('tfg:vi/vacuumizing/latex_from_rubber_sapling')
 
 	event.custom({
 		type: 'vintageimprovements:vacuumizing',
 		ingredients: [{ tag: 'tfg:rubber_leaves' }],
-		results: [{ fluid: 'tfg:latex', amount: 50 }],
+		results: [{ fluid: 'tfg:latex', amount: 10 }],
 		processingTime: 150
 	}).id('tfg:vi/vacuumizing/latex_from_rubber_leaves')
 

kubejs/startup_scripts/create/constants.js

@@ -186,63 +186,12 @@ global.CREATE_DISABLED_ITEMS = [
     'create:warped_window_pane', 
 
     // Blocks
-    'create:andesite_alloy_block', 
+    'create:andesite_alloy_block',  
-    'create:industrial_iron_block', 
     'create:experience_block',
     'create:rose_quartz_block', 
     'create:rose_quartz_tiles', 
     'create:small_rose_quartz_tiles',
 
-    // Shit Copper Blocks (Когда гребаный Create стал модом про декор)
-    'create:oxidized_copper_tiles', 
-    'create:copper_tile_slab', 
-    'create:exposed_copper_tile_slab', 
-    'create:weathered_copper_tile_slab', 
-    'create:oxidized_copper_tile_slab', 
-    'create:copper_tile_stairs', 
-    'create:exposed_copper_tile_stairs', 
-    'create:weathered_copper_tile_stairs', 
-    'create:oxidized_copper_tile_stairs', 
-    'create:copper_shingles', 
-    'create:exposed_copper_shingles', 
-    'create:weathered_copper_shingles', 
-    'create:oxidized_copper_shingles', 
-    'create:copper_shingle_slab', 
-    'create:exposed_copper_shingle_slab', 
-    'create:weathered_copper_shingle_slab', 
-    'create:oxidized_copper_shingle_slab', 
-    'create:copper_shingle_stairs', 
-    'create:exposed_copper_shingle_stairs', 
-    'create:weathered_copper_shingle_stairs', 
-    'create:oxidized_copper_shingle_stairs', 
-    'create:waxed_copper_shingles', 
-    'create:waxed_exposed_copper_shingles', 
-    'create:waxed_weathered_copper_shingles', 
-    'create:waxed_oxidized_copper_shingles', 
-    'create:waxed_copper_shingle_slab', 
-    'create:waxed_exposed_copper_shingle_slab', 
-    'create:waxed_weathered_copper_shingle_slab', 
-    'create:waxed_oxidized_copper_shingle_slab', 
-    'create:waxed_copper_shingle_stairs', 
-    'create:waxed_exposed_copper_shingle_stairs', 
-    'create:waxed_weathered_copper_shingle_stairs', 
-    'create:waxed_oxidized_copper_shingle_stairs', 
-    'create:copper_tiles', 
-    'create:exposed_copper_tiles', 
-    'create:weathered_copper_tiles',
-    'create:waxed_copper_tiles', 
-    'create:waxed_exposed_copper_tiles', 
-    'create:waxed_weathered_copper_tiles', 
-    'create:waxed_oxidized_copper_tiles', 
-    'create:waxed_copper_tile_slab', 
-    'create:waxed_exposed_copper_tile_slab', 
-    'create:waxed_weathered_copper_tile_slab', 
-    'create:waxed_oxidized_copper_tile_slab', 
-    'create:waxed_copper_tile_stairs', 
-    'create:waxed_exposed_copper_tile_stairs',
-    'create:waxed_weathered_copper_tile_stairs', 
-    'create:waxed_oxidized_copper_tile_stairs',
-
     // Other
     'create:honey_bucket', 
     'create:chocolate_bucket',

kubejs/startup_scripts/gtceu/materials.js

@@ -37,7 +37,8 @@ const registerGTCEuMaterialModification = (event) => {
 		GENERATE_FRAME,
 		GENERATE_PLATE,
 		GENERATE_DENSE,
-		GENERATE_RING
+		GENERATE_RING,
+		GENERATE_FOIL
 	} = $MATERIAL_FLAGS
 
 	var metalTooling = [
@@ -194,7 +195,7 @@ const registerGTCEuMaterialModification = (event) => {
 	GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD);
 	GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW);
 	GTMaterials.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW);
-	GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW);
+	GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_FOIL);
 	GTMaterials.WroughtIron.addFlags(GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SMALL_GEAR);
 	
 	GTMaterials.Copper.addFlags(GENERATE_BOLT_SCREW);
@@ -255,6 +256,11 @@ const registerGTCEuMaterialModification = (event) => {
 	GTMaterials.Galena.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.WEAK_POISON, 1, false));
 	GTMaterials.Chromite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.IRRITANT, 1, false));
 
+	// Make these the lowest tier of EBF instead
+	GTMaterials.BlackSteel.getProperty(PropertyKey.BLAST).setBlastTemperature(1000)
+	GTMaterials.RedSteel.getProperty(PropertyKey.BLAST).setBlastTemperature(1000)
+	GTMaterials.BlueSteel.getProperty(PropertyKey.BLAST).setBlastTemperature(1000)
+
 	// Color Adjustments
 	GTMaterials.BismuthBronze.setMaterialARGB(0x5A966E)
 	GTMaterials.BismuthBronze.setMaterialSecondaryARGB(0x203E2A)

kubejs/startup_scripts/minecraft/constants.js

@@ -503,7 +503,6 @@ global.MINECRAFT_DISABLED_ITEMS = [
     'minecraft:mud',
     'minecraft:netherite_scrap',
     'minecraft:suspicious_gravel',
-    'minecraft:stonecutter',
     'minecraft:gravel',
     'minecraft:large_fern', 
     'minecraft:tall_grass', 

kubejs/startup_scripts/railways/constants.js

@@ -100,24 +100,6 @@ global.RAIL_WAYS_DISABLED_ITEMS = [
     'railways:track_incomplete_tieless_narrow',
     'railways:track_incomplete_tieless_wide',
 
-    // Caps
-    'railways:white_conductor_cap',
-    'railways:orange_conductor_cap',
-    'railways:magenta_conductor_cap',
-    'railways:light_blue_conductor_cap',
-    'railways:yellow_conductor_cap',
-    'railways:lime_conductor_cap',
-    'railways:pink_conductor_cap',
-    'railways:gray_conductor_cap',
-    'railways:light_gray_conductor_cap',
-    'railways:cyan_conductor_cap',
-    'railways:purple_conductor_cap',
-    'railways:blue_conductor_cap',
-    'railways:brown_conductor_cap',
-    'railways:green_conductor_cap',
-    'railways:red_conductor_cap',
-    'railways:black_conductor_cap',
-
     // Incomplete Caps
     'railways:white_incomplete_conductor_cap',
     'railways:orange_incomplete_conductor_cap',

kubejs/startup_scripts/sophisticated_backpacks/constants.js

@@ -8,7 +8,6 @@ global.SOPHISTICATED_BACKPACKS_DISABLED_ITEMS = [
     'sophisticatedbackpacks:auto_smoking_upgrade',
     'sophisticatedbackpacks:blasting_upgrade',
     'sophisticatedbackpacks:auto_blasting_upgrade',
-    'sophisticatedbackpacks:stonecutter_upgrade',
     'sophisticatedbackpacks:stack_upgrade_tier_2',
     'sophisticatedbackpacks:stack_upgrade_tier_3',
     'sophisticatedbackpacks:stack_upgrade_tier_4',

pakku-lock.json

@@ -229,7 +229,7 @@
             "files": [
                 {
                     "type": "curseforge",
-                    "file_name": "AdvancedPeripherals-1.20.1-0.7.43r.jar",
+                    "file_name": "AdvancedPeripherals-1.20.1-0.7.44r.jar",
                     "mc_versions": [
                         "1.20.1"
                     ],
@@ -238,18 +238,18 @@
                         "forge"
                     ],
                     "release_type": "release",
-                    "url": "https://edge.forgecdn.net/files/6577/898/AdvancedPeripherals-1.20.1-0.7.43r.jar",
+                    "url": "https://edge.forgecdn.net/files/6623/216/AdvancedPeripherals-1.20.1-0.7.44r.jar",
-                    "id": "6577898",
+                    "id": "6623216",
                     "parent_id": "431725",
                     "hashes": {
-                        "sha1": "a6f544738d3c0bb38712dededf12d0e80bd357c7",
+                        "sha1": "7dd9807debcc9eb475bc67a5156bca19a7b46578",
-                        "md5": "3b54478098221219b35146ceac7c6133"
+                        "md5": "8731f8e8503a6e7a5f9f87d59b96d13e"
                     },
                     "required_dependencies": [
                         "282001"
                     ],
-                    "size": 885577,
+                    "size": 885693,
-                    "date_published": "2025-05-26T17:39:08.747Z"
+                    "date_published": "2025-06-06T22:01:06.353Z"
                 }
             ]
         },
@@ -389,7 +389,7 @@
             "files": [
                 {
                     "type": "curseforge",
-                    "file_name": "appliedenergistics2-forge-15.4.4.jar",
+                    "file_name": "appliedenergistics2-forge-15.4.5.jar",
                     "mc_versions": [
                         "1.20.1"
                     ],
@@ -397,18 +397,18 @@
                         "forge"
                     ],
                     "release_type": "release",
-                    "url": "https://edge.forgecdn.net/files/6605/410/appliedenergistics2-forge-15.4.4.jar",
+                    "url": "https://edge.forgecdn.net/files/6629/570/appliedenergistics2-forge-15.4.5.jar",
-                    "id": "6605410",
+                    "id": "6629570",
                     "parent_id": "223794",
                     "hashes": {
-                        "sha1": "8660d742d2f8d8b7bdadae76e84144587811e9d2",
+                        "sha1": "7ee55608d1625ec1fb22d60bd73aa31fe80cc896",
-                        "md5": "74cc19c79dd5dbfa3e511597c7fc0592"
+                        "md5": "92d85cc2573550525f9b9a647f9f8459"
                     },
                     "required_dependencies": [
                         "1173950"
                     ],
-                    "size": 8413070,
+                    "size": 8413069,
-                    "date_published": "2025-06-01T14:46:39.523Z"
+                    "date_published": "2025-06-08T13:24:02.623Z"
                 }
             ]
         },
@@ -467,7 +467,7 @@
             "files": [
                 {
                     "type": "curseforge",
-                    "file_name": "afc-1.0.17-1.20.1.jar",
+                    "file_name": "afc-1.0.18-1.20.1.jar",
                     "mc_versions": [
                         "1.20.1"
                     ],
@@ -476,18 +476,18 @@
                         "forge"
                     ],
                     "release_type": "release",
-                    "url": "https://edge.forgecdn.net/files/6549/467/afc-1.0.17-1.20.1.jar",
+                    "url": "https://edge.forgecdn.net/files/6635/351/afc-1.0.18-1.20.1.jar",
-                    "id": "6549467",
+                    "id": "6635351",
                     "parent_id": "877545",
                     "hashes": {
-                        "sha1": "abd0379e85da6bce0e47341a5f51909cc57e1744",
+                        "sha1": "c2cfffcce7ff7c1c978326a674389fcbdfb61fd4",
-                        "md5": "701563a64374eb0825c54e063fdd407d"
+                        "md5": "cb8183be65ca88c20b111e9ae9083dd7"
                     },
                     "required_dependencies": [
                         "302973"
                     ],
-                    "size": 5105665,
+                    "size": 5117468,
-                    "date_published": "2025-05-20T04:37:38.210Z"
+                    "date_published": "2025-06-10T03:09:58.637Z"
                 }
             ]
         },
@@ -722,6 +722,45 @@
                 }
             ]
         },
+        {
+            "pakku_id": "oKnJXlzNyfYcMTcv",
+            "type": "MOD",
+            "slug": {
+                "curseforge": "baguettelib"
+            },
+            "name": {
+                "curseforge": "BaguetteLib"
+            },
+            "id": {
+                "curseforge": "1264423"
+            },
+            "files": [
+                {
+                    "type": "curseforge",
+                    "file_name": "baguettelib-1.20.1-Forge-1.0.0.jar",
+                    "mc_versions": [
+                        "1.20.2",
+                        "1.20.3",
+                        "1.20.1",
+                        "1.20.4"
+                    ],
+                    "loaders": [
+                        "forge"
+                    ],
+                    "release_type": "release",
+                    "url": "https://edge.forgecdn.net/files/6523/425/baguettelib-1.20.1-Forge-1.0.0.jar",
+                    "id": "6523425",
+                    "parent_id": "1264423",
+                    "hashes": {
+                        "sha1": "bb17d8ed796efce38eb8fcc72ec477f3373e6c9f",
+                        "md5": "f27a8d6a333579d93a9881100d559b56"
+                    },
+                    "required_dependencies": [],
+                    "size": 26550,
+                    "date_published": "2025-05-12T19:47:40.637Z"
+                }
+            ]
+        },
         {
             "pakku_id": "eIMAkTQ4QJiCSZSg",
             "type": "MOD",
@@ -1462,6 +1501,44 @@
                 }
             ]
         },
+        {
+            "pakku_id": "0Cv6dO3ZGvsziQH1",
+            "type": "MOD",
+            "slug": {
+                "curseforge": "clean-swing-through-grass"
+            },
+            "name": {
+                "curseforge": "Clean Swing Through Grass"
+            },
+            "id": {
+                "curseforge": "915308"
+            },
+            "files": [
+                {
+                    "type": "curseforge",
+                    "file_name": "cleanswing-1.20-1.8.jar",
+                    "mc_versions": [
+                        "1.20.1",
+                        "1.20"
+                    ],
+                    "loaders": [
+                        "neoforge",
+                        "forge"
+                    ],
+                    "release_type": "release",
+                    "url": "https://edge.forgecdn.net/files/5962/530/cleanswing-1.20-1.8.jar",
+                    "id": "5962530",
+                    "parent_id": "915308",
+                    "hashes": {
+                        "sha1": "c128e24c47ab4a389b3868ff6913ee0631f254e8",
+                        "md5": "84f9950e09245d82f72a6461f57ca30f"
+                    },
+                    "required_dependencies": [],
+                    "size": 8305,
+                    "date_published": "2024-12-04T16:23:38.883Z"
+                }
+            ]
+        },
         {
             "pakku_id": "PDE7RB7hlFnTfgkq",
             "type": "MOD",
@@ -1651,6 +1728,45 @@
                 }
             ]
         },
+        {
+            "pakku_id": "On44S9fQbI0vVJTW",
+            "type": "RESOURCE_PACK",
+            "slug": {
+                "curseforge": "computercraft-greg-flavored"
+            },
+            "name": {
+                "curseforge": "ComputerCraft: Greg Flavored"
+            },
+            "id": {
+                "curseforge": "1061743"
+            },
+            "files": [
+                {
+                    "type": "curseforge",
+                    "file_name": "ComputerCraft Greg Refreshed 1.1 - 1.20.1.zip",
+                    "mc_versions": [
+                        "1.20.2",
+                        "1.20.5",
+                        "1.20.3",
+                        "1.20.1",
+                        "1.20",
+                        "1.20.6",
+                        "1.20.4"
+                    ],
+                    "release_type": "release",
+                    "url": "https://edge.forgecdn.net/files/5560/613/ComputerCraft Greg Refreshed 1.1 - 1.20.1.zip",
+                    "id": "5560613",
+                    "parent_id": "1061743",
+                    "hashes": {
+                        "sha1": "6d1d3642537c40ea813507379941773a49c62f28",
+                        "md5": "57d0168a3d006bca79603d0646594f83"
+                    },
+                    "required_dependencies": [],
+                    "size": 957439,
+                    "date_published": "2024-07-24T09:35:57.853Z"
+                }
+            ]
+        },
         {
             "pakku_id": "MaU4DxZPJWpFlsaT",
             "type": "MOD",
@@ -1745,7 +1861,7 @@
             "files": [
                 {
                     "type": "curseforge",
-                    "file_name": "corpse-forge-1.20.1-1.0.20.jar",
+                    "file_name": "corpse-forge-1.20.1-1.0.21.jar",
                     "mc_versions": [
                         "1.20.1"
                     ],
@@ -1753,21 +1869,24 @@
                         "forge"
                     ],
                     "release_type": "release",
-                    "url": "https://edge.forgecdn.net/files/6121/243/corpse-forge-1.20.1-1.0.20.jar",
+                    "url": "https://edge.forgecdn.net/files/6624/394/corpse-forge-1.20.1-1.0.21.jar",
-                    "id": "6121243",
+                    "id": "6624394",
                     "parent_id": "316582",
                     "hashes": {
-                        "sha1": "fc5cd03dd52f24467c879b44296ddc70b85398f4",
+                        "sha1": "fb68fba706e0a41f1e46492e0d54fde4945b8a05",
-                        "md5": "143d3e76139de3b9186849f494a41af6"
+                        "md5": "346a9e592558c1fde772b39c10be4cdf"
                     },
                     "required_dependencies": [],
-                    "size": 244994,
+                    "size": 245618,
-                    "date_published": "2025-01-24T21:52:45.963Z"
+                    "date_published": "2025-06-07T07:02:24.647Z"
                 }
             ]
         },
         {
             "pakku_id": "v5lo2gHNUaKnn445",
+            "pakku_links": [
+                "oKnJXlzNyfYcMTcv"
+            ],
             "type": "MOD",
             "slug": {
                 "curseforge": "corpse-x-curios-api-compat"
@@ -1781,28 +1900,31 @@
             "files": [
                 {
                     "type": "curseforge",
-                    "file_name": "corpsecurioscompat-1.18.x-1.20.x-Forge-2.2.2.jar",
+                    "file_name": "corpsecurioscompat-1.20.x-Forge-3.0.2.jar",
                     "mc_versions": [
                         "1.20.2",
                         "1.20.3",
                         "1.20.1",
-                        "1.20",
                         "1.20.4"
                     ],
                     "loaders": [
                         "forge"
                     ],
                     "release_type": "release",
-                    "url": "https://edge.forgecdn.net/files/6327/919/corpsecurioscompat-1.18.x-1.20.x-Forge-2.2.2.jar",
+                    "url": "https://edge.forgecdn.net/files/6616/671/corpsecurioscompat-1.20.x-Forge-3.0.2.jar",
-                    "id": "6327919",
+                    "id": "6616671",
                     "parent_id": "1138130",
                     "hashes": {
-                        "sha1": "1e00db91b74287eb63f389c6c8cb5a70df41f8e0",
+                        "sha1": "946d6cc5055eac39900ff252cd2eb72caf95e4ac",
-                        "md5": "82d54c35a60a963f292dc3f3fd3b3af2"
+                        "md5": "f760be75a5b1c4c22c9327e72cd08a2c"
                     },
-                    "required_dependencies": [],
+                    "required_dependencies": [
-                    "size": 9117,
+                        "309927",
-                    "date_published": "2025-03-21T09:35:57.857Z"
+                        "1264423",
+                        "316582"
+                    ],
+                    "size": 12495,
+                    "date_published": "2025-06-05T08:45:11.493Z"
                 }
             ]
         },
@@ -4437,7 +4559,7 @@
             "files": [
                 {
                     "type": "curseforge",
-                    "file_name": "guideme-20.1.7.jar",
+                    "file_name": "guideme-20.1.8.jar",
                     "mc_versions": [
                         "1.20.1"
                     ],
@@ -4445,16 +4567,16 @@
                         "forge"
                     ],
                     "release_type": "release",
-                    "url": "https://edge.forgecdn.net/files/6489/464/guideme-20.1.7.jar",
+                    "url": "https://edge.forgecdn.net/files/6634/593/guideme-20.1.8.jar",
-                    "id": "6489464",
+                    "id": "6634593",
                     "parent_id": "1173950",
                     "hashes": {
-                        "sha1": "fc039093c479b3632b1ab60ea503e79b76b686f9",
+                        "sha1": "cc5e96b09949c5f1ad5d6aa5c45695f760715e95",
-                        "md5": "01ca90ca84ab2f886e4c5a2101934d00"
+                        "md5": "38d8791dc9114d9cf6bcd5f2af1402e7"
                     },
                     "required_dependencies": [],
-                    "size": 9401162,
+                    "size": 9401167,
-                    "date_published": "2025-05-03T00:27:09.520Z"
+                    "date_published": "2025-06-09T21:54:55.087Z"
                 }
             ]
         },
@@ -5881,6 +6003,39 @@
                 }
             ]
         },
+        {
+            "pakku_id": "v7A0bgYd4KcqmpVA",
+            "type": "RESOURCE_PACK",
+            "slug": {
+                "curseforge": "new-animals-for-terrafirmacraft"
+            },
+            "name": {
+                "curseforge": "New Animals for TerraFirmaCraft"
+            },
+            "id": {
+                "curseforge": "1246070"
+            },
+            "files": [
+                {
+                    "type": "curseforge",
+                    "file_name": "TerraFirmaCraft_New_Animals.zip",
+                    "mc_versions": [
+                        "1.20.1"
+                    ],
+                    "release_type": "release",
+                    "url": "https://edge.forgecdn.net/files/6436/812/TerraFirmaCraft_New_Animals.zip",
+                    "id": "6436812",
+                    "parent_id": "1246070",
+                    "hashes": {
+                        "sha1": "c3318956eff6b4c9e49e81b89ff2b49eaf16d4dc",
+                        "md5": "09466b7016348fb845c40886f466e9b2"
+                    },
+                    "required_dependencies": [],
+                    "size": 65591,
+                    "date_published": "2025-04-18T17:00:53.570Z"
+                }
+            ]
+        },
         {
             "pakku_id": "PelbQK42HFCTe5cc",
             "type": "MOD",
@@ -7781,6 +7936,46 @@
                 }
             ]
         },
+        {
+            "pakku_id": "B9nXYwWrLGp1WG43",
+            "pakku_links": [
+                "fMkiGcRPRv1DdRC1"
+            ],
+            "type": "MOD",
+            "slug": {
+                "curseforge": "tfc-lunch-box"
+            },
+            "name": {
+                "curseforge": "TFC Lunch Box"
+            },
+            "id": {
+                "curseforge": "1283445"
+            },
+            "files": [
+                {
+                    "type": "curseforge",
+                    "file_name": "tfclunchbox-1.20.1-1.0.0.14.jar",
+                    "mc_versions": [
+                        "1.20.1"
+                    ],
+                    "loaders": [
+                        "neoforge",
+                        "forge"
+                    ],
+                    "release_type": "beta",
+                    "url": "https://edge.forgecdn.net/files/6646/846/tfclunchbox-1.20.1-1.0.0.14.jar",
+                    "id": "6646846",
+                    "parent_id": "1283445",
+                    "hashes": {
+                        "sha1": "de4051c4345290b9d99f2d26090ad466f112b3ec",
+                        "md5": "ada6f65d0fc9785a34b9deb76c53e882"
+                    },
+                    "required_dependencies": [],
+                    "size": 95828,
+                    "date_published": "2025-06-13T12:54:20.803Z"
+                }
+            ]
+        },
         {
             "pakku_id": "O9o4v50wMwsyPZeQ",
             "pakku_links": [
@@ -8186,7 +8381,7 @@
             "files": [
                 {
                     "type": "curseforge",
-                    "file_name": "TerraFirmaGreg-Core-Modern-0.6.7.jar",
+                    "file_name": "TerraFirmaGreg-Core-Modern-0.6.8.jar",
                     "mc_versions": [
                         "1.20.1"
                     ],
@@ -8195,19 +8390,19 @@
                         "forge"
                     ],
                     "release_type": "release",
-                    "url": "https://edge.forgecdn.net/files/6613/427/TerraFirmaGreg-Core-Modern-0.6.7.jar",
+                    "url": "https://edge.forgecdn.net/files/6641/343/TerraFirmaGreg-Core-Modern-0.6.8.jar",
-                    "id": "6613427",
+                    "id": "6641343",
                     "parent_id": "513402",
                     "hashes": {
-                        "sha1": "76662e65565207a7682cafd39ef068e4c0a98516",
+                        "sha1": "989c76bb022dd8fdc0363c6ff9bdaa1665ff6571",
-                        "md5": "7c41c1ca1a8a9edf0e9fb72bdf5ebf44"
+                        "md5": "ada07963205a8b7089d6b9664c833286"
                     },
                     "required_dependencies": [
-                        "302973",
+                        "890405",
-                        "890405"
+                        "302973"
                     ],
-                    "size": 297697,
+                    "size": 297767,
-                    "date_published": "2025-06-04T11:47:57.083Z"
+                    "date_published": "2025-06-11T20:08:19.890Z"
                 }
             ]
         },

pakku.json

@@ -1,6 +1,6 @@
 {
     "name": "TerraFirmaGreg-Modern",
-    "version": "0.9.10",
+    "version": "0.9.11",
     "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.",
     "author": "Exception, Xikaro",
     "overrides": [