From 5c356b0f46ddbf59215083b23032b892f4bd6dff Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Sat, 28 Jun 2025 05:14:05 -0500 Subject: [PATCH] Some small stuff (#1225) * - Lots of ui updates. And a couple fixes. * - New button textures. - Fixed campfire loot table. - Made anvil rod recipes easier. - Added assembler recipes for multiblock tank parts. * - Added assembler recipes for multiblock tank parts. * - Updated Changelog --------- Co-authored-by: Pyritie --- CHANGELOG.md | 4 ++ kubejs/assets/tfg/textures/gui/button.png | Bin 227 -> 218 bytes .../assets/tfg/textures/gui/button_20x20.png | Bin 178 -> 152 bytes .../assets/tfg/textures/gui/button_98x20.png | Bin 219 -> 192 bytes .../assets/tfg/textures/gui/button_hover.gif | Bin 8582 -> 6698 bytes .../assets/tfg/textures/gui/button_hover.png | Bin 223 -> 211 bytes .../tfg/textures/gui/button_hover_20x20.png | Bin 178 -> 152 bytes .../tfg/textures/gui/button_hover_98x20.gif | Bin 6548 -> 4870 bytes .../tfg/textures/gui/button_hover_98x20.png | Bin 212 -> 188 bytes .../tfg/textures/gui/curseforge_logo.png | Bin 693 -> 666 bytes .../textures/gui/curseforge_logo_hovered.png | Bin 707 -> 707 bytes .../assets/tfg/textures/gui/discord_logo.png | Bin 772 -> 750 bytes .../tfg/textures/gui/discord_logo_hovered.png | Bin 807 -> 779 bytes .../assets/tfg/textures/gui/github_logo.png | Bin 685 -> 730 bytes .../tfg/textures/gui/github_logo_hovered.png | Bin 713 -> 727 bytes .../assets/tfg/textures/gui/modrinth_logo.png | Bin 850 -> 822 bytes .../textures/gui/modrinth_logo_hovered.png | Bin 794 -> 856 bytes kubejs/server_scripts/gregtech/recipes.js | 37 ++++++++++++++++++ .../server_scripts/tfc/recipes.materials.js | 2 +- kubejs/server_scripts/tfg/loot_tables.js | 8 ++++ 20 files changed, 50 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2bbbc98e..2bd8dc4f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - New electric refrigerator with different tiers. You can craft the old one into this new one, but please take your food out of it before upgrading otherwise it will be lost! @ofoxsmith - Added many new advanced food items including freeze-dried fruit, calorie paste, and meal bags. @Redeix - Quest updates for all of the above. @TomPlop +- Main UI overhaul and curseforge branding updated @Redeix ### Minor changes - Balance changes for water wheels and glowstone blocks @Pyritie - Added straws for the blaze burners so now you can pump liquid fuels into them (#1204) @34y34y34y34y34y34y34y34y34y @@ -32,6 +33,9 @@ - Updated texture for aqueous accumulator (#1168) @Redeix - Kaolin Klayzes now also drop blood lilies @Pyritie - Crushing wheels need a machine hull to craft now @Pyritie +- Anvil rod recipes are easier now (#1225) @Redeix +- Minecraft campfires now drop themselves (RIP lost bluesteel) (#1225) @Redeix +- Wooden multiblock tank increased to 1000000mB, and steel multiblock tank increased to 8000000mB @Redeix ### Bug fixes - Fixed a mud hut structure that had deprecated zinc ingots @Pyritie - The electric greenhouse now also allows loose rocks and plants inside, since TFC spawns them on any grass block @Pyritie diff --git a/kubejs/assets/tfg/textures/gui/button.png b/kubejs/assets/tfg/textures/gui/button.png index bed12e5f363b67affcc2545373577d1c94b57b67..72ebc6fc49a450eed5b98b36f576670ff40b92d4 100644 GIT binary patch delta 169 zcmaFNc#Cm@WqpsQi(^Pem3=e@!$w$l$>{IYS)<>Yzf6u?z3SPjto8gGF3NQY34ZHcUH_GVfq}u()z4*}Q$iB} DZ!Jbd delta 178 zcmcb`_?U5mW&Ko77srr{#<#aN3N|^2xL#zx#jYDTi8Y6Ri-Y5rO>BKUR=J5WxSWCi(`mIZ}Ob|SFVdQ I&MBb@05|+1L;wH) delta 128 zcmbQixQTIsWo3$|i(`mI@7pUIc@G$HupBsk%Eaff=pKIK2ci*e=XOsxHAz&n*ID%E z?&&|Y7j`(jx1BKIn$*Nq%My&QN1e&xUb)rDg@NIz_P0CJzHi%Q}goU!{dZ@i9N`kEOV=P@uaFnGH9xvX)VSPc^eFPTrL(*`5V4qdD29kiB{G#*jzl@{U7Z=H7zFM z*T%Q)DoX=2cg^Dn{CRSI@6JuJ#)4g2zYEti3aD`;HW46>9*fcRj19WOed-A3^Q(N{ W$`|QxWME)m;P7)V?fd07;BTrL`x*G>rLRgGnQ*C>|J))RLlBV1+rqlsm4 z8G;f26t`V-%FcCEx~cwr4adPdf4|>l-}`+*=)INKxXRfXmQ=6cc>dPh|Ns1xo?MPj ziXIv)oUIBA1yn?uTAU^Xa0np;Keo&$c6;~H>$mdRwNn=LD>7yFBwqC9c*A7vB%SB? TtZ6+10|SGntDnm{r-UW|QYc0_ diff --git a/kubejs/assets/tfg/textures/gui/button_hover.gif b/kubejs/assets/tfg/textures/gui/button_hover.gif index 739a9ce187156a838aceaff76adfcc7bd11e5f27..054545d739ee009e709355bbba945aab84c08825 100644 GIT binary patch literal 6698 zcmZ?wbhEHbJi#Es@R0!oZoYi~>(?&^1_s5SES#($`aidyYe=xOV}PrXo&hr>0|SE& zNFhiI15-;&-^$Z(`4`XGa;tl`;DX=$ZI3*rJ?mWd>eRM%5(V#lu7B%&p0eiqKYpH7 z6^9mm>_`!ud}dkjjvBA!AxqbEoz1eoxb}PZo2KI_b9eOkZ9n&FTlJB;)Av8_l#Sj0 zdjHS8^0&XM{}8drkSHr%;UU2w@PR{8)6z3Cv$AvM%AF@~zWm7<#TkHbE8Jm?3=9mn zZry@-hH2IjBu7f3I#Qz`-eLc@-siv0l^c3+e`!0i=p)DE(xwy3K69G>wK=omYu8)f z>08%)=eEmbyt?7%pS#m8zS$OhxAgS$sHd~~&ToF;wD-ThYB9TqhlOdxj2Yz;%U^UH zzwzBd^Lw*LC+D#lCo9daalTSjU@*w4>YBA`*Qr~tesM`_TYE=mpXMU$^o4kxzFz9e z=icYP?j5s<+CDO~ujdF? zt;jq5JTlYJ@BH-p_Iv*IAKm_#J%U4Zg>%M^ik2CRPe}ZH+`+6_+39SV+DAq{SMNT3TbrA(56L**i%-i>9D9-Rl37!!a(igy&zF-pH%Uf3ZSCaU+M3O}TASyTGFxVqY}u1F^MY<> z)Yoeh9&K8k{jb3~CEtwKf8pcTi?9Cadp+N%cJJP)+s!$Qrhh9BSMxZL(Gf0E#&N>p z#R`s-(=@hu>`Z^zmdSqn=F0Dq5>}P2QC#J#S}j)Hn)PkhtW}(|yrt7$i)imW{rZ-8 zj>+$Cn>SB)zxlIANr6EjHn+BSF0yy`5#iI*_y!DGzRri2WI;-?U&d#7j7&7F%@YH+;L47O74a_^G*bTey_)k&_` zAET_5Ub}TycXPL$P}^z!=XXg~%_8ZDId>kumieo#z~F%9)4aNSMELbE0l!`^ZFoE{ zZ+)eI7i0U8q&{{BG0*)=-Cy*0`5!-U&WhJ`>4i1dqxaU?-_9uSF_Sy`a?|HIeYX$E zKE1xT<@9&mDxvPS>FS5WPdrLzpJtJ9V?`5(g<8at=NX(#lIETvm6bDZZaeY9vudlV z*4C4r5wAF5$uw&^frg2!Ro{%te|1L2z(nK;m zwQ_}|*0vj-sg;_ust$X;xXHOnYW1O8H@LLBqn)CEcFp`f+x=EnR26s49`3TPsyj70 z3J&ZjegtLIJ|g_Nj-Wq#rytx`y;tfqCnzqzGphtTF8<8ftHf;gYL(>KtnKSEr?x)r zI{u{ZdJgNUQ*XX~UgNX;(7Ro8+2YS#|Gv+Ds`~ct?hzJ3H=NRUylCe*c3dLz`45du z%g!%TIVx}Nbgex4((>1|&S#4}R#~w~?fMmUWfhxuwuS;j0jNlQ{hM1x$Hpfnr>1Al z8Xg{O1!FV3%F$donkz?hC6NPKqs7H& YaWPt4j20K8#RZLK3`PrB0tKu!0JhNtn*aa+ literal 8582 zcmZ?wbhEHbJi#Es@R0!oJUl$w+S(pGc%b-`g_D(mfkE*-mL9+ z(zkK*b?4sS__IfE@%5awyLkKc?|<55>%RZ>_w_da`CqVGRH%DYaHMzas1Or9z;W|f zuu)`YW#`P5J5Szx`IA#h%gXB(XF%7iRl82zdbNu)fPsNHf5AP`#K6D+36op5ZasML z0OUC^W?sXw<<38YQ=Y5$TD(5H_*H^NUrMGQqw*T(-TMl3&X?rguUPlK=Kb#$hc1R} z-ntV@icaQOWgj|v`p256^*3_#yi#^gY}t0sJCCY zICOn@e3tDf$lH3Y-05#L)<&(5kexC^G+_6G4Lf$Q)*pYdWmf3BdDlPu*xFlr`uz`; zzgg#h|2MA=t8Hj)V`>U*Y454%^y}`ORM77`aq^7hsXo(Z&WoJwJ$L?+poN}`m#*@6 zW~?z;y)n#5a|@EU4<0&vW7eX)ITrJJ@)s^% zowU?!`Lvoh+tq@7{m-`04YPukRSX{rvU&&)dt=-kbojv8{6{e;4Hbk_$_SK(R z&QRXhc)Os`a-Dbi%XQ{;>*suqFVoJcsj6?Yt834WY07G8?wV-S+1}Vab;6`sx>MSw z%`9o1J$r8b{J!c%izh8z*)x6Kg4Ju>CoZ3{V)LxE727xN+%<8}!u6X9Rvm0ReEjHv z!V@R!QyF*U9Lv3MvBFLB&b|8&9zJ^fBu5Zt8@@wqv^6H$B+S686Gudg<%;>4@Gv?UNUKl#BWx*1Y z#Vdn+bLaQ3F3Nfws*Jtp|!~yOLrdC-gCNqUFGr<=XBB;uk5?f zeCgl~H_iJfVf60(hnEZ=zkL1n{m0K=(qSMdf@N$&kO3tsax?lcGY*IO!pj8I{Cun?aR-r5|cOm^j*LC;MX{5+w;E?NCf3%s z2RAYWRkpOccTDu@>M5JrA3153!<6dY>9K9I7iY&e)%7i$uw;$l-1e2LX0F{*6|^90 zW6YwhYu7jL*u8r1mi;RZM(;T?``G+>nQ4rt*PNYpz9_=&*6llYQIgU_hS$)1_lAmP z@?}EdQ*n;ZW_6V{bcP%~rwruf%%p2OflO{gdQWe|x z?}l@h8Rz=j+aG+7O_=xoe}iRZQhjYkV@Ic6b4_wtT6$F1-(^E1fWF z&f=VTtuxz~tcqJUclyMV)tf@smQUEQd8gmj8S@wII$*VD!TS9Nj|b$nted}q@x%q= z!v)*jHLu;ci5fl+7+yfjrF+y&Jx2+K&brsm_cz;1D^5^)(+8@kQ+_ouW%TaIh+2PR z&9$#G40|nB6?*Hc*zj;=qLZ(B`ggzuJ;^ z^W2`vQ!H9b%Q~mdo)gp8W;JQ<;;GXoOl(-Ps(YFBqSYI!*DhSSaa-Z$oUPmUr0v|r z&A9h)%lsK-nl6wU>%zrLm#M`L0%CaBo0 z8cj~4$!Rn>frn7wLk**OVl+>T=84ffF*pZ8M@y&C(rL7G8ZDhhODCGmHH{Xrqebj! Q5j$GMjux>atcbM+06z44EC2ui diff --git a/kubejs/assets/tfg/textures/gui/button_hover.png b/kubejs/assets/tfg/textures/gui/button_hover.png index 775ab38f93152b3dc7c9d4be7faee2be030a03d5..b0fd3ee963b9b9bc25f1eac9a0ac8d2bb96687c6 100644 GIT binary patch delta 162 zcmcc5c$sm6Wqqrsi(^Pe% zxIM?%GpxZs_q=sq*;BOw^IDng>U~EU<8$`!Kk#3OLxhEiwb8**AwU2Z)35PMVa!(c wJ3+IH*X>|$oNU)ORi#>b(l@Dw$=?_b3yTYjh+dh-z`(%Z>FVdQ&MBb@06ri)d;kCd delta 174 zcmcc2c%N~CW&K1?7srr{#<#aN@*Y+YXuHUq>g9hRMXts3jLMP@nTZ;^u1)(CSGnlN z?DdP!SSI%vGXDr$W$|G9wOci7+H3Exzs0nDV{Y`8Yf4Is=D8OhIDN~>_uj$#!W=3r zOq`7lP6`tQure#yFIDd^V!v}t{g#tuU-G>A`;GplN~f+WKUj83Sk6*TIjAAJ5WxSWCi(`mIZ}Okd&-s~|nGe^qy<%_^Q#mZ5Y5Ml(_4xlYSENet7zl)F`Y*u>b_*xV%AgA`7lJ;uRsQ(NFn!U7v11_lNOPgg&e IbxsLQ0NwQ^B>(^b delta 128 zcmbQixQTIsWo3$|i(`mI@7pUIc@G$HupBskN^Z?#NgKw=m8?~28`Tx3s%pD(wQD`v zJ^hEaV)^komjwmV)TEMI611mdKI;Vst03S6pJOBUy diff --git a/kubejs/assets/tfg/textures/gui/button_hover_98x20.gif b/kubejs/assets/tfg/textures/gui/button_hover_98x20.gif index c5940fbcc793e08b20843920f9ee3c9e72d717d5..d502372fb97a5106fed9a00a4764b5ac6a7a4c48 100644 GIT binary patch literal 4870 zcmZ?wbhEHbOkxmW_{abPH($R0_3IY{1B2pE7EV?W{h!; zq!6Tqfho47Z{_K?{EI`}8oD>%+w+^hElDimap$sEk?Y=Z_viXt|CsZ9SI7H*{Vy5Y zEfqg<7%NTJRQ)Vj- zR=6YJHa0RaFx#l0TjOo>O=8XPXP3 zfP#)z=kX_>Dw(YohDu*TcW5M|dbPC@k1<;>L>~9Fm%ro{=|+aM==UE>jj*qPcC}y5;-gUar!WI#DI| zUdndUQ$6$htJ9A#xH?@kh}2e_zEJHWC$Cp;$OO^py-CZLtvV}dr?@%x#?M*T`c8hj zZFVlw`S#rRvg;SRr?-7!e_>+&;wxL(i)kl9zddAs*%7?+@OH<{o9Qz&Uq*IRYU~i7 zb^J%+RRJyjH~z5<=-ia z+@qJO`LV37?VP(Bdx!cDw}|u^Z512~B93W%f8qX8BSCY*%AF@~zWm84rDf%{ij!=I zF3UKuX~yoUuY9gMaNlQCzy0t2!MA#rzWg05T=9ozXmYOA?eu+Y+!gz9#@ys@+_PTU z#BHcl){8oy^JSXXzHK*OzN)&nuKv`I^>+8%znig1WPH1>n$FQWW5)~g70qTY35||KgCeTiu^|J$~@F zJ@T0LtaI5Rfr4hPP9XbCNUA`UHkehe%`IlXP`_8}qUSqp}UqZt|f+K)|fjGy)UDm|FzyR^+ zty{MqJa_e5%Q&i>}>QQ%vWF)w4)x}4YhbOalYc=8pjd;iB; ze_3?Cht9UTt$`;`UpIZ-79@5 zne(14Sd{a6pQ>O3OU~j~1@CRF^!LW zm_2X)f`#*`>6`T!zEQE9^L)lMkZ-uoD+@NTtX*_?-G6(@52ev8mHQTMQjOWvWhuK} zJ<4+Z+1DIZIZ<0r>CDh}4O{u(LwS#O^~KBuGjf;sPA>d8OK$Gn^OerUQ7Lt4Ox2D0 z&Ec)x?VVjd6MJ*p@+aj@>eH+5D402Sir<{cGZq^3OfBtSzGBgW!T`pV6E?25-ri!q zXYaoK2M!)OeB|h{!wknyoj!B+G&Oxb6T{~zne#HN*1W#4tRP2-(c?r#-KO;yUONQk z3hErHU=F{OA#-m=fU377uhr^6717zdi+ZCjzMuVRQfcD-Pdvt(Q(u1E{bb(iis;=d z*O?!^UaMTwm{if)QexIo*Ot}Y)YTtkTh!RxQa_1ldhN_f%zlis=JlH{TfSoDs?}@O zu3Nuh9mB>gTeofBN=-jb$Lhyb>s~+DrR*cb=&_+<-TN2X-1`G_4{A&G8^(V!*`qi= zU~2vb6Vt^v)?`HK#%@heDfixb>rlo$i3l^{%LUi0JboQ}zr6Bx^|9ZcRT^dW6^%`` zEv;TDn$4XBZ9X0S6S{MHCr?S7IEkBaR_2@<(?(}r&C$F$nm0%DCQ+jy@BxO=Qe(8#7%eqMOO4S| SgVsa2qb2QVNjuC+T5AApd0rg= diff --git a/kubejs/assets/tfg/textures/gui/button_hover_98x20.png b/kubejs/assets/tfg/textures/gui/button_hover_98x20.png index 3b3120dc407c9b37ca5db9d4bdc79695c55c5cd7..49e34ed327a69cef6de4e434d824ac8fbed798c9 100644 GIT binary patch delta 139 zcmcb@xQB6qWqqEfi(^Pc>)VTpdACvQre90mC`21=*fMeE zq%Eyp7r(l7obvZGdv@#Xyv~3%weuhFw-`8b2ooSQ%%0tvbVc>(<^?`6;u-?U^A7&3 SVPIfj@O1TaVOi&t&;$VdwKlE* delta 163 zcmdnPc!hC-Wqq5ci(^Pc>)V?fc@HS?xLh@>TNM@xsE9PR zI86xP5aM!lQuNS(3m%b9IyZCYas9XE+oM+7wQFiKSKJ`&&MfP(BP4Aq0|Ntt Mr>mdKI;Vst0O(&oQ2+n{ diff --git a/kubejs/assets/tfg/textures/gui/curseforge_logo.png b/kubejs/assets/tfg/textures/gui/curseforge_logo.png index 6cf5699c7312badd0209b219ecc05d828ef5fd91..86829dad259664b08eb24dd079811beee5854951 100644 GIT binary patch delta 655 zcmdnWI*V1YGr-TCmrII^fq{Y7)59f*fq_8*ggMw47#NDHs=iEAl&JUdba4!cXgxc9 zWA<$akz@O{IYqYIncyq%N8Uq#r_1POvSO^$^Ea&ma~#?pT?}sP$eAm(YncdBW8YN~ z>ja)lGtO#Oye{Zgm~9oYe9k++OD8=;>L&|4|6Tk3?(Xk8MWwaPKAN{g85_!VokepU zdgp9mocH(VY^LlYmz*(I&U7DZx5~wR|9^a)U1)al>Q`R&$v0mHR@q3r z2!HpUdHeRQ((`)VIyCpPZ;0Od?(lPc&44wGe{S7T;b{6&VQ|2N=kxcw-P}I@ep7sR z?UiE?xi*i#-9oz8M&jGl-d(J|5AMeCUp6?heDB^vw+cm`p6^z1^m+OB@%i`j>I+uX zOGT(~>NP+3dHiqPzc;({boX%aG|2P+X?A8%mAoK2JvUOqU9h5e%E8hA!8w`YHw87> zlDs$@Iv+I{@;fM6?|Yr~uxN|Wjs=^f0>q9@VLHIlQ@Jhmse@q>-*uPhRkxI;^d6nU z)U))!rwEr1%*hq6N-XvW?OD|rBXf>>a=KC;Lp^)kjV{ZWy1YfScfq5mYf=Rg-npl>-WKf9C_R38 zd+wik=l3p8^;=$2znI74gN@Wi4c8sdyr!icJkh{Y-V&z6w>0Hf`Sf^}o@E&3joHez2eHkP{E&{2|W3 Pz`)??>gTe~DWM4fHXJAh delta 683 zcmbQmx|LP2Gr-TCmrII^fq{Y7)59f*fq_8@ggMw47#OVFxerZLl&DYlba4!cXgxb) zW8NbJiR1qpg}vhzCkOGYG$)^YqBQZrSLZ91v(N4;slS-Fotr_T*R3!7@lXzn z2Fw26#ivrjVCBa6DMNuZG(rWfnuR?t}H5s*Q#Jxm)5wvbIJgDb(-VZd^|3I diff --git a/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png b/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png index 6fc6e7fb4f4f3c27606b3059d92dd207c3bc9048..da36fc2d8ffe7c0bf27dda004af1811d0a2e6726 100644 GIT binary patch delta 690 zcmX@idYDzQGr-TCmrII^fq{Y7)59f*fq_8*ggMw47#NDHs=iEAl&?QJ-9G!agTyg; z(cL0f9$s5;R9-jN=XmyG>O#3h(hq z{_yB%%3jwa!B-AixmwNrw{+TPpZ1bV?{|K`R~_#+>-=+uhUv4j`J=C#ySR~sA$}XD z=t`xCom+}aVyu3=dC<kl4$%KM^w>p=cFmlM$6W+;VV4>~gnLFcaL))^o#Y*j+cLXJ7q(!whzY0IKVV)){ zhiC5DnQS3m^|r3lgtcY7y)J%}=xX|yv~Yda)+7I)cQLT@hY9+O_eUVKp_Q*M9#&e^>BWy(ohUWJj{7wUvQ zxZlw>-I;&-;oMD2KmXo+ez)Y@`}Y|c{xM1vXxioFVdQ&MBb@0AwFG Ay#N3J delta 690 zcmX@idYDzQGr-TCmrII^fq{Y7)59f*fq_8@ggMw47#OVFxerZLl&?QKV}Je?1CitV z9p`?yqT$=V<&}$esM9G2)?J&PeCuK@>6k0I)p)6FgW9)JJ%+5Elb#z`uS40HBW{*_MN@bb97 z4#N&ZzUNw-?e^9fPV+cnw(!-T`Va5^ZnfI`{{th#gU}s^e`jqr-PsXSuA=uj_An0+y8wOoVRw}D);qk7^i#oDb z@HjnH-naTZ^tLb+m`GyOFnQs z>^sU~z)|@%beZZkrUh>sj@dFiaNtpp<1?(xu8)&WND;Uw!6IzX?UTj97~|NLE>Lv) z%DOGrPDB}Qoaiva?g$6S+9$W4@B29CnAE~T{`2N$MYXYB+_yiK)!$$7L9)?+!?JqS z8D$oecbSJXnhiLnojG;NezhU*eRuV)Er~r!n`GOTN(wXF**`OUONE8YszQ|uLfXC6 zA2=RL)=zfalEbchyV2U?A>XB@GKK{&E2AD=?dzDa?da9cN1|Jm_n!)7SIrfWbn^L_ zBq(#W$3)4QLHz5}{S7CMGySXzQoK{oWcjD6u4})ob-0Aa`}LWD!9NApn%y_Oc6sK_ usG64OH~&vOyIY;icERN@z`&pY!W?W23=G9pRbM75O4Kj#ba4!cXgwQl zpCOzmQ!DP`q28X5>CBbp5p-fwnWu=M=gUiqk}<4HoxDp=tE_u8%XHGx9i9s>qzG7< zgt<&UTE^+*JZquiv}rzitxm;!<@cX{|GPUo@cf>S z5cm)oa!B`tvH2f?e|1JCjhvqK4F{*s?4GfLWr~G${DW&JzT9QLzC`1Gx3*-(=T%2+ zW3=DS_U=Cvlly-2@3N&e$JS2UJZa)o@%5?9i+-F=7xZCmY?fD6dB#NcZ;R@{PYZf;Yj#?b{fW>997GLuYz8x$vk4|;8 z9z1zq^72Opz4^D_r!tGoI{G=>q1Tda*YW*R)Q;pbGkgp=TJxzU^Nxzdq>7%$rh=Iu z$L)07`ILp>wM6QNBqu9sUmv`-7>98-t|F$@X<>9BLj10X|jk&HX zj@Z}!c{F3Uv8-P)+Z(oR6I2Df-Exhu?M^k1TpY&G;@zqs>>ui*<<}bd_TS^>HB4I$ zMmWsM6n?x{Z!WKhPl$-xW1qQ{Ue^! x*yl)nBjbs4H4Pgr#DCRu>YR&=_ubF9e3tbygGXj-7#J8BJYD@<);T3K0RS9bP3Hgr delta 762 zcmaFI+QO#T8Q|y6%O%Cdz`(%k>ERN@z`&pc!W?W23=CH8+=nJAO4M)jba4!cXgxb) zV|J9I%<=vHs}i0C81T2px%Q;#xoSANu&W>ETX-eqM8dR7y7di{FC1<17VTg^CbuBF`M!D#|^1?1> zKi;J!`<}(jpD%NFX1H`q`K-I9t(T;7=XHP5V-9Ls^4WAsyc;9K^!xb}Dnt&rNig_? z8VjwmU-2NT;LYpLzSm0jwY^!_*=z9Z;D6ut-?uA%?06Ktey;M~ha!6)ZY`GYm)civ z7r5#CCLM!gUmSj9FgW~vY?@lg^vS`9;i>hV`)n7~mV4~%|52(}T~Zq}EmfD@^Lcj1 zCf&8?@>kz0=E|sa8jz{>SzA`a1)El;ao~-;uPbYjYhvKi2r%VrjDt6n? z-0@}|+wm8%5qkX`2UV+ftg!jm({awg>Ylu^|I9t^0djJOw~23@66~ycGuD%>r11;; zeou*ce;278H2TK3sk`sc>?fPb{3V%F}TGQnc8W>mXs0q1$ zOF_g(ZTgJ*c-0qd#S+Gk-UmOuf9a{U)NKpvy&=~=%P+mQ+y7LR-rLLJZJqBc{4ZR* zG4HLu-Q`8RM%JR*^Bg|Pwtdf^=i$4zlanFdZ~pFg@q2!~+GYRygCv8&pKrJ1TMnN& z*SL+lLtWeckhtA?iR2k9r@a}S7P|6H3O+3HnW3;#-|Px^pH2W*!}izTe`g6uy(r`I zyH|B<<$+j*IR;|gndJ*6#akDu?6~&K`@DzRbP0l+XkK!XjZ+ diff --git a/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png b/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png index 34149a6a2a4eeea9d4d211d1b2a4ea4713f1b326..6d4f20faa9c9591718e4f635f7e63f9edee02745 100644 GIT binary patch delta 769 zcmZ3^*3G8a8Q|y6%O%Cdz`(%k>ERN@z`&pY!W?W23=G9pRbM75O4RT5ba4!cXgwNk zn-Lr+VXM!gSo$J}E4Sl9gFa`<$!R>7{%q-XHri$3(bD$l+QC4lgGUwhoJ^WGXETY4 zNJooE3A{-N_?2O7V#B@EJC>{UiPe+4(|`Yt>sGT3{&8>Tear9F_y5MN`}p=a14BWT zoWcyHXX)*13@pnuS2+c2EKaVkE3+tkn10otg`sIx`|{_LHG8s>*Dxk4t+LzkQ*MEM z$@|*s>(8o|Y>@f3M&$JO$3<)m4;)|WeJ{vOZWoz$cwU>!hMH5kS2j(W7_mxETHxq> zo2~>kmYV;TE;X7BGX)r0O1-zF@%2Y7xvQhKdf^+!U7sgD*uOZ)Pa!@_Q(HZ>pvEmAem@anFxX?k%;2)9d)}RgMBmo*iOr@b}F zy6Lz7`|aMspLLDl^#czt$}i>o zc!R+~CsdtZUi_G+Q?XEg(H}DKJzJ8cc zA6t<+$ACTgwYK7cAFE7sE8={XDf&G0JLGw{?TERN@z`&pc!W?W23=CH8+=nJAO4Q%w#Go4?!-kSVkWk*Cn(~}s1gIsY%A1}-k`6A>$ zE4o=+(^v4Zsgu`fH(`Tg4Q<=L1SnoP;{0p-X6wzHrE@&xS&XdTpRfP?{QUfzp=PUP z84j$sUE0m~;LXf+ObqiJEyNGjTd(jCII%zc%Faze)`8DAZ%$-5aOv}+k8i%{@ZPp~ z>2cx@$8=w=y!)*S88tnOLrrJRf#lI!IdZy61$D4yg~19^MsTNLYQ%QRhwL zeRhUfXM8kX9ewS~)Bhv4a@)yOYqKhsiPYc~;q_AIU6nfAo9bO+w3j&DU@W>R!jO=aCb@Pl^NXje zR?Zha`036em6lJ3xn@c3e%t2$=fdew;dW8S1k08qB|INFi{}*x77DvH|DLP=^_rC8 zqY3bQ88#cbd*;r#h4*I%P;)BK}uE1P!yd~(sjZYsAq!vr)W2^{@}ZB`wS-^>3uyXK_Tf0%g1#ww#R$lMs;}jtQTN(@X0CAaO1x9Ipybb zkS?=pb~&EEU#cIP9lrWfUDNB!*R|BFpq5iK3ze(@v6y?uL94W9}N zGk6_k4gUS@Z~3xsw|@6CG~BnJ_NH~hjC(I<7;-L>J$P@EOYw4z3#(P7mv${~c=1&I zSpCD=meQ2Fla@Ye`jC{|8p@&F@aE?44ioni2lAd7#dP%-mTlskq2!bw_i$sv{l4Ff z(wv7@R$dOyyZ6)N!t{bBr~B@5`gL+03(~u<`(6J&u|9H6^qRzI{-q2I3=E#GelF{r G5}E)dW%)DGr-TCmrII^fq{Y7)59f*fq_8*ggMw47#NDHs=iEAl&J6Vba4!cXgxc9 zeg16+k>mF3y1JOS7DX6+kWWY|x;H-{BvVR?qsK&ZNzl@)s{toZxE(WRouYGO#s3CJ zr@kNj1|2069UD(}sZ}npJH78l-&~ig`!1cdFDZXte7^j>ZS?-Sc9Bz+(UA=4`8g%- z>3i1g*;U28VcxWU8(sO+&y#P}pO?R1_H5$p=P`NnJ{M1Z@$elR!~O4qP9L_^oMBut z<=Ta-H@C&=y?OX9jg=*SU)}nzE168B1e{*nmQnD%e2?M!_3I2Ri8pSgA7@_n$Rf=| zD%7zmd-KgVZ!hoUTrGU0&_;qm;q<1%3`?e5E8ER_pisuRO%JygKC(adC~PuZ-C{@eXb-!?jUb>`mQ zx$fnZplP}Fw|DAo+;T?c@h-hU5zfQRb6<&a=H5ORdtG<+qHRh`7KO$)Tnk=c9zRKi zNuf(=+2zbg<#}GeyDlv#c+REZDYURZd46&QSA)=!9n+*ghg2pNn5}Vh54QSH;`v|j z<@0@V46htlYVQBeX|wE{rqcXnyMBGydHsNWy>xtc`TOO+>h7!E-}cmc`eB=Z(4!X| fKh5=K_{XSctkLkTo+pxlfq}u()z4*}Q$iB}6?{l_ delta 674 zcmcb`x|UV3Gr-TCmrII^fq{Y7)59f*fq_8@ggMw47#OVFxerZLl&FvQba4!cXgxc_ zw(pgJNGrd;zssUc)-DqdEqdrKvT{>TPGgsr>h1*I1#cQ`cPw1g;nE(o#Npi>u9GHv z9-W*hJSRS_%~D7xqVN6jjq7V4AN>52g+Yd|{eOI2#OtqB3=H*lf_Ii3tlR&;Lpb&C zR#UltcZPl{1%BSuA*M2V!$H?I`#cMx=P;Anha$U;k|?3e6wv!W(!TY23ra#~~YJ^m-^S2;e3uG=E{__l0ib^6jN&sJW$F8X<= zM%RWIz1__>5_U0!IvN~X^H=)2An#&!17-oIdadSc28LdNFoENRaau-~B^f08k4yBr zg|)x?ZrvjAV2=2*MSO?279}<$b!Ieg^yFaFOw|_8a-0(6F^OgK%{ND7ZC6YYa^k3% zm(KcyZF$A@^qj(!AP>!h zmh8`M&Q~<$ZIq9#d9SwF=~WF##dU2JFL5|&5&R<_nKWw zUP0>1m#ZiD1#@0pF diff --git a/kubejs/assets/tfg/textures/gui/github_logo_hovered.png b/kubejs/assets/tfg/textures/gui/github_logo_hovered.png index 4d5c929eae5a7a70ee12379b9e34c03bb6019f1b..b549c5be65b68c69eee551b7362168034865a654 100644 GIT binary patch delta 717 zcmX@fdYx6VGr-TCmrII^fq{Y7)59f*fq_8*ggMw47#NDHs=iEAl&J6Yba4!cXgxYz zF@JM_NSpjV9nsLKzMcX%)MiK;{N@eb%DpP9Xw|l&{R@3{yY3sf7)ne!r8MgfYv-&P z4}~8KEf8nRy}XxGbK&!Qp9|jYd@i@e<~-w#yzTbp<&$3Tk~*-z+A8#=y|n2+2(DOy1&2w&*R74bLai6sh`K3G5hQ?wheLXO&g9MKYnLh?jZvfg|0;h6?Uzg zUd*lNbih)s-?X8UvBZW2+3<{?=)iL?st7A%#V4If8_~F;Ds6(Oamp!sLX27$c zKBj)@6mJFL4Xd6Ooy^**HP`%VjoC~eh7CI0r#I!?|1RkCg*jt($%-cxlAH((AB>zRfKJQ(qeIWmKddDUmWsasqhVMb@2Xq$~2p-T?&|B5w z#G&gsX|>{$9e4BEGiRO3x*^q=t*}XF_08}(*1q+(&v|LIT+rxCylj#^`Bczt)*ZLs zsx(~sDd}*L_3E!CrX>Cw43}R{`B<^0quCtasotDjAtxBM&6BH|p?nsBA`4$v=~Y`P zwk&&Hr5CNUvi_N3@+>t+fg8OXC9A?!uaw%F`)+>Ib!*myu5Y!BQRR(3`&2x08WcDx zDl0Xsk3_%RzU+$Tp`Gj=la5Tgz45%+9##j=pg+?(D_0jU(sx*?;+f%X6j`xL#opr_ z!?xRRBctzyY}HtK?z>&jKF%dUnoQdq`4c8+g|6G%8!%VALwb7U0+Tuh)7#O$THIe4lnN8Kg-msG z^(%}}yt#Vy+|&GQ)sbgw=H0w0`}WD_&%zDgzkmN9zb~@;XcE(h=jwB2n^aa;|DNbE z=k@x`g6+2%C#Y~Tta}~z)WwUlzCnPg;rMZP2D90|mdlMz_r0I)kj$`TN=qV#gNSQy zakk*ai3SJv?AteO|J0zp4kiaaR;=lr{YN6Wc-`ZV9q)hdoipG5didOxE2X?Iml*iW zdw#un$GX!mOOov7PhO^Z`l(RE+p=h~dzLshX*qilf?eoxVmvf1245p4OjtO(_@2v0VP@E9-$l_cp^XW}ebF p{5@ zq;k^LeOcm`oZHX-{ktczu)m*wO3;zQ7;jhU7D1Q84trfioTl8~9K>~dTQA$xAQ9J# z+FWZD*1Z;T72JIDjgr-^6;p(kip+a1>Db1QAt|0Mz_MdqchIV7LYk`O<>f7j9ujS- z`va#ww%EF@{*%^(;+JYS3g>J(o{`nI<(Aabg9=U@U5ga@k{?;b0@ocXJyf+NeDUi=nRJko!M%R{sN`ri|x_Nx1wypFpZyTic1 Oz~JfX=d#Wzp$P!DM?x6@ diff --git a/kubejs/assets/tfg/textures/gui/modrinth_logo.png b/kubejs/assets/tfg/textures/gui/modrinth_logo.png index 2e82d6ab264cd5d13c5a58fbdb368c229d1e4b45..43546223c2d31465662ccafea8017813fe671d88 100644 GIT binary patch delta 814 zcmcb_wvA1(Gr-TCmrII^fq{Y7)59f*fq_8*ggMw47#NDHs=iEA6t8D`;pyTS6481z zd}H2i1A$tdUz}_{-b0;OJ|`7kyHJu!KSi0Qws&UapLM*VWThj!!F#MG#U;_nN*c^RY~ zj|sh0y6AC$J)enB>HA3mjcV>rmB!oCm00I7Uu$9b5aRvj*cVymr@O9%YFc@ie6Me0 zsHu&Rv}5$Q$v*7Q65!az^+LMuEkjz=QY}XYo zRkM%)H{(+qoR^;BJ0P$?`_z}PRTs*{m)xn3OOIVGm^StCS@zuExW+djAl}6}|C{lG?Tk0(%`ehAkr3b8`Za`2vnVLAvHNUX$+d02;Yb~e6fel;Bn9N&?>W{yRf7`Qgoj&{j_wRrFDq>*x!ERTw X;IvI#YX$=Y1B0ilp9{-6r-UW|#CB|5 delta 842 zcmdnSc8N`~Gr-TCmrII^fq{Y7)59f*fq_8@ggMw47#OVFxerZL6t8Dy@pN$viD*4L zV{g}O2Z7`N?V92bUTuubX{yb7$9iWOhfW>qeuoduGZOgvUcb@W+WUY*v-s;&BexSA z+w<1h-LW{D6>hwHalf)ax`Rj5dK3G<&y!P2^`>((Bd}ujY0su=3`|z=^}1uv z+k1Ha(F6Bp8)!8I@T>gHTzca1Ge(Aj-S3Q_UtHgD)_a1%3bh6NjW&655)JQTG(+Xm zxhm%suV7lixlF9ZDS+YC9rNF_TfHW1X@Ge?^|xt`5;7#`g8+5FHzeOXlwDAPQl4zB#qAuu_C%-k?!U558cXjyOE__vc`1|cDweJzpCu}E&rc0XwP*>jbeOVp zq4C>KhqN4~dR=1SiV=;RI9XvY%f@%RYdZJ2*1z$b%cML-pqe3nlh)RgT2oibuI3Wm zy#8pN%d@!*J`GFeZ&=CL5tp^Bjk`M~D06bw#Akul^Uq&Z__nOn_jLPb#Tjq%AKILJ zlA`K+YU&b}K$XSW&utm>@9{3J$!1Q{JzxBfr8PL(_FUDIAFLgH^DbX`Get{F-8A{4 z;UVjL(hjTYrTBe!9m=>A$r1i({hy+_nNN-z<=oBNF4a=zzPso4ujS9g%r&M7^Ed@` ztg5k)S>-t6=B@1uU(D3~dFbjQ^XXFx5*ZsrE|@<&q~5gSTt}CIPe;@fsdU#vUO$Co zm7knw=E@3DaeOrAhQS8&jpx&zPx@`mUXbB^cmCMV^6~cdNZMgmR-}?8;^$hHK6YhSoJ8#Rtz`)??>gTe~DWM4f DMk0OF diff --git a/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png b/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png index 60fd47f07cb2a3e41c2c5822ac89f8d23b07af45..eb1e848e27ad6385f085fe5eff8f56faf8ef3576 100644 GIT binary patch delta 848 zcmbQmc7si^Gr-TCmrII^fq{Y7)59f*fq_8*ggMw47#NDHs=iEA6t8FI@^o90av&l%gRd40-eOdF~nV@%M=^ z)KvIihFukSci`r2vM1V-1B%gko3 z`+B>R=WV~rhSHB8lT#TUJbJFWp(pO0b$1d-m>H6Q(xC>s&m#k$>keg8GQZ_Lo)S+oRqkEv25sTJ6CnfI(KQ^9foZe7x ztjORa-T8NhUE+eE>$j#Qv3Gv66KFgi_l|ddgXZ~JpM@DiCNAvy(eWxuJMl)^x(*k{ zSrc~tDAa8C(sTDZ!!$R;b?V)ZH8tMa4Pe$DLe_ zOn+}4*m28j%AC!F}Yl(T%e|P_PUWj+vIba0$0rV?Aj_n zxb@!mJeRXXZpEx!n|7;OG{*8C*!P;TqQhwaws-sHHgr@TxWz0qt9yldnmt36VB^{! zE0=Wfgq7*k&zmlkVZHfMz=pnW>s^AXv+7#C=PtUmMs-dVW8>M1wZASmPBfpDuNOGw zodv6>q|I`VZvI>Alk4l2KCx|B$c^dKMm9Eck&A{?Yic5=lR)*Uncb*QWoD5 zlYV55{GEswYh@Vwj&Yw-W&LBy%^+X7%=ecr8qSC+3@`Dfs3mcrYrpy*G_kGxMsupKEugB>8ViHEpH`sX z8~i(P+56wirZDBR)(bPvS21{~Q8l~#f7pX{EKEvwmRyjv*w;7nz}wHfWwnzy5A4|b zjwP?#c8C6=%j?shiKPEI`9+QY;@8(vx$mz1fB(9ocsm=zA6A8XYdvF%qb4&jFfe$! L`njxgN@xNA9&v}R delta 785 zcmcb?Hj7QMGr-TCmrII^fq{Y7)59f*fq_8@ggMw47#OVFxerZL6t8DGO_q4)w@w=bx9$-`7{qv$eU$%&<>)|G$HbPu`v`*JY?E z;&?u7%euNaITfL(c~Pe>KJU-0FXzAd)8y^8)!(PL&gY*hFRUV&u=3084f*f)FY)jV zRypUkoT1_KpG5&@raJNm-DfEYmQ{02v5jM7*meE*p`E`Uw#;px9HZ&njUz=@=!p=!FoM&@lNdqp@b~Qb8gE8U0$}7pKh^K_#5JQ_9DmT>ILw(^Z69XpZx6b0nOTR4H?ULLh@~KU?yoc9FAai1nV7Dos4ll*(g~^)bU*5M z_87-r*2E>Ndia_JfBO~Qe9HH41=Fp_HDR;sC#};9b@Ds3@Aw-t2DXNJz1-vpE4$d1 z9u?wF+I_pP`*-NeGaW9hD_jp|as>A5=e2fzll0WNE9z3yf}|y{Wf_dO&I`@=RB()W z_e6NYSIt=<tO(Be*V{8K;!cOlOtA$XzV>CQ%^wPLmL@hN z$-Suda5@u1<~KA;}TF4D`F@=$9f`$gqly5gO6 zofE$(&Yz*Mrq7FMV}eKfuO!{|D{m@UW#tPL{jrsKed|I%dd-K61<@wXOBxv*;;$Z4 zcu{)rQb90-uYe)P*RQW{Ot|jG;*wO-%~>G4`rE(d=}d}(3GG`ZJe>cp<#V{D!trl$ t3SVlUym)fcaUYkB&%6KY-z(QMDh4LChpL*bW?*1o@O1TaS?83{1OOg~V5|TD diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 9110847b1..7efc5bccc 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1197,4 +1197,41 @@ const registerGTCEURecipes = (event) => { .duration(7 * 20) .EUt(60) //#endregion + + //#region Multiblock Tanks + + event.recipes.gtceu.assembler('tfg:assembler/wood_wall') + .itemInputs('4x #forge:treated_wood', ChemicalHelper.get(TagPrefix.plate, GTMaterials.Copper, 1)) + .itemOutputs('gtceu:wood_wall') + .circuit(4) + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.assembler('tfg:assembler/wooden_multiblock_tank') + .itemInputs('gtceu:wood_wall', ChemicalHelper.get(TagPrefix.ring, GTMaterials.Copper, 2)) + .itemOutputs('gtceu:wooden_multiblock_tank') + .circuit(4) + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.assembler('tfg:assembler/wooden_tank_valve') + .itemInputs('gtceu:wood_wall', ChemicalHelper.get(TagPrefix.ring, GTMaterials.Copper, 1), ChemicalHelper.get(TagPrefix.rotor, GTMaterials.Copper, 1)) + .itemOutputs('gtceu:wooden_tank_valve') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.assembler('tfg:assembler/steel_multiblock_tank') + .itemInputs('gtceu:solid_machine_casing', ChemicalHelper.get(TagPrefix.ring, GTMaterials.Steel, 2)) + .itemOutputs('gtceu:steel_multiblock_tank') + .circuit(4) + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.assembler('tfg:assembler/steel_tank_valve') + .itemInputs('gtceu:solid_machine_casing', ChemicalHelper.get(TagPrefix.ring, GTMaterials.Steel, 1), ChemicalHelper.get(TagPrefix.rotor, GTMaterials.Steel, 1)) + .itemOutputs('gtceu:steel_tank_valve') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + + //#endregion } diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 80f4d9112..243e60f28 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -454,7 +454,7 @@ function registerTFCMaterialsRecipes(event) { .id(`tfc:heating/metal/${material.getName()}_rod`) // Слиток -> 2 Стержня - event.recipes.tfc.anvil(rodItem.withCount(2), ingotItem, ['bend_last', 'draw_second_last', 'draw_third_last']) + event.recipes.tfc.anvil(rodItem.withCount(2), ingotItem, ['draw_last']) .tier(tfcProperty.getTier()) .id(`tfc:anvil/${material.getName()}_rod`) diff --git a/kubejs/server_scripts/tfg/loot_tables.js b/kubejs/server_scripts/tfg/loot_tables.js index f9644fbba..2cd1aedb2 100644 --- a/kubejs/server_scripts/tfg/loot_tables.js +++ b/kubejs/server_scripts/tfg/loot_tables.js @@ -80,4 +80,12 @@ function registerTFGLoots(event) { ); }) }); + + //#region Blocks + + event.addBlockLootModifier('minecraft:campfire') + .removeLoot(Ingredient.all) + .addLoot('minecraft:campfire') + + //#endregion }; \ No newline at end of file