From 5f6089dd60fdfd985363e76ba8b0fd62abda2c11 Mon Sep 17 00:00:00 2001 From: thederpysockdude123 Date: Sat, 13 Dec 2025 11:21:49 -0700 Subject: [PATCH 1/4] added tfc:foods tag to a whole bunch of tfg foods (#2405) * Update items.food.js Signed-off-by: thederpysockdude123 * Update items.food.js Signed-off-by: thederpysockdude123 --------- Signed-off-by: thederpysockdude123 Co-authored-by: Redeix --- kubejs/startup_scripts/tfg/items.food.js | 32 +++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/tfg/items.food.js b/kubejs/startup_scripts/tfg/items.food.js index 3c9cdbe03..5ecfb2b58 100644 --- a/kubejs/startup_scripts/tfg/items.food.js +++ b/kubejs/startup_scripts/tfg/items.food.js @@ -92,6 +92,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_moon_rabbit') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -99,6 +100,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_moon_rabbit') .texture('tfg:item/food/cooked_moon_rabbit') .food(food => food.hunger(4).saturation(8)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -108,6 +110,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_glacian_mutton') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -115,6 +118,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_glacian_mutton') .texture('tfg:item/food/cooked_glacian_mutton') .food(food => food.hunger(5).saturation(8)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -124,6 +128,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_sniffer_beef') .food(food => food.hunger(3).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -131,6 +136,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_sniffer_beef') .texture('tfg:item/food/cooked_sniffer_beef') .food(food => food.hunger(8).saturation(9)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -140,6 +146,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_wraptor') .food(food => food.hunger(3).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -147,6 +154,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_wraptor') .texture('tfg:item/food/cooked_wraptor') .food(food => food.hunger(6).saturation(8)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -156,6 +164,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_springling_collar') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -163,6 +172,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_springling_chops') .texture('tfg:item/food/cooked_springling_collar') .food(food => food.hunger(4).saturation(4)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -172,6 +182,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_walker_steak') .food(food => food.hunger(3).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -179,6 +190,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_walker_steak') .texture('tfg:item/food/cooked_walker_steak') .food(food => food.hunger(8).saturation(10)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -188,6 +200,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_glider_wings') .food(food => food.hunger(1).saturation(1) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -195,6 +208,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_glider_wings') .texture('tfg:item/food/cooked_glider_wings') .food(food => food.hunger(2).saturation(3)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -204,6 +218,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_whole_soarer') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -211,6 +226,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_whole_soarer') .texture('tfg:item/food/cooked_whole_soarer') .food(food => food.hunger(6).saturation(6)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -220,6 +236,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_crusher_meat') .food(food => food.hunger(3).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -227,6 +244,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_crusher_meat') .texture('tfg:item/food/cooked_crusher_meat') .food(food => food.hunger(5).saturation(6)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -236,6 +254,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_goober_meat') .food(food => food.hunger(1).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -243,6 +262,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_goober_meat') .texture('tfg:item/food/cooked_goober_meat') .food(food => food.hunger(3).saturation(9)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -252,6 +272,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_stackatick_chunks') .food(food => food.hunger(1).saturation(1) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -263,6 +284,7 @@ function registerTFGFoodItems(event) { .eaten(ctx => { ctx.player.give('minecraft:stick') })) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -273,6 +295,7 @@ function registerTFGFoodItems(event) { .eaten(ctx => { ctx.player.give('minecraft:stick') })) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -282,6 +305,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_cruncher_ribs') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -289,6 +313,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_cruncher_ribs') .texture('tfg:item/food/cooked_cruncher_ribs') .food(food => food.hunger(10).saturation(14)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -298,6 +323,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_surfer_steak') .food(food => food.hunger(2).saturation(2) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -305,6 +331,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_surfer_steak') .texture('tfg:item/food/cooked_surfer_steak') .food(food => food.hunger(8).saturation(8)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -314,6 +341,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/raw_long_pig_filet') .food(food => food.hunger(2).saturation(1) .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') @@ -321,6 +349,7 @@ function registerTFGFoodItems(event) { .translationKey('item.tfg.food.cooked_long_pig_filet') .texture('tfg:item/food/cooked_long_pig_filet') .food(food => food.hunger(4).saturation(2)) + .tag('tfc:foods') .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') @@ -438,7 +467,8 @@ function registerTFGFoodItems(event) { .tag('tfc:foods/usable_in_jam_sandwich_2') .tag('tfc:foods/usable_in_sandwich') .tag('tfg:foods/usable_in_meal_bag') - .tag('tfc:foods/dairy'); + .tag('tfc:foods/dairy') + .tag('tfc:pig_food') // Oatmeal event.create('tfg:food/oatmeal') From ab0226f74d138594bb1f0cc2c55a9c94244473ae Mon Sep 17 00:00:00 2001 From: Mqrius Date: Sat, 13 Dec 2025 19:22:44 +0100 Subject: [PATCH 2/4] Don't backup DistantHorizons LODs (#2406) Exclude "DistantHorizons.sqlite" from ftbbackups2 since that's not critical data and leads to a lot of backup bloat. Signed-off-by: Mqrius --- config/ftbbackups2.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ftbbackups2.json b/config/ftbbackups2.json index fb96a0bd6..32efe057c 100644 --- a/config/ftbbackups2.json +++ b/config/ftbbackups2.json @@ -65,7 +65,7 @@ *path/ends/with.txt Any files who's path ends with *path/contains* Any files who's path contains */ - "excluded": [], + "excluded": ["DistantHorizons.sqlite"], // The dimension used when creating backup preview image, specify "all" to enable automatic detection of primary dimension (can be very slow) "preview_dimension": "minecraft:overworld" -} \ No newline at end of file +} From ea04149a6344956fe1d62a055a33915e71f1e0d0 Mon Sep 17 00:00:00 2001 From: thederpysockdude123 Date: Sat, 13 Dec 2025 11:23:25 -0700 Subject: [PATCH 3/4] updating tags of cover facades/domum ornamentum stuff to include treated wood planks (#2404) * Updated tags to include treated wood planks.js Signed-off-by: thederpysockdude123 * Updated tags to include treated wood planks.facades.js Signed-off-by: thederpysockdude123 * Update tags.facades.js Signed-off-by: thederpysockdude123 --------- Signed-off-by: thederpysockdude123 --- kubejs/server_scripts/domum_ornamentum/tags.js | 1 + kubejs/server_scripts/tfg/machines/tags.facades.js | 1 + 2 files changed, 2 insertions(+) diff --git a/kubejs/server_scripts/domum_ornamentum/tags.js b/kubejs/server_scripts/domum_ornamentum/tags.js index 5a85f632a..9d793dc97 100644 --- a/kubejs/server_scripts/domum_ornamentum/tags.js +++ b/kubejs/server_scripts/domum_ornamentum/tags.js @@ -95,6 +95,7 @@ function registerDomumOrnamentumBlockTags(event) { "gtceu:dark_concrete_windmill_b", "gtceu:small_dark_concrete_bricks", "gtceu:square_dark_concrete_bricks", + "gtceu:treated_wood_planks", //createdeco blocks "createdeco:dean_bricks", "createdeco:short_dean_bricks", diff --git a/kubejs/server_scripts/tfg/machines/tags.facades.js b/kubejs/server_scripts/tfg/machines/tags.facades.js index 33a59ebbd..97fd56085 100644 --- a/kubejs/server_scripts/tfg/machines/tags.facades.js +++ b/kubejs/server_scripts/tfg/machines/tags.facades.js @@ -72,6 +72,7 @@ function registerTFGFacadeWhitelistItemTags(event) { 'gtceu:laminated_glass', 'gtceu:plascrete', 'gtceu:cleanroom_glass', + 'gtceu:treated_wood_planks', //gtceu casing 'gtceu:steam_machine_casing', From c40ffcc0bfedda4c404c9d015687a24a1cccc102 Mon Sep 17 00:00:00 2001 From: Mqrius Date: Sat, 13 Dec 2025 21:14:22 +0100 Subject: [PATCH 4/4] Move boiled eggs to food processor to deconflict with cooked egg, fix pickled egg recipe name typo (#2407) * Move boiled eggs to food processor to deconflict with cooked egg Signed-off-by: Mqrius * Move boiled_egg recipe, fix pickled egg recipe name Signed-off-by: Mqrius --------- Signed-off-by: Mqrius --- kubejs/server_scripts/tfg/food/recipes.food.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/tfg/food/recipes.food.js b/kubejs/server_scripts/tfg/food/recipes.food.js index d20037ae2..1210e0ab4 100644 --- a/kubejs/server_scripts/tfg/food/recipes.food.js +++ b/kubejs/server_scripts/tfg/food/recipes.food.js @@ -575,8 +575,6 @@ function registerTFGFoodRecipes(event) { cookingRecipe("baked_potato", "tfc:food/potato", "tfc:food/baked_potato") - cookingRecipe("boiled_egg", "#firmalife:foods/raw_eggs", "tfc:food/boiled_egg", "#tfg:clean_water 200") - cookingRecipe("cooked_rice", "tfc:food/rice_grain", "tfc:food/cooked_rice", "#tfg:clean_water 200") processorRecipe("pasta_tomato_sauce", 60, 8, { @@ -667,6 +665,14 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('tfg:food/calorie_paste').copyOldestFood().addTrait('tfg:freeze_dried') }) + processorRecipe("boiled_egg", 200, 16, { + circuit: 1, + itemInputs: ["#firmalife:foods/raw_eggs"], + fluidInputs: ["#tfg:clean_water 200"], + itemOutputs: ["tfc:food/boiled_egg"], + itemOutputProvider: TFC.isp.of("tfc:food/boiled_egg").copyFood() + }) + //Kelp cookingRecipe("dried_kelp_a", "tfc:plant/winged_kelp", "tfc:food/dried_kelp") cookingRecipe("dried_kelp_b", "tfc:plant/leafy_kelp", "tfc:food/dried_kelp") @@ -922,7 +928,7 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('4x firmalife:food/bacon').copyFood() }) - processorRecipe("picked_egg", 1000, 8, { + processorRecipe("pickled_egg", 1000, 8, { circuit: 1, itemInputs: ['minecraft:clay_ball', 'tfc:powder/wood_ash', 'tfc:powder/salt', 'tfc:food/boiled_egg'], itemOutputs: ['firmalife:food/pickled_egg'],