From bb9c0b608c9f6beb55f968613480c2cee9517988 Mon Sep 17 00:00:00 2001 From: Redeix Date: Wed, 10 Dec 2025 01:53:28 -0600 Subject: [PATCH 1/3] 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s7Io-U3d7QMBTeZ5~hh_uaDnQO+vBrLAfA@XMW|HL|{`Ze0EO(o$k)^)F&(!eTs z+u@bTLeDITD)CDPuT;O!iA(!9ukzWP?-u?2{l|B$6LczAxB6;V-Tw3Y&z0?78hYLI z{rmSKu8smMymxcVzWlD;c3Zb{o^V^Db9`J}2B+ehmp^~byqJ;l{+I;AC!2J$*@-;| zKif}mc$I-17#9|ES)dH{zRL z?*A6fGAEC(8<`TJCNTmHJ`t)VGuUouISxt7IcegLd|v-Y*y;9@SM&d$ zdScFZX;=L6FwMs^_0|>{pX{9Xt!U8{Nw@N>IaU97-yC>mKY#zxH%G1;-Y(UNRr*xR zw0iCn7k^jJS9%W;nHbvr_IhPy@YKH5T^4uq{M!0DzrrGp;?)Q5o_@`+TZp0J;{#8x znTh8l-WwThoWJ&}Yl!dR+?iY6>d6q^|y`RYUvlHa+{(i#3w7&Y*cK%iBssb&4Ek72-ec|A^s=fcs z9lO7I*L9Y@yRi3^@tXPnwIp3`e|ciF(V?#F%ALkdn|OJt+=B^%j&UK{)SY+I+y5yjNq zUBWw3rj*PN%bhEEEOUn1wA6{GpZ+RIEuL%8v0|ETjJnF)iN8bE-|9JE(yMb?ZTjhN zFMpk4+oW`=^JUk@b7vle1Rb9%!Ek!hk1xkUm6B9k`ebIPPd_c#!njFEb=hle-eqZB zp0da1vi~&;x8Lh0Q!1d^_*1#~Nl|2z!W*F%ZzWzRD{$Q{oOSvsD3kWd%y6G5dgy?E z8P69%0oR9)^=5`|b<_Txkm*wTF3cct+O}2tr^wZsO$|O)zJZs2{J6yAwtJ^GW5e=e zML+Uf_RV;7@IAvzAE~t~Hh%c1I?L_%N0vJ$j`!N|Z10rb#p2lUc-Nf0HH{}Pa;D9n z=jUP5)$rb}BG2P;LE+sA1{{U5)49|2jSVeNeR-4O^k^c>rAb{6%}#1$Mmb8mPTZI! z)*3S}d-Z7!4woZyD*pXY=3J54x$NPjb0@Y$Gj38!jx_t})b})dH3!p?!1l-LeF7|s zmwtSFzb`T`+~AJdB#lOe2Q7ZrV_+jAwWe^*Z9EQQ(|3f3SPKP_S)%t zxnQD-AY;Lt4~;t;mSoI0D>j$UV^YH!51tIkZSTSYL?j>T*YDc&xISTTmeCyl;*YDf zE-vU2|G7kE>Z;iEsM#-0cgD+el;3+l)#&9#$5qes7Pz_A=sWp(URiA>e7SYsoC%EQ z?yp*~UB>GtPc>KOJM-9SX0J?g+nbgpvhtbUKG0vAC$+lPl2JM2T-@=CzDBCOU*<8r z`>XbKY3ZD0tzjn~N7%XP9{HXemVfPckrRv1=W@OHXSdvJSL)tZR$X~g@?x&?$?o>z zMd@`v=XzgRzgB%~dgY3h|K|%jZ=by9#nTp^fK%xgqWRX#+x0wUt*OYJnC^DW@U2GAoVOJ=#RLZ$EbZ@lFZ%Y zc1{MF>axBdyTdc}d6sSE%#&Iz5+tR&-gjs0%USQ77!uyys54UKeSAhp_%dr){}W$nvc3?ekxUjQaA_ znpb{5yF9I{r-#?ZvQgp9yl-!tUwLwV@%#PF@v8yj&p&IqPDjsXNj!0(!A+pebM1+{ ztHZXIKJx3)=r}T0B63P(c8&s<($vk@Z^qnH;ZfSMknxa$*QmsgjGZ`UaCO`X`g fRc(>R2m7DpM;O~~ysKwmU|{fc^>bP0l+XkKbW{Yv literal 0 HcmV?d00001 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') From 99a55f9855f9d58d51093d488820acbbb588add0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 10 Dec 2025 09:20:05 +0000 Subject: [PATCH 2/3] Update CHANGELOG.md Signed-off-by: Pyritie --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c90bd6963..79b2e1cb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## Unreleased ### Changes - Doubled the durability of all space suits @Pyritie +- Added "too cold to handle" and "too light to handle" for cold things and lighter-than-air things. Uses the same mechanic as tongs. Lighter-than-air things can also be negated with diving suit boots or carrying something Very Heavy in your inventory, and all effects (including "too hot to handle") are negated by super tanks/chests, cells, and space suits, but *not* drums or buckets. @Pyritie +- Added debuff effects for all medical conditions, so you're immediately notified when carrying something hazardous instead of wondering why you have Hunger II. @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 From ba7c2b3403b1fff9085ebf9a70c371a9430964c9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 10 Dec 2025 09:23:17 +0000 Subject: [PATCH 3/3] Update CHANGELOG.md Signed-off-by: Pyritie --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79b2e1cb5..58961ca28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Doubled the durability of all space suits @Pyritie - Added "too cold to handle" and "too light to handle" for cold things and lighter-than-air things. Uses the same mechanic as tongs. Lighter-than-air things can also be negated with diving suit boots or carrying something Very Heavy in your inventory, and all effects (including "too hot to handle") are negated by super tanks/chests, cells, and space suits, but *not* drums or buckets. @Pyritie - Added debuff effects for all medical conditions, so you're immediately notified when carrying something hazardous instead of wondering why you have Hunger II. @Pyritie +- The hazard effect that previously instantly killed you (which did not spawn a corpse) now gives you Wither III instead. @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