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

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog
 ## [Unreleased]
 ### Changes
-- Normalized ladder crafting outputs, removed ladders as steam boiler fuel @oosyrag
+- Normalized ladder crafting outputs, reduced ladders and wood frame burn times @oosyrag
 ### Bug fixes
 ### Translation updates
 

kubejs/server_scripts/create/tags.js

@@ -87,11 +87,6 @@ const registerCreateItemTags = (event) => {
 	event.add('create:non_movable', 'tfg:geyser_source')
 	event.add('create:non_movable', 'tfg:geyser_source_small')
 
-	event.add('c:hidden_from_recipe_viewers', 'create:cardboard_package_12x10')
-	event.add('c:hidden_from_recipe_viewers', 'create:cardboard_package_10x8')
-	event.add('c:hidden_from_recipe_viewers', 'create:cardboard_package_10x12')
-	event.add('c:hidden_from_recipe_viewers', 'create:cardboard_package_12x12')
-
 	event.remove('create:stone_types/deepslate', 'minecraft:deepslate')
 	event.remove('create:stone_types/dripstone', 'minecraft:dripstone_block')
 	event.remove('create:stone_types/blackstone', 'minecraft:blackstone')

kubejs/server_scripts/create_factory_logistics/tags.js

@@ -3,4 +3,5 @@
 
 function registerCreateFactoryLogisticsItemTags(event) {
 	event.add('c:hidden_from_recipe_viewers', 'create_factory_logistics:incomplete_fluid_mechanism')
+    event.add('tfg:create_logistics_jar', 'create_factory_logistics:copper_jar_package_8x8')
 }

kubejs/server_scripts/gregtech/recipes.js

@@ -1737,8 +1737,15 @@ const registerGTCEURecipes = (event) => {
 
 	// Change
 
-	event.remove({ id: 'gtceu:large_boiler/minecraft_ladder' })
-	event.remove({ id: 'gtceu:steam_boiler/minecraft_ladder' })
-	event.remove({ id: 'gtceu:large_boiler/gtceu_wood_frame' })
-	event.remove({ id: 'gtceu:steam_boiler/gtceu_wood_frame' })
+	// The 9x buff for large boiler recipes above does not apply to this for some reason, so it gets 3x duration for an effective 1/3 reduction instead
+
+	event.forEachRecipe({ id: /gtceu:large_boiler\/(minecraft_ladder|gtceu_wood_frame)/ }, recipe => {
+            var newDuration = recipe.get("duration")
+            recipe.set("duration", newDuration*3)
+        })
+
+	event.forEachRecipe({ id: /gtceu:steam_boiler\/(minecraft_ladder|gtceu_wood_frame)/ }, recipe => {
+            var newDuration = recipe.get("duration")
+            recipe.set("duration", newDuration/3)
+        })
 }