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_E<2s~Z=T-G@yGywo_ CEk;BD delta 178 zcmcb`_?U5mW&Ko77srr{#<#aN3N|^2xL#zx#jYDTi8Y6Ri-Y5rO>BKUR=J5WxSWCi(`mIZ}Ob|S?YA3l%S)2h=ajk4u3S?FWH+6K;Y@>=d#Wzp$Pyt C{31jE delta 128 zcmV-`0Du3O0kQ#*IeBDBL_t(IjqTL24Ztu61i;72G)&_aybm+r6)VSPc^eFPTrL(*`5V4qdD29kiB{G#*jzl@{U7Z=H7zFM z*T%Q)DoX=2cg^Dn{CRSI@6JuJ#)4g2zYEti3aD`;HW46>9*fcRj19WOed-A3^Q(N{ U$`|QxWB>vVPgg&ebxsLQ02l^1qW}N^ delta 170 zcmX@Wc$;y8Wqq%wi(^Pc>)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? StZ6+15O})!xvX7|yKy=&MHo;3v7UreeYD+=fG}{8y>|(8mSySn%Xx8j%3YxR)8VMM+ znV@*tqE!(uHI|qdX=;k1X1f-GUCj%K<|+w+mlkJdw%XZI_m5`!gEMpHoH;XR=6SyN zdw=IU=U{Lg3e$lO2 z{dy@f9C|XAi-iI{{SyRpMBxG>NYt#Ns%EJ|3nqYfzh(Ug>?b{-OeXtV#+cpk4kYY- zNQV=LJZtojy7ssYSja0%17{SJ9-AyGP=Pm3xwmr1X~R2N6(t(TmSaW_u4yM9Gw%=a z{U67Q2MB#^#=Yy$yo7JQMEn56Vv(EinVE6WLV0Ramj>ym`58+EH)b}ITpof45pckI zBALeK30h=>Ix}l$v`FI&NC{cbnK&NSM8H7=r!$f~<|QDAYnzPFrbjYw{5TsdJeaw&a~fp%vo z#j4*W2Sb^a8193({SvhczDpE?94izx%EJ{Vj&`KV{Uoj80=OK8?+4S!rhP0?Q7qdk z$WFIaAa}|}d-$dnE zj801;`Z7p)s_=Q$`oZR&8<;VMe7ZXd_D<7hsPSg{KBAJqZ#a%Q2tizN`ovXx3nPt?b3A+1GU-i)B zEju^>9(?T7+1z(^Z_mS2JiDoH@tso%q_&>P8k*4=&qtq}Sj9|ivB%2O3et>%_d6Xq zlHE~i`AtQVhivp}q?&?mK91VCtv)}p_rYXdbuT$oSZdnUROgBhS;b_AarcVwsyJ8v z>-ZkLb_p0m#eFZW;uJZ61|9v~R?;vut1&5&>VnZg zvjR840zye#m=nJX7fNzulk0JEDVS$fTqo-?bEXG*1!-wn6WJIUkwAtd-h!N@ksl?l zfqMeqbDU{Z#ymXB=JY(vx^p{0Xe9>E)KX)zYR}dyD)3o5lP!ZhSR1jjEF$A{AFZjE zA&FYp(lVr0mG~Ccy%gk{9%`3pZhK^`uGC=g$R%A~VK?PxK#fh%z=78e5h&`b3=m0L zwViZVfzmOl{TwXMZGn|QN9g34`b0Xw0Vif6RXG8%S>x_|ASy8}r^MX+zXIo@ed-#( z{_i@)Fk*%g`_OA)!yGfrF~c1D*xpbLU1{h_LsuHQa-JWw3~^zI3qxEO;=&LYALx&P KAz{)%XZd3Y_~IXrqiD9{CCcrZ|3=Z z&-=XJ`Hsgicjtp)U7$aM9)L{4)6h2Pefj| zv?9aw(p8E*Zx||4y-M4sf2eZxXq`ghLAy`D(($SehN=j%=8qaA_!PevtY zb83{`qcf`(Z+zh5HD=*YD&(tr#_p*s{Ed44FJ0e@NH>c4j>*{Am=TLf-1D(bXfB(0 z2I)B_&^pid^X{E}pL#yZ5BxWwn_36A8%TiZk>W-4;yV5l5-8@?)UL|-Zm3I4OMCB% zFjz7Iwf8!&lo@J~!b!izDOn1}5k;F*pmkpa&a7x|Q*W(roJYfP_)M7FB?5`;9g#$# zGfrjEn0fj8sF;ExdSOO!IVpr)QH2WubE}03M{Fe0x_Vi|Rk=c`Qfsuj#wI1GxvjmU zv#YyD4zk!f+0vKDhR*8lAL@(Sls#*deSfn5m3EVC`%KHox%WlEk`udG1+V+74Ydlz z4s7SNtT1SyWcdC{Lk^~Qapm2o(F5xnPN>f@xJ-gsdJvvSL1z1rbC__NFC(`gob8j( zDLKjYE-tMMC_l!#%>UF4jCK%6KR;q4`ybiOEv;?sI#5StsCZ5lj-K%-?rqsV9QR5}O6JV^2<6ckp(7CDzt zE|v2H=Pn%-ci ze=J^ncX`1G3*v5s)jB0Spm1dOyk&%?qFBbTW`@iz->yADJW9p(RfCeKY2)y?gJSQb z8L?BUq-ZG=VGBj4Uc#$Es`pdGNm>qvK-iQ9U^*LNnT zzWFb#Z$S&sVLg5_wUvgN_#s9E4z3eU++p-SgRX4Q!^EgEK70J>E8g!xymr6wmzzSw zO?dGoxw`9`T_ku&H<)pw+2|$x3yh40ngKm{wEXzV%IezPt;BTm2Qe9=cCKu86}M5p z`;VKLx>@r`+lxzki#jNl0z_}lVboW_j+&Ntx~CoHXO{S3;dQINlKST5GrL>|)?1Te zv2kG-EHN<6EFc-5>5;|oAyE))+DT^NCoEJ>{%Hc27ZaMEN-d{X3jbbAtl@J+vXp?b zXlY1AgGiF0Pz$uO#w*RIG;Q3D(vqkMaIdgGZy^4J``GxzS1(xUYtZaw-OX)bCV%;3 ze2~|yK5Dd983cRZ-X5^M+|-JqT=iaSnm_I6Jet@$kKi>$jo7NsF^sL~H1*ktTl4`7 z$++C`p$MLhyKnS)zqlZucez^%u!r4HfrIm% zxIM?%GpxZs_q=sq*;BOw^IDng>U~EU<8$`!Kk#3OLxhEiwb8**AwU2Z)35PMVa!(c uJ3+IH*X>|$oNU)ORi#>b(l@Dw$=?_b3yTYjh+dh-00f?{elF{r5}E)$AUk{j 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)C)n42az%+Jh8Mo;}9Fa8q00Ou_;iAqF7uboFyt=akR{ E0NwQ^B>(^b delta 128 zcmV-`0Du3O0kQ#*IeBDBL_t(IjqTL24Ztu61i;729<1XTJOPt=1$rj2Cn1$3D@6*2 zD&o7B_$wiI$DGp<5N0MCV}xKU*Is(>M@VZ8A_4#?U$N)5yxbin!2}ch8E9t5$iAgo iYv_Y5s!CCqs?rTpogI&gR-Uo|0000RbU zNDBi~Y)jwD({K3~hqyI#Z@#zZH-B4_Sj6MbWv?RFz2olB^|}5r=lQOV_y77|GPYYP ze&jG#ny#t(S+dA!xs2x5s*Oo2Z|QD%o!WHxgyGB#yZ=m#48M8%Pe1>%>u=xr(~PWe zN5E}t1loM-)-8xDnF^0UZBK*St`-s5(D&-pw%C;m8@;c8V@v*Y_Ipm<&7W;9d;$tO zTAjzAe5z!&S{O3jB=qdIb;fJUkNoX&-1+iHk7n}4H{H8#r|o~7J7ea*(8o`g?Tukj zP_Xcb$f)R;v0}%G8xb4(sXBmz%N#u50A97oTgcxPOzeT}3!h z*@mzFl=r5S$y)O-%=zN6_S(85YpxxYt=hk)Am3-7CJetXFNvLkrs;q8u@H`8ZmzKras)Yu_D>-dkz zU8@$~ z`$5fOxruBgto=&L##2S~=F6*>ikyvgy!KYz`b*xfB)*C$wV9XZ8CUPA%fC|;xkoQm z^J7_E+c|eN_73$QZV~A-+A25}L>$xj{=)sGMuO&ql{-(~eEE}8O3TV?6(`vaU6yfR z(~R9yU-?{j;J(kOe*543gKzaLefc|BxZ)4b(BxdJ+v)q*xGVPIjJe6*xM#hxiQ7=A ztQU1Y=gTy&ecNund{uRCUHz#a>+SBje>Y>3$oO_$HJzh%#*P=}E1rGvkW^++Kz8UU ztPZ7rrX97B7DeG`sE&pzd6npB${9^LqbUbh6LU0ojOLEf+%cLv=-I6uEptZ8oY698 Iz{(tJ0KsLN(f|Me literal 6548 zcmZ?wbhEHbOkxmW_{abP9v&WTZEX)8JW%|}!pRC0Q2fvBnVXoN>YJFJnVij+o|v1P zXltNnVhVyFSwGj1U}whwS0gvCT2(-CYq;>lOA?)@KY{bkYl z9y;6Vwg#R&k@IcB!KKAsv5r%BtSYM(&D(!vorsTK*XE~RCbxy|E)RHL{jRJ3WyKWP zx$nEb)ipAC6g5?PFqXIF8~670PnbAq@|3C5rcY&-dcZu)h!k@F`=H5MD>0BI@QkTY5-KgIj-rC*X z+2u2_H@7W+Qr@IKz50%VnRBQ3&6zx7p+V2o(*ETu7A+_YU|cz2<9h4uE#`an?%RLh z;Gx4ujvhPAaQxKiGiOgz)8{iWd=8Aq468M-Z!9aw5n}W>QBk*P{e{;KLAioDhboxE zFJ;Kwn-QSuEy-)OI#5M)_U@wIsEhAsf0|U9c>fcR@#fT*A9p{Qx4I&F_sVtVN3Yi^ z*EA+ow6>I(b=0+GbvJeO2iX=iHn-GIVwzq%a}u*3BeqNP$~D`dh1ZeJ&6c2;mZZrtUP`ld%wK$cJ;B}o>dxU^%adxwJoh)DVoil z1#LbZ{S&%#dM8gwoH&V_aaQJ>8q+09;eK4juzu6#En7E}?!&=b%tphE z9?g-_bT*pKM$_5g>?(}r&C$F$nm0%DCTRl)VTpdACvQre90mC`21=*fMeE zq%Eyp7r(l7obvZGdv@#Xyv~3%weuhFw-`8b2ooSQfEp%UQ9ZhOflrLMhCuSXgFkB+ PfWXt$&xK{3Q$iB}{Ixc& delta 163 zcmdnPc!hC-Wqq5ci(^Pc>)V?fc@HS?xLh@>TNM@xsE9PR zI86xP5aM!lQuNS(3m%b9IyZCYas9XE+oM+7wQFiKSKJ`&&MfP(BP4Aq0}yz+ L`njxgN@xNA=wClk 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 zcmV;A0&xAc1)2pRiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPLe@sb4 zK~z|U&6lxj+dve?zbgq8wA_$Q5d0rV5Dbbk*<&GHLg(y-5S&1U;?Yxvh-{r2x~3EY zfsWM_J75gbn9V78>u`%8n>tvhobFE2$w^dylMv_oeed17_bhUCeS=IX+7$tScP&E| zZ9t8jv;m&|`I`c3k^!z(BA2y3e;Jsa9yPuNizLy$|M>NraW=`-^$iD;+38VwJQ(O# z?(YM)x3wFdjYfzmy$7&cweG{`FDX#00sPwBBnX1^crd^;4DuTY0v=X?WvKmkp#*_lU1dMsMW#vFIVh-0tTdLY3l#Rud0*s}=@>oRh17mpV zbU3^cysCj*9L@`qXCiI@e+ORJiaA_xf85=r*>!$B0~{`QJDqIH0vIzgVPt^Ac@rud!+Zw#uDh%W0~5v> zxD0}-4hJXel%gIO11O!K;#$@ka2QK%%PQ?~yeM_Y)3p3l9fWlpDbf1?aY@H`r^ zC`GvDN|t89$bbxYgjOsLr&ZMC8W!NdbN_!+1M+xQ#`SVauB^hJ(iiPyDE>vnwHDt6 p1W=u|AhNT)_5U)kv%LiX_y@^|9v4vw_!j^G002ovPDHLkV1hOrCga0LFxl! ziC7rOLZu3n;iP0{iBz4G;|6eQ90%fDTk@YQl8C0*UP2!1b!F_ z`yl<8kHaB6&jTSO9|(mRTNdv7eJpG{?r%OnWAX5i zn4sBi1HjSPr@;V^!yym^r&qtaN(T{12BO(+V`1C)d3$>_cJ8`y+Ydvmf2&ped4ETx zQb`B#!w_T3`k18CiQ6s1I16zK007q2DgeX~sUYk_tTa`{+;w9Qr9p@mX8{0!5Q5ES za~dQvO?aM{{NZrsY_wX2A%x&}&jN^)8WGV05g~iPAb_T-@xp8bC8DXR%GPbPLj0pgBLA8C`Zc)l`CCFsfvg7PSeaM&;f)D~ie+cS9fO-%lyaNCo zP0M87%n@PJHoH64ysUTlzw)_@Qf3eyqRgatwg~2xlt*|7;G@2L3rJ*|0CO$iuL&iA zasLa1UQ}weT4Er7zOqG4v<|Dnyw@nYt{37ZT%q4b8jZ$9fL5zjvA&P|1It+<6N!2% R&Hw-a07*qoM6N<$0fKxyE`R_4 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 zcmV;j0!{tH1;Yg)iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPSf5n$S zYui8=#vc{C6x89?pv4~`AT0*PNe653l(9p|hcM2N$q)jbJVba17(&MoXvaXoi!~&% z6TC=c@Z!Z}y+y=R)WJGMI-UNdmh()9bkgs+_uhM7PMXi>0Dza9YY$u0&e5?10AIEV z6{#XvxwLb1Tsrvd;D-kQ717I=f1B%4prVC^4M?R>GxYg6zy`mseic3iOV<@X?>{}| zj%Hw>JswK~!|>Xjj(FzbA#i(}`NPv*53N>f3Scj7p3WNpfWOtM1k?1|oepM}6+EwB zTwr!`68lNL*#v;d+IT20v4Ze^sr<;Hlt`8VJPTEHPOmoC0v*KT9!#^W!4gSTEpnp)>=k zzyIMCPi#BLfp3e2p7gCqg>pcp)a!SlaK74!q{uQrX)Y7F z3@|t=LP>3y^?-(^t#cxWiQEwwm}XjqgX&kxu%0Oe2uW?tnFdr!e?3K(6Du4`O40Th zih}WCp|5JS#Q*1t00$3N6Hdx7TyP{4qmau04_8B_INY2*q9VsI0tepff2jue_8e>1 z>n^z&1EbL>X&%3Sxtk3yb|Yd6N^x1Yp)6J4--w2nLl2k3ZL+2F`@7G(8J*wX0Ra91 Y7;q^)Z@?Lz000002uVdwM6N<$f@B{zy#N3J delta 690 zcmV;j0!{tH1;Yg)iBL{Q4GJ0x0000DNk~Le0000Y0000Y2nGNE06Iqt!jT~#f6bV` zZ`3dp$G<_H@YE8s&rD0g^Ffqt}3@=;D-c5vFkWaV;?P-H#v^u_wn;L?>VuOBmn@Nym|c_W3cJR zPb>hqF%IV{vp&6iF_uWkHlgbLfAH@8wK~23@BskeRk*|ZYO^)Dh+KChF7s2*i1d$- zj3-F4OxYhSERGH`KQo8^@e!V_uBu0`tN?p^m6NWw+t@ujMay=yL2|Dz+dBr+rIZg` z+S)>QZLKiDQV;+@eryn6z1^;K?%X82t$ck8&I}>Cl;Y9ya&BxVig-K8e=?*~F24Nu zjypepm4hT%hV3xCn55a{?S}7HLRC2zfiMU;d#cPM1T^kx!)Svr2$sys z%0H_y4c|v6inL*jBC;KZr5O_d+`pMuw0Jl~s&ORH5-W{+@Ce}SELjV``<-dT)#{&6! zQX$-b0y+G8eu}?6J69Me@2_c5Q~43CHs3YY)0x>?e1u!<|H$Uudt(9G{CH5W|090@ Y-1RB)NMRoe000002uVdwM6N<$g8Wr9_W%F@ diff --git a/kubejs/assets/tfg/textures/gui/discord_logo.png b/kubejs/assets/tfg/textures/gui/discord_logo.png index 48c1bcefd2cd07ea282a5256dafaa55b8f8e0451..09491fdee4743daaa185de02c73eeb8c9c486e3b 100644 GIT binary patch delta 740 zcmVE7eq)WhhS+#3T8-B$dYzR6fsHZ(jggK1*Jkub;~5K;+i#*rMO9< z&}0xgG*(2D#dZloLzmX=H|g+g-@B6*?z5D*$8Jk->uwlYq z7yuCPSyaL;$TK(m5dMBLG=T|8e}KW4nTwdH1e7>CU*Oir^xXs3q$uBuD;aq6s>D59 zEA5+0kHTDS@3Z@MrF_P%ma~$Pl^3sN1EToLXAw*VfrB3-B<=+;6$F5=Ziv=Q_qc90 zY6WE)$~C}dZVCQ5)>r3|FV>aGNeR%{KkQyP^-ljvq#_nE>}T$WXe?r2e|>cxfSiPO z7kD*goa^!knpy*ErF}CJoxN7mo1)Vrfql+N`AQGK*<&G|f z2n0h;Ej)8uMRiheJ&34ywVZ8L%h^`H_tUAX#H;0Oi?i_=#Gi-jGm`kU)qC+4S4r9*%IT8C8NqQf1P&EN$KctqZLn8 z(qdX#0}nD?<7?Bpzo|gJSWnv*2sy*$bpZg4T7hjvsKh^g{Nk9qGaXKI2J8m5kR=dH zMr||JyJa_7qgDWfONAg4PgP7RPK8Y2-b*@Gfc#PfdRx0GHoyka!fpMi>B0RWlN* zKd9hpaO~^zP1bb2hU~71jWFiH|4oPc+j#i6;#;qsBfa4iz2UWUACDToe?C#N&$28q z#`Hk=XaGR_<27Y*0`fpI0OdQ}-v-bor%1Vv_;oIObbVZwWi1Cu=WB?vEv?RPtKM*m zOfG?^xwfZHD@R6S8vtbgJs@EHIw{Px-(gu~3vfwl{XCo4a~7e22TW0(ZXO94WmMGlfv z!x-}bafvTB)C-O*Pzr#z>-YO=5E|%q3Qpd7+Nr=@Ae=B3i)nYDl3zPHq)$07*qoM6N<$g2EzURR910 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 zcmV+c1OEJ{28#wEiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPLf4xaW zK~z|U#aBIOQ&AW_F9acV=u!%8h|qv931rEZ4AT6xi$gNHI7ozs;?}`YLczr$E9q}?nktD)=xy7Q6XzoSx4AYW=JD<@Tee=YmF4+A%D z^#>vqX2fuwc@I%DVxUq^0FW!8Jq3PADd(y@276iqYa2Tx5?#Df((A(N6XaIo$d_7a zHm+?#3j5>|05H5b0{}##i=N!!#Tf#jIX4zwxTT`HRqz}{taziA?KEoHPQUltjjO~P zwQPr)Wpn7DH6V&R;Y_2Je>JRbk4wyo1EX_qb$gz|l7a1Ao2bgmiqlxTS>yynlPV5{ z*aut%Jj#_31NO1)%TsZv#t>$=b~#AbeC9WMZj0VZ~Wt8oOgYmG%a{uOr{}B;ZDLy z-G=-SgmWW$_44CXZ^re^>a(32D}JG zMqLfwFZ6mBiRl=CjI$6C8qGEUp!25%00>1!rCj29d@2Ay3l4F-LOzZ27akdH#}dzq z$YoQ=WmBkEe;Ut4B8W$Ve?(j>q(ayMa@iCBU}|O=t(^nt<*KQl6~Xe{!X$+9!wQ-i zyX}TY{Lsr)6NeQ+U^#@ubPVwcbDnS!aT7*^`<*ZK)*2z=kPrRKQ+pvSL`imBunIH@ z`TA{7D2B41#YU-ux%uSLKt7cVHvr7dCtXcQxP2SVw#irv4k12~f5GndzA=-;jq99X zAY$YM@vdAw$Bpe;h)7JY5CK3;Y;Y(>3)=H!`RBNO8_hP>K5R+*=_kUQSF6%~g6q@Q zDkeG}5en1GRpCx?f=LKl8(2rt@d)0&yk#-v6B7VR#RXIQ_WgIJ_S*Z80D#{=mh6R) znBM7_F$tm_!QQe&bEhcKt0fzyilcz&0x$io1=3$UJ+k320O%jaX-f6pJ^cIJ_r=Ui@{^K+Bv;qC?i-}ezh@U(o)0i=}H z(AC+tT`uh5?q&r9U%q~?^{E0h8W2M0+Z-TG)7}8r*Vh1qVc6Pd#{;I~IA$~&RY7`d zv)SzJ)42(&6U1>m7yuy4vcmwRl-72;1;B9}JkJAQKA)Fx)n+P=V;si;e?TdfBqHYf!Vh+5-O!EiZtxHZf#N>YP$dzi-iVgG`<5+6d$#^ zpnzBb0$@BIb8&IeXz=Cbg)~jeBiH8kRseWSM6go<1w|rR0b)EJH%^wODN3nzvEp)U z7eH+fTz&XxNh#M=5JQ1BG?`3xn$b_UPBra;KuU>i+qtgklv0*$f7`h(v9!!2cnW|Lq_~zF^Hh0aa5k()M^ifRbV>ga>F2&40O~=hDZlp#Jf_YmBA=$Z`t-Ti zz(0Q*UyFC|r}}>1Cf~N@JD0;eP*ugyLGqnT0R90kGbn)ee+*dw0000M#_A4^K}-qOvnQ{oL^>!IT8|Bj_=2@uYKde^Z5h-91e&7Uw&BY^?CpRe?Af1ron!{|A-T1 z{k1h7k4FH2<2V2SrPNzNq?7;ve@ZC;AP52gz;3t8`!r6C@B2AW9{?$39ym#o%Dx3h zv=cU%)9IA|7DBWF(Ew?h7TRrbtW#4~nx^o5zg6(^b8Xc)HRfP(9CwDvvg~~jr4(+r z8(h~#9LHF#Rseu740A~HQD^u9eI0arIhBW*4GvDxhRUTTrRtV*kHN< zRY5Sutokv*q6bk*y%fD> z{i#(x7#U-TqNp=St9?Wl!HluI#;7WWwCW1w&LEUhNGZWN2j@J`c!EA9W0M-wmoWy$ zSpE-nDrZ^Nn7&^MVgdmuR9RnnIu}5$*DC;EI-S-&WNvU}>FKMJj#CNJMtVO;M1&07*qo IM6N<$g7PjUWB>pF 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 zcmV;;0y6!{1=j^3iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPLe~C#% zK~z|U#g`#(vrrU$)1izk51W=|S=4n(MkO z7K^D_Xx@3-1KwEj~lj$F9LWdZQ|`dY$OucqQS#xM+^e_Vg1luIBJ zu&U*9$!fJKoj28dHknKSuq+G9vTWb?5km9>Xq$AX(5JZE5L8tXNa;aBM5?F0QXWSz%8S25x^}VE~@S+XcAW?IeKG`58db1=ae30%8x? z0MqG|@p!Cs`1SQgnx^HJYYTfT0Q?+8aMl4i#X+(M?CEr>oGeXKgb-oz#^u;9fLacC zo~K1o6jnhRa-^f#Y<6}v?BvxcRSq~&6rt;SE_*s5gr@6yE?X?Af94@$nkGRI*o_Eu zs#hh{bv-vtv+Ro6nvjb2eF0i`flR(6No;^12zYsUDSO0Q>9?lTDZ;r2NRq^s+p*6! zyahlBQv8;Qd8>1xFF>gzNoY$lS$Mi6KS<61w%hGlTi#T)D5=i(K82?#ZL`?`@c#Zj z=ZG#d5xBYij=hA+Vdj+8na4gmZI&NMUg4;=av00000NkvXXu0mjf-}g(0 delta 703 zcmV;w0zm!O1<3^=iBL{Q4GJ0x0000DNk~Le0000Y0000Y2nGNE06Iqt!jT~ue|t$p zK~z|U&6vAt>p&2OKOc?>q*5sYwm}bIkSbNKy^ThmO0gxmK0Ius^84m(cN;NLF=jZ3%Kvghk zF5zBPGuHVK{hG6;6{K(J^--SZ#Bn?h~a*L?+vGL^*xq4?6LXc(IAY*M1FE1~x z=T&P&&S8cCH9-VHV4UB%e~$WZvKpOh0H71X2$CepMMtJ#v~1hv{{G$= zp^uLblv2cTTuVh8gb_r;K)pp2LX_LHQVQF)jRuuc6h+Z13aucn>k>r~v)Sw-I@+j| z5~UQL=NUnU0B9K(YY+suu8UHtmJ%r?cXxM$VMrK;Wxr9C<2bdpfAT7jbLl47ah$Tp zXljPE+8X7-AVLU=q9BfA;y5m=U`)%{rOxsVf`A|h%72(;8II$S=Xq!O-V~$?1k~2d zEl=kf$bP>EV6|GcKBS{!l1^Wnw4X+hKGOS1mSx8NV$Aywz+}B%kA4Ynsv1*ScY^5q l5h28n+zLo3f7kuU6+b1uLQ2O(#@qk^002ovPDHLkV1l0*6A1_PNgb}GCDozpKc;HgU&c?r51 za56YUyV@`e+|bQ{(O+N(ktZHWNzvloBv2&ZyLXRANiBXXVZ-3Op#b3BnL(p?k2rJH zwP-q+h&7ATvU5!szyF+!BOv1If0xg#3u#UU6cE}~gmkIjOyuT%hLAw(;@g+P0Kmh~ zM_?Dc99eRp-b5k=!dM?x1^_M=9~fAd`qiI9pv))Jhe#`d^TuB!SzPA_blU)`S4?R7>o}^c@4`y3|!EI!HA4e}MpeeOMVj z0Z%+@!%qZIL52$ABdSZSJj2#=y@(W`Ihlv=kN!~3<%o$@KzCYEQDs|k2{Nu!$ZUB; zq!l_- zrOFP#5TGl{^j50Sb{C}Fe_m%@s}W|E=yI2-Xge zP+vqtZ}u~ww*lCmpK>b5U|)@e^I`%`XVy0qDo49l-lo;5`6ZWHe?@(>=CJAs0*lj9 zO?MOH-)OG61d-e0BsOL6lp+m2Xub{I`Sm3q0#pcfc+*toaPk9A{^&l42?`O zq?3FskDO?^)`%%T*fHs?6akLf3(9T^xN8;wKJv_J({B-QmHiOHkReR66LS9^MGYp` zTdnj~zdBd*np)mme}Jd`z|p7xmm>X%l`t<8 delta 842 zcmV-Q1GW6N2GRy0iBL{Q4GJ0x0000DNk~Le0000Y0000Y2nGNE06Iqt!jT~te**+b zL_t(oh0U0~irYXC$NxTpU%}OZS!{xRYVHNxrU)#41;0S>gP33rj_d3ywT<8iDRcFe zGDgS8Ej$m8Y#0C2nRGw0E-h|NooFsLS=4}m;x9vFb{Tq#u^X9{_q zbEpES38of=LQnwe+&BB1g-VdLf~f?#e;Ni5)(NYY=Tdq*ZmUNr1(hiif1(DM`iAB~ zJZ>J0v)lmS*-W$HFej#ZYy|-Y=w6shOjIPE$B2KF=N962-46h%>7_ORq=Wl}geC z3S1Rgk&__31hMYBe2KnAf9y$}0wa_VdjM~;Dz(Wfm8l)83Kg@j#ePKQod8ULq@S>< z0f=5|riKfPWKwC9YLVtqJD< z4W)c*17a=DbN&Q{Q(HaGdgS;8h>o7q)a;ZhDkn8#(J{h1-Wx!we;N->y25DESqNA1 zul#bIY2?Q;Y~60R8iaO7yNuiVr{)$nD3%ipLQsgRd^jAcL73Uvx1s2nE&0OLqBob6 zaA5&}6wo)}!Y6{b&WMUIOo&?K8fQhqO8F8UBjm_~3Tjj&LE@a)Ft9hV&t~V6`#T44 zYV^Po*SE^f8nkF~e`9^45gjArFfAPbrR=sBIS8quh}9}W7cc+)vnpBbZw}srsA_7B z@2oo0h|}VxUT*kMti9XjmNrAQ0s)NNEH@@*=O?UdZXQ4rL;zyzdN3FS6O~e7vQE57 zLbXT$w10>oZA=70JAgXtjK|}@`V&rxo{Ei4{!=sE(EF47|h{9 zq%+7adywjf11sBt-1pDKieF8@r$c3*SNxU>q4540Y%BCHkq#V z+ldVAk0h{l@$qA20N~>1C9sTM?mKdz&O{Og;+VbM8vy8kA26`4^^=@KphA-ALWBwU zx=ZCdv@B|;;r=y=XEGIe{(9ZgjHn;pa;;93cUzb*mf7>+}`ZEQ6t_}iBIlnU(9<2 zFal^uK^qSUY{qL9>@?GMBXA}v&DSzd29wSy5Y#pfK8AVlMvdP|&TOO}sG7R6yCpb* zT@Ap#>j8L(GQYO&zMX)GdBEBO5}J#sCuTnYdJ%!G_^G6d3|4k5f1Z~TXgjmgP_T~n zuS8ONYJP=FoubmLC7gNzfz5cW`qP1tH=1uQQIzgD1xXn^r$~zr+OK1Oex>9+fT}

