diff --git a/CHANGELOG.md b/CHANGELOG.md index be3799ba0..c90bd6963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ - Doubled the durability of all space suits @Pyritie ### Bug fixes - Fixed aged sake, vodka, and whiskey losing their buff effects, but for real this time @Pyritie +- Fixed fries and cheese curds not being able to be put on burgers. @Redeix +- Fixed sliced brinza missing the proper cheese tags. @Redeix ### Translation updates ## [0.11.10] - 9-12-2025 diff --git a/kubejs/assets/tfg/textures/block/casings/test_casing.png b/kubejs/assets/tfg/textures/block/casings/test_casing.png new file mode 100644 index 000000000..ebe3418a7 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/test_casing.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/test_casing.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/test_casing.png.mcmeta new file mode 100644 index 000000000..620b7685a --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/test_casing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/test_casing_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/test_casing_ctm.png b/kubejs/assets/tfg/textures/block/casings/test_casing_ctm.png new file mode 100644 index 000000000..76241a5fa Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/test_casing_ctm.png differ diff --git a/kubejs/server_scripts/tfg/food/tags.food.js b/kubejs/server_scripts/tfg/food/tags.food.js index 02aa366af..9e5d65464 100644 --- a/kubejs/server_scripts/tfg/food/tags.food.js +++ b/kubejs/server_scripts/tfg/food/tags.food.js @@ -175,7 +175,8 @@ function registerTFGFoodItemTags(event) { const cheeses = [ '#firmalife:foods/cheeses', 'tfg:food/slice_of_cheese', - 'firmalife:food/shredded_cheese' + 'firmalife:food/shredded_cheese', + '#tfc_gurman:foods/brinza' ]; cheeses.forEach(item => { event.add('tfg:foods/cheeses', item); diff --git a/kubejs/startup_scripts/computer_craft/constants.js b/kubejs/startup_scripts/computer_craft/constants.js index a345baf46..e255a52d1 100644 --- a/kubejs/startup_scripts/computer_craft/constants.js +++ b/kubejs/startup_scripts/computer_craft/constants.js @@ -17,5 +17,5 @@ global.COMPUTER_CRAFT_DISCS = [ '{Color:8349260}', '{Color:5744206}', '{Color:13388876}', - '{Color:1118481}', + '{Color:1118481}' ] \ No newline at end of file diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index b9ac3f4c6..eab52bc3e 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -836,7 +836,7 @@ global.TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([ { input: "5x minecraft:clay_ball", output: "10x rnr:unfired_roof_tile", name: "roof_tile" }, { input: "5x minecraft:clay_ball", output: "firmalife:oven_top", name: "oven_top" }, { input: "5x minecraft:clay_ball", output: "firmalife:oven_chimney", name: "oven_chimney" }, - { input: "5x minecraft:clay_ball", output: "firmalife:oven_bottom", name: "oven_bottom" }, + { input: "5x minecraft:clay_ball", output: "firmalife:oven_bottom", name: "oven_bottom" } ]); global.TFC_FIRE_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([ diff --git a/kubejs/startup_scripts/tfg/blocks.casings.js b/kubejs/startup_scripts/tfg/blocks.casings.js index b11f03bdd..0faab3877 100644 --- a/kubejs/startup_scripts/tfg/blocks.casings.js +++ b/kubejs/startup_scripts/tfg/blocks.casings.js @@ -116,6 +116,10 @@ function registerTFGCasingBlocks(event) { .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_brown') + event.create('tfg:casings/test_casing') + .soundType('copper') + .hardness(5) + .resistance(6) + .tagBoth('c:hidden_from_recipe_viewers') - } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/items.food.js b/kubejs/startup_scripts/tfg/items.food.js index 2ff882c35..e07c5fdfc 100644 --- a/kubejs/startup_scripts/tfg/items.food.js +++ b/kubejs/startup_scripts/tfg/items.food.js @@ -358,7 +358,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/cooked_beer_battered_cheese_curds') .food(food => food.hunger(3).saturation(2)) .tag('tfc:foods') - .tag('tfc:foods/usable_in_burgers'); + .tag('tfg:foods/usable_in_burgers'); // French Fries event.create('tfg:food/raw_fries') @@ -372,7 +372,7 @@ function registerTFGFoodItems(event) { .texture('tfg:item/food/cooked_fries') .food(food => food.hunger(3).saturation(2)) .tag('tfc:foods') - .tag('tfc:foods/usable_in_burgers'); + .tag('tfg:foods/usable_in_burgers'); // Poutine event.create('tfg:food/poutine')