From bb9c0b608c9f6beb55f968613480c2cee9517988 Mon Sep 17 00:00:00 2001 From: Redeix Date: Wed, 10 Dec 2025 01:53:28 -0600 Subject: [PATCH] A bunch of random stuff (#2365) --- CHANGELOG.md | 2 ++ .../tfg/textures/block/casings/test_casing.png | Bin 0 -> 586 bytes .../block/casings/test_casing.png.mcmeta | 5 +++++ .../textures/block/casings/test_casing_ctm.png | Bin 0 -> 2102 bytes kubejs/server_scripts/tfg/food/tags.food.js | 3 ++- .../startup_scripts/computer_craft/constants.js | 2 +- kubejs/startup_scripts/tfc/constants.js | 2 +- kubejs/startup_scripts/tfg/blocks.casings.js | 6 +++++- kubejs/startup_scripts/tfg/items.food.js | 4 ++-- 9 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 kubejs/assets/tfg/textures/block/casings/test_casing.png create mode 100644 kubejs/assets/tfg/textures/block/casings/test_casing.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/test_casing_ctm.png 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 0000000000000000000000000000000000000000..ebe3418a751f48b72b27e4af676e6e53fe7dbe16 GIT binary patch literal 586 zcmV-Q0=4~#P)sIaIUM>ihjS(zs`2M zrB&B8@9*yvML`e*4c%-u^!t6b+bwyX6NX_!UtV5l2_dZM`T3dAXk_ok7y$A-XEvK* zjKT9flv0FYNL|<81g95)27%{!0EA&^O{Zc?DTEMB0)Xr5YpSXuiXvRs1t16lE-o&Z zOeUmh`hS9|swm5nG)*bXlCQ5XilX4@>51FhTkh`eEXiL9eBUQcQ-UC1x7*Qfx5@LI zD2iAt7C4TBF^2JY{7tZ0t=Mcf7-ML++kAX{P?n`Nuh(m`EJFyv<>jRv@q9i<2!RvF z@$r1V>-8EbCClX!*LA6?3g7ohl7wEb*T{(z$MJEwT%xr`N=Xz&e13kSwI<6lq?GLU zdy1mqa5&KEbQ(Ev0c(DEcp#2rdoPLt-}h~gk|eQtIpw4UAf-fW&3HVfEK8=-DTBcP ztu;xKa5x;uvdre>q@L&fCYVmAD5V$2P&*1;E?eo6UwX=DWa80;LqQ z*$l040XBmc{bDf*#%-G|`cI?`*YpTQ{l1my=QUz5C zZHm-JNGw=X;vzOI5lC#HOvgWB8$i zDra_RrTit|o|xUWzu7R51KX!^bseW+lPPBV^!|-9lh4gz)O6Zrivca)r?;1u@xT8v zMs)uwZ+~!u*%JqnIu0TL+GdN3|2RV& zM2L#S(bryLK+6+&KB}BaOdD$}6!*;}bsTm3ZQEk$%0)VHj39~}dhRIMY>qGtx&(SV z2KoqyiUh!bmQPH3i#ht*ODHK7KXj5E1APQUsoS5;<`UE1Vh%lb6j@gK2>^`FPvSLf z3j2l;WwHB$T#muv5+D5SU5w4@t^@$`d-f7|4q0soL444k%~B{1a^c(=%!dAW0$#($ zZP*xVH5|hxDEZiy#YcaCkLkHto}E9Kka!e`^F*&0-ZSKh2!5L3P4GBUBhFDC@I^M0pw^)z0+OloKhwe&Q;zJXUSo^FC?|sYLU`1$r-8Lsw8>wa8C5h-~Q~6T&rJAYRhXOrBcZmvFo)YFM2s4 z16{Lvndg7}6GGeM>YxA0Mr160sx0jy-I3m41Mh_re4|4t$%(_adHTAtHIsN z>j1kF0C@4>NlKYv&KU19GO?en)kRcI!)=+g?ri}i1jOwG4xM_HrMKV1tCvwy-NDrR z=CdabFn)OIu>@W`c#?BpoJMzQC~|*J6!*=LAKm-p1Ol&n+P4p?CnXSs{W0^ zZ_jpuI7AU;w(FgCnVA>Hcii*d(=bhb_}?YMAVOB89a_F)GCuRIUHi?3i5$csWxI+K zxMY-cpH^+18OCXtCYEK9%jNoXWpkY{h^Uq=Tqh)*k^5Ay+KkV1jV#M1m&^9)`pO2f zBFc&Bim}ej;8aq_ofrViviS7IRU%>}M2;MoCzs0+gaNW5C8p~u4W?#_Ngc=Nkh80aG)3f*y<%jFW&-eQg%m`9Nn!oW{<4D=BYMd3kz zHZkojX8y<=iX!(D02s?Xg&X-4)qJvmOgc?b)A;z(0!F*JD*=F~#&Y;>M825f!S4X+ zOd74IvGDOFnnwHa1l-8SjXVsui5t2EL5SnJoV|R3$7;Dk=s zT#!*TiDt{BLkCHaP$U^GGr---7K*HJ=th%DxlPk>kt7iTaGdagxqzf-n9UZQ4oH%K ztVj%K8Mf|LP!t*AFMqnS<9}eiYBHQpbMdPx(V&VK`J^P3s$FMVo9N4lUmpl}-tUz% z>Cr)|=Wd`zMSL$pO-aj@y8moOd0V7n-UdPc*G9``lo&xUuCiSItoTi0V$m3W(MlHnmV^(k0`*K1A67zR1 zU*_6IJ*h3|0aRuviRX5rQCjy4P64_b^^zqonzt4>*y^9MeYu!-Z!5aoMLQX&8KFHjEoIDIe{STp7!m7>PZRoPW$#j^)LbX{H+ShTbl%7$k2dB z5Qa&u$la?}wRPf7j3|i2ofuh^S!-+{3L=%W*V$a&Bn%?7p#j1mO6uNK)2ntDw { 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')