`a^pcOlBNwz>XT+Qz+*s(X9088T3(6%0{51;zA9_mc)w>V;N%p`W~~c}*j48Gz^gz|pDzmm>ccD`!GL);tC8 zXhKh7~IXZ*?ZCJ)i|>soE@*8lJ8cyqS~ a0Q?0Y-mOVob6S%C00004bO7ggGGnR6)(r2(x>je<_IdcvU!C z27pOnM(F^;wJoX+LU2AeY?;^*83N~DF3MAa=w2U3fI_ALfOij%Ku;Akllq8kq_gfc zhVYp$w^G>C11tg!QHdim1aMoO`pj49Fj7?l0@Y+Cr#u2IQhpIf#ZJw}2)zYiq^gV# zgAw~qaoOb#{-^@lS*%u@f0C{)RYFd}zQ^n~00w}6E^T9wsfq@r#S#l*yW5V7`&H@8 zh(rabMZswZQH;M0J45VZ7v;AEC4TxP21TZb%Tc&T@YS$w0PO_x9a}31n@7adt(qj9qGw?f00%6aua%jFd`(P zocw!)UWrOf>Y^7m)OyzXMFI{a9cD(q=5iHU)9DS=yk!;a8m$H5HSe#_3PM>*G2?HVswiM za1*Qc{-aIUvXOULf>+ { .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