From df03ccbeb71709e5f438f33c6fc2c6c374bc7b6e Mon Sep 17 00:00:00 2001 From: thederpysockdude123 Date: Thu, 22 Jan 2026 09:54:23 -0800 Subject: [PATCH 01/66] removed netherrack dust centrifuging that doesn't actually exist (#2804) Signed-off-by: thederpysockdude123 --- kubejs/server_scripts/gregtech/recipes.removes.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index a566cfdec..315b10d7e 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -831,6 +831,10 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:compressor/compress_plate_dust_wood' }) + // Remove Netherrack dust centrifuging + + event.remove({ id: 'gtceu:centrifuge/netherrack_separation' }) + // Remove Default Pressure Plate Recipes const MC_PRESSURE_PLATES = [ 'bamboo', From 07058f77e758cbc597e2326987007996bfcc0239 Mon Sep 17 00:00:00 2001 From: thederpysockdude123 Date: Thu, 22 Jan 2026 11:02:59 -0800 Subject: [PATCH 02/66] added Ad Astra airlock to valid cleanroom doors (#2808) Signed-off-by: thederpysockdude123 --- kubejs/server_scripts/gregtech/tags.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index ad32deab1..6953a1202 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -91,6 +91,7 @@ function registerGTCEUBlockTags(event) { event.add("gtceu:cleanroom_doors", "ad_astra:desh_sliding_door"); event.add("gtceu:cleanroom_doors", "ad_astra:ostrum_sliding_door"); event.add("gtceu:cleanroom_doors", "ad_astra:calorite_sliding_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:airlock"); // Groups up concrete blocks into tags. Object.entries(global.GTCEU_CONCRETE_BLOCKS).forEach(([type, ids]) => { @@ -112,4 +113,4 @@ function registerGTCEUFluidTags(event) { event.add("c:hidden_from_recipe_viewers", "gtceu:blaze"); event.add("c:hidden_from_recipe_viewers", "gtceu:thorium"); -} \ No newline at end of file +} From acf86208c6c4171d8e335dd52c951e93a223fad5 Mon Sep 17 00:00:00 2001 From: TreyR9 <106098556+TreyR9@users.noreply.github.com> Date: Thu, 22 Jan 2026 13:51:52 -0600 Subject: [PATCH 03/66] Add files via upload (#2812) Adjusted saturation outline to be golden rather than red, for increased visibility and similarity to AppleSkin. Also adjusted some of the nutrition icons for slightly higher contrast with said outlines. Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com> --- .../ihearttfc/textures/gui/icons/overlay.png | Bin 0 -> 9957 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 kubejs/assets/ihearttfc/textures/gui/icons/overlay.png diff --git a/kubejs/assets/ihearttfc/textures/gui/icons/overlay.png b/kubejs/assets/ihearttfc/textures/gui/icons/overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..8bfc78f1878c81ee7088fef4aa39ab2defca491e GIT binary patch literal 9957 zcmeAS@N?(olHy`uVBq!ia0y~yU}OMc4mJh`hM1xiX$%Yk44y8IAr*{oV%cj#LciJZ z7YK?9xOg!*I&kb&wpG$lD!X`eQ(0i9Si;e!-9aM%n$|URDXfkt(^XLD)(C33VBMmp z*r4(yKzGHDf8Te{wBF;BHi=>Knc0=`b?;{vzu)dN}bA+8v!zSSmj2{j%Y5Zo)W3WhIoHCaooS|j|!zmWY z6Zvck3}rPnHqX9BhZ^SR>|YzQVS(OkbCWfdkJ+NG+TYUKTdvN(?9Gjid;8bRZQ=2& zd0V&9WU{*M zpC7WT1R}!Mt=QQmsx4-k{nY8CgN4Ka2?2%(U8YqJe2Rk2!X|vtI+h=3=9#ZkbCK=y zOZgq|0{$JaxOUQEi_rpBhV9FPX?pGa`+e%d@%IZw!U{Tp0IrG2Y35%L*@7*W;u9?|$Szha; z^G{>mBV3Xk#>~I?9ICzusO&F(vt{Oa&Pn%Q-Yz~LT~s}{i0Sp0;~qElnfmTz=lai?5P6EZ+dSvdw8>%D%`c}s zK9|hY{p;7`q^~;^9oNbIT6tj6x?M+ZEp>Is)$&f#p1;#)_QqrHw|Bnc4hrdUwG>c$ z*~^=gJ{J^YzxWvPuQYnGB%EE+>BYk4XQ{a1So@Oxt55QScWmHYvG>(`r<&AI+uBfF zeX|8NVmb>>&D8tT#iF7m*uZMUYN6#*$1bVk*21XE@Z)>>p2Wntt35)L9;{i+BiPWZ zs&Mn8wtzr{*>9Ik{<5`885&cCn^XL2epNC0+^oq@O3FCdFk3>SVaajziI;a}HdgKx z`>VR**QelR{?~&YSxOxDF5q$02#v{6**E3Iiam>59mKD2{}EuB{DJ-3yGix6+oLA@ z*r4Sy{bHYyBb(CMhT^(fb_RAAhHIN&+_8MVR{o#aa|yQzjT%V{7=+~K|BEozd8JX! z`Gd*iMxF7`etljsrAHrT`~R6P{{G^|V|9~CJg)zAV!Ly!VIQ-@rE1fkAJ;4VU@{5b zv^v;H_Mgkw)O!aPC*A!sr^sqj>{XVN{PjhvB7WqhT>53(lrrBue_n|E?znpuk9lL; z<=^h&k3Z4SEpdUV;R%0Cu*Uq${hJ)i{`&T8R5J^)opS$6GjC7h`gV_O_w`pC=9dR~&*8zJfBKAPV;Ptx#BA_8 z&@RD{x@BQbLd^&3(<_+O_{2(&EZ|wdw;-p%>OqgQd6e<|ZHD zfAYlH`q7z+4J(*67R!p2GJGvy^pw~7c~-`aC81aUg3`;Y+yD9eb4ZFPmt}TjRk)%x zvB1MF-TD>7t)BZ+dR=!nepED@!TU)U z;xls^&yJ~#|MxRJ;LR7}O4Yd$kuGU>;70(PPkaQ!+hdFF9{7>KT>C<}BcO2SOKFR+ z6;{U%**GLvhRFXq>9EC6AZITq3D+E8S&$=errqpEB5y!BQ(dt8%>zFYoPS<;=CZ=# z$K1m7U^CAAUslImB;PLUoyK!SiaClQDL42IzoY{5&g2HB3D)x@T-lN)F`nmkDBJ#X z$6xnqpLsUsPc_+`a<6@6Vn~|s#G`BqZ$SI~E14%9bc`GrKg`vdBhX8@ndzvcelrgI)$#dYe`)R#_=`1h=zwdeZoHnvwYnQBB;{$0GTb)s^z zG{-5s@`A;a_P<-RrjS{CntT%yT2~dg@LpG z$o|#k&O3KzUtFNn&?0|n|E4)L|G9tWoo}3=lyI*oyX>EmK(m9O!y)CL-l5v6?Av8c z9v)ol_3O3WKc7?6e>iUvY&@`pe~ov{Z}*($2f`PnSMyZFF%)dLefjd!< zyzteghTru(cvCdt2Mcj|DMmg2tVP-cCN`tEzi{T+-g4qHEe z;$WU9-Z0nw$g8if<0Jz=tx#EaXFBN*K9f2qz8M1Bg#Y8+|Q3y_AGQ=>bKS2<U|2h{`$*YCRc?C3ty}aW~fO|cX{x5rzew&-k+Fy z@rL&tX3PF3^3L1k)Npfiy&y;9PT>RPOcF`qn z7ZmH(j<9fMc-^{VVHF*v^-k&YE2}{cGoHmv1_g{oiT6`d_N>wLo#^PRq!& ze^pL>f4&&+^1SpV_EY++sMvFFy*C&(eJwpFyhc`u(Lsi%>FCAhdTbgDeV-dRB(`Lh zE`M`l^V$1cf(!~w3@#7$D~Eeu-u;a04@XJYffZlnPaRsfJf-}5@TIS37dDw4k+5)m z@VU~x=XU<}mGP_$%LQJtCJ1!@_cg z2jLw~OV>|mV!aZry)W2rf7_4a35rHMD}uYu9Jy$a{j}&ROVfiG?Mbo?91I%Pw)kU@dvYy7{XJ6zRwdX=cyKJc%3 zYAvhck#gW6*9T2Ok5EtkH#Zl(GYPpX*<-|_nE8Q$Q?&V8y48Jk2A0(8uiigBE?+Og z!ShRaVxofi<{$>Y%`N`g4%HKWG_0Fb=V-ma{wwq3`{HTZf)_m3uVMZ1=h%Y%jS4S$ zeHzaHN)Bk}kXZ1JUFhEjzl%)|%F{F*Sa>#>ymE1U#2guIY?EPp;zLTEX|CUF%O+EC zBL~J479!Smc5w`$u8%Y)KfPqwD{b!Pd}78j-`Q#AeR9m78L}2kc)URNgqoY_OYUTa zorznU^-~nK^8_%slmx{Uom8E*S-^9;rdkWfjl#mhqCY$@OKLt6vtxmB>o)BdgVQ>|m^zp(%=T%b*TLl;$&-{Eoe|@u4M?;==*qRyJ4jwxg zlW|6m?X8;L4T+3!hfT^aLoe1ZpmR&Xr(xAE{VR;zo^hXEvAneY7W!9x zkEm3PBEx@=};!R~sQuX`8UFX@c-AODT?y=9I~x@@0eZt-^N zgTJnSALxHE`a6;TzlZzAL#IzNusUpPbkPoee_yO&Q&H;930pGQ1I`I8ka-ck_3fPr zj~B@Ql3uWGSL)6O?mWj1&4^@rp}?G&bl@|SL4DH=50k^{r#{TITI1<4g;6CvA!$+H zz6|z&HvXpp2P`CR-|Vycb8Px7qw6A>Cms5D=43WJXH}3$%zZC@T9Zk=Z%GR0Y2T*j zYHTO_mY55(oDTFEapyvuO{D;Y);`X3xDv%`tjMO z4Q|H$A1_X7EHHRb$;i;jZ}-1@>RgT%ue>j3eT%G;Cp#(|B4Y zGjchYd#i+rIAvN9lks?!uF-MQ##|~4&4J&4wB|mho-@<&%ALL7rid2mJZVocuvSfccB_ZpK$^6%HH;uhiJC{m3|Z zV5gA-V*roR$8tGA?U;VH!~fZMoEEg5D^dJ-_WwU_v9CUi`?!SU{n<}lU3{>nHe=7( z12^B@`^=Ouss4Raf3A&`&J2zR!T){ac-szhsDj+5#-#Ss`{}cb326#ZMg`MAjRv0l z)ad)!qHjvQPdsOycXIK;GcznZ9k#DNb)zC6;ar!6!$ z;o^yZ|E!r<9{VxyGdFTP_}TE`t^F_Q9=1uc{7eTIADr;#*2=gC%Q-ZZDq4FPxf+_i zIvO0y`q_-<|9H`5R43|iQ8#Js^hnEZss5Jjvmm>F8XVwz|dy0eCn*}+qSM>Q`5~G?L4(RKH&PkH3ho6>sFeT z#kPj6;>}o?lMrJl%6(-;)o$L9_1BKFotl=L{#$VQDX!F0@u}f!3wOsZJ(gQGb=LNq zOSRQf76dib)^*;JYW2Rh$vZT2abe`)*>Adf^RBG8@Plo)%hzdT3ynJ_l@`M_~hxY zE;v3uq~`mEd$!3Z=T#w_8iQno-gvLieC?clHSYGbRfTp_Lbt8S%3gILV&TGLuD(}g zeD$~MXGPs?=Q@?PAY=2VvWsa?-(0#L7Q7-U{6&=a&C_pF_bl^{tTIl#p+emWkhNUESp-nA*s_sw4L6Ebq5jvR*f@ik>px zd12j!A56cExxyN;2QEYsp=Yg@wC?%D%Qe&px6Zy{qX)s%VzEMhslzVS9{+6L*XdP(N1B9E+#2{V}$ zu9auLKH^SZ;KQWfzkXQkF7EwQ_Wae;w?Deioj$<&oVE9Js>HqBNw;quc&fj^sU?kp zX+bA*WrOh+_u1vCDgBj2)px^Fue{y7B!2Vur+a@tKYixp=hQzBPJa6Jc=A&B*M>=t z;&!~_mc9P@W2w=uzswk*fK$?TUUXkNc~ARr8s0!hK)v`DuTu^SApc|Mu^vw|f6R5z1Y)V#n&IUH^2K z25tWplwVSv`R8M4(D%b-l0Ozq-7@o5;Lq7!U!Q0F643v8KT9LLu4HLQ)xJe?+yC9( zy5#blvP&<2vt<5%IrUOfhHd7`3oq}A6XOA;+a*I>t@zd}n(qk=e)nt1 zx;tiz`tBI*m}X; z1fSfW&#kwnylAobdHsmnr!xyC8NK^_>(kGkUq%TZQZKDdx2%j==-$7{DC>);QB_Lj z-hGMAUZ-zNG)=v={Oi-+gQiQrAAb7ut)gklz2#@0JXOy=VK28{;q~u(dYk9HP}n^0 zjl%t}Ir@)xn@s<>JytXLo!5lWz3(UN#s~cueN1!dezp+k->74BIE5;jP2ej$@8pL-fSPjzIH>(qsK;H zdtX0&Uw(aB_`D3|$G^5rT&cfp+VuDNy8Us&`ojOj^jqsRb-d$td8*l63HnuxO#5N1@fY?;pYo-!L^ z)ok}f*;N-z{qudE%1ld*$TVL6iRXXiOx(!7ZX%~`@RA$y+iHHC>Hl>7wEAi8xs#v7 zUM)W~VeY52{V9@H>v!+@7t_V_ezu-}X{4&Y%|>^*y~WLUZf36KsVbbl$4tewO_QfK zwf)PhpUpfnH6iQY-xUAmz5U+oC&$)hKYe<=?8J$WD=+^KTm@^CCr_rdjB}x+H3DyRlnbB*V-tpT>Du{y!U?j z+^YYvRqpPRXrAeXyaa{ECB;Cj+-S3`?i)G7s=jvNG#OuSMj8+ub;SO zzdh)p?V0%S+{$ZCSGPqd8oZm)b$4(1x~-~}la9SwQod#@m#1CMZL^ENe!5JO{~fe{ z`?t5}4*ZjU9(iEByLrTZxpN0je(Ak-(pl1C%ANyOUk)>A*S>b@wf~m8(d1jsM!%)G zTl;b%a%AsrIC5)qLEF~yhvwJr9m!u)`+5J>4dr>8Q__prf+nqqo?FAJ(MMXEkb?T@)g?- zbGesDmR8@+zxFY8<+Xn^Z`a&dm(z9ZV=8;7^n|>dx9h^69=4MSz4l;-mVEfzZKYYa zGnbsblfU%WhsB$$Mfr5>6X*Jfy%ukszrA~F{!#yHa;9An4PyvVcZ?|FGu#K z;QK{Mwz|eCY`n6SJ?j#jgpSZL}eIeT2Qt&&#)}zD(I#@m;X@WpvP5 z*Ua{{XVvS@A2`21y0I`mKkUzH^9{Q`{1ZKW$u0C~yhAI;Sq2t`67A>{43Zt0Yzhq9 zZY3%_`E-gkXF*|2q4bLj3g^r?)*R-SZ?I$gVBPpFfkQO;SflCRIU6+&_m`Fvc9qdR}wGgHJAmrx!&dcdhclK_x1nu zxJ6lG!>5Jw@i;J;6#n?cQgH0MewgpS;N??!R$ub?b^Pjw{Ay`XPsW5_4Uc)U2C5lzNP#0<|5HACXd%=XfY%S z-2OZ1^wZW)rC(~^hvloSpT6#?eEx;huTOTng`a$$<#VR{ur~@ z^S`GV?k={nGW<@#_A?nbyzZ@yia&4tV$-Zo_e6Q0?iYRZ^yebc)E`T?rerm5Gujm; zd~nWz1ze`A#Y{Kcx8B`USD9a(ldxx@>f=<`L%yF<=cYA%-4nHPThGdiKE*uA?$3>D8c6lDnnaa4^>}10f-cS8=rBmO$Z&&?${c%zDC7IrNC$*P6UiCiJ<5d;! zneyYiZhkuRulL`_s+?GjUUA>a*&#B=_LVk*&hx@H>WcmM|FT}BZ`A(YG^?H9^gwFN#GnZEy zzHY8{`q)#eqgCrw++2ERN7g)^!1s!4-g=hmJz&_FT>E||W7qL>tM^U)ePxF2wiP=? zr+?3j(Ad6amgb831o^4$S7t7*yT9z`uiAwtzwC{ew$vL`bF}JP8Zj_3BsWf&B3mDI z;M7@n-GpniOin9oc=u&7|AU^HJCc?^WqBl++;GET#x{r9!E-W?%QSMBP3tuLo3Odt z_~V9i7GIjrbN-lPsBxIx;<1lp9dr7ckCwW(<{Bhh=sucjxPtkd#FU4{#}@MJw=|x@ zJ7=Q?b4D{S%Q40t`9ij1?A;Q~R~U~RJjDNc&EfP1)$Nb}uC_lir!;=1nlzgN!%dUT zojfkQ%mR$fD(I8%F+S>NaZ zCtD9g#4Go1hBdb=^OjC|=*o7&LB}|Og`qlR=laia`wuuyU^EiA&11oO;Lg9#)iS+>w_w;E`Z- zxW@e9Fq4LGN(0Xk17Ao4Qj#6KY@d?EMH==bOiiBDsFB#fB%sQEG<8zro`eRb z3F2#te2fHCc>)*~Jz22BC*OEN`0nKlPeeD%Oy_Z7WEN@Auu##P$n!*$S)^f4(zM5u z8Z{Ccm;_kckEmA7ZrpRnmQ_Lj=F=M~2cGf-FvQe3#K=jW@MhCss6456T#Z>Ty@Bb$ zC+0_=_MCNydq0n9!gZeF8lwkEY#I!Db~1XsJWotP=BCYfJeg74*nzR&!aE25^C$zW!u}c0Y*G%if*e_)5i@DK0lnk5d7gZKr^)d1ti^L>X1$~a zrU#1-KL|SEP-pDGcq0FprMzT;AhQUAxGdZBN4acD8>_h-R3e_wNjU%t)tDlI7&gfc z7G{wKj}7N6Pd0crQN+W-@X)*a@F|x#w)d?J|GH zg4>-1wkZnok_#A~DBqmZ#j^u6GIQIn<+UR7&l3!+3i2nPh1^R!(7Ss%!;X(3JJgIO z`11rXeCo{bb7s49f`Row@A5;Y6B}!i8ki>dyA(_18$Y-Pa&DDTjJV_pb~X)$pAJUL z6`1o<8<-wkoBVLs2?smS;4%9o%hv6Z1)tw(GUVCGuIuG_V#qAgV52tU@MK1FP!7iq|_P+d2X=ZPT5T%~D;CpBh(@(=IwBc_uYZ9wjIKT;HtZ!Dm@dpU#4 zY0tvBDGK}&3mBd-u9TU?(vV@Pxo$Gg6HsQfQJCsnHM=q6mMyEoEWhq-Rp!LB z1}1?tCrcU04mCCnhKnUpG1{ON6Cw=;!lxeYIqR_H?K~!dT=ipLCp8)vIWTf4&y?xn zaghd@Yi+o0I#0_)MlJ`5lTQNfr71|2`!jYN3w}K7q{9r*z*eURpEKJckOGr=QrCUh z4uO(`k4uq6zOleskb7UBEWDedz{3;3aL7TaU4i-HDF#-BDF43KYRrisZ?XwlwrrQ| zcy>3KVbRYoJIag-`gj5u&P{YEQ)j*inmm~0-=D3{{QLw1>jN3il=6IIfwv%Ye{&Z7 zO?ewx8i zWQQo52E)dpNq5*KEx6e<7}6c3c2~@9i~xo2G{4E!ip=RCr}1zmTS#`Og4CAGy2CAL z;S5siA#r%`S%)>C@Xb~~^>;#}G00rD6vHW?X>yT<2hy%6MHQ1~7V zemd`jgB~bJP10za*cbuI#NEqJ*-mVX0nHt$2J(D1W8S!{n#*C$Je}{ZY()ndSQW%o z3|n}PXo0+D8~LuA=SdSImxG>1Qpa}5j;D8n8IpdM>@+u;z|1VtAj6SlEZLC?a&677 zJJOOT8X379_*gdHyv=ju*E>yyjdh3a$V;AR0}XpW+0Y59O+*?Z>=WPh^Q0VRU{#PV zy745JZ4anu5ciu|t-`DbN(%~Yc}5Rd*)$m9EK=W1!VB}C} z2{n2E3RP6GeB%dO?*=pMDSLEBU$Vf!fw5r1K_$r#Qp_R@>*rd0_hysf31E;(+3+Hl zZO@Kst_E@cxz%dScA%*hrHm5|;*tv(Dn4G>nQrtTxq<0{a?`QfJQbziMHtr4v-$4J zCIXr*W70Qz5DM~(ZRNY!JQ{2o3|%a7_tFlW-o2cm;^&v0<>x^Q5&lFsuvE-sgKp|Nqax!0`Wn@wHjc85kJYK(!GwLs(d~9NWh)J`4;D44$rj JF6*2UngIW8JZ=C0 literal 0 HcmV?d00001 From feda51f459b5e959a0f2fa86441f4f851521f70f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 22 Jan 2026 20:32:06 +0000 Subject: [PATCH 04/66] some glass alloy smelter unification --- kubejs/server_scripts/ae2/recipes.js | 6 +++--- kubejs/server_scripts/gregtech/recipes.removes.js | 3 ++- kubejs/server_scripts/minecraft/recipes.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 8e464897b..1520747f9 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -1874,15 +1874,15 @@ const registerAE2Recipes = (event) => { // Quartz Glass event.recipes.gtceu.alloy_smelter('ae2:quartz_glass') - .itemInputs('5x #forge:dusts/certus_quartz', '4x #forge:glass') - .itemOutputs('4x ae2:quartz_glass') + .itemInputs('#forge:glass', '#forge:dusts/certus_quartz') + .itemOutputs('ae2:quartz_glass') .duration(20) .EUt(120) .addMaterialInfo(true) // Vibrant Quartz Glass event.recipes.gtceu.alloy_smelter('ae2:quartz_vibrant_glass') - .itemInputs('ae2:quartz_glass', '8x #forge:dusts/glowstone') + .itemInputs('ae2:quartz_glass', '#forge:dusts/glowstone') .itemOutputs('ae2:quartz_vibrant_glass') .duration(20) .EUt(480) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index a566cfdec..57d31852a 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -474,9 +474,10 @@ function removeGTCEURecipes(event) { //#endregion - //#region Выход: Слиток камня + //#region Выход: Слиток камня event.remove({ id: 'gtceu:alloy_smelter/alloy_smelt_stone_to_ingot' }) + event.remove({ id: 'gtceu:alloy_smelter/tinted_glass' }) //#endregion diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 738582ec0..e2ac32d73 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -186,7 +186,7 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Тонированное стекло, tinted glass event.recipes.gtceu.alloy_smelter('tfg:minecraft/tinted_glass') - .itemInputs('minecraft:glass', 'tfc:powder/amethyst') + .itemInputs('#forge:glass', '4x tfc:powder/amethyst') .itemOutputs('minecraft:tinted_glass') .duration(260) .EUt(16) From 960d0cc2df7db8a0dff86500dfd232e902464aa7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 22 Jan 2026 20:37:25 +0000 Subject: [PATCH 05/66] remove tuff dust --- kubejs/startup_scripts/gtceu/constants.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index d6d660eae..51e69cb5d 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -252,7 +252,10 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:tiny_deepslate_dust", "gtceu:andesite_dust", "gtceu:small_andesite_dust", - "gtceu:tiny_andesite_dust" + "gtceu:tiny_andesite_dust", + "gtceu:tuff_dust", + "gtceu:small_tuff_dust", + "gtceu:tiny_tuff_dust" ]); //#endregion From 65daa7cddb51e53056d0c231d758f4a53cd507c3 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 22 Jan 2026 20:57:47 +0000 Subject: [PATCH 06/66] remove any other stone dust recipes --- kubejs/server_scripts/gregtech/recipes.removes.js | 10 ++++++++++ kubejs/startup_scripts/gtceu/constants.js | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index eabda9272..6c780ab13 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -835,6 +835,16 @@ function removeGTCEURecipes(event) { // Remove Netherrack dust centrifuging event.remove({ id: 'gtceu:centrifuge/netherrack_separation' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__granite' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__diorite' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__andesite' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__deepslate' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__blackstone' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__endstone' }) + + removeMaceratorRecipe(event, 'macerate_end_stone'); + removeMaceratorRecipe(event, 'macerate_end_stone_bricks'); + removeMaceratorRecipe(event, 'macerate_end_stone_brick_wall'); // Remove Default Pressure Plate Recipes const MC_PRESSURE_PLATES = [ diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 51e69cb5d..40e7aa930 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -255,7 +255,10 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:tiny_andesite_dust", "gtceu:tuff_dust", "gtceu:small_tuff_dust", - "gtceu:tiny_tuff_dust" + "gtceu:tiny_tuff_dust", + "gtceu:endstone_dust", + "gtceu:small_endstone_dust", + "gtceu:tiny_endstone_dust" ]); //#endregion From cc8dc5d12a142d33546fe9af0e0679768ccf5d0a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 22 Jan 2026 21:04:17 +0000 Subject: [PATCH 07/66] #2803 Related Work Items: #20 --- kubejs/server_scripts/ae2/recipes.js | 4 ++-- kubejs/server_scripts/asticor_carts/recipes.js | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 1520747f9..6ded94a6a 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -25,7 +25,7 @@ const registerAE2Recipes = (event) => { 'BA ', 'CCB', ], { - A: '#forge:rods', + A: '#forge:rods/wooden', B: '#forge:plates/steel', C: '#forge:exquisite_gems/certus_quartz', }).id('tfg:crafting/certus_quartz_cutting_knife') @@ -35,7 +35,7 @@ const registerAE2Recipes = (event) => { 'BA ', 'CCB', ], { - A: '#forge:rods', + A: '#forge:rods/wooden', B: '#forge:plates/steel', C: '#forge:exquisite_gems/nether_quartz', }).id('tfg:crafting/nether_quartz_cutting_knife') diff --git a/kubejs/server_scripts/asticor_carts/recipes.js b/kubejs/server_scripts/asticor_carts/recipes.js index f68341ca5..f7f477827 100644 --- a/kubejs/server_scripts/asticor_carts/recipes.js +++ b/kubejs/server_scripts/asticor_carts/recipes.js @@ -27,4 +27,6 @@ const registerAsticorCartsRecipes = (event) => { .duration(100) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) + + event.replaceInput({ mod: 'tfcastikorcarts' }, '#forge:rods', '#mcw_tfc_aio:metal_rods') } \ No newline at end of file From 3412188f589fe6e4db7557b1190b98d54bba2cf2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 22 Jan 2026 21:12:47 +0000 Subject: [PATCH 08/66] langs --- kubejs/assets/ad_astra/lang/ja_jp.json | 2 +- kubejs/assets/betterend/lang/ja_jp.json | 22 ++ kubejs/assets/gtceu/lang/ja_jp.json | 117 +++--- kubejs/assets/tfg/lang/en_us.json | 4 +- kubejs/assets/tfg/lang/ja_jp.json | 352 ++++++++++++------ .../assets/wan_ancient_beasts/lang/en_us.json | 4 +- 6 files changed, 339 insertions(+), 162 deletions(-) diff --git a/kubejs/assets/ad_astra/lang/ja_jp.json b/kubejs/assets/ad_astra/lang/ja_jp.json index 154e7095d..f7c38f451 100644 --- a/kubejs/assets/ad_astra/lang/ja_jp.json +++ b/kubejs/assets/ad_astra/lang/ja_jp.json @@ -1,7 +1,7 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.ad_astra.oxygen_distributor": "人工空気分配機", - "block.ad_astra.moon_sand": "月の砂", + "block.ad_astra.moon_sand": "灰色の砂", "block.ad_astra.moon_stone": "斜長岩", "block.ad_astra.moon_cobblestone": "斜長岩の丸石", "block.ad_astra.moon_cobblestone_slab": "斜長岩の丸石のハーフブロック", diff --git a/kubejs/assets/betterend/lang/ja_jp.json b/kubejs/assets/betterend/lang/ja_jp.json index e72e61194..6da8c531a 100644 --- a/kubejs/assets/betterend/lang/ja_jp.json +++ b/kubejs/assets/betterend/lang/ja_jp.json @@ -14,6 +14,7 @@ "block.betterend.bolux_mushroom": "Bolux Mushroom Colony", "block.betterend.bolux_mushroom_wild": "Wild Bolux Mushroom Colony", "block.betterend.bolux_mushroom_dead": "Dead Bolux Mushroom Colony", + "block.betterend.brimstone": "Brimstone", "block.betterend.bushy_grass": "Novagrass", "block.betterend.bulb_moss": "Bulb Moss", "block.betterend.cave_bush": "Carmine Lamella", @@ -45,14 +46,21 @@ "block.betterend.filalux_wings": "Filalux Wings", "block.betterend.flamaea": "Flamaea Mushroom", "block.betterend.flammalix": "Flammalix Mushroom", + "block.betterend.flavolite": "イグニンブライト", + "block.betterend.flavolite_bricks": "イグニンブライトのレンガ", + "block.betterend.flavolite_pillar": "イグニンブライトの柱", + "block.betterend.flavolite_polished": "磨かれたイグニンブライト", + "block.betterend.flavolite_tiles": "イグニンブライトのタイル", "block.betterend.fracturn": "Fracturn", "block.betterend.glacian_hymenophore": "Glacian Hymenophore", "block.betterend.globulagus": "Globulagus", + "block.betterend.hydrothermal_vent": "Thermal Vent", "block.betterend.hydralux_small": "Hydralux", "block.betterend.hydralux_large": "Hydralux", "block.betterend.hydralux_sapling": "Hydralux Sprout", "block.betterend.inflexia": "Inflexia", "block.betterend.lacugrove": "Lacugrove Algae", + "block.betterend.lacugrove_bark": "Raw Adakite", "block.betterend.lamellarium": "Lamellarium", "block.betterend.lanceleaf": "Lanceleaf", "block.betterend.lanceleaf_small": "Lanceleaf Dagger", @@ -60,6 +68,7 @@ "block.betterend.lucernia_leaves": "Lucernia Lamella", "block.betterend.lucernia_leaves_fallen": "Small Lucernia Lamella", "block.betterend.lucernia_outer_leaves": "Lucernia Hyphae", + "block.betterend.lucernia_bark": "Fiendish Spire", "block.betterend.lutebus": "Lutebus", "block.betterend.magnula": "Magnula", "block.betterend.nightshade_moss": "Nox Moss", @@ -69,11 +78,24 @@ "block.betterend.rubinea": "Rubinea", "block.betterend.ruscus": "Ruscus Grass", "block.betterend.salteago": "Salteago", + "block.betterend.sandy_jadestone": "ランプロアイト", + "block.betterend.sandy_jadestone_bricks": "ランプロアイトレンガ", + "block.betterend.sandy_jadestone_pillar": "ランプロアイトの柱", + "block.betterend.sandy_jadestone_polished": "磨かれたランプロアイト", + "block.betterend.sandy_jadestone_tiles": "ランプロアイトのタイル", "block.betterend.selagine": "Selagine", "block.betterend.shadow_berry": "Nox Berries", "block.betterend.shadow_berry_wild": "Wild Nox Berries", "block.betterend.shadow_berry_dead": "Dead Nox Berries", + "block.betterend.shadow_plant": "Blackened Ashgrass", "block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom", + "block.betterend.sulphur_crystal": "Sulfur Crystal", + "block.betterend.sulphuric_rock": "Thermal Vent Deposit", + "block.betterend.sulphuric_rock_bricks": "Thermal Vent Deposit Bricks", + "block.betterend.sulphuric_rock_pillar": "Thermal Vent Deposit Pillar", + "block.betterend.sulphuric_rock_polished": "Polished Thermal Vent Deposit", + "block.betterend.sulphuric_rock_tiles": "Thermal Vent Deposit Tiles", + "block.betterend.tube_worm": "Tube Worm", "block.betterend.twisted_moss": "Twisted Moss", "block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss", "block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss", diff --git a/kubejs/assets/gtceu/lang/ja_jp.json b/kubejs/assets/gtceu/lang/ja_jp.json index 555415ec9..dae23f329 100644 --- a/kubejs/assets/gtceu/lang/ja_jp.json +++ b/kubejs/assets/gtceu/lang/ja_jp.json @@ -1,6 +1,7 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "%s Surface Bud", + "block.gtceu.salt_block": "塩ブロック", "block.gtceu.greenhouse": "電気温室", "block.tfg.steam_bloomery": "蒸気式塊鉄炉", "block.tfg.steam_thermal_centrifuge": "蒸気式熱遠心分離機", @@ -23,9 +24,6 @@ "block.gtceu.ulv_super_chest": "基本型スーパーチェスト", "block.gtceu.ulv_hermetic_casing": "基本気密外装", "block.gtceu.hv_energy_output_hatch_4a": "§6HV 4A ダイナモハッチ§r", - "block.tfg.bioreactor": "Bioreactor", - "block.tfg.growth_chamber": "Growth Chamber", - "block.tfg.single_itemstack_bus": "Limiting Input Bus", "block.gtceu.red_granite_cobblestone": "赤色花崗岩の丸石", "block.gtceu.mossy_red_granite_cobblestone": "苔むした赤色花崗岩の丸石", "block.gtceu.copper_crate": "銅製クレート", @@ -36,43 +34,11 @@ "block.gtceu.bismuth_bronze_drum": "ビスマスブロンズ製ドラム", "block.gtceu.overworld_marker": "地球", "block.gtceu.the_nether_marker": "The Beneath", - "gtceu.greenhouse": "電気温室", - "gtceu.steam_bloomery": "蒸気式塊鉄炉", - "gtceu.food_oven": "電気オーブン", - "gtceu.food_processor": "自動調理", - "gtceu.large_solar_panel": "大型ソーラーアレイMK I", - "gtceu.large_solar_panel_tier2": "大型ソーラーアレイMK II", - "gtceu.large_solar_panel_tier3": "大型ソーラーアレイMK III", - "gtceu.gas_pressurizer": "ガス圧縮機", - "gtceu.nuclear_fuel_factory": "核燃料形成機", - "gtceu.nuclear_turbine": "原子力蒸気タービン", - "gtceu.heat_exchanger": "熱交換機", - "gtceu.fission_reactor": "核分裂炉", - "gtceu.evaporation_tower": "蒸発塔", - "gtceu.ostrum_harvester": "オストラムハーベスター", - "gtceu.moon_dust_harvester": "ムーンハーベスター", - "gtceu.ostrum_linear_accelerator": "オストラムリニアアクセラレーター", - "gtceu.bioreactor": "Bioreactor", - "gtceu.growth_chamber": "Growth Chamber", - "gtceu.coal_liquefaction_tower": "液化塔", - "gtceu.smr_generator": "Small Modular Turbine", - "gtceu.tooltip.machine.moon_dust_harvester_1": "§7Extraterrestrial Vacuum Cleaner§r", - "gtceu.tooltip.machine.moon_dust_harvester_2": "§7Harvests infinite Regolith Dust depending on the biome its placed in.§r", - "gtceu.tooltip.machine.ostrum_harvester_1": "§7Legally Distinct Spice Crawler§r", - "gtceu.tooltip.machine.ostrum_harvester_2": "§7Harvests infinite Ostrum Dust when placed over an Ostrum deposit.§r", - "gtceu.tooltip.machine.ostrum_harvester_3": "§7Requires drilling fluid to work.§r", - "gtceu.tooltip.machine.ostrum_linear_accelerator_1": "§7Higgs Boson not included§r", - "gtceu.tooltip.machine.ostrum_linear_accelerator_2": "§7Breaks down Ostrum Dust into its components. Requires various fluids from fission line.§r", - "gtceu.tooltip.machine.heat_exchanger_1": "§7Heating up Fluids with other hot Fluids§r", - "gtceu.tooltip.machine.heat_exchanger_2": "§7Transfers heat from one fluid to another.§r", - "gtceu.tooltip.machine.nuclear_fuel_factory_1": "§7Producing extra spicy Rods§r", - "gtceu.tooltip.machine.nuclear_fuel_factory_2": "§7Processes raw radioactive material into fissile fuel.§r", - "gtceu.tooltip.machine.steam_bloomery_1": "§7塊鉄炉を蒸気の力でアップグレードしよう！§r", - "gtceu.tooltip.machine.steam_bloomery_2": "§7鉄系の粉もしくはインゴットを塊鉄に加工します。§r", - "gtceu.tooltip.machine.steam_bloomery_3": "§7コークスか無煙炭を燃料にすると生産速度が2倍になります。§r", - "gtceu.tooltip.machine.steam_parallel": "§7一度に最大8つのレシピを実行でき、その分多くの蒸気が必要になります。§r", - "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Smoothie Maker§r", - "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas and liquids from carbonic solids§r", + "block.tfg.bioreactor": "Bioreactor", + "block.tfg.growth_chamber": "Growth Chamber", + "block.tfg.single_itemstack_bus": "制限搬入バス", + "block.tfg.hydroponics_facility": "水耕栽培施設", + "block.tfg.pisciculture_fishery": "養殖場", "item.gtceu.tiny_wood_dust": "極小の木のパルプ", "item.gtceu.small_wood_dust": "小さな木のパルプ", "item.gtceu.wood_dust": "木のパルプ", @@ -82,7 +48,7 @@ "item.gtceu.tiny_thermochemically_treated_hardwood_dust": "極小の熱処理済み堅木のパルプ", "item.gtceu.small_thermochemically_treated_hardwood_dust": "小さな熱処理済み堅木のパルプ", "item.gtceu.thermochemically_treated_hardwood_dust": "熱処理済み堅木のパルプ", - "item.gtceu.tool.behavior.canoe_creator": "§5Boater: §fCan Create Canoes", + "item.gtceu.tool.behavior.canoe_creator": "§5船乗り: §fカヌーを作ることができる", "item.gtceu.deepslate_dust": "混成岩の粉", "item.gtceu.small_deepslate_dust": "小さな混成岩の粉", "item.gtceu.tiny_deepslate_dust": "極小の混成岩の粉", @@ -126,6 +92,9 @@ "item.gtceu.naquadah_credit": "§7262,144 Credits", "item.gtceu.neutronium_credit": "§72,097,152 Credits", "item.gtceu.wood_plate": "繊維板", + "item.gtceu.salt_dust": "塩", + "item.gtceu.small_salt_dust": "小さな塩", + "item.gtceu.tiny_salt_dust": "極小の塩", "item.gtceu.chipped_salt_gem": "欠けた塩の結晶", "item.gtceu.flawed_salt_gem": "傷のある塩の結晶", "item.gtceu.salt_gem": "塩の結晶", @@ -136,6 +105,9 @@ "material.gtceu.air": "空気", "material.gtceu.liquid_air": "液体空気", "material.gtceu.cooperite": "クーパー鉱", + "material.gtceu.rock_salt": "カリ岩塩", + "material.gtceu.salt": "岩塩", + "material.gtceu.quartzite": "クォーツ", "material.gtceu.armalcolite": "アーマルコライト", "material.gtceu.desh": "デッシュ", "material.gtceu.ostrum": "オストラム", @@ -143,6 +115,7 @@ "material.tfg.etrium": "エトリウム", "material.gtceu.tarkianite": "タキアン鉱", "material.gtceu.thorium": "トリアナイト", + "material.gtceu.dimethylbenzene": "キシレン", "material.gtceu.aluminium_silicate": "ケイ酸アルミニウム", "material.gtceu.rocket_alloy_t1": "R-AS ロケット合金", "material.gtceu.rocket_alloy_t2": "ASM-4914 チタニウムロケット合金", @@ -196,14 +169,14 @@ "material.gtceu.dense_ostrum_vapor": "重質オストラム粉塵", "material.gtceu.lightweight_ostrum_vapor": "軽質オストラム粉塵", "material.gtceu.ostrum_vapor": "オストラム粉塵", - "metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust", - "metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore", - "item.gtceu.tool.behavior.silk_ice": "§dSculptor:§r Silk harvests Packed Ice", - "item.gtceu.tool.butchery_knife.tooltip": "§cButcher:§r Butchers animals for more meat", + "metaitem.dust.tooltip.purify": "水にドロップすることで洗浄できます。", + "metaitem.crushed.tooltip.purify": "水にドロップすることで洗浄できます。", + "item.gtceu.tool.behavior.silk_ice": "§d彫刻家: §r氷塊を切り出すことができる", + "item.gtceu.tool.butchery_knife.tooltip": "§c肉屋:§r 動物を解体してより多くの肉を得られる", "item.gtceu.tool.tooltip.repair_info": "", "item.gtceu.tool.tooltip.repair_material": "", - "gtceu.machine.lp_steam_extractor.tooltip": "§7Does not extract fluids", - "gtceu.machine.hp_steam_extractor.tooltip": "§7Does not extract fluids", + "gtceu.machine.lp_steam_extractor.tooltip": "§7液体の抽出はできません", + "gtceu.machine.hp_steam_extractor.tooltip": "§7液体の抽出はできません", "gtceu.jei.bedrock_fluid.nether_natural_gas_deposit": "Beneath Natural Gas Deposit", "gtceu.jei.bedrock_fluid.moon_helium": "ヘリウム", "gtceu.jei.bedrock_fluid.moon_helium_3": "ヘリウム3", @@ -212,10 +185,33 @@ "gtceu.jei.bedrock_fluid.liquid_carbon_dioxide": "液化二酸化炭素", "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "アンモニア交じりの重水", "gtceu.jei.bedrock_fluid.liquid_ice": "氷", - "gtceu.recipe.category.ingot_molding": "Material Molding", - "block.gtceu.wire_coil.tooltip_pyro": "§8Pyrolyse Oven and Nuclear Fuel Factory:§r", - "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Coal Liquefaction Tower, Moon and Ostrum Harvesters:§r", - "tooltip.moldraw.shift_view_molecule": "§7§oHold (Shift) for Molecular Structure§r", + "gtceu.recipe.category.ingot_molding": "鋳造処理", + "block.gtceu.wire_coil.tooltip_pyro": "§8熱分解炉と核燃料形成機:§r", + "block.gtceu.wire_coil.tooltip_cracking": "§8クラッカー、液化塔、ムーン・オストラムハーベスター:§r", + "tooltip.moldraw.shift_view_molecule": "§7§oシフトを押して分子構造を確認§r", + "tooltip.moldraw.shift_view_alloy": "§7§oシフトを押して合金組成を確認§r", + "gtceu.greenhouse": "電気温室", + "gtceu.steam_bloomery": "蒸気式塊鉄炉", + "gtceu.food_oven": "電気オーブン", + "gtceu.food_processor": "自動調理", + "gtceu.large_solar_panel": "大型ソーラーアレイMK I", + "gtceu.large_solar_panel_tier2": "大型ソーラーアレイMK II", + "gtceu.large_solar_panel_tier3": "大型ソーラーアレイMK III", + "gtceu.gas_pressurizer": "ガス圧縮機", + "gtceu.nuclear_fuel_factory": "核燃料形成機", + "gtceu.nuclear_turbine": "原子力蒸気タービン", + "gtceu.heat_exchanger": "熱交換機", + "gtceu.fission_reactor": "核分裂炉", + "gtceu.evaporation_tower": "蒸発塔", + "gtceu.ostrum_harvester": "オストラムハーベスター", + "gtceu.moon_dust_harvester": "ムーンハーベスター", + "gtceu.ostrum_linear_accelerator": "オストラムリニアアクセラレーター", + "gtceu.bioreactor": "Bioreactor", + "gtceu.growth_chamber": "Growth Chamber", + "gtceu.coal_liquefaction_tower": "液化塔", + "gtceu.smr_generator": "Small Modular Turbine", + "gtceu.hydroponics_facility": "水耕栽培施設", + "gtceu.pisciculture_fishery": "養殖場", "tagprefix.sword_head": "%s製剣身", "tagprefix.pickaxe_head": "%s製ピッケルの頭", "tagprefix.shovel_head": "%s製シャベルの頭", @@ -251,5 +247,22 @@ "tagprefix.marble": "%s鉱石(大理石)", "tagprefix.deepslate": "%s鉱石(混成岩)", "tagprefix.pyroxenite": "%s鉱石(輝岩)", - "tagprefix.dripstone": "%s鉱石(鍾乳石)" + "tagprefix.dripstone": "%s鉱石(鍾乳石)", + "gtceu.tooltip.machine.moon_dust_harvester_1": "§7吸引力の変わらない、ただ一つの収集機§r", + "gtceu.tooltip.machine.moon_dust_harvester_2": "§7設置したバイオームに応じて、さまざまな岩屑の粉を無限に収集します。§r", + "gtceu.tooltip.machine.ostrum_harvester_1": "§7ここ掘れワンワン！§r", + "gtceu.tooltip.machine.ostrum_harvester_2": "§7オストラムの混じった砂の上に設置すれば、オストラムの粉を無限に収集してくれます。§r", + "gtceu.tooltip.machine.ostrum_harvester_3": "§7稼働には採掘油が必要です。§r", + "gtceu.tooltip.machine.ostrum_linear_accelerator_1": "§7ヒッグス粒子は関係なし§r", + "gtceu.tooltip.machine.ostrum_linear_accelerator_2": "§7オストラムを粉塵にまで砕き、様々な鉱石を生産します。核分裂ラインからの生産物を必要とします。§r", + "gtceu.tooltip.machine.heat_exchanger_1": "§7高温の液体による液体の加熱に§r", + "gtceu.tooltip.machine.heat_exchanger_2": "§7一方の液体の熱をもう一方の液体に送ります。§r", + "gtceu.tooltip.machine.nuclear_fuel_factory_1": "§7危険な熱い棒§r", + "gtceu.tooltip.machine.nuclear_fuel_factory_2": "§7放射性物質を燃料棒に加工します。§r", + "gtceu.tooltip.machine.steam_bloomery_1": "§7塊鉄炉を蒸気の力でアップグレードしよう！§r", + "gtceu.tooltip.machine.steam_bloomery_2": "§7鉄系の粉もしくはインゴットを塊鉄に加工します。§r", + "gtceu.tooltip.machine.steam_bloomery_3": "§7コークスか無煙炭を燃料にすると生産速度が2倍になります。§r", + "gtceu.tooltip.machine.steam_parallel": "§7一度に最大8つのレシピを実行でき、その分多くの蒸気が必要になります。§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7昇華塔でもある§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7炭素系固形物からガスと液体を抽出します。§r" } \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 18d561b5f..0d9efc266 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1727,8 +1727,8 @@ "tfg.tooltip.dna_syringe.explain": "Right-click on a mob to obtain a DNA sample. Place in a crafting grid to clear contents.", "tfg.tooltip.shift_hint": "[Hold-Shift]", "tfg.tooltip.lab_equipment.part": "§7Precisely Holds: ", - "tfg.tooltip.lab_equipment.set": "\"§7Does not contain a 5000mB round bottom flask.\"", - "tfg.tooltip.lab_equipment.set_dirty": "\"§7Soon you might discover penicillin if you dont clean this.\"", + "tfg.tooltip.lab_equipment.set": "§7Does not contain a 5000mB round bottom flask.", + "tfg.tooltip.lab_equipment.set_dirty": "§7Soon you might discover penicillin if you dont clean this...", "tfg.tooltip.single_itemstack_bus.0": "§6Item Slots: §f1", "tfg.tooltip.single_itemstack_bus.1": "§6Stack Size: §f1", "tfg.tooltip.growth_chamber": "This machine can run more recipes at once by increasing the number of layers.", diff --git a/kubejs/assets/tfg/lang/ja_jp.json b/kubejs/assets/tfg/lang/ja_jp.json index ccacc8221..155f3bde9 100644 --- a/kubejs/assets/tfg/lang/ja_jp.json +++ b/kubejs/assets/tfg/lang/ja_jp.json @@ -437,6 +437,76 @@ "block.tfg.loose.red_granite": "赤色花崗岩の小石", "block.tfg.spike.red_granite_spike": "赤色花崗岩のつらら石", "block.tfg.rock.aqueduct_red_granite": "赤色花崗岩の用水路", + "block.tfg.rock.sandy_jadestone_stairs": "ランプロアイトの階段", + "block.tfg.rock.sandy_jadestone_slab": "ランプロアイトのハーフブロック", + "block.tfg.rock.sandy_jadestone_wall": "ランプロアイトの塀", + "block.tfg.rock.hardened_sandy_jadestone": "硬いランプロアイト", + "block.tfg.spike.sandy_jadestone_spike": "ランプロアイトのつらら石", + "block.tfg.sandy_jadestone_support": "ランプロアイトの梁", + "block.tfg.rock.cobble_sandy_jadestone": "ランプロアイトの丸石", + "block.tfg.rock.cobble_sandy_jadestone_stairs": "ランプロアイトの丸石の階段", + "block.tfg.rock.cobble_sandy_jadestone_slab": "ランプロアイトの丸石のハーフブロック", + "block.tfg.rock.cobble_sandy_jadestone_wall": "ランプロアイトの丸石の塀", + "block.tfg.rock.gravel_sandy_jadestone": "ランプロアイトの砂利", + "block.tfg.rock.aqueduct_sandy_jadestone": "ランプロアイトの用水路", + "block.tfg.rock.bricks_sandy_jadestone_stairs": "ランプロアイトのレンガの階段", + "block.tfg.rock.bricks_sandy_jadestone_slab": "ランプロアイトのレンガのハーフブロック", + "block.tfg.rock.bricks_sandy_jadestone_wall": "ランプロアイトのレンガの塀", + "block.tfg.rock.polished_sandy_jadestone_stairs": " 磨かれたランプロアイトの階段", + "block.tfg.rock.polished_sandy_jadestone_slab": " 磨かれたランプロアイトのハーフブロック", + "block.tfg.rock.polished_sandy_jadestone_wall": " 磨かれたランプロアイトの塀", + "block.tfg.rock.chiseled_sandy_jadestone_stairs": "ランプロアイトのタイルの階段", + "block.tfg.rock.chiseled_sandy_jadestone_slab": "ランプロアイトのタイルのハーフブロック", + "block.tfg.rock.chiseled_sandy_jadestone_wall": "ランプロアイトのタイルの塀", + "block.tfg.loose.sandy_jadestone": "ランプロアイトの小石", + "block.tfg.rock.flavolite_stairs": "イグニンブライトの階段", + "block.tfg.rock.flavolite_slab": "イグニンブライトのハーフブロック", + "block.tfg.rock.flavolite_wall": "イグニンブライトの塀", + "block.tfg.rock.hardened_flavolite": "硬いイグニンブライト", + "block.tfg.spike.flavolite_spike": "イグニンブライトのつらら石", + "block.tfg.flavolite_support": "イグニンブライトの梁", + "block.tfg.rock.cobble_flavolite": "イグニンブライトの丸石", + "block.tfg.rock.cobble_flavolite_stairs": "イグニンブライトの丸石の階段", + "block.tfg.rock.cobble_flavolite_slab": "イグニンブライトの丸石のハーフブロック", + "block.tfg.rock.cobble_flavolite_wall": "イグニンブライトの丸石の塀", + "block.tfg.rock.gravel_flavolite": "イグニンブライトの砂利", + "block.tfg.rock.aqueduct_flavolite": "イグニンブライトの用水路", + "block.tfg.rock.bricks_flavolite_stairs": "イグニンブライトのレンガの階段", + "block.tfg.rock.bricks_flavolite_slab": "イグニンブライトのレンガのハーフブロック", + "block.tfg.rock.bricks_flavolite_wall": "イグニンブライトのレンガの塀", + "block.tfg.rock.polished_flavolite_stairs": " 磨かれたイグニンブライトの階段", + "block.tfg.rock.polished_flavolite_slab": " 磨かれたイグニンブライトのハーフブロック", + "block.tfg.rock.polished_flavolite_wall": " 磨かれたイグニンブライトの塀", + "block.tfg.rock.chiseled_flavolite_stairs": "イグニンブライトのタイルの階段", + "block.tfg.rock.chiseled_flavolite_slab": "イグニンブライトのタイルのハーフブロック", + "block.tfg.rock.chiseled_flavolite_wall": "イグニンブライトのタイルの塀", + "block.tfg.loose.flavolite": "イグニンブライトの小石", + "block.tfg.rock.scoria_stairs": "スコリアの階段", + "block.tfg.rock.scoria_slab": "スコリアのハーフブロック", + "block.tfg.rock.scoria_wall": "スコリアの塀", + "block.tfg.rock.hardened_scoria": "硬いスコリア", + "block.tfg.spike.scoria_spike": "スコリアのつらら石", + "block.tfg.scoria_support": "スコリアの梁", + "block.tfg.rock.cobble_scoria": "スコリアの丸石", + "block.tfg.rock.cobble_scoria_stairs": "スコリアの丸石の階段", + "block.tfg.rock.cobble_scoria_slab": "スコリアの丸石のハーフブロック", + "block.tfg.rock.cobble_scoria_wall": "スコリアの丸石の塀", + "block.tfg.rock.gravel_scoria": "スコリアの砂利", + "block.tfg.rock.aqueduct_scoria": "スコリアの用水路", + "block.tfg.loose.scoria": "スコリアの小石", + "block.tfg.rock.scorchia_stairs": "スコーチアの階段", + "block.tfg.rock.scorchia_slab": "スコーチアのハーフブロック", + "block.tfg.rock.scorchia_wall": "スコーチアの塀", + "block.tfg.rock.hardened_scorchia": "硬いスコーチア", + "block.tfg.spike.scorchia_spike": "スコーチアのつらら石", + "block.tfg.scorchia_support": "スコーチアの梁", + "block.tfg.rock.cobble_scorchia": "スコーチアの丸石", + "block.tfg.rock.cobble_scorchia_stairs": "スコーチアの丸石の階段", + "block.tfg.rock.cobble_scorchia_slab": "スコーチアの丸石のハーフブロック", + "block.tfg.rock.cobble_scorchia_wall": "スコーチアの丸石の塀", + "block.tfg.rock.gravel_scorchia": "スコーチアの砂利", + "block.tfg.rock.aqueduct_scorchia": "スコーチアの用水路", + "block.tfg.loose.scorchia": "スコーチアの小石", "block.tfg.rock.stone_wall": "石の塀", "block.tfg.rock.smooth_stone_stairs": "磨かれた石の階段", "block.tfg.rock.smooth_stone_wall": "磨かれた石の塀", @@ -493,6 +563,10 @@ "block.tfg.glacian_wood_stripped": "表皮を剥いだグラシアンの菌糸", "block.tfg.glacian_leaves": "グラシアンのひだ", "block.tfg.glacian_leaves_fallen": "グラシアンのひだ", + "block.tfg.crimson_wart_block": "真紅のキャップ", + "block.tfg.warped_wart_block": "歪んだキャップ", + "block.tfg.aeronos_cap": "エアロノスのキャップ", + "block.tfg.strophar_cap": "ストロファのキャップ", "block.tfg.marker.moon": "月", "block.tfg.marker.mars": "火星", "block.tfg.marker.venus": "金星", @@ -621,8 +695,8 @@ "block.tfg.casings.heat_pipe_casing": "ヒートパイプ外装", "block.tfg.glacian_wool_frame": "氷塊羊毛の耐熱フレーム", "block.tfg.aes_insulation_frame": "AES断熱材の耐熱フレーム", - "block.tfg.machine_casing_power_casing": "Insulated Power Casing", - "block.tfg.active_power_transformer": "Active Energy Transformer", + "block.tfg.machine_casing_power_casing": "絶縁体外装", + "block.tfg.active_power_transformer": "大型変圧器", "block.tfg.sand.fluorapatite.blue": "青いフッ素燐灰石の砂", "block.tfg.sandstone.raw.fluorapatite.blue": "青いフッ素燐灰石砂岩", "block.tfg.sandstone.wall.raw.fluorapatite.blue": "青いフッ素燐灰石砂岩の塀", @@ -692,6 +766,31 @@ "block.tfg.large_nest_box": "深紅の大きい巣箱", "tfg.block_entity.large_nest_box": "大きい巣箱", "block.tfg.large_nest_box_warped": "歪んだ大きい巣箱", + "block.tfg.cultivation_monitor": "栽培モニター", + "block.tfg.egh_planter": "水耕栽培プランター", + "block.tfg.grow_light": "植物育成ライト", + "block.tfg.casings.machine_casing_egh": "水耕栽培外装", + "block.tfg.pisciculture_core": "養殖場用コアローター", + "block.tfg.casings.greenhouse.treated_wood_greenhouse_casing_0": "§nFlawless§r加工木材の温室の壁", + "block.tfg.casings.greenhouse.treated_wood_greenhouse_casing_1": "§nVertical§r加工木材の温室の壁", + "block.tfg.casings.greenhouse.treated_wood_greenhouse_casing_2": "§nHorizontal§r加工木材の温室の壁", + "block.tfg.casings.greenhouse.treated_wood_greenhouse_casing_3": "§nNubio§r加工木材の温室の壁", + "block.tfg.casings.greenhouse.treated_wood_greenhouse_casing_4": "§nOrnate§r加工木材の温室の壁", + "block.tfg.casings.greenhouse.copper_greenhouse_casing_0": "§nFlawless§r銅の温室の壁", + "block.tfg.casings.greenhouse.copper_greenhouse_casing_1": "§nVertical§r銅の温室の壁", + "block.tfg.casings.greenhouse.copper_greenhouse_casing_2": "§nHorizontal§r銅の温室の壁", + "block.tfg.casings.greenhouse.copper_greenhouse_casing_3": "§nNubio§r銅の温室の壁", + "block.tfg.casings.greenhouse.copper_greenhouse_casing_4": "§nOrnate§r銅の温室の壁", + "block.tfg.casings.greenhouse.iron_greenhouse_casing_0": "§nFlawless§r鉄の温室の壁", + "block.tfg.casings.greenhouse.iron_greenhouse_casing_1": "§nVertical§r鉄の温室の壁", + "block.tfg.casings.greenhouse.iron_greenhouse_casing_2": "§nHorizontal§r鉄の温室の壁", + "block.tfg.casings.greenhouse.iron_greenhouse_casing_3": "§nNubio§r鉄の温室の壁", + "block.tfg.casings.greenhouse.iron_greenhouse_casing_4": "§nOrnate§r鉄の温室の壁", + "block.tfg.casings.greenhouse.stainless_greenhouse_casing_0": "§nFlawless§rステンレスの温室の壁", + "block.tfg.casings.greenhouse.stainless_greenhouse_casing_1": "§nVertical§rステンレスの温室の壁", + "block.tfg.casings.greenhouse.stainless_greenhouse_casing_2": "§nHorizontal§rステンレスの温室の壁", + "block.tfg.casings.greenhouse.stainless_greenhouse_casing_3": "§nNubio§rステンレスの温室の壁", + "block.tfg.casings.greenhouse.stainless_greenhouse_casing_4": "§nOrnate§rステンレスの温室の壁", "block.tfg.titanium_concrete": "チタン鉄筋コンクリート", "block.tfg.polished_titanium_concrete": "磨かれたチタン鉄筋コンクリート", "block.tfg.titanium_concrete_tile": "チタン鉄筋コンクリートタイル", @@ -701,7 +800,7 @@ "block.tfg.titanium_concrete_bricks_square": "チタン鉄筋コンクリートの大レンガ", "block.tfg.nuclear_turbine": "原子力蒸気タービン", "block.tfg.evaporation_tower": "蒸発塔", - "block.tfg.cooling_tower": "Nuclear Cooling Tower", + "block.tfg.cooling_tower": "原子力冷却塔", "block.tfg.smr_generator": "Small Modular Turbine", "block.tfg.casings.machine_casing_desh_ptfe": "Radiation-Safe Desh Casing", "block.tfg.growth_monitor": "Growth Monitor", @@ -777,22 +876,18 @@ "item.tfg.unfinished_inscriber_accumulation_press": "未完成のInscriber Accumulation Press", "item.tfg.brick.deepslate": "混成岩のレンガ", "item.tfg.brick.dripstone": "鍾乳石のレンガ", - "item.tfg.loose.moon_stone": "斜長岩の小石", "item.tfg.brick.moon_stone": "斜長岩のレンガ", - "item.tfg.loose.moon_deepslate": "ノーライトの小石", "item.tfg.brick.moon_deepslate": "ノーライトのレンガ", - "item.tfg.loose.mars_stone": "粘土質岩の小石", "item.tfg.brick.mars_stone": "粘土質岩のレンガ", - "item.tfg.loose.venus_stone": "粗面岩の小石", "item.tfg.brick.venus_stone": "粗面岩のレンガ", - "item.tfg.loose.mercury_stone": "コマチアイトの小石", "item.tfg.brick.mercury_stone": "コマチアイトのレンガ", - "item.tfg.loose.glacio_stone": "響岩の小石", "item.tfg.brick.glacio_stone": "響岩のレンガ", - "item.tfg.loose.permafrost": "永久凍土の小石", "item.tfg.brick.permafrost": "永久凍土のレンガ", - "item.tfg.loose.red_granite": "赤色花崗岩の小石", "item.tfg.brick.red_granite": "赤色花崗岩のレンガ", + "item.tfg.brick.sandy_jadestone": "ランプロアイトのレンガ", + "item.tfg.brick.flavolite": "イグニンブライトのレンガ", + "item.tfg.brick.scoria": "スコリアのレンガ", + "item.tfg.brick.scorchia": "スコーチアのレンガ", "item.tfg.terra_firma_greg": "TerraFirmaGreg", "item.tfg.scaffolding_frame": "足場の型枠", "item.tfg.airship_hull": "飛行船の船体", @@ -1096,12 +1191,15 @@ "item.tfg.catalyser_pt_re_zsm": "白金-レニウム ZSM-5触媒", "item.tfg.used_catalyser": "白金-レニウム ZSM-5触媒（使用済み）", "item.tfg.loaded_resin": "レニウム吸着樹脂", - "item.tfg.rod_mold": "Fire Rod Mold", - "item.tfg.small_gear_mold": "Fire Small Gear Mold", - "item.tfg.nugget_mold": "Nugget Mold", - "item.tfg.unfired_rod_mold": "Unfired Fire Rod Mold", - "item.tfg.unfired_small_gear_mold": "Unfired Fire Small Gear Mold", - "item.tfg.unfired_nugget_mold": "Unfired Nugget Mold", + "item.tfg.rod_mold": "耐火の棒の型", + "item.tfg.small_gear_mold": "耐火の小さい歯車の型", + "item.tfg.nugget_mold": "塊の型", + "item.tfg.unfired_rod_mold": "未焼成の耐火の棒の型", + "item.tfg.unfired_small_gear_mold": "未焼成の耐火の小さい歯車の型", + "item.tfg.unfired_nugget_mold": "未焼成の塊の型", + "item.tfg.fish_roe": "%sの魚卵", + "item.tfg.rotten_voiding_cover": "腐敗物消去カバー", + "item.tfg.flora_pellets": "フローラペレット", "material.tfg.latex": "ラテックス", "material.tfg.vulcanized_latex": "加硫処理ラテックス", "material.tfg.fluix": "フルーシュ", @@ -1128,6 +1226,14 @@ "material.tfg.venus_stone": "粗面岩", "material.tfg.mercury_stone": "コマチアイト", "material.tfg.glacio_stone": "響岩", + "material.tfg.sedimentary_clastic": "砕屑堆積岩", + "material.tfg.sedimentary_carbonate": "炭酸塩堆積岩", + "material.tfg.sedimentary_organic": "有機質堆積岩", + "material.tfg.metamorphic": "変成岩", + "material.tfg.igneous_ultramafic": "超苦鉄質火成岩", + "material.tfg.igneous_mafic": "塩基性火成岩", + "material.tfg.igneous_intermediate": "中間質火成岩", + "material.tfg.igneous_felsic": "珪長質岩", "material.gtceu.thermochemically_treated_hardwood": "熱処理済みの堅木", "material.gtceu.hardwood": "堅木", "material.gtceu.asurine": "瑠璃岩", @@ -1257,15 +1363,18 @@ "material.tfg.cyclohexanone": "Cyclohexanone", "material.tfg.cyclohex_diperoxide": "1,1-Cyclohexanediyl Dihydroperoxide", "material.tfg.aciditic_waste": "酸性エポキシ廃棄物", - "material.tfg.tpaoh": "Tetrapropylammonium Hydroxide", + "material.tfg.tpaoh": "テトラプロピルアンモニウムヒドロキシド", "material.tfg.sodium_silicate": "ケイ酸ナトリウム", "material.tfg.metal_rich_solution": "Leachate Metal-Rich Solution", - "material.tfg.crude_mixed_gas": "Crude Mixed Gas", - "material.tfg.zsm5_gel": "ZSM-5 Gel", + "material.tfg.crude_mixed_gas": "粗製混合ガス", + "material.tfg.zsm5_gel": "ZSM-5ゲル", "material.tfg.leachate": "レニウム浸出液", "material.tfg.clean_powder": "Re-Silicate Clean", "material.tfg.catalyser_powder": "レニウム ZSM-5触媒", "material.tfg.sodium_aluminium": "アルミン酸ナトリウム", + "material.tfg.chloroplasts": "葉緑体", + "material.tfg.nitrate_rich_water": "富栄養水", + "material.tfg.nitrate_rich_semiheavy_ammoniacal_water": "富栄養化したアンモニア交じりの半重水", "ore_vein.tfg.deep_sheldonite": "Cooperite & Bornite", "ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet", "ore_vein.tfg.deep_garnet_opal": "Opal & Garnet", @@ -1287,6 +1396,8 @@ "ore_vein.tfg.normal_copper": "Copper & Chalcopyrite", "ore_vein.tfg.normal_garnet_tin": "Garnet & Cassiterite Sands", "ore_vein.tfg.normal_garnierite": "Garnierite & Cobaltite", + "ore_vein.tfg.normal_garnierite.emi.0": "Tip: Gabbro is always", + "ore_vein.tfg.normal_garnierite.emi.1": "underneath Basalt.", "ore_vein.tfg.normal_gold": "Gold, Limonite, & Hematite", "ore_vein.tfg.normal_graphite": "Graphite & Diamond", "ore_vein.tfg.normal_gypsum": "Gypsum & Calcite", @@ -1302,12 +1413,18 @@ "ore_vein.tfg.normal_olivine": "Bentonite & Olivine", "ore_vein.tfg.normal_quartz": "Quartzes", "ore_vein.tfg.normal_redstone": "Redstone, Cinnabar, & Ruby", + "ore_vein.tfg.normal_redstone.emi.0": "Tip: Granite is always", + "ore_vein.tfg.normal_redstone.emi.1": "underneath Rhyolite.", "ore_vein.tfg.normal_salt": "Salts & Borax", "ore_vein.tfg.normal_saltpeter": "Saltpeter & Electrotine", "ore_vein.tfg.normal_silver": "Silver, Galena, & Lead", "ore_vein.tfg.normal_sphalerite": "Sphalerite & Pyrite", "ore_vein.tfg.normal_spodumene": "Spodumene & Lepidolite", "ore_vein.tfg.normal_sulfur": "Sulfur & Pyrite", + "ore_vein.tfg.normal_tarkianite": "Tarkianite & Oilsands", + "ore_vein.tfg.normal_tarkianite.emi.0": "Only in dry climates.", + "ore_vein.tfg.normal_tarkianite.emi.1": "Min temp: 7°C", + "ore_vein.tfg.normal_tarkianite.emi.2": "Max rainfall: 100mm", "ore_vein.tfg.normal_tetrahedrite": "Tetrahedrite (Normal)", "ore_vein.tfg.surface_bismuthinite": "Bismuth (Surface)", "ore_vein.tfg.surface_cassiterite": "Cassiterite (Surface)", @@ -1315,7 +1432,7 @@ "ore_vein.tfg.surface_sphalerite": "Sphalerite & Sulfur", "ore_vein.tfg.surface_tetrahedrite": "Tetrahedrite (Surface)", "ore_vein.tfg.deep_mars_chromite": "Redstone & Chromite", - "ore_vein.tfg.deep_mars_pitchblende": "Pitchblende, Thorium, & Uraninite", + "ore_vein.tfg.deep_mars_pitchblende": "Pitchblende, Thorianite, & Uraninite", "ore_vein.tfg.deep_mars_sheldonite": "Bornite & Cooperite", "ore_vein.tfg.mars_almandine": "Almandine & Sapphire", "ore_vein.tfg.mars_apatite": "Apatite & Pyrochlore", @@ -1323,13 +1440,14 @@ "ore_vein.tfg.mars_coal": "Coal & Hematite", "ore_vein.tfg.mars_copper": "Copper & Chalcopyrite", "ore_vein.tfg.mars_galena": "Silver, Galena, & Lead", - "ore_vein.tfg.mars_sapphire": "Gold, Electrotine, & Bauxite", + "ore_vein.tfg.mars_gold": "Gold, Electrotine, & Bauxite", "ore_vein.tfg.mars_graphite": "Graphite & Diamond", "ore_vein.tfg.mars_hematite": "Hematite & Limonite", + "ore_vein.tfg.mars_lapis": "Lapis, Lazurite, & Sodalite", "ore_vein.tfg.mars_lubricant": "Trona, Talc, & Glauconite", "ore_vein.tfg.mars_neodynium": "Bastnasite & Monazite", "ore_vein.tfg.mars_nickel": "Garnierite & Cobaltite", - "ore_vein.tfg.mars_pitchblende": "Pitchblende, Thorium, & Hematite", + "ore_vein.tfg.mars_pitchblende": "Pitchblende & Thorianite, & Hematite", "ore_vein.tfg.mars_quartzite": "Quartzite, Asbestos, & Barite", "ore_vein.tfg.mars_salt": "Salts & Spodumene", "ore_vein.tfg.mars_stibnite": "Tetrahedrite (Normal)", @@ -1390,7 +1508,7 @@ "ore_vein.tfg.nether_mica": "Kyanite, Mica, & Bauxite", "ore_vein.tfg.nether_molybdenum": "Wulfenite & Molybdenite", "ore_vein.tfg.nether_monazite": "Bastnasite & Monazite", - "ore_vein.tfg.nether_naquadah": "Naquadah & Plutonium", + "ore_vein.tfg.nether_naquadah": "Naquadah", "ore_vein.tfg.nether_olivine": "Bentonite & Olivine", "ore_vein.tfg.nether_pitchblende": "Uraninite & Pitchblende", "ore_vein.tfg.nether_quartz": "Nether Quartz", @@ -1401,9 +1519,12 @@ "ore_vein.tfg.nether_silver": "Silver, Galena, & Lead", "ore_vein.tfg.nether_sphalerite": "Sphalerite & Pyrite", "ore_vein.tfg.nether_sulfur": "Sulfur & Pyrite", - "ore_vein.tfg.nether_sylvite": "Sylvite", "ore_vein.tfg.nether_tetrahedrite": "Tetrahedrite", "ore_vein.tfg.nether_topaz": "Topaz & Chalcocite", + "ore_vein.tfg.venus_manual_salt": "Salts & Spodumene", + "ore_vein.tfg.venus_manual_salt.emi.0": "Only in Salt Flats.", + "ore_vein.tfg.venus_manual_sulfur": "Sulfur & Pyrite", + "ore_vein.tfg.venus_manual_sulfur.emi.0": "Only in Sulfuric Ravine.", "tfg.creative_tab.tfg": "TerraFirmaGreg", "tfg.disabled_portal": "Portal magic seems to be blocked by an unknown force, try reaching another dimension by going down or up", "tfg.tooltip.food_trait.refrigerating": "§b冷蔵保存", @@ -1437,20 +1558,20 @@ "entity.tfg.rnr_plow": "Paving Cart", "effect.tfg.cooling": "§bCooling", "effect.tfg.warming": "§6Warming", - "effect.tfg.instant_radiation": "Instant Radiation", - "effect.tfg.chemical_burns_warning": "Suffering Chemical Burns", + "effect.tfg.instant_radiation": "瞬間被爆", + "effect.tfg.chemical_burns_warning": "化学火傷", "effect.tfg.poison_warning": "Poisonous Material", "effect.tfg.weak_poison_warning": "Weakly Poisonous Material", "effect.tfg.irritant_warning": "Irritant Material", "effect.tfg.nausea_warning": "Nauseous Material", - "effect.tfg.carcinogen_warning": "Carcinogenic Material", - "effect.tfg.asbestosis_warning": "Asbestosis", - "effect.tfg.arsenicosis_warning": "Arsenicosis", - "effect.tfg.silicosis_warning": "Silicosis", - "effect.tfg.berylliosis_warning": "Berylliosis", - "effect.tfg.methanol_poisoning_warning": "Methanol Poisoning", - "effect.tfg.carbon_monoxide_poisoning_warning": "Carbon Monoxide Poisoning", - "effect.tfg.radioactive_warning": "Irradiated", + "effect.tfg.carcinogen_warning": "癌", + "effect.tfg.asbestosis_warning": "アスベスト症", + "effect.tfg.arsenicosis_warning": "ヒ素中毒", + "effect.tfg.silicosis_warning": "珪肺", + "effect.tfg.berylliosis_warning": "ベリリウム症", + "effect.tfg.methanol_poisoning_warning": "メタノール中毒", + "effect.tfg.carbon_monoxide_poisoning_warning": "一酸化炭素中毒", + "effect.tfg.radioactive_warning": "被爆", "gtceu.medical_condition.radioactive": "§4放射性物質", "symptom.tfg.glowing": "Glowing", "tfg.greate.uls_limit": "§432§r (§8ULS§r)", @@ -1470,7 +1591,7 @@ "trim_material.tfc.rutile_tfc": "Rutile", "trim_material.tfc.lazurite_tfc": "Lazurite", "trim_material.tfc.pyrope_tfc": "Pyrope", - "trim_material.tfc.rock_salt_tfc": "Rock Salt", + "trim_material.tfc.rock_salt_tfc": "Sylvite", "trim_material.tfc.ruby_tfc": "Ruby", "trim_material.tfc.salt_tfc": "salt", "trim_material.tfc.sapphire_tfc": "Sapphire", @@ -1518,52 +1639,53 @@ "ore_vein.tfg.rose_quartz.emi.1": "biomes in climates", "ore_vein.tfg.rose_quartz.emi.2": "below -10°C.", "emi.category.tfg.ore_vein_info": "Ore Veins", - "tfg.emi.liquid_bb_burn_time": "Duration: %d secs", - "tfg.emi.liquid_bb_superheat": "§lSuperheated", - "emi.category.tfg.blaze_burner": "Blaze Burner Fuels", + "tfg.emi.liquid_bb_burn_time": "持続時間: %d 秒", + "tfg.emi.liquid_bb_superheat": "§l過熱", + "emi.category.tfg.blaze_burner": "ブレイズバーナー燃料", "emi.category.tfg.block_interaction": "Block Modifications", "emi.category.deafission.fission_reactor_coolant": "Fission Reactor Cooling", "emi.category.deafission.fission_reactor_processing": "Fission Reactor Material Holder", "emi.category.deafission.fission_reactor_fuel": "Fission Reactor Fuel", - "tfg.toast.ore_prospector_none": "No ores found in range.", - "tfg.toast.ore_prospector_message": "Ores found within %s §6blocks in this direction: %s", - "tfg.tooltip.ore_prospector_stats": "Scan Range: %s, Cross Section: %s x %s.", - "tfg.tooltip.ore_prospector_count": "This prospector will display ore counts.", - "tfg.tooltip.ore_prospector_xray": "This prospector will display a %s x-ray view of ore blocks.", - "tfg.tooltip.ore_prospector_mode_vein": "per-vein", - "tfg.tooltip.ore_prospector_mode_block": "per-block", - "tfg.hangglider.disabled_dimension": "You can't use a hang glider here!", + "tfg.toast.ore_prospector_none": "範囲内で鉱石は見つからなかった...", + "tfg.toast.ore_prospector_message": " %s §6ブロック以内に: %s個の鉱石を発見", + "tfg.tooltip.ore_prospector_stats": "探知範囲: %s、 横範囲: %s x %s.", + "tfg.tooltip.ore_prospector_count": "この探鉱槌は鉱石の数を表示します。", + "tfg.tooltip.ore_prospector_xray": "この探鉱槌は鉱石の場所を%s表示します。", + "tfg.tooltip.ore_prospector_mode_vein": "鉱脈単位で", + "tfg.tooltip.ore_prospector_mode_block": "ブロック単位で", + "tfg.hangglider.disabled_dimension": "こんなところでグライダーを使えると思っていたのか？", "tfg.tooltip.nametag": "§7Used on a Scribing Table along with an item to name it, or with black dye to name the tag.", "tfg.tooltip.yeast_starter": "§7Created with dried fruit", - "tfg.tooltip.beehive": "§7Needs to be filled with empty frames and surrounded by flowers to attract bees.", + "tfg.tooltip.beehive": "§7蜂の巣枠を入れ、周囲を花で囲むとハチが入ってきます。", "tfg.tooltip.obsolete.tree_tap": "§4Obsolete§f: Replaced by the AFC TreeTap, you can craft it from this one by placing this in a crafting table!", "tfg.tooltip.obsolete.fridge": "§4Obsolete§f: Replaced by the TFG Refrigerator, you can craft it from this one by placing this in a crafting table!", - "tfg.tooltip.blaze_burner": "§cSuperheat§r §7with Coke, Anthracite, or Flawless and Exquisite coal gems.", - "tfg.tooltip.machine.perfect_overclock": "This machine has §2Perfect Overclocking§r!", - "tfg.tooltip.machine.parallel": "Can parallelize with Parallel Control Hatches.", - "tfg.tooltip.machine.customize_interior": "§7The interior is customizable! Check the multiblock preview in JEI.", + "tfg.tooltip.blaze_burner": "§c過熱状態§r§7にはコークス、無煙炭、高品質の石炭（傷のない、精巧な石炭）", + "tfg.tooltip.machine.perfect_overclock": "§2パーフェクトオーバークロック（POC）§rに対応！", + "tfg.tooltip.machine.parallel": "並列制御ユニットによる§d並列化§rが可能", + "tfg.tooltip.machine.customize_interior": "§7The interior is customizable! Check the multiblock preview in EMI.", + "tfg.tooltip.machine.customize_greenhouse": "§7このマルチブロックの壁にはどの§e鉄の温室§7のブロックでも使うことができます。EMIのマルチブロック情報を確認してみてください。", "tfg.tooltip.armor.copper_diving_suit_warmth": "§7Warmth: -1", "tfg.tooltip.armor.copper_diving_suit_insulation": "§7Insulation: +1", "tfg.tooltip.armor.netherite_diving_suit_warmth": "§7Warmth: -2", "tfg.tooltip.armor.netherite_diving_suit_insulation": "§7Insulation: +9", - "tfg.tooltip.armor.netherite_diving_suit_set": "§7Wear the full set to be §eHeatproof§7 from ambient temperatures.", + "tfg.tooltip.armor.netherite_diving_suit_set": "§7フルセットで着用することで§e耐火§7を得ることができる。", "tfg.tooltip.armor.nanomuscle_warmth": "§7Warmth: 0", "tfg.tooltip.armor.nanomuscle_insulation": "§7Insulation: +10", - "tfg.tooltip.armor.nanomuscle_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", - "tfg.tooltip.armor.nanomuscle_legs_buff": "§7Provides §9Speed I§7 when worn", + "tfg.tooltip.armor.nanomuscle_set": "§7フルセットで着用することで周囲の気温の影響を§e完全に遮断§7する。", + "tfg.tooltip.armor.nanomuscle_legs_buff": "§7着用時、§9移動速度上昇 I§7を常時付与する。", "tfg.tooltip.armor.quarktech_warmth": "§7Warmth: 0", "tfg.tooltip.armor.quarktech_insulation": "§7Insulation: +10", - "tfg.tooltip.armor.quarktech_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.armor.quarktech_set": "§7フルセットで着用することで周囲の気温の影響を§e完全に遮断§7する。", "tfg.tooltip.armor.space_suit_warmth": "§7Warmth: 0", "tfg.tooltip.armor.space_suit_insulation": "§7Insulation: +10", - "tfg.tooltip.armor.space_suit_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.armor.space_suit_set": "§7フルセットで着用することで周囲の気温の影響を§e完全に遮断§7する。", "tfg.tooltip.support.tier1": "§79 x 5 x 9", "tfg.tooltip.support.tier2": "§717 x 9 x 17", "tfg.tooltip.support.tier3": "§733 x 13 x 33", - "tfg.tooltip.solar_panel.single": "Produces §6128 FE/t§r (32 EU/t) on the §6moon§r during the §6day§r", - "tfg.tooltip.solar_panel.large_tier1": "Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r", - "tfg.tooltip.solar_panel.large_tier2": "Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r", - "tfg.tooltip.solar_panel.large_tier3": "Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.single": "§6月面§rで§6日中§rに§6128 FE/t§r (32 EU/t)を生産する。 ", + "tfg.tooltip.solar_panel.large_tier1": "§6月面§rで§6日中§rに§61024から4096 EU/t§r生産する巨大な構造物。", + "tfg.tooltip.solar_panel.large_tier2": "§6月面§rで§6日中§rに§64096から16384 EU/t§r生産する巨大な構造物。", + "tfg.tooltip.solar_panel.large_tier3": "§6月面§rで§6日中§rに§616384から65536 EU/t§r生産する巨大な構造物。", "tfg.tooltip.petrified_egg": "§7Requires Magma to Incubate", "tfg.tooltip.large_egg": "§7Can only be incubated in a §oLarge Nest", "tfg.tooltip.sniffer_wool": "§7Harvested from the back of a Sniffer", @@ -1572,28 +1694,32 @@ "tfg.tooltip.cooling_foods": "§bCools you by: 2°C", "tfg.tooltip.cooling_foods_strong": "§bCools you by: 10°C", "tfg.tooltip.warming_foods": "§6Warms you by: 4°C", - "tfg.tooltip.hotornot_container": "§aSafely contains §6hot§a, §bcold§a, and §elighter-than-air§a items and fluids.§r", - "tfg.tooltip.hotornot_hot_equipment": "§7Provides protection from all §6hot§7 items, fluids, and pipes.§r", - "tfg.tooltip.hotornot_cold_equipment": "§7Provides protection from all §bcold§7 items, fluids, and pipes.§r", - "tfg.tooltip.hotornot_floating_equipment": "§7Provides protection from all §elighter-than-air§7 gases.§r", - "tfg.tooltip.machine.one_energy_hatch": "Accepts exactly §6One§r Energy Hatch.", - "tfg.tooltip.machine.two_energy_hatches": "Accepts up to §6Two§r Energy Hatches.", - "tfg.tooltip.machine.subtick": "This machine supports §2Subticking§r!", - "tfg.tooltip.machine.coil_energy_discount": "Every coil after §6Cupronickel§r reduces energy usage by 10%.", - "tfg.tooltip.machine.coil_speed_discount": "§6Cupronickel§r coils process 75% slower. Every coil after §3Kanthal§r increases processing speed by 50%.", + "tfg.tooltip.hotornot_container": "§a§6高温§a、§b低温§a、§e宙に浮く§aものを安全に格納できる。§r", + "tfg.tooltip.hotornot_hot_equipment": "§7装備時、§6高温§7のアイテム、液体、パイプの影響を受けなくなる。§r", + "tfg.tooltip.hotornot_cold_equipment": "§7装備時、§b低温§7のアイテム、液体、パイプの影響を受けなくなる。§r", + "tfg.tooltip.hotornot_floating_equipment": "§7装備時、ガスによって§e空中に浮かなくなる§7。§r", + "tfg.tooltip.machine.one_energy_hatch": "§6１つ§rのエネルギーハッチを導入可能。", + "tfg.tooltip.machine.two_energy_hatches": "最大§6２つの§rエネルギーハッチを導入可能。", + "tfg.tooltip.machine.subtick": "§2サブティック§rに対応！", + "tfg.tooltip.machine.coil_energy_discount": "§6キュプロニッケル§rよりも上位のコイルでは10％ずつ消費電力が軽減されていく。", + "tfg.tooltip.machine.coil_speed_discount": "§6キュプロニッケル§rコイルだと、処理速度が75％に低下する。カンタルコイルよりも上位のコイルでは処理速度が50％ずつ上昇していく。", "tfg.tooltip.machine.bioreactor_1": "§7Chemistry meets Biology§r", "tfg.tooltip.machine.bioreactor_2": "§7Combines organic and inorganic ingredients to produce synthetic biological products.§r", "tfg.tooltip.machine.growth_chamber_1": "§7Growing new life§r", "tfg.tooltip.machine.growth_chamber_2": "§7Contains everything needed for Biological Engineering.§r", - "tfg.tooltip.machine.evaporation_tower_1": "§7Not to be confused with the Distillation Tower§r", - "tfg.tooltip.machine.evaporation_tower_2": "§7Gets rid of excess solvent to condense solutions.§r", - "tfg.tooltip.machine.electric_greenhouse_1": "§7Putting the Factory in Factory Farming§r", - "tfg.tooltip.machine.electric_greenhouse_2": "§7Uses water to grow trees, crops, and other plants. Can be sped up with fertilizer. Faster and easier than other ways of growing plants, at the cost of energy.§r", - "tfg.tooltip.machine.cooling_tower_1": "§7Heating up the Atmosphere§r", - "tfg.tooltip.machine.cooling_tower_2": "§7Cools the hot coolant by dissipitating excess heat to the atmosphere.§r", + "tfg.tooltip.machine.evaporation_tower_1": "§7蒸留塔じゃないよ§r", + "tfg.tooltip.machine.evaporation_tower_2": "§7余分な溶媒を取り除き、溶液を濃縮します。§r", + "tfg.tooltip.machine.electric_greenhouse_1": "§7§o農作物の工業的生産§r", + "tfg.tooltip.machine.electric_greenhouse_2": "§7電気で一年中作物を育てよう！電気式温室は、成長促進のために肥料を入れたり、養殖場と組み合わせてより効率的に生産できます。§r", + "tfg.tooltip.machine.cooling_tower_1": "§7大気を暖める§r", + "tfg.tooltip.machine.cooling_tower_2": "§7大気中に余分な熱を放散することで、熱くなった冷却水を冷却します。§r", + "tfg.tooltip.machine.hydroponics_facility_1": "§7§o農家の夜明けは遅い§r", + "tfg.tooltip.machine.hydroponics_facility_2": "§7電気温室（EGH）の上位版！水耕栽培施設は、EGHよりも収穫確率が向上しており、酸素がない場所でも稼働できます。§r", + "tfg.tooltip.machine.pisciculture_fishery_1": "§7§o1ピチピチチャプチャプ§r", + "tfg.tooltip.machine.pisciculture_fishery_2": "§7養殖場は、新鮮な魚を食卓に供給するだけではなく、§3アクアポニックス§7による電気温室の効率化にも利用できます。この施設は、§o#tfg:pisciculture_fishery_fluids タグが付いたあらゆる液体で満たすことができます。§r", "tfg.tooltip.obsolete.depreciated": "§cDeprecated, cannot be crafted any more", - "tfg.tooltip.antipoison_pill": "§9Cures Poison", - "tfg.tooltip.antipoison_tablet": "§9Cures All Active Harmful Effects", + "tfg.tooltip.antipoison_pill": "§9毒を治療する", + "tfg.tooltip.antipoison_tablet": "§9有害な状態異常を全て治療する", "tfg.tooltip.dna_syringe.empty": "§7An empty syringe.§r", "tfg.tooltip.dna_syringe.dirty1": "§7A used syringe.§r", "tfg.tooltip.dna_syringe.dirty2": "§7Be careful not to poke anyone with this...§r", @@ -1609,27 +1735,36 @@ "tfg.tooltip.wireless_card_1": "どんな距離でも無線接続ができます。それがたとえ他の惑星であったとしても。", "tfg.tooltip.wireless_card_2": "アイテムの受け渡しは可能ですが、電力の負荷が非常に高いです。", "tfg.tooltip.wireless_card_3": "惑星間の物流には§dレールガン§rを利用してみるのもいいですね。", - "tfg.tooltip.component.blue_ice": "Can be placed inside a Fission Reactor to increase the maximum heat by §90.5§r", - "tfg.tooltip.component.aes_insulation_frame": "Can be placed inside a Fission Reactor to increase the maximum heat by §91§r", - "tfg.tooltip.component.glacian_fur": "Can be placed inside a Fission Reactor to increase the maximum heat by §92§r", - "tfg.tooltip.component.impure_moderate_core_frame": "Can be placed inside a Fission Reactor to increase the maximum heat by §95§r", - "tfg.tooltip.component.moderate_core_frame": "Can be placed inside a Fission Reactor to increase the maximum heat by §910§r", - "tfg.tooltip.component.dry_ice": "Can be used as an input in the Fission Reactor to cool it down, requires a Material Holder", - "tfg.tooltip.component.refrigerant_pellet": "Can be used as an input in the Fission Reactor to cool it down, requires a Material Holder", - "tfg.tooltip.component.nuclear_turbine_1": "§eBase Production:§r 8192 EU/t", - "tfg.tooltip.component.nuclear_turbine_2": "Each Rotor Holder above §5EV§r §7adds§r 10% efficiency and multiplies EU/t by 2.", + "tfg.tooltip.component.blue_ice": "核分裂炉に導入することで耐熱許容量を§90.5§r増加させる", + "tfg.tooltip.component.aes_insulation_frame": "核分裂炉に導入することで耐熱許容量を§91§r増加させる", + "tfg.tooltip.component.glacian_fur": "核分裂炉に導入することで耐熱許容量を§92§r増加させる", + "tfg.tooltip.component.impure_moderate_core_frame": "核分裂炉に導入することで耐熱許容量を§95§r増加させる", + "tfg.tooltip.component.moderate_core_frame": "核分裂炉に導入することで耐熱許容量を§910§r増加させる", + "tfg.tooltip.component.dry_ice": "マテリアルホルダーが導入されている核分裂炉に搬入することで冷却することができる", + "tfg.tooltip.component.refrigerant_pellet": "マテリアルホルダーが導入されている核分裂炉に搬入することで冷却することができる", + "tfg.tooltip.component.nuclear_turbine_1": "§e基礎発電量:§r 8192 EU/t", + "tfg.tooltip.component.nuclear_turbine_2": "§5EV§r以上のローターホルダーでは効率が10％ずつ向上し、発電力が2倍ずつ上昇する。", "tfg.tooltip.component.smr_generator_1": "§eBase Production:§r 4096 EU/t", "tfg.tooltip.component.smr_generator_2": "Dedicated to produce power from sCO2 and the Small Modular Reactor.\n Use Lubricant and Booster to increase its efficiency and manage the cooling loop of the SMR.", - "tfg.gui.refrigerator.unify_dates.enabled": "Expiration Date Unification is: §aOn", - "tfg.gui.refrigerator.unify_dates.disabled": "Expiration Date Unification is: §cOff", - "tfg.machine.food_refrigerator_power_usage": "§7Consumes§r %s EU/t §7while active to keep your food fresh.§r", + "tfg.gui.refrigerator.unify_dates.enabled": "自動で食料をまとめる: §aOn", + "tfg.gui.refrigerator.unify_dates.disabled": "自動で食料をまとめる: §cOff", + "tfg.machine.food_refrigerator_power_usage": "動作中は %s EU/t§7消費して§r§7食料を新鮮に保つ§r", "tfg.gui.rnr_plow.random_mode": "Randomize Materials", "tfg.gui.rnr_plow.width": "Path Width: %d Blocks", "tfg.gui.rnr_plow.empty_crushed_base_course": "§cMissing Crushed Base Course!!", "tfg.tooltip.progenitor_cells.mob": "Animal culture: ", - "tfg.tooltip.fake_nutrition_info_listener": "§7§oHold (Shift) for Nutrition Info", - "tfg.tooltip.fake_nutrition_info": "§7Nutrition:", - "tfg.tooltip.cheese_slice_microplastics": "§b- Microplastics: 1.9", + "tfg.tooltip.fake_nutrition_info_listener": "§7§oシフトを押して栄養素を確認", + "tfg.tooltip.fake_nutrition_info": "§7栄養素:", + "tfg.tooltip.cheese_slice_microplastics": "§b- マイクロプラスチック: 1.9", + "tfg.tooltip.recipe_condition.oxygenated.true": "§b酸素がある環境下で動作", + "tfg.tooltip.recipe_condition.oxygenated.false": "§5酸素がない環境下で動作", + "tfg.tooltip.recipe_condition.climate_rain": "Rainfall mm", + "tfg.tooltip.recipe_condition.climate_temp": "Climate °C", + "tfg.tooltip.recipe_condition.gravity": "Gravity m/s²", + "tfg.tooltip.firmalife_greenhouse.oxygen_required": "§cAn oxygenated environment is required!", + "tfg.tooltip.firmalife_greenhouse.oxygen_required.block": "§7An oxygenated environment is required to function as a greenhouse in space.", + "tfg.tooltip.grow_light_disapointment": "§7設置しても作物の成長速度は向上しません...", + "tfg.tooltip.rotten_voiding_cover": "§7腐敗物消去カバーは腐敗したアイテムを消去することに特化したカバーです。", "tfg.gui.menu.field_guide_splash_text": "Tip: Read the field guide!!!", "tfg.gui.menu.ram_usage": "RAM:", "tfg.gui.menu.fps_count": "FPS:", @@ -2113,7 +2248,7 @@ "quests.extreme_voltage.mars.desc.3": "最後にもう一つのアドバイスです。動物は大事にしましょう。中には&a家畜&rとして&f飼いならす&rことができる動物もおり、後の進行で必ず必要になります。\n\nまた、「&a宇宙のあるきかた&r」の章にも火星での生活に関する情報があるので、ぜひ確認してみてください。\n\n常に警戒を怠らず、計画的に行動すれば、火星はあなたの勇気に必ず報いてくれるでしょう。", "quests.extreme_voltage.mars.task": "Land on Mars", "quests.extreme_voltage.nuclear_fuel_factory.title": "核燃料形成機", - "quests.extreme_voltage.nuclear_fuel_factory.subtitle": "危険な熱い棒", + "quests.extreme_voltage.nuclear_fuel_factory.subtitle": "核分裂のスタートライン", "quests.extreme_voltage.nuclear_fuel_factory.desc": "&6核燃料形成機&rは、&c核分裂炉&r用の燃料棒を作るための機械です。\n\n動作の仕組みは熱分解炉とほぼ同じで、&eより高性能なコイル&rを使うほど処理速度が速くなります。燃料棒の製造は&c非常に遅く&r、&c消費電力も多い&rため、可能な限り&a上位のコイル&rを使うことを強くおすすめします。\n\nもうすぐ解禁される&9並列制御ユニット&rにも対応していますが、現時点では使う必要がありません。", "quests.extreme_voltage.heavy_water.title": "重水", "quests.extreme_voltage.heavy_water.subtitle": "重たいお水", @@ -2198,7 +2333,7 @@ "quests.extreme_voltage.first_iv_circuit.subtitle": "EVはもう終わりか？", "quests.extreme_voltage.first_iv_circuit.desc": "ようやく新しい回路を手に入れ、新たなステージへと進むことができます。選択肢は一気に広がりますが、まず最初に目指すべきは &6IV組立機&r です。これを作れるようになると、炉のコンポーネントである&eモデレートコアの耐熱フレーム&rを作成でき、炉の&c耐熱上限&rが大幅に向上し、冷媒ペレットに頼らずに安定稼働できるようになります。\n\nさらに、&5EV回路作成機&rを作れば&bナノプロセッサー系統の回路&rが解禁されます。もちろん、これらの回路にはNanoCPUチップが必要になるため、安定した核分裂システムが整っていることが前提になります。\n\n詳細は&6IV&rの章でしっかり説明されているので、新しいティアへ進むにあたり安心して準備を進められるはずです。", "quests.extreme_voltage.moderate_core.subtitle": "素晴らしいアップグレード", - "quests.extreme_voltage.moderate_core.desc": "ここまでくれば&6核分裂炉&rを本格的に強化することができます。&eモデレートコア耐熱フレーム&rは2種類あり、どちらを作れるかは運次第です。\n\n性能の良い方なら、&dプルトニウム燃料棒1本&rの核分裂炉を&a冷却材の供給なしで&r稼働できるようになります。これで、面倒な&bR冷媒ペレット&r作りから解放されます。もちろん、冷却材と組み合わせれば、&a2プルトニウム燃料棒2本&rで稼働できる可能性もあります。\n\nこのコアを作る工程は「&6グラファイトライン&r」と呼ばれます。失敗したり性能が低いコアができてしまうなど、ランダム要素を楽しむことができます。そのため&dAE2&rによる全自動化は少し工夫が要りますが、不可能ではありません。\n\n最適なやり方というのは環境によっても変わるため、ぜひ実際に構築しながら効率の良い方法を見つけてみてください。", + "quests.extreme_voltage.moderate_core.desc": "ここまでくれば&6核分裂炉&rを本格的に強化することができます。&eモデレートコアフレーム&rは2種類あり、どちらを作れるかは運次第です。\n\n性能の良い方なら、&dプルトニウム燃料棒1本&rの核分裂炉を&a冷却材の供給なしで&r稼働できるようになります。これで、面倒な&b冷媒ペレット&r作りから解放されます。もちろん、冷却材と組み合わせれば、&aプルトニウム燃料棒2本&rで稼働できる可能性もあります。\n\nこのコアを作る工程は「&6グラファイトライン&r」と呼ばれます。失敗したり性能が低いコアができてしまうなど、ランダム要素を楽しむことができます。そのため&dAE2&rによる全自動化は少し工夫が要りますが、不可能ではありません。\n\n最適なやり方というのは環境によっても変わるため、ぜひ実際に構築しながら効率の良い方法を見つけてみてください。", "quests.extreme_voltage.abs.subtitle": "溶かして混ぜちゃえ", "quests.extreme_voltage.abs.desc": "&6合金高炉&r（通称：ABS）は、かなり特別なマルチブロックです。&6EBF&rに似た仕組みをしており、高性能なコイルを使えば「POC」が可能になります。また、EBFのほとんどのレシピを&a通常より25％速く&r処理できるのも大きな強みです。なお、インゴットではなく「熔融液体」になる点はご注意ください。\n\nABSの最大の利点は、&6大型機械&rの構築に必要となる合金を作れることです。粉砕機や蒸留機のような基本機械には、それぞれ大型版（マルチブロック版）が存在し、搬入・搬出ハッチの増設や並列制御ユニットの追加など、柔軟にカスタマイズできます。\n\n大型機械の詳しい仕組みについては、「&6Gregtechの電力システム&r」の章をご覧ください。", "quests.extreme_voltage.ev_mixer.title": "&5EVミキサー&r", @@ -2325,7 +2460,7 @@ "quests.extreme_voltage.radiation.task": "Safety First!", "quests.extreme_voltage.hexafluorosilic_acid.title": "六フッ化ケイ酸", "quests.extreme_voltage.hexafluorosilic_acid.subtitle": "フッ酸の中に、石が、ある！", - "quests.extreme_voltage.hexafluorosilic_acid.desc": "六フッ化ケイ酸は、赤色花崗岩、粗面岩、または粘土質岩の粉末を化学槽でフッ化水素酸に浸すことで作れます。これらの粉末は、破砕機を使えば無限に入手可能です。", + "quests.extreme_voltage.hexafluorosilic_acid.desc": "六フッ化ケイ酸は、黄土岩の粉末を化学槽でフッ化水素酸に浸すことで作れます。この粉末は、破砕機を使えば無限に入手可能です。", "quests.extreme_voltage.martian_sludge.title": "火星の泥漿", "quests.extreme_voltage.martian_sludge.subtitle": "べちゃべちゃな工程", "quests.extreme_voltage.martian_sludge.desc": "六フッ化ケイ酸を遠心分離すると、フッ素を回収できるほか、&6火星の泥漿&rも得られます。これはラドンや核分裂残留物の生成に必要な素材です。", @@ -2721,7 +2856,7 @@ "quests.high_voltage.moon_harvester.desc": "&7月&rでは、いくつかの鉱石の&e無限化&rができます。\nそのためには異なる種類の鉱石の&b岩屑(がんせつ)&rを集める必要がありますが、それぞれ特定のバイオームでしか入手できません。\n岩屑の採取には&6ムーンハーベスター&rを使用します。使う際に覚えておくべき重要なポイントが2つあります：\n\n•&9回路&rを設定するために、&9搬入バス&rが必要です。\n•&6クラッカー&rと同様に、使うコイルのグレードが高いほど、エネルギー消費が軽減されます。\nこれは特に、基地から離れた場所で岩屑を採取する際に役立ちます。\n\n集めた岩屑はそのままでは使うことができません。\n岩屑から資源を抽出するために&a小規模な処理ライン&rを組む必要があります。&7月面基地&rを発展させましょう！", "quests.high_voltage.regolith_vapor.title": "月面堆積粉塵", "quests.high_voltage.regolith_vapor.subtitle": "宇宙塵", - "quests.high_voltage.regolith_vapor.desc": "&b岩屑&rを処理するには、&b月面堆積粉塵&rが必要になります。ただし、その準備には少し手間がかかります。\n\n必要なものは以下の通りです：\n\n• &7月の砂&r——&6破砕機&rを使えば無限に入手できます。\n• &e二酸化炭素&r——&9酸素&rと&7炭素&r（&bダイヤモンドの粉&rから入手可能）から生成できます。\n•&9窒素&r——&dコーラスフルーツ&rの栽培によって生成できます。\n\nTips：を&b二酸化ケイ素&rから&9酸素&rを取り出す過程で、安定した量の&eケイ素&rを副産物として得られます。非常に便利な副収入源ですね。", + "quests.high_voltage.regolith_vapor.desc": "&b岩屑&rを処理するには、&b月面堆積粉塵&rが必要になります。ただし、その準備には少し手間がかかります。\n\n必要なものは以下の通りです：\n\n• &7瑠璃岩の粉&r——&6破砕機&rを使えば無限に入手できます。\n• &e二酸化炭素&r——&9酸素&rと&7炭素&r（&bダイヤモンドの粉&rから入手可能）から生成できます。\n•&9窒素&r——&dコーラスフルーツ&rの栽培によって生成できます。\n\nTips：を&b二酸化ケイ素&rから&9酸素&rを取り出す過程で、安定した量の&eケイ素&rを副産物として得られます。非常に便利な副収入源ですね。", "quests.high_voltage.regolith_vapor.task": "Got it", "quests.high_voltage.regolith_dust.title": "バイオームごとの岩屑", "quests.high_voltage.regolith_dust.subtitle": "月面スタンプラリー", @@ -2735,6 +2870,10 @@ "quests.high_voltage.final_dust.desc": "&e金星&rに到達するまでは、&7月&rで確保できる&c無限資源&rはこれだけです。\n\nこれらの資源が無限化されていれば、&dGregTech&rをかなり快適に進められるでしょう。&a月面基地&rの維持にも欠かせません。\n\n具体的な用途：\n•&dAE2コンポーネント&rの作成\n•&6レールガンの弾&rの&c無限&r生産\n\n資源が無限化されたことで、いくつかのパッシブラインを組むことができるようになったと思います。そちらに注力してもいいかもしれません。", "quests.high_voltage.titanium_greate.title": "Greate-チタニウムエディション", "quests.high_voltage.titanium_greate.desc": "TerraFirmaGregにおいてGreateの要素はこれで最後です。超高電圧にふさわしい超高性能ではありますが...今さら歯車を回したいですか？", + "quests.high_voltage.pisciculture.title": "養殖場", + "quests.high_voltage.pisciculture.subtitle": "頭がよくなる", + "quests.high_voltage.pisciculture.desc.1": "&b養殖場&rは無限に魚を入手できる施設であり、&3アクアポニックス・ループ&rに必要なマルチブロックでもあります。これは養殖場と&2電気温室&rの間でレシピが循環し、互いの生産量を強化し合う構造です。正しく構築すれば、外部からの投入物を一切必要としません。", + "quests.high_voltage.pisciculture.desc.2": "&5注記：&rこの構造物は、液体タグ&o&7#tfg:pisciculture_fishery_fluids&r&rを持つ任意の液体で満たすことができます。ただし、一部の液体は宇宙空間だと凍結すること、またマルチブロックコントローラーが&n酸素のある環境&rに設置されていない場合、実行できないレシピがある点に注意してください。", "quests.low_voltage": "&7LV&r - 低電圧時代", "quests.low_voltage.subtitle": "どんな元素も無駄にしない優しい工業mod", "quests.low_voltage.lv_machine_hull.title": "第二のマシン筐体", @@ -2928,10 +3067,10 @@ "quests.low_voltage.lv_circuit_assembler.desc.1": "これからは、すべての回路を&3回路作成機&rで作るようにしましょう。&6LVやMV回路を簡単に&r作れるようになります。\n\n&3回路作成機&rを新しいティアにアップグレードするたびに、より&d高性能な種類の回路&rを作れるようになります。必要な素材は&c複雑な&rものや&m少し&r珍しいものもありますが、全体的に制作効率が良くなります。", "quests.low_voltage.lv_circuit_assembler.desc.2": "&l&3余談：&r&o回路作成機は、歴代のGregTechで登場したり姿を消したりしてたんだ。GT5では登場せず、GT5Unofficialで再び追加された。GTCEでは見送られて、GTCEuではまた登場して...神出鬼没だね。", "quests.low_voltage.lv_greenhouse.title": "電気温室", - "quests.low_voltage.lv_greenhouse.subtitle": "KubeJSは全てを解決する", - "quests.low_voltage.lv_greenhouse.desc.1": "マルチブロック機械である&3電気温室&rは、Createに頼らず、電気の力で&a木&rや作物を安定して生産できる便利な設備です。さらに、TFCの装飾用植物なども栽培できます！\n\nこの機械は数少ない&2パーフェクトオーバークロック(POC)&r対応の装置のひとつです。POCの場合は入力電圧のティアが上がるたびに実行速度がx4ずつ上昇していきます(通常はx2ずつです)！", - "quests.low_voltage.lv_greenhouse.desc.2": "&9注意:&rMVレシピを実行するには、&bMV&rエネルギーハッチを1個、または&7LV&rエネルギーハッチを2個設置する必要があります。マルチブロック機械は、同じティアの電力を4A分合わせることで1つ上位のティア相当として扱われます。\n\nEMIでレシピが&bMV&rと表示されている場合、コントローラー画面の表示が&bMV&r以上になっていないと動作しません。\n\n&9注意：&rこの装置を組み立てるには大量の&7スチール&rが必要です。スチールは&3EBF&rによって簡単に作成できるようになります。", - "quests.low_voltage.lv_greenhouse.desc.3": "&l&3余談：&r&oこのマルチブロック機械は、もともとGTCEu_Community_Pack用に開発されたもので、いまはGTCEuの開発者向けドキュメントにも掲載されているよ。TFCでの植物の成長速度に合わせて動作がかなり遅めに調整されてるんだけど、TFGの0.9以前のバージョンでは、なんと1レシピにほぼ1時間もかかってたんだ！", + "quests.low_voltage.lv_greenhouse.subtitle": "KubeJSは全てを解決...してた", + "quests.low_voltage.lv_greenhouse.desc.1": "マルチブロック機械である&3電気温室&rは、Createに頼らず、電気の力で&a木&rや作物を安定して生産できる便利な設備です。さらに、TFCの装飾用植物なども栽培できます！", + "quests.low_voltage.lv_greenhouse.desc.2": "&9注意：&rこのマルチブロックは、壁面に任意の鉄の温室ブロックを使うことができます。使用可能なブロックの詳細についてはEMIのマルチブロック情報を確認してください。電気温室（EGH）は、肥料の使用や、後の&cHV&r段階で&3アクアポニックス・ループ&rを導入するなど、いくつかの方法でより効率的に動かすことも可能です。&r", + "quests.low_voltage.lv_greenhouse.desc.3": "&l&3余談：&r&oこのマルチブロック機械は、もともとGTCEu_Community_Pack用に開発されたもので、いまはGTCEuの開発者向けドキュメントにも掲載されているよ。TFCでの植物の成長速度に合わせて動作がかなり遅めに調整されてるんだけど、TFGの0.9以前のバージョンでは、なんと1レシピにほぼ1時間もかかってたんだ！\n\nTFGの0.11では、レシピと構造が改変されて、さらに「水耕栽培施設」という第二形態の追加だったりRubenVergさんによるカスタムレンダーとかもあって、完全に一から作り直されたんだ。\n\nそんでこのクエストの元のサブタイトルは「KubeJSは全てを解決する」だったんだ。これは当初、この機械がKubejsで作られたカスタムマシン――つまり開発キットの実例だったからね。でも今では、TFCの食品特性を正しくサポートするために、全部Javaで実装されてるんだって。", "quests.low_voltage.lv_centrifuge.title": "基本型遠心分離機", "quests.low_voltage.lv_centrifuge.subtitle": "逆ミキサー", "quests.low_voltage.lv_centrifuge.desc.1": "&l鉱石処理以外での用途：&r\n\nこの機械にできないことはあるのでしょうか？粉末を種類ごとに分離、空気の分離、税金の申告、それ以外にも...\n\nとにかく、用途が多すぎます！つまりは、&c遠心分離機は必須！&rということです。", @@ -3228,7 +3367,7 @@ "quests.medium_voltage.mv_energy_hatch.desc": "&7LV&rバッテリーバッファと&7LV&rエネルギーハッチでは、もはや全くの力不足です。\n\nそろそろ&3MVエネルギーハッチ&rに更新しましょう。これで、&3変圧器&rを使わずともMV電力を使用できます。", "quests.medium_voltage.mv_kanthal_coil.title": "カンタルコイル", "quests.medium_voltage.mv_kanthal_coil.subtitle": "熱い！熱い！", - "quests.medium_voltage.mv_kanthal_coil.desc": "&3カンタルコイル&rは重要なアイテムです。これを用いることで、&3EBF&rの温度を&d2700K&rまで上げられるようになります。温度が上がることで、新たなレシピが解禁されるほか、従来の精錬を&e高速&rで行うことが可能となります。詳しくは&aエネルギー&r関連のクエストを参照してください。\n\nなお、複数種類のコイルを混ぜて使うことは不可能です。", + "quests.medium_voltage.mv_kanthal_coil.desc": "&3カンタルコイル&rは重要なアイテムです。これを用いることで、&3EBF&rの温度を&d2700K&rまで上げられるようになります。温度が上がることで、新たなレシピが解禁されるほか、従来の精錬を&e高速&rで行うことが可能となります。詳しくは&a「GregTechの電力システム」&rのクエストを参照してください。\n\nなお、複数種類のコイルを混ぜて使うことは不可能です。", "quests.medium_voltage.mv_kanthal_ingot.title": "カンタル", "quests.medium_voltage.mv_kanthal_ingot.subtitle": "今、カンタルがアツい！", "quests.medium_voltage.mv_kanthal_ingot.desc.1": "Hot and Notが帰って来た！こないで\n\n&aTerrafirmaCraft&rをバケツまで進めた皆さんなら、きっと覚えているはず。\n\n&c熱い○○インゴット&r系のアイテムは、トングなどの対策アイテム無しに持っていると&c炎上状態&rになります。\n\nまた、今回は&aTFC&rのそれと異なり、&c温度が自然低下しません&r。機械を用意して、能動的に冷やす必要があります。", @@ -3293,7 +3432,7 @@ "quests.metal_age.copper_diving.desc": "洞窟の帯水層、何とかしたいですよね。\n銅の潜水装備を作れば最大20分間の潜水が可能です！", "quests.metal_age.bloomery.title": "塊鉄炉", "quests.metal_age.bloomery.subtitle": "鉄器時代を目指して。", - "quests.metal_age.bloomery.desc": "塊鉄炉は、錬鉄を作成するためのTerraFirmaCraftのマルチブロックです。\n炉で鉄鉱石を溶かすと鋳鉄になってしまいます。これは脆く、錬鉄ほどの耐久性もありません。\n\n塊鉄炉は高価なので、自動プレート生産と鉱石処理の設備を整備するのもよいでしょう。\n\nフィールドガイドには、塊鉄炉の仕組みと必要な鉄と木炭の正しい比率に関する詳しい情報が記載されています。", + "quests.metal_age.bloomery.desc": "塊鉄炉は、錬鉄を作成するためのTerraFirmaCraftのマルチブロックです。\n炉で鉄鉱石を溶かすと鋳鉄になってしまいます。これは脆く、錬鉄ほどの耐久性もありません。\n\n塊鉄炉は高価なので、自動プレート生産と鉱石処理の設備を整備するのもよいでしょう。\n\nフィールドガイドには、塊鉄炉の仕組みと必要な鉄と燃料の正しい比率に関する詳しい情報が記載されています。", "quests.metal_age.mining.title": "金属時代の採掘", "quests.metal_age.mining.subtitle": "誰にだって止められっこないさ", "quests.metal_age.mining.desc": "採掘、それはこのModPackの醍醐味の一つです！金属時代の進行にも&l大量の&r金属が必要になります。\nそこで役に立つのが採掘用ハンマーです！これは、採掘速度が少し遅くなる代わりに、3x3x1の範囲のブロックを採掘できるツールです。\nスニークして、一度に1つのブロックを破壊することもできます。", @@ -3527,7 +3666,7 @@ "quests.ore_proc.gem_slurry.desc": "宝石の&6泥漿処理&rは、ルビー・サファイア・グリーンサファイア向けの特別な処理ルートです。必須ではありませんが、ちょっとした手間でより多くの資源を回収できます。 電解処理と比べて：\n\n-&cルビー泥漿&rではアルミとクロムがほぼ3倍に！\n\n-&9サファイア泥漿&rではアルミが2倍に！\n\n-&aグリーンサファイア泥漿&rでは2倍のアルミとベリリウムのおまけ付き！\n\nそのうえ、どの泥漿処理でも少量のチタン・鉄・バナジウムを追加で得られる可能性があります。", "quests.ore_proc.gem_slurry.task": "Any Gem Slurry Ore", "quests.moon": "月", - "quests.space_survival.subtitle": "人の手がまだ及んでいない、人類最後の秘境……それは宇宙！", + "quests.moon.subtitle": "人の手がまだ及んでいない、人類最後の秘境……それは宇宙！", "quests.space_survival.preparations.title": "出発に先立って", "quests.space_survival.preparations.subtitle": "宇宙旅行は準備がすべて！", "quests.space_survival.preparations.desc": "そんなことより早く出発したいですって？その熱意は大事ですが、熱意だけで宇宙を生き抜くことは出来ません。何事にも&9準備&rが必要です。さもなくば、石ひとつ持ち帰ることも出来ずに死んでしまいますよ？\n\n宇宙旅行に最低限必要なものは以下の通りです。\n・宇宙服と呼吸のための空気\n・ロケットとドラム1杯の燃料\n・宇宙から帰還するためのロケット発射台\n・大量の食料と水\n・自衛のための武器や防具", @@ -4159,7 +4298,7 @@ "quests.tfg.chunk_limit.desc": "サーバーで遊んでいる場合、デフォルトのフォースロード設定できるチャンク数はかなり少なく抑えられています。\n\nサーバー管理者であれば、README.txtに従ってこの上限を変更できます。また、自分にOP権限がある、あるいはチートをオンにしている場合は、「&a/ftbchunks admin extra_force_load_chunks @p set X&r」というコマンドを使えば、自分のフォースロード上限をXの値に設定できます。", "quests.tfg.field_guide.title": "クエストに関する重要な情報！", "quests.tfg.field_guide.subtitle": "もっといろいろ知りたいですか？", - "quests.tfg.field_guide.desc": "クエストはまだ開発中で、常に改善に努めています！特定のゲーム内の仕様に関する多くの情報は、インベントリの「本」タブからアクセスできるフィールドガイドにも記載されています。\n\nクエストですべてが説明されるわけではないので、EMIとフィールドガイドはあなたの強い味方になることを覚えておいてください。\n\n追記：この文章は日本語の時のみ表示されます。クエストの文章がおかしなところで改行されることなどで悩んでいる場合は「Better Line Break」というModを導入することをお勧めします。このModは日本語でのクエストの表示を改善してくれます。\nまた、クエストは日本語で読みたいけれど、アイテムは英語で検索したいという場合は「Untranslated Items」というModの導入をお勧めします。ツールチップに日本語名と英語名の両方が表示されるようにしてくれます。", + "quests.tfg.field_guide.desc": "クエストはまだ開発中で、常に改善に努めています！特定のゲーム内の仕様に関する多くの情報は、インベントリの「本」タブからアクセスできるフィールドガイドにも記載されています。\n\nクエストですべてが説明されるわけではないので、EMIとフィールドガイドはあなたの強い味方になることを覚えておいてください。", "quests.tfg.books_again.title": "本をなくした方へ", "quests.tfg.books_again.desc": "クエストブックとフィールドガイドの本がまた欲しいですか？コピーはこのクエストで何度でももらえるので安心してください。", "quests.tfg_tips": "Tips - サバイバル", @@ -4810,6 +4949,7 @@ "quests.tfg_tips.cellar_blocks.title": "貯蔵庫での保管方法", "quests.tfg_tips.cellar_blocks.subtitle": "食品の集合住宅", "quests.tfg_tips.cellar_blocks.desc": "&b食品棚&rは、あらゆる食品を保管できます。&b吊るし棚&rは、&a肉&rと&aニンニク&rを保管するために使用できます。\nここに保管された食品は、&d壺&rよりも強力な保存特性を受け取ります。", + "quests.tfg_tips.cellar_blocks.task": "Any food shelf or hanger", "quests.tfg_tips.beneath.title": "The Beneath", "quests.tfg_tips.beneath.subtitle": "おい地獄さ行ぐんだで！", "quests.tfg_tips.beneath.desc": "地の底深く、&d岩盤&rを越えた先には過酷な地下空間である&4The_Beneath&rがあります。\n&4Beneath&rには進行に必須な要素はありませんが、多くのリソースと生活の質を向上させる要素が眠っています。", @@ -4818,7 +4958,7 @@ "quests.tfg_tips.beneath_prep.desc": "&4Beneath&rは非常に危険です。地球の中心に近いため、平均気温は常に&c15°C以上&rであり、深く潜るほど高くなります。そして危険な生物たちが数多く潜んでいます。\nこの先のクエストでは、探索をするために必要な準備を教えます。", "quests.tfg_tips.beneath_temp_management.title": "体温管理:冷却手段", "quests.tfg_tips.beneath_temp_management.subtitle": "隙を見て冷却", - "quests.tfg_tips.beneath_temp_management.desc": "&4Beneath&rは、気温が高いため、体を冷却する手段として&a水&rを持っていきましょう。\n一時的な基地を作る予定がある場合は、極地地域で採掘した&b氷塊&rを持っていくといいでしょう。", + "quests.tfg_tips.beneath_temp_management.desc": "&4Beneath&rは、気温が高いため、体を冷却する手段として&a水&rや&a液化氷泥&rを持っていきましょう。\n一時的な基地を作る予定がある場合は、極地地域で採掘した&b氷塊&rを持っていくといいでしょう。", "quests.tfg_tips.beneath_clothes.title": "体温管理:服装", "quests.tfg_tips.beneath_clothes.subtitle": "クールビズ", "quests.tfg_tips.beneath_clothes.desc": "&b服&rも体温管理において重要な役割を果たします。&4Beneath&rに行く前に最も簡単に作れるのは&d麻の服&rです。\n\n&d絹製の服&rには&a絹糸&rが必要で、これは&cWebbed_Lair&rと呼ばれるBeneath内のバイオームに大量にあります。\n\n&9青鋼&rの製造に成功していた場合はよりよい装備が作れます。", diff --git a/kubejs/assets/wan_ancient_beasts/lang/en_us.json b/kubejs/assets/wan_ancient_beasts/lang/en_us.json index 0c8c38a9e..494713798 100644 --- a/kubejs/assets/wan_ancient_beasts/lang/en_us.json +++ b/kubejs/assets/wan_ancient_beasts/lang/en_us.json @@ -3,5 +3,7 @@ "block.wan_ancient_beasts.quick_red_sand": "Hematitic Quicksand", "item.wan_ancient_beasts.toxlacanth": "Raw Toxlacanth", "item.wan_ancient_beasts.raw_ancient_meat": "Raw Eater Drumstick", - "item.wan_ancient_beasts.cooked_ancient_meat": "Cooked Eater Drumstick" + "item.wan_ancient_beasts.cooked_ancient_meat": "Cooked Eater Drumstick", + "config.jade.plugin_tfc.surfer": "Surfer", + "config.jade.plugin_tfc.soarer": "Soarer" } \ No newline at end of file From 2ee4a8cf3c048374fe88fb62cafe42f6b5067f70 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 22 Jan 2026 22:42:50 +0000 Subject: [PATCH 09/66] tweak oil textures --- .../textures/block/fluids/fluid.oil_light.png | Bin 5061 -> 5063 bytes .../block/fluids/fluid.oil_medium.png | Bin 5058 -> 5060 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.oil_light.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.oil_light.png index 1a4892311945ee24fa5ad5d5cc140ece805a5bf4..3b60203e117664c3d212adfb4dfe8ccb5daa7465 100644 GIT binary patch delta 5052 zcmX@Aeq4QmWqqZmi(^Q|oVjyj%N|?twRms)otGeH$iMmj(Yt<0XPtLX;CBspmp5;6 zviBo?4yINm7475y|NWlN@9F-p>cr)|Z@U%&tM>$3ADbt!Jqa~A)Pd_8}Cx!k{| zBClUv=VGoOz5aTMYkBi;16lqrF3YQUK5y>OsXX^}-n#>Pm#a*9Q2$TrZ)er>$EA+5 zrn>#z@sQu+<5Rx8^<42U6jVQGRj_7B_Fp*6U-Bd5eL&&ce-pkKyUg!mw^Zo-5~QRZ zJN3%dh0}#?GFtBPtR`)IV>V(lkm|aQ~n$CdNsncTM=r`+-2d>vyLRsTSGztc%-^x^ z!9m{V^A4NVo7wy*pOJ4BpqJ>|UD!BPEoVW}+81dalUZ2$W8N*VwtdXB|M^bVoSe@3 zV0F9t2RE!%e9rX9ahUk_(Is;^o3ED~qhfbzxq0Ul%q?zbkKy%lvDxwZX>TX{RqKCC zN?q;NFi%sK`Wf@cG4iFToKM`WZ5KZ@$g0RKSsDHD{G6sMQ>XUs;p%;q;;MH${$Zo5 z-(3NIsWq1aYZBYp+1J^A<iC?E|-r~9wlHKw*3f65na6Qu}_0$>*!_QM1{w!GdNu<$8 zY{J|*Vy((5`W9{3xd)CgyBoV14+`^si z$BZ62N^x`h)^)RIHu|Qt-YctcV0ie#?4#BE->ou<>ieeupFFKT`^+if1#(q_J!!LEojP@5O2vgAjoLyE66#Cdi$?!&6yk7A&z#w| z<8WbPiFt2p@Z!c=ue?&;SuIf%_f=ijMeg#Cr_Q?{U*rz z?-6Fd=iJY4oRocTFK;o?a?$QzUIP3zd&}0{oN#JW-L{GYyw_H~|FcN?)8uK9zgbVr9OtxV4AC$z1*OhH-K4#MPE8 zJ0xy%qU&ByYVyn3@;Z&J6$gsn)Es19#4jztZz21+`H;(ZKj%%GM4sz?Oem7tRsJgZ zAal~2cly^*V>b&(^Z<7Bcd$NW2$+CMaTNg@eFH_4gb19&PTFPpK+7$SlRZ{gBEvlXRx+ zwM@;Y>P2!mOP{d2cg=hKeo{q%!2aF)4Jw~(*~0!Y;ZV!nYv=DzpKbDX(XUl0doLZF z(zAHQn=^u$JNHjee#{nvz^ zh&kE9K7U0t--&x=(=4PWES>-1fNc7n1kKL!KMhjntKaopsh@gqMpE~D13AXIxnws)jLbO*8S-;`yUIZO8=OA(EQ_rcI}G&6PEqHQl%fX zBK+r(Bh2mVw(#p)mR|T!->}%A{>|sSD|}*yN2@ZLhEK$gkm(jW~2HL^@>g z!lgkn{S^mJc=ONsu;8N2^dro>-}7FdE+WX>?)t}pSv*MIJ4U*1%LbF=ZeQCSHEIhA ztgP!2-s{?&*t1Ie;>mv<@=pvq!#{EOR&3DjWRJh~fYG<|5VPI%unLFtM?v+5ZcFr} zGYIHv?_}DD_@LRgn%}v?K%qz9^ zMBkXTvIjeyP1fG}u>E7h!K1u3-(#a3>M#AOdE}y1etW@0`8NiMkJ#HA*w<9F@*in# zGI{K%r@GkezgwLH=Z@)5Os9+4@8H^I7d&GNzcBx#b4jl|ZNmQ?n0uuz@jJ)S5TiS~ z{UL=dN1C5>h|b($|LM<(8%CRV+teR$TI6_CD8c8Do6Uy~o~Kth756WD(4{hy^W{sA zd6#tSKRN_nJYJHz>&x+X{|*TqyBJyg{-s*4zM9;I&$FV6mXudGq-RakG&XzFu=w8B z)7;)0!z&(4TDj2vP;-kxIr=@>Li#!ztAPp89{CX=idXzhzHT4J)`q}TD14Q?6G`@DW!%W_Z8$0lN%&Gr`t%=u?yPpDs#_s|j&-Wjivscv)P zm|fYj=AB;+SHBj#S#Qy}UGh@M#0rHPHFt^c-1E9rm96^!EKuapyHxUWX^q^=83LLg zA1t#oedVO-Se3TvvmpPaiDeh&?a<`?*{r?1={{A%adOsaTL?rF-+!oIFt0)Ij^%qrj^511mfFk%%-yFl|C-4aq<^xm z2zZg2{_Ds|%?Vf7oaf5lk$csDX=me=%MUxxgr!u+St=V#2kr{1f5h&j{K)YWb7nL9 zykjD-md*>eGuoixwm42m`!wIA{{^?*HIK9%+LnKa2~eyG-om_5r>`bS8%Hp1TVc&wI z>TjD@#`fJ?aj%6vm`6bBXSL*{qjQo}7EkHl*;7BA-(u56z8E|CK*fVoAN9K&3G?{& zl1*4nMKG8D+fx&X#vOCK-Hb(5OOM`r93^e?(~*hi;{mlhMY^5r|7%^H8_VdK}W4;bg4^tIU_H}6;7q@sh(_3dnOQ`;v0SztBe#ha%8 zQIFegSo^GI))y4DecPjyxz2x=N$SI>)^crac`Nl^zu?|XrTa!RG@Bo~ajufv*_h8ZEz@e|gf%k~I4zdP1UbzP zUvu}&hnUGOJ3ef`z_UTsG+1HZ2j<|J9}WnKh5Ol@IR5so<;Md;^_>+3tAcIK%Z}S` zb-EL6Q;;m5zUs}K4+@PfZrc`I<>ObI?04?QhXbNT`yD>}rDXkXjk$k>+3)<*b3cV@ z%QhPIbMvpOV|aL8*8ax7d770>KN(L?obiI|8P7>+vAs{;GQRT?>dlW@e&No{jx&?= z{G6lTmH0l`c$k^9VnWSChRuiTo0Vq8uXrOU*{asOD)W>s|eF!}O=) zzK$2`e>igQu&z@Gx%bd9QAygbv88z5%JpH@dbx+1eRx&v?vzz*=x#4rSH;%6d*hsB zvq$N=i>K#n1@DQORw%w}XMF*?_gz`J8}30nyO#v>wchf#IdS&KObzQqCflpBTk9`8 zb1Jd>;9g-YccmnlUGGS)VF)R|K!~sxN!=$;ak|$$61ynm4D(zxkk` zyXoP~<0 zUaLmWbZ*whBR*cTui~s89W*gI_=Jo9mhCi7{vGii%U8K^W}gmvX+3=x%Wcj21AQ;l zV2?Y{&c#zf1%^0@9TQiR~D9+ zbh4W*>zo*Df23LMVBUU%sV&=|WdSgQexoHDx9EHb{r5oD zeubvN#!cBfHaAB(l^e8{uPnb6)^u;i;tiYFBbF%1eQ287?%1Al?dvgf3%QIb_P!4; z#XVy5o|pg2%f`du;j-D2u6lj&lV3jRPea?Wy)Jk2pG=z;r$e2%|SQQ}}DpqgNI{aehzj^D08P`tYS?UtJ ze{t!N_)@pE_ZKtS7Cm&cJGbZ4miPzWE_xpy9C3BJk@t^3bMO8MekOnG4ldqavY_5y z?c$S=Z50kuo0X?7|D~@xOLf_dIpuE4V|oSoi{?+boLyCQod3o}G5#Gf^{wo4;%8}j zdxZplI9dKj!F=xWEp~UN_ljJf_Vixvs@ca~-Mv$inCm9VFJTGY(PJqTtX!fut?Hk{ ztnyVQM(aXa8#?8e=&9L!`1s?WOW%}8yJ^Sx>-kEKh~D@+FY_V0T%+AV!L$53JauK4 zluG7iY&xfYDd{QSk5k)~rJf1Rzm@X&)sYK=rB0k)>@pK~f0mWoa@>z|)y`u(<2^R) z<(xJn`~6FmC|#>rK@OMCPcCw;*|Vo%BCpY#=UFm`wBF2^`RJBWz`duQu{W;7in&y| zJQn$=zV32-eU{gk(ofAUYEl8G*Q(g>cy(Z#)0C|D{%2mCSuyuXwA2TMpN?iBHTrcM z9?S`|DF{1m74bo#+3QfaQ}toye+v#?@|pea$+=6?HXchR?V7~DGX3+5&Mn8>R$Y0U zS{Z+<#UuYGqwA^XftQvByFbpaE&uaCrf>T9rLjBpPCx3kJ6ZX>e#Om?C;0!&edm27 z%3<1RkB>9M6PGK??YK0>|I4~ozHJW}UA=S))Q>bTD|vL#*y>S7bUrh~n+ce};)9i>K7c=UGG)ckk+c;pHDTlNWsy%m+0yPy61s@mz2H>WByb-KNW zt-+t4VVz%s9`XI>oOg`bFEHr-&Y~@{_7kk)a_+Bx(>15hI&Yg}*JSTwsVQ#d2bt^H z`JJSn&$r&r%D=={3Ag%GU!Gn0^B+_18_T8tgTDC8j(T;dSy}7Ng1Z$C<@H9A?nY<5B=2$L zpVpo?>Cl{uj9)|hg`avzz7h_QWSjnnQCcPbLH*iEtISh3l~ow5z4q<@*21XFnZ5qc zr>Re$ENgr5nXX&_`^=}&|K_j0GS$OohRsCpN^hGVveVA_&Ff@m5%{25ZUldu($SM*R2cc_Z~S;+j8b( zW?`1K<(HMbav#Jh-JVU!`MI~4Db>#P-6WPR9~#zgR7_Eq%d)ul?|w5iJ=7s!2d1;^eKL@4?GuQ6f6K|P+ z&G-N1IhO>kO?zUq^oHW*mfnb8O#zJ?4VOm-S0CYQ+pc-U_{rAL6A~7CgA4D3@42nN z;fd@4L4FIS{g+#&f0tL0Q*rj(@U?DH$poIKcmG$%e@Li0aXGcgT&vdel-KK3JD#lP zakEKK7YXnByQoRtXYq2D;Jv1Ag(qEF6|?*6C$_e`87BF5n`^Fr_%F^8%hF$y_P(d; amwlI9m2h~E>OBSq1_n=8KbLh*2~7aTchO=1 delta 5050 zcmX@EepG#eWqrA)i(^Q|oVjyz%O3CGbMf9*ZT4ZB;qUl6B|@+NW{4LBvOInF%+hk3 zN?n6OfQHkiqCdai|F=`I{knS2di!b8=VaIKzx~>u-*bM3PKd?hKf>4Tt>zmV1K9ZcfnfgecMx?oLsr+zm0=#rr$wc9W&9I zMR|vrou=B~4&n`t_|R}vd1>tp{ykEv2V+;SuoQBye^7I{S^sP4zSXafHP<}))x>T- zr<(8jpPL^Z>`&bH(qU(dsqQh>uvr@#yS6Txt>`NxU{kbn{=2U|+<)dh7u&E=)o*V7 zk3WscuNRzKuDFrWbz8Uh{fZA)yxB8LpRSV7-FUF{oUB}dsfOUk2kWMrtI37D|1tTR z=+6y&5q%j?iaXg;mxfmuRA%0CJIq`*p<=?ayrcHTTtVSsW}mc7x+aV6%&Bi>7qcvN zw#nGw=l-!(R!(New=3Ek{6ez%sNa`9(`Vnu=DREY&0CWFggsc@`lX*I zyRE+J!>x}^Bb**2b)MwDEBH6@U~|hV>%LC*9xq;g2?xKucSIKZ3yC_Z%2i02h>5*^ z;oZm{v#GoyVe|Cm6U^o>+I-mLV{#PhFSk5aivzLx`6)*;_Zzq_Kh)wLlA_+p&hwj> z|Ag?~YpV5&b`>q};QIFuDd ziS$j_^FU(VRz_id5m90Ox+6PPjnX&14w@w2bow@5gqqEVjkeoGW=)%+=c6JgdAfx? zQ%A?-r>@)*RaOFOtF zyC!0Oy=>n!OLvzo^;}qQ_SW0RL+#YWm)yK9!u%)rFDd#45FQ4pA(=y3beyPMi5hL6i5f%EtvU^MZFAeXb(-c2WI@18T3I z`q-Q}@kG;B=V1FTrOOdHmsXx(<=?YU_wMq%h0FK(#=KE*RN21Q=6FTr&iEMBNm5vg{G>v&%Q@?G235-Kg?FE_2b(-MpT<$wpV7v7VU%tA>!Kt=Pxd-#kzBXCGm3xIT{K(~xTaPp!<1cHuJwG$$^txW&CF^#CY`85V z=fh~)zxGO-{4r)Waq|y%$}<@~U)O)`6kd5Jx7n?3!{L@rc^M|T4Ua_a1o*iw^|0@p z(sS#N^iM|B2XT|G$3*>kpmpPyPvRvz9~%#=?zQTlVm>mL2mNlnt1J?HvS7PS&{07l z{z=MVDUbf0_^h0K`pmmee;Bzt*+jh?3^}Dg9#A%#60F|xXI7K;q!hI!%atp=wjW`x zcXgG&JoV)z`Q5*{y(Qe!&+c75+hpI2iUa4evrbOD_mFY!O4ns)Zfs!gtGceQuX8l+ zVWao5wtpP_pAM$`Exeom<;9&CyRDB7a;)lP|JmFzhwW#{!$xCKPlHT{m~)HlW*)uC zDq@~=+;!73qlb-WceL&~(p>T|<-_u}=lmjj)#QBY>$&Aryk|agDAQS)tYq7p8a1^m zW}oB4)5|lqXv;rg_slFh;_~7dH}CTc9EAbI z@;$qDe9b!dl*cUf_tHFqT^}`mm?@KZN54XATF(ocPt9!xJ3KBgo&KqENwU+DBh9ma zU0K1sl;!2jljq!RJltz;HJ@IYj)1EUqE-$10cFJ?~cCer1U&1R_Ar-u0 zdR5%d69*Pa^j3MU(XsaUcQ{vmsem-s?R}iwpbGNm+rO-RPuh9}L)ZN{_+`yArTX5( zzg0Hr_B|InwA0(nXu_3Ad+q+(T*~CUQQWq4arGZPKbMs-CdzlZ;sQGR0|AQj_X~IYpkFxp5oIj1L$4 z3Ozh@-^uvEv@1T1KMwKxq#k1Sj)<}Rs35<+{P_`PZmnM{}ryn{Er8E zYv-)oRD7tJMM&yqQ<$~Q3?D1Y>wVt^0t$0zbFu#TEbnEBdUv3^fWus@a z;}>I#efgh+-_^^Wa6VzzaZg&LJ;PWfKjO=z?d&_WJx%sy&UGqIS2FV6Wx<=f^Rj8< zaXx;P2acayna=R>chzUqE!^auA~K6-)v}YjZRTCSe&K}>|BjH$$=9E-|5RGE{}H?H zgLgj~11j6uTRU?sScT60T(&Rj?anQn{6?lzeiYn(cu-I7(#}_sJnxPb_1)~4zqKcB z-%6j4MUls1Up)JFP*$h3ydpu~^Qqn>KTDA;`;Q9dkJA^uY2o}5Qhvp0c0KpSp9kb0 zo~;PD>?^xNfPdeG8{To3735Ur+PBP)S~0uwFmu%63k^a)Z*rG~G`42$e;L?$M?YXv z^dm;m9o(OF^Ng(0f1Fxjqndf^@V+4T81p$Zx=tH^RJd#tJY#uEblrx-&09{iv0r|y zJmuK+St;*797tuFbvemL?acej$5ux^s-NO)D5qjC@liqd{gqux)5?x8AN#xV!_F%u ztBwj8YnHC4e%Zl(`2@>kZJUhm5o$IM>J;a$l2Tox>%H`S%qyXs<$oBh7tOC(al6H) z^$EL}alDIG( zZhn6S_-C=~{(C4y=-#yDt;;7>T(I~eD!1j$S}VDb<<>U!Cng-bwCOP~i@ z%6%`jKPoV`&d&1+(>`cjJICu2vy{|#q0;>mqoceGp9)JaKegK?C|yOblYQE@AniRWbQh(!npGJ zqUn3?TRio&=zVHEz2K6S_VeW`w#D)@9+{oLylS%Q>euhh|M;?O@iLksO@eCl#tqrTwIBhA9%oQb=C+AsO~&&lfIm*1@Y_bxTs&8&Bs9DMT; zW9FH@ka@56Z^@W8BdO?~9Mc&WKk(nKSRLymWF$ zkSLQ{-Gp5;J{&my__wfSP}a9k%2%-bVsSUIf1tLtWWu%7EelUt z&G+b@YW+a_eqY86@0zU1XIBe5yIWXJl&+8Nqep8D`TDN!k z@|3@>Mw{h;S$=2Ta9~35fz4EeKGVknS^-EIHD}%OAe_ER8IY!P>FdfC%mI^E{KRG!aWoK}Ba+5SWME`7ml#z;Noqv>(2 zbNebDcm>;C+%0BxqlsNabK`-z0{pWsb+Vs-(Q$d^l%Hb!Oa6YoQ>yzhVS7uk){`$H zWpT$RNzRq((EOOme!j0LJ7%Kh^Amk)ozwm>UavUL-*Jmu?uj<%iX)kv)9>%y|CoJR z-YtET^0J*(LM_Kz>)EF`e5?&W_F~T$JC8%Vc=qMqb~3otKTd|?J>@nlrzb8{nFRqV!o zCEV6;igM}-e}`0wm{06E6KWc_d)2SHH|6B5hX=Pr-Tr_5Smx4HGrPIb^J4tUzPQZZ zUg02{GA;jS{kouVrH=`pT=bsmetb|KVP##ZCMV$V{$Cn>n`S!_$*-TC4L^)2-|1|OO0!~J-^eEd}RbWf!DU;kn+=ZNS@ zpQj|XpAj-kddcm?dhFPoG~c&^>Js;s37nsBJxnqA!56=yh4CNr_8*v3&fsqIfa8y! zaNNE62^AA~R1aSJ-FeB;XiEA2_q7L`Un=@f=e)P#i>jvf+SQLH?KhJ6*f2LBM)O-Y zSDiucJRzU2+x(3^yjB;zy>?n!qHOWSJwMNUiaq>4UZF(L=F`l*#;;!fpJY-cu5H6{ RgMop8!PC{xWt~$(696{UoOFtm|Fo_6`0MxIeqDCHBre4*dd}kik+18oFPHn*ROI!m z?_A9Fqt{BDZ6M44#btRF&*#k@I+f?X&U<%Y?{bwX5B^F0t?#UQ{OB@ zJ07wx`BBEcJ-ju)WP(tI=pLr6J?<|aGRxXswGN5dZLji|>*Df9j(i?Ud#9Z63Rf*H zeX-PK{u7O^Q$gnIc75xZtaspO^oi|j)#+~1B;C*EtqjdD6E1l=- z3U5fE0@%07AevRo6J1olq$%vWK5jF&5vrlu;dcUo)_Iq~$j@QQ?q!RAMr z*w2x#wS-!`x^dI2~-Su)VSO+IdNm( zKGBK;s@3i6X4REknV&VStbK&-mxV6Ke-hTfeCO*Yx3D?ixPwcyd@5XA%O+JE*l_Wp-H0hCT7tsM*ZWF?#G0nf9r9iAm4oBh5vXehN9?C3DZQF^>&HR;QrBGhRAcA?0@% z${(?dnD4**P)_PYgVeLXM|E1KcCxbw)_;<_9c?q?hvPDLahnAj3$%Tbe2djKT+=dG z;d5|WK)rii!IBp{|LJwIvwqzDn|rdmpLewYznagD+`oTncY0pdTeaTnnzpRZNsF#i z=VT^M`^{~6i7%m(opsd{_Lc0%dP{a3 z53ReNHoVDA?_A6n`HPePPT?``X_G3B^RM{0=lMC0SjisEdb5hEPWIjwU&)?DpI%&O zj+kYnk!P{&$9ccZj8t*!X>P}qN@WuEzQ22R*B7_Utw$y`R4?g#_TEfoYtPA$$>M$$ z0n9@DYI#Tag!omy{&5W2yJXuX|B$?&&HQWc9GK6uuajMV-GjeQv)%>2-s`b2?y0aa zzs#;nc6**&aXif2cj!<3#`C)aKc8#Uo1iA`e=O{K%x0y%A1zA~IHiMg1A5!0c@^3` zVpP_*EjZNd_Blp~|II%0nD`(U9vQKZ!n`pawK|2l7MBiP>d`g(`ry;lhC?sk{Ak>} z{e!~iRqI^Te~153==a<+$vxvxbF8P$k85oF8K;EhKJ46bh}lYbdY7S6Y5m0y4m%RG ze#>6pq4l;d`JLB36Mf~63s}Q5Rih-Yb+A8ScYoyQ^mAqDJH2k>z$dbD0vo6O?v*nY zoMEB(_m1C$ChcmLTTORoUC#^#- z{xtu@>~&zT%KDvKejE(l@O9>)CABjuCX|Rp`#;(Fi2dD?Z``}xHI_|!m{+-^OIbxu z#eL0*BY!78cRx05=G~`1nZ<;7wWcv73z!Cq>qQc`==>+o$Os* z^>)j&FE6z(|1LhwpzqwQYJc<08pDqbbFW{Sq`dbqvsG}n&&-X9>@r{1-H(gt+Ixt3 zx)1MPZJQJ9^DSG;_Fr6FT>SG&7rXKbHMuAJN<~snF1NCu3sE_^gt5@F`&Wusx_H2y z4q5S&vre_Jn>`l$B*cHIb@IXaQuFKszRapH_^VrAF+nG_i}~ipC4HS=Or~XqY8Cxt zbJd%_=;FGXN%AU7PYMbzoULy%$60wL^QuR`Ro%UqXRRsmVfSy{@_*fZzcAS!P1mpU z-pRC^e`V75Z^yRS-E)8N_Rx{$)YHY?e8wNH-D#~+`rEif$#CND)=6cDnseSHr(4a4 zmfyTfZep)+#q4@TU(rtXL+M2=h5H|@j4)dC`2@ezp$AI7)8kG(pV-GaQHVe9Rq$fH zDMCxq)vV<|D#&KCzwMlTX@dQZA}#ZnI^QWLGsDvy&icJ7HfJ?YahH5`YRcqmn*^Ty z+?)5RLNeA;*r1c$-(+7T`<6{9FXYxGa z%G#ob*QZWX$UGxBU(;@G&d=1j(oym=?N9i=c+s18AV;paFE_IM&jSf76)AI@1xpLx zX5Jtl?JAPWavZ#TvE|o3Bsfa1eJaH7p|&#D>9s=`FREp9fdA_ zONjSt7VJ2^GsPr0FevEWT7QNj`*Kcy8>6`0PIumLCXI z7xp`Mp?+St%Gs};)0gSQWUo2rRg&CimU~L`>e;;p#$T`0nNE_wy7qHybB>8;aK!}i zC7}zaZHRsRm-U==@RMjZ<5Yt?8je?$%|DzyVC1VVJV{hohw=FoZ?BBcU0Y{M&dZ*} zA^uNn7UQ-hX{F0i@i7Nq*4(GPB@2>E8zAD{dhxBR7H08Q$MpZwT z867>HDp|g8_HXv`4Oi|yY^+t8y4%C*X~2rVN1E^S%4e796t&PQ3;XWfSdcavv+X!zY)vMOuJhHW}i>xx!-Zj+-{$K?^Mg@DzjVJC2cfV?cXl+O}Dn0v8~|}SK)st{ux)Z${gwrl+HK$ zlgnNI*m&vDyHxH^gbRqW@1?M zs=eZZ%8j?;%O-u;W}|B}^+@xvh3h{oNX@_cae>v{hmLLaCex;|?mH#F=P|n}t6EqY zZ+TgO_Y1ydAN0QZ-S)a5T`UszjiEc_2y@(q&jv3hoZWTr2itMx-cQRpV{UodB%J*0 z8{f&!sd1+ycvBSTy_b(eCdps8uw(j)-@SJ(1$Al8zhM!2@99J<6%#BJ_LYw^8L z{vOlxKa{C+e`m|&Ymt`rsxN2$J|MEaa$eY6oygew{SWh%7KBb(I3?p%`If#PtIw_Y zS{<^$UGL6`<1@qOedDg_JfSK#XNL#J?X&+C*M1kj)Vb`we#Mt*d|ytg%&MPrN{rtl zxopX&kpD|vHy;t1{Q2CADXR@1IldDvs`B-J|AW!`)+5I0uh)NQ`0O2=>e-paW%sjB z{>ie>Q?9lD-Zb&itxb1!`<8y*@gk$sC+C3wr{*aOxTYJrCuOyqI~sIe-s7|1RKH_W zR|yz=Y`$`|h22i>{`?aYjZPoG^y6S--;R2w-S>@k{~S=hpl-3~C!_hwrOjLP7W4XE z`{@$3<_=^0&oY<8F^__0=fusGuv+A&;rOyaxu|^K;pT5QG#yQ^TYTr{+-81IsQ9hz zT$k0Z?!jCczbb>)b@WdcH`wIZ_BW>2Iigk8I5;Mn?bL3YmE5y;oo@2z&zPh1?@;M4 zZ{N;+^?r2|PPi~eEA#T)JCRk*?42P&;hz-0=E&JjymrH5>aM*y@4aUWywtT{ z;PKPOYgfsuj6ZAN_sP#W{PEMiE!x*pBllcXw|p;SYAsj)vvL3B+Rg~>6Gf7mcAvH0 zlpJ9WpY^Hp-qs5T#cURMbh5r{skku3&!)o7ea^WhXSP=;yq*7iU3Mq?Zq+$Kip!U8 z_-r-p%!?}yKAry76=hSRA9wj!x|f-FZh6AL-}ycx93a0I|^OPt(dSkTKui9%`a!0f|&tU^IIf8Ds22H z_FQVaU)!XEs?+=5+iT35@n^wb2BUR?`uSBCZT9a|nRuc%Sby!CPwXq%+wAXaO^oxp z^U(g_<%$EEUazdf`?fu14?5oc_V?7-iI)qHpEdI+EIPTP=gbSeiU$uIGwL7zDSp1~ zLF1K^i{}d|8=sB1_(7rGWS%|Oqd%J`C+|AFmAla9x|6j3hQ{;n*({dM7ti$JaCv>3 z(dYI?mA#gx_v05#v|auszH44)uy<@lflI6G7HR$$@BGysdn}98JS_b%xAJIk&uJ)uEg>zDal;lChf^R(`DfQmtl@zvs428&m(19XqT(HndG%8Q^_+N26I` zVmo`iO*r2S5%;K4Bf&L6dCw-QZRAwqzF@Oxqkc@F^sgh)HYX-cv$WIo%T;f;+j@}s zp3?afb0+ETFZWw;X8DQONeyChA56_!-W+k}J%0QD{s|TebFz0Xi)rQTjnIgE=$K_C zxI*>u^D-cgggH0!8mVeLHTzwSSdvkBW5Jgqy_5Z9fKblf`5Lk+&XwQ)-xIf)A@`|d=7V0Z_(_{C?b6cwsogBde}nVr)TI3@ z9O`O?~| zI95D<{baGbyzdT|*jx~v`^xald8JKHEU#DZV*WmFQb5!1>@VuC>gV=fXUzMvUlP{_g!@KdJy`7>xz-w!gl_WA0h7p3g7;l@I~8Yeiyr?Lg$wtCGFU$SFSFc zE>t^dv4)oS-5sxPDf=xG3105o6{6HV_1V)sd+qi|c21jd^wg&3H}|~%wRg($IIj{` zvx3yyM~&@Hua&>}qvosM?)l4%>K`>)d)Q~Z?t7mrSy{B|g*|_O_pIOo=5Als`73UJ zXb5KMbKk$(^-&>y$G!&#d7sZa zY+7$-^P_x5zEyx;qHlL$<5abr1xagPqL1kK zuv+ms(<8@W;@d};_~mTAUUH0z-Kpi~ol`KkxSc(Q*UQCb$LpuPo$Obw|1BwXwOh+P zOMh)DY6RPItA@j+qXtG?t%jEjQ~GqX(y);B-;VzNtXKqvb=w%*pGR=>g? zFiw9XD|h3~Q_Ur3m%n&p;QMDrSmVBl(Tscr*H24F7T(hLxwz8cp`hqZ&qs`h>kc!2 za#>&6xnf;R{Yxf(ow9k0>rO~^%ikzix8cC`OrO+KYb*>uPigqGVBsf`MkBEabLWV) zDy!&Qv}NZWIKu3D^hk5R#deoxI%Tn5pA>iOdE1bBh*|!2vG>Bv&Xdi^UmB?!3vj?i-h7z1FWguFti75-O^Nrf$A;WrAhP@-5HV z!+n-6{Bllc^Cy-S?QtxNXD-{d$;e1m&ZO=^7mL6#&X?&&#p))oI9-g4TBi7}AV%S? zZ}P({842-0+q1)GiDX^gcci{KWs%IxeHR=oJ~sSO@SXL%r}OrS6xF9fyRZ1!e{8t? z^O$8>(ea<_+5J-bUaZ?Ebc8v6{oHJ`C7agF*Oe=1E`6oG|3%xMC8^iy94|gNC7kKg z%5I%DNj81&q2}^^^LaTx&-#$C=|qok>dce;lP($f3GttLYS|iH<0o`ckBdKNQ+?dI zBh5WN^DZ40s#&FN)O%EI?x~m$2VUR4RQpP->ecZhNBM+Yif*4S?wLOQcPr=0l^-Y~1FAlREVfH)zXMw@Ry_YAf(K)))+h)d`ws&)XMSN(u zp;5Zjcf!7-&7AU=)THcZO!AwO_G*L5QzNy9DfQ{oD?Ti}I>q?Jhu=-?FD-)I7I!Q? z;P+*di?rbXn6Azh)me|(_g@ix=@uWA-1g-$`}}tYCZ6#AyjJvD-@Z9FpLkd|sLF|~m?XbMPQv`sLn-?OKTO2#t-0~3`OefOx2wFiMLiSF7Bvbt zdU#O$)imZ!+vlqGv8B9Jw<$O-sUP9>NY;MAvCs3Yl}l3%mfd(z|58=XM93`FpzG9P zXa1zjQww%Hobkxsdg;Qcv2P-zB)hK^HhkSzZvOg`^wO(B-c0W%s?FMed%_hXwP4>k zi-(T99yT*}2wHpCOt|uy-Sg|DTVD2oJD>8~Z7E`|H~OI_SF@w(J9p+T|Fz$hTC1k| z``8q`@cR8>QZPF&zXjLl<97A$-OgG|?{b)xVMOaC;kXyK$xYbT|{&^39Lg zzui03d}j47p}BADKQ`N_ee{xB$jM)(`td=uw9Nud|B3_8FLCj|@QKkn)^Wx4a6R+G zrj>8XV;-;C^1FAZ_RmXudX6-U#Vnngks6^aH$h&elb!SF@@qSH>zs3$SYF|9B!-o9-_A zkifN~GH0pT9|Jjq9XlGI@AKyNh??&|$D{sfp0vrQW?40#KMw>xG>ESM&{z>LA_AQ>CgEiJWN(ZF!gxe=wO$dxNwe@;*;wlF%wmc6>Vit2Jcdp z)6n`gqkf&w^nZ8m#z!2ou*!aCdw0plqeqy_;)1>VzVPwC@X<9&J=P{$aAkL0b)x1s zF8&xJ(=YQsD9G156S?)*t^eHFr@`8CJqu=4Ot9}bkvYL%T+SkRBFkj9BTsc+O^%!s z>rkj%7Ne4_B`kNNC;Ei9jfc1&TYXl=KZlFij}Cs>{=l(*(-cjO_-wQ?$eUD??M4z?-IThUGJyMX!2%kx@0J8BYNrI?mFwp(g)me z@#Y1~f7S$f-@7e+`B#N}<92Rg{%N}Bb*;`Eh%OfY)cJ*dQr8iecj8{RIQchi?4SEG zA+Pq#t11^WzX!Q(CiS5zavbwd3Lg90v^?o#$2n#D436e*lh`WF`R-O~E?zb}R{Hnu z3hSrBDW)uO+tvj{!=qo?io=( zw&3ljTI0i`nwA*4*DU){vgzsc(!7k?lz$553m2R3V%%JL#&TQg-H*-5FD7K%`Oq-! z*v{o4$&<7`E|{`-{v_E+DLoYmCKe@kBM&#T=5CqhZKE)A$u`cn-7cC3n|@~;IX{cb zdWS1}NYo?8pWL2{zdXKWZL>l>fu+3uTs4PNa+E@1ywrySi;AM^d)V*H{KF|HQgw6Y zzJekym8}N@p0jUn|FyUzPvL7xh0G|R808eaO*+ia>LfD zmCvX4^XPP4TrvH~sZGsK?C*RFc;uas2z=Tl?{hv&?~=tH z|9Yj{k1FyM=j={VX7<#*`TFvC<+;-uY||}f|6sI^{h)AC?c;&c8$Tyj6ufxOw(N^| z#fRm87F;;F>C19Q?A|r z<{LMCvH2?VhX+NNTipJ|wWSy?mpG~MG+FQQQ|7*$E%nUP*Sm*!6fFIrEVxm0QthsT zE$p5yx0`D%dEFHBo=>{yh+828*Z*9?B9%BCe(3va2zpr}Kg={}p&b#TN zitj_mxCvpcQHRQUzl&SE_nDY4d1lJNg2gPM{dW$SGoLn@>*EpTvw>w!u%70^v)b44 z(kj+@D#iSW&S1MSX_lry{Eq`6YBn2Mj!qTk|5R9A?q{>XMM-YXtC0Hhy>~zAuNC+% z#((F=@tIoI>NXw<3n%JkY(3n3a>-<4Gn<0eJNg&)2+zD#r+D4`W5ea*oyGfH=Etr% z^Y~EnYI%nr#mD)#?N9fb=TLW`NJVW|lcn>gHdp=1>W1BuTprK9rfE{HrnGrU_vH)I ztYd{M-h6Oil2eISIq>Ggf{thATJ_Z~ZVOK?$eOk1^yA7}{$9P04c?}T z*Ii(G*C)?0wY(x=#)-CIg@<$UU#-46&wKU8W>G^WMqdIT%#l&i-v;$UCK%Q=Aum6Xq{6u2VbZH^afd)LnPWPJy}n z^?wBK^{|`Xz0%12@qu*j-Y2HKj~p-kbpEljb=ORDn+2v^yc!ed?@e$QjhOLmw%pVc zf0%g4?l!ppNNsU(+xnhU!IPHRzR@l{QhK;^kI2m-dmr={5;rt8X&? zWV~K`>ce*33C#7UTi9PN6}FGKH-Crn9jSBXv(!tOKi18%E6BJpLv79OH!t)=|9$c7 z_p3W_-eoOY^Ob|b;+#fL*tx6kKWuEycqhK%g_!t{xtBkkp1pjB!prpQ$0lFdVZG}J zv-IU7CsxWoa-5v7J${DQq1&Ifdany8zsafjY6Y44 z9~)H9o7bw!sVpeC?0YgxwPJaHuxFiv^W(Th@63z5y)~EBBs~tPobLXr=ZNaZ1D8x} z1guWhmOOG)eO9qQFk{08!xA6mdg+e}J1<1n9r&rAV`HTt*CAvu`}yO!<$4tkfs&#Y`Fdmq>+x3fT5K0U7Tmi`A-rRfy~kCYU1%>TDUby!mWBrAM%w@jiMd>ejB`R4t^wqabd-QXimTdpi zp!D>!#>-197k}Ko&$_OF@A&E8m)6BhPyOgN|H+=>D{m^Eu-E_d`>vX#t8hAX$&WLu zH(VCvkI6ixUUl7xJ^Dj~lB(Da;YW_aRv#Zo$`)EpHoE_)aZCNY-Ro54-b^d-YMnFh z(7D$UMvH@)4OQ*lKDZf}*Q;&xROaSIm5Y)3Gmbd!kJ!JK_y$>&Q^*b(Wep}(_N!7_O`NbzVJZOp;v>H~+a<@lT`U^Lf9%mwMOrj(m*a&b2wnX18DZ!IZkVC5DOuYxCI+ za*t2?^6W}YeWTmAIhX1+tCsodmOeZvC|Y(Q&t}1H`%66NHbAQ^HaF zwy&vum7MQ|*A%)OmHISMt8+_oXLnRd1?&x?*$j;iFean5F!dIqCX7X1jHy zRaWjpOuc17kWA*)lP(*)cFuI4bwsU0$Ki9wv3&)uxi5tCKPq@fJ^Qi6V(VO)Usu@p zE4pozi@mn}xo6pEG+(LQlPRj=!1Wsfn}qpIW%B?3cY4%Nu?>co zEST2Q|C*Oyt=UVpXm*81wwU_Sua$gX>>tWY`}{dDRhYTHcF&%8%lvD;|1ZzEByero z6Pu+s6gRi@M*M0DXxwPHJTkcY2xr@N%_GK7wuYXNu-F@1cqe?%ZT$^TWDf}PTQKdv z+%o;Uyo#KPv*(7db&E>fLbs RFarYvgQu&X%Q~loCIHW#!KVNK From 0838fab0bd117e6dad220df8dac3bea3f8bbca43 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 22 Jan 2026 22:42:59 +0000 Subject: [PATCH 10/66] pakku, changelog --- CHANGELOG.md | 8 + .../quests/chapters/hv__high_voltage.snbt | 2 +- pakku-lock.json | 183 ++++++++++++------ 3 files changed, 134 insertions(+), 59 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ddd4fb17..06cc3cd55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ - Mars log electric greenhouse recipes now output the same amount of logs as earth log recipes @Pyritie - Geodes (in newly generated chunks) are now completely solid so they won't cause cave-ins any more @Pyritie - Recolored the different oils so you can actually tell them apart visually @Pyritie +- The food meter's saturation level is now indicated by a gold outline instead of a red one, so it's less difficult to see (#2812) @TreyR9 +- Changed some of the colors of Greate things to make the different tiers more visually distinct @Pyritie ### Bug fixes - Fixed a config bug causing waves to deposit shells etc with 100% chance. @Mqrius - Fixed a bug preventing the Pisciculture Fishery and Hydroponics Facility from overclocking. @Redeix @@ -23,8 +25,14 @@ - Fixed roads losing their movement speed bonus (#2790) @Pyritie - Fixed water wheels misbehaving again (#2791) @Pyritie - Fixed not being able to cast steel or higher tier materials into ceramic molds (#2789, #2794) @Pyritie +- Fixed the Ad Astra airlock not counting as a cleanroom door (#2808) @thederpysockdude123 +- Removed some leftover rock dust centrifuge recipes (#2804) @thederpysockdude123 +- Fixed some mars plants self-destructing @Pyritie ### Translation updates - Spanish @NikoNeko17 +- Russian @Petr211071 +- Chinese (simplified) @jmecn +- Japanese @sakura-gondra ## [0.11.17] - 20-01-2026 ### Important note diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index b2d05fe1f..f9e60e956 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -911,7 +911,6 @@ dependencies: ["52AD30F04DD5A812"] dependency_requirement: "all_started" description: ["{quests.high_voltage.hv_mixer.desc}"] - icon: "gtceu:hv_mixer" id: "05ABC370D7153350" subtitle: "{quests.high_voltage.hv_mixer.subtitle}" tasks: [{ @@ -923,6 +922,7 @@ "ftbfiltersystem:filter": "or(item(gtceu:hv_mixer)item(greate:stainless_steel_mechanical_mixer))" } } + title: "{quests.tasktype.item.any}" type: "item" }] title: "{quests.high_voltage.hv_mixer.title}" diff --git a/pakku-lock.json b/pakku-lock.json index f16d62b50..1e688e275 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -5968,7 +5968,7 @@ "curseforge": "ftb-teams-forge" }, "name": { - "curseforge": "FTB Teams (Forge)" + "curseforge": "FTB Teams (NeoForge)" }, "id": { "curseforge": "404468" @@ -5977,7 +5977,7 @@ "files": [ { "type": "curseforge", - "file_name": "ftb-teams-forge-2001.3.1.jar", + "file_name": "ftb-teams-forge-2001.3.2.jar", "mc_versions": [ "1.20.1" ], @@ -5985,19 +5985,19 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6130/786/ftb-teams-forge-2001.3.1.jar", - "id": "6130786", + "url": "https://edge.forgecdn.net/files/7499/810/ftb-teams-forge-2001.3.2.jar", + "id": "7499810", "parent_id": "404468", "hashes": { - "sha1": "c2af94e0b86631cb75daa8de2377ff72527651ca", - "md5": "98efb58ba7cecfb39034544eced0389f" + "sha1": "c49023f5d471aa1ba7fc624d2565fe9e82b7117e", + "md5": "1c547d6f1b22f461f84c5fb79067b0ec" }, "required_dependencies": [ - "404465", - "419699" + "419699", + "404465" ], - "size": 248592, - "date_published": "2025-01-27T16:07:52.110Z" + "size": 252579, + "date_published": "2026-01-21T10:11:35.007Z" } ] }, @@ -10480,34 +10480,9 @@ "modrinth": "RSeLon5O" }, "files": [ - { - "type": "curseforge", - "file_name": "particle_core-0.2.6+1.20.1+forge.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6427/560/particle_core-0.2.6+1.20.1+forge.jar", - "id": "6427560", - "parent_id": "985426", - "hashes": { - "sha1": "91f302ab9b85016aeb3a9a0e85b80650a1d2e984", - "md5": "ac9abf66740c4c6fa0436a369fe446a8" - }, - "required_dependencies": [ - "1005914", - "351264" - ], - "size": 97943, - "date_published": "2025-04-16T00:24:36.463Z" - }, { "type": "modrinth", - "file_name": "particle_core-0.2.6+1.20.1+forge.jar", + "file_name": "particle_core-0.3.1+1.20.1+forge.jar", "mc_versions": [ "1.20.1" ], @@ -10516,19 +10491,44 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/RSeLon5O/versions/bqPuw9aZ/particle_core-0.2.6+1.20.1+forge.jar", - "id": "bqPuw9aZ", + "url": "https://cdn.modrinth.com/data/RSeLon5O/versions/dtIZJ1r3/particle_core-0.3.1+1.20.1+forge.jar", + "id": "dtIZJ1r3", "parent_id": "RSeLon5O", "hashes": { - "sha512": "58c88b1654f3b2d733860aa3358cfa322245f2edc4ee6e79150912bf675c6bdef936f2f4f043a7cc56472a24cdee7f5963b6db2631478446fdcaf14ebc17d94c", - "sha1": "91f302ab9b85016aeb3a9a0e85b80650a1d2e984" + "sha512": "63a2c186e74851fef7ce7871c09126deb0a8090de417753873b74cfe3db3e2d61b699e2fd6033526f38356881c1817e759e34e5b536224c17247bd3b3a6d6be8", + "sha1": "935a8c19cc7a72364fdfe494d9ddbd599f01588d" }, "required_dependencies": [ - "ordsPcFz", - "hYykXjDp" + "hYykXjDp", + "ordsPcFz" ], - "size": 97943, - "date_published": "2025-04-16T00:24:40.146141Z" + "size": 770117, + "date_published": "2026-01-22T01:13:37.946023Z" + }, + { + "type": "curseforge", + "file_name": "particle_core-0.3.1+1.20.1+forge.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7504/78/particle_core-0.3.1+1.20.1+forge.jar", + "id": "7504078", + "parent_id": "985426", + "hashes": { + "sha1": "935a8c19cc7a72364fdfe494d9ddbd599f01588d", + "md5": "4386c25fd855cc4de76c3458b9a182a5" + }, + "required_dependencies": [ + "351264", + "1005914" + ], + "size": 770117, + "date_published": "2026-01-22T01:13:31.647Z" } ] }, @@ -13903,7 +13903,7 @@ "files": [ { "type": "modrinth", - "file_name": "tacz-tweaks-2.11.2-all.jar", + "file_name": "tacz-tweaks-2.12.1-all.jar", "mc_versions": [ "1.20", "1.20.1" @@ -13912,24 +13912,24 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/H8peNuJG/versions/qD990J7Z/tacz-tweaks-2.11.2-all.jar", - "id": "qD990J7Z", + "url": "https://cdn.modrinth.com/data/H8peNuJG/versions/RMgTVnMg/tacz-tweaks-2.12.1-all.jar", + "id": "RMgTVnMg", "parent_id": "H8peNuJG", "hashes": { - "sha512": "67ab623a60951ce1d6bb9b5a9e0b7a8770b399d19c8de739a7bc7a4f3536126a232cb1292be4f7599b921c2075344dc360e6a80fabbfe6c73c775bcb77fae739", - "sha1": "889c0885b6388fc7966b956a5df4efbb1c758965" + "sha512": "1ba717c181bd2211dbb82f23646d5e152bb8308475a74559b65f0ed027c55e89184ef058512cb5bb1a707e13155c609c929085510710e40f6df9baec1fc0bbf4", + "sha1": "92c9981e2e2f2edecab25ee48c5bade7a14298a8" }, "required_dependencies": [ "ordsPcFz", "SzzJttH8", "1eAoo2KR" ], - "size": 1748066, - "date_published": "2025-12-04T12:41:22.415350Z" + "size": 1894147, + "date_published": "2026-01-22T14:38:58.126712Z" }, { "type": "curseforge", - "file_name": "tacz-tweaks-2.11.2-all.jar", + "file_name": "tacz-tweaks-2.12.1-all.jar", "mc_versions": [ "1.20.1", "1.20" @@ -13938,20 +13938,20 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7293/523/tacz-tweaks-2.11.2-all.jar", - "id": "7293523", + "url": "https://edge.forgecdn.net/files/7506/850/tacz-tweaks-2.12.1-all.jar", + "id": "7506850", "parent_id": "1193263", "hashes": { - "sha1": "889c0885b6388fc7966b956a5df4efbb1c758965", - "md5": "0b11bd77a8d1e56bd8673cc9946023e1" + "sha1": "92c9981e2e2f2edecab25ee48c5bade7a14298a8", + "md5": "d616e17cf5713a027acda0c47f7c98c7" }, "required_dependencies": [ "667299", "351264", "1028108" ], - "size": 1748066, - "date_published": "2025-12-04T12:41:22.310Z" + "size": 1894147, + "date_published": "2026-01-22T14:38:49.923Z" } ] }, @@ -14754,6 +14754,73 @@ } ] }, + { + "pakku_id": "6EW3YLKi2mNaNko0", + "pakku_links": [ + "dGK4XTJPQF2dqXh1" + ], + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "wakes-reforged", + "modrinth": "wakes-reforged" + }, + "name": { + "curseforge": "Wakes Reforged", + "modrinth": "Wakes Reforged" + }, + "id": { + "curseforge": "1223529", + "modrinth": "E0SdeAoH" + }, + "files": [ + { + "type": "curseforge", + "file_name": "wakes-1.20.1-Forge-1.0.9.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7494/279/wakes-1.20.1-Forge-1.0.9.jar", + "id": "7494279", + "parent_id": "1223529", + "hashes": { + "sha1": "4e2f19e3c2d36968630f66b370ad0ab984aa5b25", + "md5": "f569011cb7513e81704bf9007e2bcb98" + }, + "required_dependencies": [], + "size": 212248, + "date_published": "2026-01-20T14:12:02.077Z" + }, + { + "type": "modrinth", + "file_name": "wakes-1.20.1-Forge-1.0.8.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/E0SdeAoH/versions/zP45vj8T/wakes-1.20.1-Forge-1.0.8.jar", + "id": "zP45vj8T", + "parent_id": "E0SdeAoH", + "hashes": { + "sha512": "77202cf04a3801e0b4af7d3f335025a37b36b1f5a20ebb47fd238d8be11fafb90250c61117900eb750183a4a201a2f2ecc966cc106aa713f07838807f5f5ce7a", + "sha1": "c90ede36b7fc05a32bf598b8e3a4d31a7e6961fc" + }, + "required_dependencies": [ + "vuNeeDyl", + "EO8aSHxh" + ], + "size": 212191, + "date_published": "2025-12-30T22:22:11.561523Z" + } + ] + }, { "pakku_id": "qM5Yyq0zqqJc8XtT", "pakku_links": [ From 5f064b841f36cef185b59ae4a53a854bd64b0188 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 22 Jan 2026 23:01:36 +0000 Subject: [PATCH 11/66] make gt oreproc much faster (except the thermafuge) --- CHANGELOG.md | 1 + .../quests/chapters/hv__high_voltage.snbt | 1 + kubejs/server_scripts/tfc/recipes.metals.js | 8 +-- .../recipes.material_ores.js | 65 +++++++++++++++++-- 4 files changed, 66 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06cc3cd55..05ad054d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Recolored the different oils so you can actually tell them apart visually @Pyritie - The food meter's saturation level is now indicated by a gold outline instead of a red one, so it's less difficult to see (#2812) @TreyR9 - Changed some of the colors of Greate things to make the different tiers more visually distinct @Pyritie +- Buffed ore washing and ore maceration recipes so at least they aren't so awful compared to Greate's methods @Pyritie ### Bug fixes - Fixed a config bug causing waves to deposit shells etc with 100% chance. @Mqrius - Fixed a bug preventing the Pisciculture Fishery and Hydroponics Facility from overclocking. @Redeix diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index f9e60e956..92974c4a4 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -1008,6 +1008,7 @@ "4AD686D18247315E" "72BD27FEEB34C7B0" ] + dependency_requirement: "one_completed" description: ["{quests.high_voltage.rocket_t1.desc}"] icon_scale: 2.0d id: "3FBDC8552F7D8008" diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index 4b150403c..64d5e7378 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -298,16 +298,16 @@ function registerTFCMetalsRecipes(event) { .inputFluids("#tfg:clean_water 100") .circuit(4) .itemOutputs(`1x tfc:ore/normal_${ore}`) - .duration(400) - .EUt(GTValues.VA[GTValues.LV]) + .duration(40) + .EUt(GTValues.VHA[GTValues.LV]) event.recipes.gtceu.ore_washer(`tfc:ore_washer/distilled_water/deposit/${ore}/${stone}`) .itemInputs(`1x tfc:deposit/${ore}/${stone}`) .inputFluids(Fluid.of('gtceu:distilled_water', 50)) .circuit(4) .itemOutputs(`1x tfc:ore/normal_${ore}`) - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) + .duration(20) + .EUt(GTValues.VHA[GTValues.LV]) }) }) //#endregion diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js index f2a38a7ec..9624a3cd3 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js @@ -114,7 +114,7 @@ function processPoorRawOre(event, material) { let maceratorRecipe = event.recipes.gtceu.macerator(`macerate_poor_raw_${materialName}_ore_to_crushed_ore`) .itemInputs(poorOreItem) .category(GTRecipeCategories.ORE_CRUSHING) - .duration(400) + .duration(40) .EUt(2) if (multiplier > 1) { @@ -198,7 +198,7 @@ function processNormalRawOre(event, material) { .chancedOutput(crushedOreItem.copyWithCount(1), 2500, 250) .chancedOutput(crushedOreItem.copyWithCount(1), 1250, 250) .category(GTRecipeCategories.ORE_CRUSHING) - .duration(400) + .duration(40) .EUt(2) // Quern @@ -267,7 +267,7 @@ function processRichRawOre(event, material) { .chancedOutput(crushedOreItem.copyWithCount(1), 2500, 500) .chancedOutput(crushedOreItem.copyWithCount(1), 1250, 250) .category(GTRecipeCategories.ORE_CRUSHING) - .duration(400) + .duration(40) .EUt(2) // Quern @@ -292,12 +292,39 @@ function processCrushedOre(event, material) { const crushedOreItem = ChemicalHelper.get(TagPrefix.crushed, material, 1) const impureDustItem = ChemicalHelper.get(TagPrefix.dustImpure, material, 1) const pureOreItem = ChemicalHelper.get(TagPrefix.crushedPurified, material, 1) - const materialName = material.getName(); + if (crushedOreItem !== null && pureOreItem !== null) { - // Bulk washing let byproductMaterial = material.getProperty(PropertyKey.ORE).getOreByProduct(0, material); const byproductItem = ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1) + + // GT machines + event.recipes.gtceu.ore_washer(`wash_${materialName}_crushed_ore_to_purified_ore_distilled`) + .itemInputs(crushedOreItem) + .inputFluids("gtceu:distilled_water 10") + .itemOutputs(pureOreItem, 'gtceu:stone_dust') + .chancedOutput(byproductItem, 3333, 0) + .duration(20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.ore_washer(`wash_${materialName}_crushed_ore_to_purified_ore`) + .itemInputs(crushedOreItem) + .inputFluids("minecraft:water 100") + .itemOutputs(pureOreItem, 'gtceu:stone_dust') + .chancedOutput(byproductItem, 3333, 0) + .circuit(1) + .duration(40) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.macerator(`macerate_${materialName}_crushed_ore_to_impure_dust`) + .itemInputs(crushedOreItem) + .itemOutputs(impureDustItem) + .chancedOutput(byproductItem, 1400, 0) + .category(GTRecipeCategories.ORE_CRUSHING) + .duration(20) + .EUt(2) + + // Bulk washing event.recipes.greate.splashing([pureOreItem, Item.of(byproductItem).withChance(0.333), 'gtceu:stone_dust'], crushedOreItem) .id(`tfg:splashing/${materialName}_purified_ore`) @@ -344,6 +371,20 @@ function processPurifiedOre(event, material) { const pureDustItem = ChemicalHelper.get(TagPrefix.dustPure, material, 1) if (pureOreItem !== null && pureDustItem !== null) { + const materialName = material.getName(); + let byproductMaterial = material.getProperty(PropertyKey.ORE).getOreByProduct(1, material); + const byproductItem = ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1) + + // With byproducts + event.recipes.gtceu.macerator(`macerate_${materialName}_crushed_ore_to_dust`) + .itemInputs(pureOreItem) + .itemOutputs(pureDustItem) + .chancedOutput(byproductItem, 1400, 0) + .category(GTRecipeCategories.ORE_CRUSHING) + .duration(20) + .EUt(GTValues.VHA[GTValues.LV]) + + // Without byproducts event.recipes.greate.pressing(pureDustItem, pureOreItem) .recipeTier(1) .id(`greate:pressing/pure_crushed_${material.getName()}_to_pure_dust`) @@ -364,6 +405,20 @@ function processRefinedOre(event, material) { const dustItem = ChemicalHelper.get(TagPrefix.dust, material, 1) if (refinedOreItem !== null && dustItem !== null) { + const materialName = material.getName(); + let byproductMaterial = material.getProperty(PropertyKey.ORE).getOreByProduct(2, material); + const byproductItem = ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1) + + // With byproducts + event.recipes.gtceu.macerator(`macerate_${materialName}_refined_ore_to_dust`) + .itemInputs(refinedOreItem) + .itemOutputs(dustItem) + .chancedOutput(byproductItem, 1400, 0) + .category(GTRecipeCategories.ORE_CRUSHING) + .duration(20) + .EUt(GTValues.VHA[GTValues.LV]) + + // Without byproducts event.recipes.greate.pressing(dustItem, refinedOreItem) .recipeTier(1) .id(`greate:pressing/refined_${material.getName()}_to_dust`) From 046b8f464f25eb6c32e0df4d5299c593f1464ba5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 22 Jan 2026 23:54:50 +0000 Subject: [PATCH 12/66] let's buff horsepower because fuck water wheels --- defaultconfigs/createhorsepower-server.toml | 6 +++--- kubejs/assets/tfg/lang/en_us.json | 4 ++-- kubejs/assets/tfg/lang/fr_fr.json | 2 +- kubejs/assets/tfg/lang/ja_jp.json | 2 +- kubejs/assets/tfg/lang/pt_br.json | 2 +- kubejs/assets/tfg/lang/ru_ru.json | 2 +- kubejs/assets/tfg/lang/uk_ua.json | 2 +- kubejs/assets/tfg/lang/zh_cn.json | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/defaultconfigs/createhorsepower-server.toml b/defaultconfigs/createhorsepower-server.toml index 99f557598..a6a5b86ba 100644 --- a/defaultconfigs/createhorsepower-server.toml +++ b/defaultconfigs/createhorsepower-server.toml @@ -3,13 +3,13 @@ creatureRPMRange = 16 #How much stress small creatures can produce for the horse crank. #Range: > 1 -smallCreatureStressRange = 8 +smallCreatureStressRange = 16 #How much stress medium creatures can produce for the horse crank. #Range: > 1 -mediumCreatureStressRange = 12 +mediumCreatureStressRange = 24 #How much stress large creatures can produce for the horse crank. #Range: > 1 -largeCreatureStressRange = 16 +largeCreatureStressRange = 32 #The multiplier for "Poor" paths #Range: 0.0 ~ 1.7976931348623157E308 poorMultiplier = 0.5 diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 0d9efc266..691f8f311 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -2086,7 +2086,7 @@ "quests.combat_tips.flintlock_gun.subtitle": "Eat Lead!", "quests.combat_tips.flintlock_gun.description": "Well this is the moment you have been waiting for, it's a gun. Now it's not that good of a gun, but technology has to start somewhere. Guns have many advantages compared to other ranged weapons, useful to you now is that &3Glayzes&r and &2Klayzes&r cannot block bullets.\n\nFor more information on how TACZ guns work view the gun at the top of this quest chapter.", "quests.tasktype.checkmark": "Click here to complete this quest/task", - "quests.tasktype.item.any": "Any Item of type:", + "quests.tasktype.item.any": "Any of this item:", "quests.tasktype.lookat": "Look at a:", "quests.tasktype.travelto": "Travel to:", "quests.groups.primitive": "Primitive Age", @@ -3855,7 +3855,7 @@ "quests.steam_age.horse_crank.title": "Your First Power Source", "quests.steam_age.horse_crank.subtitle": "Make your livestock pay rent", "quests.steam_age.horse_crank.desc.1": "The &3Animal Crank&r is your first accessible source of mechanical power. To use it, place the crank on the center of a 7x7 cleared area and leash an animal to it. Different animals will provide different amounts of power, while the blocks underneath will increase the speed of the output power. The area of multiple cranks can overlap.\n\nYou may need to hold a second lead to attach an animal.", - "quests.steam_age.horse_crank.desc.2": "&3Small Animals (8 SU):&r\nWolf, Dog, Pig, Sheep, Goat, Alpaca\n\n&3Medium Animals (12 SU):&r\nCow, Donkey\n\n&3Large Animals (16 SU):&r\nHorse, Mule, Musk Ox, Yak", + "quests.steam_age.horse_crank.desc.2": "&3Small Animals (16 SU):&r\nWolf, Dog, Pig, Sheep, Goat, Alpaca\n\n&3Medium Animals (24 SU):&r\nCow, Donkey\n\n&3Large Animals (32 SU):&r\nHorse, Mule, Musk Ox, Yak", "quests.steam_age.poor_paths.title": "Poor Paths", "quests.steam_age.poor_paths.subtitle": "This is just dirt", "quests.steam_age.poor_paths.desc": "This is the worst kind of road you could use. The animal crank will operate at 8 RPM.", diff --git a/kubejs/assets/tfg/lang/fr_fr.json b/kubejs/assets/tfg/lang/fr_fr.json index b10805f81..9a9a4317b 100644 --- a/kubejs/assets/tfg/lang/fr_fr.json +++ b/kubejs/assets/tfg/lang/fr_fr.json @@ -2896,7 +2896,7 @@ "quests.steam_age.horse_crank.title": "Your First Power Source", "quests.steam_age.horse_crank.subtitle": "Make your livestock pay rent", "quests.steam_age.horse_crank.desc.1": "The &3Animal Crank&r is your first accessible source of mechanical power. To use it, place the crank on the center of a 7x7 cleared area and leash an animal to it. Different animals will provide different amounts of power, while the blocks underneath will increase the speed of the output power. The area of multiple cranks can overlap.\n\nYou may need to hold a second lead to attach an animal.", - "quests.steam_age.horse_crank.desc.2": "&3Small Animals (8 SU):&r\nWolf, Dog, Pig, Sheep, Goat, Alpaca\n\n&3Medium Animals (12 SU):&r\nCow, Donkey\n\n&3Large Animals (16 SU):&r\nHorse, Mule, Musk Ox, Yak", + "quests.steam_age.horse_crank.desc.2": "&3Small Animals (16 SU):&r\nWolf, Dog, Pig, Sheep, Goat, Alpaca\n\n&3Medium Animals (24 SU):&r\nCow, Donkey\n\n&3Large Animals (32 SU):&r\nHorse, Mule, Musk Ox, Yak", "quests.steam_age.poor_paths.title": "Poor Paths", "quests.steam_age.poor_paths.subtitle": "This is just dirt", "quests.steam_age.poor_paths.desc": "This is the worst kind of road you could use. The animal crank will operate at 8 RPM.", diff --git a/kubejs/assets/tfg/lang/ja_jp.json b/kubejs/assets/tfg/lang/ja_jp.json index 155f3bde9..134711f8b 100644 --- a/kubejs/assets/tfg/lang/ja_jp.json +++ b/kubejs/assets/tfg/lang/ja_jp.json @@ -3855,7 +3855,7 @@ "quests.steam_age.horse_crank.title": "最初の動力源", "quests.steam_age.horse_crank.subtitle": "24時間働けますか？", "quests.steam_age.horse_crank.desc.1": "&3アニマルクランク&rは、最初に利用できる動力源です。使用するには、7x7の整地されたエリアの中央に設置し、動物をリードでつなぎます。\n動物の種類によって出力される応力の大きさが異なり、下のブロックによって回転速度が向上します。それぞれのクランク同士の領域は重なっていても問題ありません。\n\n注意:動物を取り付けるには、リードを2本持っている必要がある場合があります。", - "quests.steam_age.horse_crank.desc.2": "&3小型動物(8 SU):&r\nオオカミ、犬、豚、羊、ヤギ、アルパカ\n\n&3中型動物(12 SU):&r\n牛、ロバ\n\n&3大きな動物(16 SU):&r\n馬、ラバ、ジャコウウシ、ヤク", + "quests.steam_age.horse_crank.desc.2": "&3小型動物(16 SU):&r\nオオカミ、犬、豚、羊、ヤギ、アルパカ\n\n&3中型動物(24 SU):&r\n牛、ロバ\n\n&3大きな動物(32 SU):&r\n馬、ラバ、ジャコウウシ、ヤク", "quests.steam_age.poor_paths.title": "貧弱な道", "quests.steam_age.poor_paths.subtitle": "奴隷労働", "quests.steam_age.poor_paths.desc": "これは使用できる中で最悪の道路です。アニマルクランクは2RPMで動作します。", diff --git a/kubejs/assets/tfg/lang/pt_br.json b/kubejs/assets/tfg/lang/pt_br.json index 5dbc566d9..74c064112 100644 --- a/kubejs/assets/tfg/lang/pt_br.json +++ b/kubejs/assets/tfg/lang/pt_br.json @@ -1829,7 +1829,7 @@ "quests.steam_age.horse_crank.title": "Sua Primeira Fonte de Energia", "quests.steam_age.horse_crank.subtitle": "Hora de fazer o gado pagar o aluguel", "quests.steam_age.horse_crank.desc.1": "A &3Manivela de Tração&r é sua primeira fonte viável de energia mecânica. Para usá-la, coloque a manivela no centro de uma área limpa de 7x7 blocos e prenda um animal a ela. Diferentes animais geram diferentes quantidades de energia, e os blocos sob eles afetam a velocidade da rotação. Manivelas próximas podem compartilhar parte da área de atuação.\n\nTalvez você precise segurar uma segunda corda na hora de prender o animal.", - "quests.steam_age.horse_crank.desc.2": "&3Animais Pequenos (8 SU):&r\nLobo, Cachorro, Porco, Ovelha, Cabra, Alpaca\n\n&3Animais Médios (12 SU):&r\nVaca, Burro\n\n&3Animais Grandes (16 SU):&r\nCavalo, Mula, Boi-Almiscarado, Iaque", + "quests.steam_age.horse_crank.desc.2": "&3Animais Pequenos (16 SU):&r\nLobo, Cachorro, Porco, Ovelha, Cabra, Alpaca\n\n&3Animais Médios (24 SU):&r\nVaca, Burro\n\n&3Animais Grandes (32 SU):&r\nCavalo, Mula, Boi-Almiscarado, Iaque", "quests.steam_age.poor_paths.title": "Caminhos Ruins", "quests.steam_age.poor_paths.subtitle": "Isso é só terra mesmo", "quests.steam_age.poor_paths.desc": "Esse é o pior tipo de estrada possível. A manivela vai girar a 8 RPM aqui.", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index 8be9e20f9..522ddb6b4 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -3701,7 +3701,7 @@ "quests.steam_age.horse_crank.title": "Твой Первый Источник Энергии", "quests.steam_age.horse_crank.subtitle": "Пусть домашние животные платят за жильё", "quests.steam_age.horse_crank.desc.1": "&3Скотный Привод&r — это твой первый доступный источник механической энергии. Чтобы его использовать, размести привод в центре очищенной площадки 7x7 и привяжи к нему животное. Разные животные дают разное количество энергии, а блоки под ними могут увеличить скорость вращения. Площадки нескольких приводов могут перекрываться.\n\nИногда может понадобиться удерживать второй поводок, чтобы прикрепить животное.", - "quests.steam_age.horse_crank.desc.2": "&3Мелкие животные (8 SU):&r\nВолк, Собака, Свинья, Овца, Коза, Альпака\n\n&3Средние животные (12 SU):&r\nКорова, Осёл\n\n&3Крупные животные (16 SU):&r\nЛошадь, Мул, Мускусный бык, Як", + "quests.steam_age.horse_crank.desc.2": "&3Мелкие животные (16 SU):&r\nВолк, Собака, Свинья, Овца, Коза, Альпака\n\n&3Средние животные (24 SU):&r\nКорова, Осёл\n\n&3Крупные животные (32 SU):&r\nЛошадь, Мул, Мускусный бык, Як", "quests.steam_age.poor_paths.title": "Плохие Дорожки", "quests.steam_age.poor_paths.subtitle": "Это просто грязь", "quests.steam_age.poor_paths.desc": "Худший тип дороги, который можно использовать. Скотный привод будет работать на скорости 2 об/мин.", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index c9be8adbe..b1472e75f 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -3780,7 +3780,7 @@ "quests.steam_age.horse_crank.title": "Ваше перше джерело енергії", "quests.steam_age.horse_crank.subtitle": "Змусьте свою худобу платити оренду", "quests.steam_age.horse_crank.desc.1": "&3Тваринний Привід&r — це твій перше доступне джерело механічної енергії. Щоб ним скористатися, постав привід у центрі очищеної ділянки розміром 7x7 блоків і прив’яжи до нього тварину. Різні тварини генерують різну кількість потужності, а блоки під ним впливають на швидкість вихідної енергії. Зони кількох приводів можуть перекриватися.\n\nМожливо, доведеться тримати другий поводок, щоб приєднати тварину.", - "quests.steam_age.horse_crank.desc.2": "&3Малі тварини (8 ОО):&r \nВовк, Собака, Свиня, Вівця, Коза, Альпака\n\n&3Середні тварини (12 ОО):&r \nКорова, Осел\n\n&3Великі тварини (16 ОО):&r \nКінь, Мул, Мускусний віл, Як", + "quests.steam_age.horse_crank.desc.2": "&3Малі тварини (16 SU):&r \nВовк, Собака, Свиня, Вівця, Коза, Альпака\n\n&3Середні тварини (24 SU):&r \nКорова, Осел\n\n&3Великі тварини (32 SU):&r \nКінь, Мул, Мускусний віл, Як", "quests.steam_age.poor_paths.title": "Погані шляхи", "quests.steam_age.poor_paths.subtitle": "Це просто бруд", "quests.steam_age.poor_paths.desc": "Це найгірший тип дороги, яку можна використовувати. Тваринний привід працюватиме зі швидкістю 8 об/хв.", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index 5e372b721..30859486c 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -3940,7 +3940,7 @@ "quests.steam_age.horse_crank.title": "你的第一个动力源", "quests.steam_age.horse_crank.subtitle": "让你的牲畜付租金", "quests.steam_age.horse_crank.desc.1": "&3动物曲柄&r 是你第一个可获得的机械动力源。要使用它，将曲柄放在一个7x7清空区域的中心，并用拴绳将动物拴在上面。不同的动物会提供不同数量的动力，而下面的方块会增加输出动力的速度。多个曲柄的区域可以重叠。\n\n你可能需要手持第二根拴绳来拴住动物。", - "quests.steam_age.horse_crank.desc.2": "&3小型动物 (8 SU):&r\n狼, 狗, 猪, 绵羊, 山羊, 羊驼\n\n&3中型动物 (12 SU):&r\n牛, 驴\n\n&3大型动物 (16 SU):&r\n马, 骡, 麝牛, 牦牛", + "quests.steam_age.horse_crank.desc.2": "&3小型动物 (16 SU):&r\n狼, 狗, 猪, 绵羊, 山羊, 羊驼\n\n&3中型动物 (24 SU):&r\n牛, 驴\n\n&3大型动物 (32 SU):&r\n马, 骡, 麝牛, 牦牛", "quests.steam_age.poor_paths.title": "劣质路面", "quests.steam_age.poor_paths.subtitle": "这只是土", "quests.steam_age.poor_paths.desc": "这是你能使用的最差的道路。动物曲柄将以8RPM运行。", From 6ce28447f5256ed1df24cf4fdb4f858258622daf Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 00:49:57 +0000 Subject: [PATCH 13/66] bump up moon animal spawns a bit --- kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json | 2 +- kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json | 2 +- kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json | 2 +- kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json | 2 +- kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json | 2 +- kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json | 2 +- kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json | 2 +- kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json | 2 +- kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json | 2 +- kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json index a8e0f54b3..bdcadd76f 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json @@ -56,7 +56,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.0003, + "creature_spawn_probability": 0.01, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json index 2895ad9b1..01404bf9a 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json @@ -60,7 +60,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.0006, + "creature_spawn_probability": 0.01, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json index 53dd80166..e1b31499f 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json @@ -55,7 +55,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.0003, + "creature_spawn_probability": 0.0005, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json index dc0984985..78f29f76c 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json @@ -58,7 +58,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.0006, + "creature_spawn_probability": 0.001, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json index a313d8db6..71e451418 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json @@ -54,7 +54,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.0003, + "creature_spawn_probability": 0.01, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json index 3897eeeb7..7fa136647 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -58,7 +58,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.0006, + "creature_spawn_probability": 0.01, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json index 3ece7dd46..daaa5ff95 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json @@ -55,7 +55,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.0003, + "creature_spawn_probability": 0.01, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json index 82b5a6914..2318e94fa 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json @@ -58,7 +58,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.0006, + "creature_spawn_probability": 0.01, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index 031090ba2..ce6e50d86 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -58,7 +58,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.001, + "creature_spawn_probability": 0.02, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json index 2839d273a..1413884ea 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json @@ -67,7 +67,7 @@ ] ], "has_precipitation": false, - "creature_spawn_probability": 0.001, + "creature_spawn_probability": 0.02, "spawn_costs": { "species:limpet": { "energy_budget": 0.15, From 53ab1367581c749f6dc72c8a226f50680b3f7454 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 01:43:41 +0000 Subject: [PATCH 14/66] add create stock bridge, add missing recipes for certus/fluix deco blocks --- .../chapters/applied_energistics_2.snbt | 40 ++++++++--- kubejs/assets/afc/lang/ru_ru.json | 41 ++++++----- kubejs/assets/tfg/lang/en_us.json | 6 ++ kubejs/server_scripts/ae2/recipes.js | 40 ----------- kubejs/server_scripts/ae2/tags.js | 13 ---- .../create_stock_bridge/recipes.js | 17 +++++ kubejs/server_scripts/main_server_script.js | 1 + .../tfg/stone_types/constants.rocks.js | 20 ++++++ pakku-lock.json | 70 +++++++++++++++++++ 9 files changed, 164 insertions(+), 84 deletions(-) create mode 100644 kubejs/server_scripts/create_stock_bridge/recipes.js diff --git a/config/ftbquests/quests/chapters/applied_energistics_2.snbt b/config/ftbquests/quests/chapters/applied_energistics_2.snbt index 86e58834a..4d9acd900 100644 --- a/config/ftbquests/quests/chapters/applied_energistics_2.snbt +++ b/config/ftbquests/quests/chapters/applied_energistics_2.snbt @@ -72,8 +72,8 @@ quest_links: [{ id: "6845144F7EA1081D" linked_quest: "24158DEE63DAEB41" - x: 5.0d - y: -4.5d + x: 6.0d + y: -3.5d }] quests: [ { @@ -362,6 +362,7 @@ type: "item" } ] + title: "{quests.ae2.cables.title}" x: 0.5d y: -6.0d } @@ -400,7 +401,7 @@ item: "ae2:crafting_unit" type: "item" }] - x: -1.0d + x: -2.0d y: -6.0d } { @@ -412,7 +413,7 @@ item: "ae2:crafting_accelerator" type: "item" }] - x: -2.5d + x: -3.5d y: -6.5d } { @@ -431,7 +432,8 @@ title: "{quests.ae2.crafting_storage.task}" type: "item" }] - x: -2.5d + title: "{quests.ae2.crafting_storage.title}" + x: -3.5d y: -5.5d } { @@ -452,6 +454,7 @@ title: "{quests.ae2.pattern_provider.task}" type: "item" }] + title: "{quests.ae2.pattern_provider.title}" x: 0.5d y: -9.0d } @@ -507,7 +510,7 @@ item: "ae2:interface" type: "item" }] - x: 2.0d + x: 3.0d y: -6.0d } { @@ -526,7 +529,8 @@ title: "{quests.ae2.export_bus.task}" type: "item" }] - x: 3.5d + title: "{quests.ae2.export_bus.title}" + x: 5.0d y: -7.0d } { @@ -653,7 +657,7 @@ item: "ae2:import_bus" type: "item" }] - x: 3.5d + x: 5.0d y: -5.0d } { @@ -680,7 +684,7 @@ type: "item" } ] - x: 3.5d + x: 5.0d y: -6.0d } { @@ -693,7 +697,7 @@ type: "checkmark" }] title: "{quests.ae2.interface_automation.title}" - x: 5.0d + x: 6.5d y: -6.0d } { @@ -1094,6 +1098,7 @@ { id: "270F842BF5012A13" item: "ae2:io_port" + optional_task: true type: "item" } { @@ -1283,6 +1288,21 @@ x: -2.0d y: -9.0d } + { + dependencies: ["25007C5E43D28DB2"] + description: ["{quests.ae2.stock_bridge.desc}"] + id: "0E54B3BCBBA34A00" + optional: true + shape: "heart" + tasks: [{ + id: "1F8D81C524CE694A" + item: "createstockbridge:ae_bridge" + type: "item" + }] + title: "{quests.ae2.stock_bridge.title}" + x: 5.0d + y: -8.0d + } ] subtitle: ["{quests.ae2.subtitle}"] title: "{quests.ae2}" diff --git a/kubejs/assets/afc/lang/ru_ru.json b/kubejs/assets/afc/lang/ru_ru.json index 3ffc65f59..fd8f8aedd 100644 --- a/kubejs/assets/afc/lang/ru_ru.json +++ b/kubejs/assets/afc/lang/ru_ru.json @@ -1,6 +1,5 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "comment_data.13.10.25": "Строчки без перевода: 565-568, 759-766, 711-774", "item.afc.wood.lumber.baobab": "Баобабовая доска", "item.afc.wood.chest_minecart.baobab": "Вагонетка с сундуком из баобаба", "item.tfc.wood.support.baobab": "Опора из баобаба", @@ -463,10 +462,10 @@ "block.afc.wood.sapling.mountain_fir": "Саженец субальпийской пихты", "block.afc.wood.potted_sapling.mountain_fir": "Саженец субальпийской пихты в горшке", "block.afc.wood.fallen_leaves.mountain_fir": "Опавшие листья субальпийской пихты", - "block.afc.wood.leaves.scrub_hickory": "Scrub Hickory Leaves", - "block.afc.wood.sapling.scrub_hickory": "Scrub Hickory Sapling", - "block.afc.wood.potted_sapling.scrub_hickory": "Scrub Hickory Potted Sapling", - "block.afc.wood.fallen_leaves.scrub_hickory": "Scrub Hickory Fallen Leaves", + "block.afc.wood.leaves.scrub_hickory": "Листья карии флоридской", + "block.afc.wood.sapling.scrub_hickory": "Саженец карии флоридской ", + "block.afc.wood.potted_sapling.scrub_hickory": "Саженец карии флоридской в горшке", + "block.afc.wood.fallen_leaves.scrub_hickory": "Опавшие листья карии флоридской", "block.afc.wood.leaves.bigleaf_maple": "Листья крупнолистного клёна", "block.afc.wood.sapling.bigleaf_maple": "Саженец крупнолистного клёна", "block.afc.wood.potted_sapling.bigleaf_maple": "Саженец крупнолистного клёна в горшке", @@ -563,10 +562,10 @@ "block.afc.wood.sapling.flame_of_the_forest": "Саженец лесного пламени", "block.afc.wood.potted_sapling.flame_of_the_forest": "Саженец лесного пламени в горшке", "block.afc.wood.fallen_leaves.flame_of_the_forest": "Опавшие листья лесного пламени", - "block.afc.wood.leaves.lebombo_ironwood": "Lebombo Ironwood Leaves", - "block.afc.wood.sapling.lebombo_ironwood": "Lebombo Ironwood Sapling", - "block.afc.wood.potted_sapling.lebombo_ironwood": "Lebombo Ironwood Potted Sapling", - "block.afc.wood.fallen_leaves.lebombo_ironwood": "Lebombo Ironwood Fallen Leaves", + "block.afc.wood.leaves.lebombo_ironwood": "Листья лебомбо айронвуд", + "block.afc.wood.sapling.lebombo_ironwood": "Саженец лебомбо айронвуд", + "block.afc.wood.potted_sapling.lebombo_ironwood": "Саженец лебомбо айронвуд", + "block.afc.wood.fallen_leaves.lebombo_ironwood": "Опавшие листья лебомбо айронвуд", "block.afc.wood.leaves.horsetail_ironwood": "Листья хвощевидного железного дерева", "block.afc.wood.sapling.horsetail_ironwood": "Саженец хвощевидного железного дерева", "block.afc.wood.potted_sapling.horsetail_ironwood": "Саженец хвощевидного железного дерева в горшке", @@ -757,22 +756,22 @@ "block.afc.wood.potted_sapling.ironwood": "Саженец верховного железного дерева в горшке", "block.afc.wood.fallen_leaves.ironwood": "Опавшие листья верховного железного дерева", "block.afc.wood.leaves.ironwood": "Листья верховного железного дерева", - "block.afc.wood.sapling.cypress": "Slender Cypress Sapling", - "block.afc.wood.potted_sapling.cypress": "Slender Cypress Potted Sapling", - "block.afc.wood.fallen_leaves.cypress": "Slender Cypress Fallen Leaves", - "block.afc.wood.leaves.cypress": "Slender Cypress Leaves", - "block.afc.wood.sapling.teak": "True Teak Sapling", - "block.afc.wood.potted_sapling.teak": "True Teak Potted Sapling", - "block.afc.wood.fallen_leaves.teak": "True Teak Fallen Leaves", - "block.afc.wood.leaves.teak": "True Teak Leaves", + "block.afc.wood.sapling.cypress": "Саженец хиноки", + "block.afc.wood.potted_sapling.cypress": "Саженец хиноки в горшке", + "block.afc.wood.fallen_leaves.cypress": "Опавшие листья хиноки", + "block.afc.wood.leaves.cypress": "Листья хиноки", + "block.afc.wood.sapling.teak": "Саженец тектоны великой", + "block.afc.wood.potted_sapling.teak": "Саженец тектоны великой в горшке", + "block.afc.wood.fallen_leaves.teak": "Опавшие листья тектоны великой", + "block.afc.wood.leaves.teak": "Листья тектоны великой", "block.afc.wood.sapling.eucalyptus": "Саженец голубого эвкалипта", "block.afc.wood.potted_sapling.eucalyptus": "Саженец голубого эвкалипта в горшке", "block.afc.wood.fallen_leaves.eucalyptus": "Опавшие листья голубого эвкалипта", "block.afc.wood.leaves.eucalyptus": "Листья голубого эвкалипта", - "block.afc.wood.sapling.fig": "Rusty Fig Sapling", - "block.afc.wood.potted_sapling.fig": "Rusty Fig Potted Sapling", - "block.afc.wood.fallen_leaves.fig": "Rusty Fig Fallen Leaves", - "block.afc.wood.leaves.fig": "Rusty Fig Leaves", + "block.afc.wood.sapling.fig": "Саженец фикуса рубигиноза", + "block.afc.wood.potted_sapling.fig": "Саженец фикуса рубигиноза в горшке", + "block.afc.wood.fallen_leaves.fig": "Опавшие листья фикуса рубигиноза", + "block.afc.wood.leaves.fig": "Листья фикуса рубигиноза", "block.afc.tree_tap": "Краник для подсочки", "item.afc.rubber_bar": "Резина (Слиток)", "item.afc.maple_sugar": "Кленовый сахар", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 691f8f311..3075912c4 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1945,6 +1945,7 @@ "quests.ae2.drive.subtitle": "The brains of the network", "quests.ae2.drive.desc": "You will need to store your disks, and thanks to the &bMEGA&r addon, you now have an extra option.\n\nYou should start with a &bME Drive&r. It can store up to &e10&r disks and consumes &e4 EU/t&r. This will be your main storage solution.\n\nThe other option is the &bME Cell Dock&r. It only stores &e1&r disk but consumes just &e1 EU/t&r, and it can be placed directly on a cable like a cover. This makes it quite useful for &aSubnets&r.", "quests.ae2.cell_housing.desc": "The &bME Cell Housing&r exists in two versions: one for &aItems&r and one for &9Fluids&r.\n\nYou can take their Storage Component out using a &ePacker&r or simply by Sneak + Right-click while holding the storage cell in your hand.", + "quests.ae2.cables.title": "Fluix Cables", "quests.ae2.cables.subtitle": "The arteries of the network", "quests.ae2.cables.desc": "Your basic cables to connect your &bAE2&r infrastructure.\n\nRemember that regular cables carry only &e8 Channels&r, while &6Dense Cables&r can carry up to &a32 Channels&r.\n\nGood news: in &2TFG&r, you can directly craft the &9Smart Cables&r! They are very helpful as they show a &evisual indicator&r for the number of used channels.", "quests.ae2.terminals.subtitle": "The... fingers? of the network?", @@ -1952,8 +1953,10 @@ "quests.ae2.molecular_assembler.desc": "The &9Molecular Assembler&r is basically your auto-crafting table.\n\nYou can use it for passive crafting, or combine it with a &9Pattern Provider&r.\n\nAs always, check the in-game guide using &eG&r to learn more about it.", "quests.ae2.crafting_unit.subtitle": "The second? brains of the network", "quests.ae2.crafting_unit.desc": "The &dCrafting Unit&r works the same way as your &bME Cell Housing&r.\n\nUse a &6Packer&r to make it functional — by itself, it serves no purpose, though you can use it to complete multi-blocks.\n\nIt’s your mandatory structure to run your &bAE2&r auto-crafting.\n\nAs usual, use the in-game guide from &bAE2&r to learn more about the &dCrafting CPU&r.", + "quests.ae2.crafting_storage.title": "Crafting Storage", "quests.ae2.crafting_storage.desc": "These are mandatory for any sort of auto crafting — the bigger the storage, the bigger the recipe chain that can be done with one request. You can also place multiple of them next to each other to add their storage size.\n\nUse the in-game guide for further details — it will explain everything far better than we ever could in a quest.\n\nTake your time to read it, it’s a great resource!", "quests.ae2.crafting_storage.task": "Any crafting storage", + "quests.ae2.pattern_provider.title": "ME Pattern Provider", "quests.ae2.pattern_provider.subtitle": "These tell your machines how to craft things", "quests.ae2.pattern_provider.desc": "The &9Pattern Provider&r is a modern &bAE2&r block. If you're only familiar with AE2 in previous versions of Minecraft, this is the block that you put your patterns into now instead of an Interface.\n\nIt can push items into the connected inventory on a crafting request, and pushing items back into it will send them back to your ME storage.\n\nIf you connect these to your GregTech machines, make sure you select the \"Allow Input From Output Face\" option on them so you can both input and output from the same side!\n\nAs always, check the in-game guide using &eG&r to learn more about it.", "quests.ae2.pattern_provider.task": "Either Pattern Provider", @@ -1964,6 +1967,7 @@ "quests.ae2.interface_automation.title": "Interface Automation", "quests.ae2.interface_automation.desc": "The best way to passively route items and fluids around your base is through the &bME Interface&r. Since Interfaces don't push out their contents, you'll need to slap a cover on your machine or pipe.\n\nRemember to enable the &eAllow Input&r option on the Output face in your GregTech machine's GUI, in order to push and pull from the same side.\n\nUsing filters on your covers can also be a handy way for multiple machines to pull out of the same Interface.\n\nTo avoid overfilling a machine's item input slots, you'll need to use a Robot Arm cover on &eKeep Exact&r mode with a filter.\n\nThe fluid input doesn’t have this issue, as it will fill only one slot automatically.", "quests.ae2.crafting_accelerator.desc": "Simply use the in-game guide — it will explain everything far better than we ever could in a quest.\n\nTake your time to read it, it’s a great resource!", + "quests.ae2.export_bus.title": "Export Bus", "quests.ae2.export_bus.desc": "The &dME Export Bus&r is a strong tool to get items or fluids out of your &dME Network&r.\nOnce you're able to craft them, you should especially look at the &eExtendedAE&r ones, as they can be of great help for some automation.\n\n&cImportant note&r: These have much more of a &4TPS impact&r than something like ME Interfaces, so it's best to use them sparingly.", "quests.ae2.export_bus.task": "Any Export Bus", "quests.ae2.import_bus.desc": "The &dME Import Bus&r is one way to get items and fluids into your &dME Network&r. You could also just push items and fluids into an Interface or Pattern Provider for the same result, though, so Import Buses are more niche.\n\n&cImportant note&r: These have much more of a &4TPS impact&r than something like ME Interfaces, so it's best to use them sparingly.", @@ -1992,6 +1996,8 @@ "quests.ae2.universal_circuits.title": "Universal Circuits", "quests.ae2.universal_circuits.subtitle": "Oh so THAT's what these are for!", "quests.ae2.universal_circuits.desc": "Ever wondered what the point of the Universal Circuit items was? Besides nice quest icons, they're primarily used for AE2!\n\nAE2 doesn't handle item tags in patterns well, so the universal circuits are designed to be used in any patterns that require circuits. This way, whenever you unlock a new kind of circuit, you only need to add one pattern to convert the new circuit into the universal one, instead of updating &oall&r of your old patterns!", + "quests.ae2.stock_bridge.title": "AE Stock Bridge", + "quests.ae2.stock_bridge.desc": "If you invested heavily into Create's logistics network, you might despair at the thought of having to tear it all down to replace it with AE2. The &bStock Bridge&r acts as a bridge between your ME network and your Create one. Check its Ponder to learn how to set it up.\n\nWe still recommend moving over any old setups to AE2 eventually, mostly because it's much lighter on your game's performance.", "quests.ae2.iv.title": "IV Tier AE2", "quests.ae2.iv.desc": "This entire branch becomes fully unlockable once you reach &1IV&r.", "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &5two EV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 6ded94a6a..28a2a9c60 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -2314,46 +2314,6 @@ const registerAE2Recipes = (event) => { .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) - // Certus deco blocks - - event.stonecutting('ae2:quartz_block', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:cut_quartz_block', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:smooth_quartz_block', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:quartz_bricks', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:quartz_pillar', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:chiseled_quartz_block', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:quartz_stairs', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:cut_quartz_stairs', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:smooth_quartz_stairs', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:quartz_brick_stairs', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:chiseled_quartz_stairs', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:quartz_pillar_stairs', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:quartz_wall', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:cut_quartz_wall', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:smooth_quartz_wall', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:quartz_brick_wall', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:chiseled_quartz_wall', '#tfg:certus_quartz_blocks') - event.stonecutting('ae2:quartz_pillar_wall', '#tfg:certus_quartz_blocks') - event.stonecutting('2x ae2:quartz_slab', '#tfg:certus_quartz_blocks') - event.stonecutting('2x ae2:cut_quartz_slab', '#tfg:certus_quartz_blocks') - event.stonecutting('2x ae2:smooth_quartz_slab', '#tfg:certus_quartz_blocks') - event.stonecutting('2x ae2:quartz_brick_slab', '#tfg:certus_quartz_blocks') - event.stonecutting('2x ae2:chiseled_quartz_slab', '#tfg:certus_quartz_blocks') - event.stonecutting('2x ae2:quartz_pillar_slab', '#tfg:certus_quartz_blocks') - - event.recipes.gtceu.macerator('tfg:macerate_certus_deco') - .itemInputs('#tfg:certus_quartz_blocks') - .itemOutputs('4x #forge:dusts/certus_quartz') - .duration(150) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - - event.recipes.gtceu.macerator('tfg:macerate_sky_stone') - .itemInputs('#tfg:sky_stone_blocks') - .itemOutputs('ae2:sky_dust') - .duration(150) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) // other deco diff --git a/kubejs/server_scripts/ae2/tags.js b/kubejs/server_scripts/ae2/tags.js index c959424f3..057915aa7 100644 --- a/kubejs/server_scripts/ae2/tags.js +++ b/kubejs/server_scripts/ae2/tags.js @@ -13,19 +13,6 @@ const registerAE2ItemTags = (event) => { event.removeAll('ae2:p2p_attunements/fe_p2p_tunnel') - event.add('tfg:certus_quartz_blocks', 'gtceu:certus_quartz_block') - event.add('tfg:certus_quartz_blocks', 'ae2:quartz_block') - event.add('tfg:certus_quartz_blocks', 'ae2:cut_quartz_block') - event.add('tfg:certus_quartz_blocks', 'ae2:smooth_quartz_block') - event.add('tfg:certus_quartz_blocks', 'ae2:quartz_bricks') - event.add('tfg:certus_quartz_blocks', 'ae2:quartz_pillar') - event.add('tfg:certus_quartz_blocks', 'ae2:chiseled_quartz_block') - - event.add('tfg:sky_stone_blocks', 'ae2:sky_stone_block') - event.add('tfg:sky_stone_blocks', 'ae2:smooth_sky_stone_block') - event.add('tfg:sky_stone_blocks', 'ae2:sky_stone_brick') - event.add('tfg:sky_stone_blocks', 'ae2:sky_stone_small_brick') - event.add('tfg:stone_dusts', 'ae2:sky_dust') event.add('tfg:reactant_fluix_ruby', 'gtceu:ruby_gem') diff --git a/kubejs/server_scripts/create_stock_bridge/recipes.js b/kubejs/server_scripts/create_stock_bridge/recipes.js new file mode 100644 index 000000000..4cfa8fddd --- /dev/null +++ b/kubejs/server_scripts/create_stock_bridge/recipes.js @@ -0,0 +1,17 @@ +"use strict"; + +function registerCreateStockBridgeRecipes(event) { + + event.remove({ id: 'createstockbridge:ae_bridge' }) + + event.shaped('createstockbridge:ae_bridge', [ + 'ACF', + 'DBD' + ], { + A: 'ae2:fluix_pearl', + B: 'ae2:interface', + C: 'create:stock_link', + D: 'ae2:engineering_processor', + F: '#forge:exquisite_gems/rose_quartz' + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 169755c01..e0cddeb76 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -237,6 +237,7 @@ ServerEvents.recipes(event => { registerCreateFactoryLogisticsRecipes(event) registerCreateHorsePowerBlockRecipes(event) registerCreateHypertubeRecipes(event) + registerCreateStockBridgeRecipes(event) registerDeaFissionRecipes(event) registerDiggerHelmetRecipes(event) registerDomumOrnamentumRecipes(event) diff --git a/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js b/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js index 5b389c8e3..fab336d36 100644 --- a/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js +++ b/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js @@ -449,6 +449,7 @@ global.BIG_ROCK_TABLE = /** @type {{String, RockType}} */ ({ "crackrack": generateMissing('crackrack', { material: 'tfg:igneous_intermediate', tfcTag: 'tfc:igneous_extrusive_items', + stonecutterTag: 'tfg:stone_types/keratophyre', gravelTag: 'tfc:pink_gravel', sound: 'netherrack', mapColor: 'crimson_stem', @@ -602,6 +603,25 @@ global.BIG_ROCK_TABLE = /** @type {{String, RockType}} */ ({ }, pillar: 'minecraft:purpur_pillar' }, + "fluix": { + isTFC: false, + collapsible: false, + raw: generateFormsExisting('fluix', 'ae2:%s', { block: 'ae2:fluix_block' }) + }, + "certus": { + isTFC: false, + collapsible: false, + stonecutterTag: 'tfg:stone_types/certus', + raw: { block: 'gtceu:certus_quartz_block' }, + polished: generateFormsExisting('quartz', 'ae2:%s', { block: 'ae2:quartz_block' }), + stonecutting: [ + generateFormsExisting('quartz', 'ae2:cut_%s', { block: 'ae2:cut_quartz_block' }), + generateFormsExisting('quartz', 'ae2:smooth_%s', { block: 'ae2:smooth_quartz_block' }), + generateFormsExisting('quartz', 'ae2:%s_brick', { block: 'ae2:quartz_bricks' }), + generateForms('quartz', 'ae2:%s_pillar'), + generateFormsExisting('quartz', 'ae2:chiseled_%s', { block: 'ae2:chiseled_quartz_block' }), + ] + }, ///////////////////////////////////////////////////////////////////////////////////////////// // MARS ROCKS diff --git a/pakku-lock.json b/pakku-lock.json index 1e688e275..b6e73220b 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -3962,6 +3962,76 @@ } ] }, + { + "pakku_id": "Dzg6pHg5yCqd3AP6", + "pakku_links": [ + "Nw8xTCQngHA15ilh" + ], + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "create-stock-bridge", + "modrinth": "create-stock-bridge" + }, + "name": { + "curseforge": "Create Stock Bridge", + "modrinth": "Create Stock Bridge" + }, + "id": { + "curseforge": "1256341", + "modrinth": "V7mbOBO4" + }, + "files": [ + { + "type": "curseforge", + "file_name": "createstockbridge-1.20-0.1.5.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6784/442/createstockbridge-1.20-0.1.5.jar", + "id": "6784442", + "parent_id": "1256341", + "hashes": { + "sha1": "0fa15f11788e3bc3a812fc597ade17af33888952", + "md5": "1359e31326732aac28d21ded5371a9ef" + }, + "required_dependencies": [ + "223794", + "328085" + ], + "size": 170122, + "date_published": "2025-07-18T17:47:38.837Z" + }, + { + "type": "modrinth", + "file_name": "createstockbridge-1.20-0.1.5.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/V7mbOBO4/versions/rzBecedb/createstockbridge-1.20-0.1.5.jar", + "id": "rzBecedb", + "parent_id": "V7mbOBO4", + "hashes": { + "sha512": "ff39b4dd4a024dcb8018bde41d0f77a9321be9b9c6314eb7ea2d5070876d735fc72c0d46b1b27db75fa099062a8f95eb9d860396dd6e9dbc8aae7018a651cd51", + "sha1": "0fa15f11788e3bc3a812fc597ade17af33888952" + }, + "required_dependencies": [ + "XxWD5pD3", + "LNytGWDc" + ], + "size": 170122, + "date_published": "2025-07-18T17:47:40.706650Z" + } + ] + }, { "pakku_id": "Fu7EpxmtyqTkOiMR", "type": "MOD", From 9b4adec5a0d8408505314557c6143c68b8f03b7d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 19:46:47 +0000 Subject: [PATCH 15/66] langs --- kubejs/assets/tfg/lang/zh_cn.json | 10 ++++++++-- kubejs/assets/wan_ancient_beasts/lang/zh_cn.json | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index 30859486c..2464e8c53 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -1812,8 +1812,8 @@ "tfg.tooltip.dna_syringe.explain": "右键点击生物获取DNA样本。放入合成栏可清空其内容物。", "tfg.tooltip.shift_hint": "[按住Shift]", "tfg.tooltip.lab_equipment.part": "§7精确盛装：", - "tfg.tooltip.lab_equipment.set": "“§7不包含一个 5000mB 的圆底烧瓶。”", - "tfg.tooltip.lab_equipment.set_dirty": "“§7如果你不清理这东西，很快就能在里面发现青霉素了。”", + "tfg.tooltip.lab_equipment.set": "§7不包含一个 5000mB 的圆底烧瓶。", + "tfg.tooltip.lab_equipment.set_dirty": "§7如果你不清理这东西，很快就能在里面发现青霉素了。", "tfg.tooltip.single_itemstack_bus.0": "§6物品槽位数量：§f1", "tfg.tooltip.single_itemstack_bus.1": "§6堆叠数量：§f1", "tfg.tooltip.growth_chamber": "通过增加层数，该机器可以同时运行更多配方。", @@ -2030,6 +2030,7 @@ "quests.ae2.drive.subtitle": "网络的大脑", "quests.ae2.drive.desc": "你需要存储你的磁盘，得益于&bMEGA&r附加模组，你现在有了额外选择。\n\n你应该从&bME驱动器&r开始。它最多可存储&e10&r个磁盘，消耗&e4EU/t&r。这将是你主要的存储解决方案。\n\n另一个选择是&bME元件坞&r。它只存储&e1&r个磁盘但仅消耗&e1EU/t&r，并且可以像覆盖版一样直接放置在电缆上。这使得它对于&a子网络&r非常有用。", "quests.ae2.cell_housing.desc": "&bME存储元件外壳&r有两种版本：一种用于&a物品&r，一种用于&9流体&r。\n\n你可以使用&e打包机&r取出其存储组件，或者手持存储单元时按住潜行+右击直接取出。", + "quests.ae2.cables.title": "福鲁伊克斯线缆", "quests.ae2.cables.subtitle": "网络的动脉", "quests.ae2.cables.desc": "用于连接&bAE2&r基础设施的基础线缆。\n\n请注意，常规线缆仅能传输&e8个频道&r，而&6致密线缆&r最多可传输&a32个频道&r。\n\n好消息是：在&2TFG&r中，你可以直接合成&9智能线缆&r！它能通过&e视觉指示器&r显示已占用频道数量，这将为你提供极大便利。", "quests.ae2.terminals.subtitle": "网络的……手指？", @@ -2037,8 +2038,10 @@ "quests.ae2.molecular_assembler.desc": "&9分子装配室&r基本上就是你的自动工作台。\n\n你可以用它进行被动合成，或将其与&9样板供应器&r结合使用。\n\n与往常一样，使用&eG&r键查看游戏内指南以了解更多信息。", "quests.ae2.crafting_unit.subtitle": "网络的第二大脑？", "quests.ae2.crafting_unit.desc": "&d合成单元&r的工作方式与你的&bME存储元件外壳&r相同。\n\n使用&6打包机&r使其正常工作——单独使用时它没有任何用途，但你可以用它来完成多方块结构。\n\n这是运行&bAE2&r自动合成所必需的结构。\n\n像往常一样，使用&bAE2&r的游戏内指南来了解有关&d合成单元&r的更多信息。", + "quests.ae2.crafting_storage.title": "合成存储器", "quests.ae2.crafting_storage.desc": "这些是进行任何自动合成所必需的组件——其存储空间越大，单次请求能处理的合成链就越复杂。你还可以将多个存储器并排放置，以累加它们的总存储容量。\n\n更多细节请查阅游戏内指南——其中的说明远比任务文本更加详尽透彻。\n\n这份指南非常实用，请务必花时间仔细阅读！", "quests.ae2.crafting_storage.task": "任何合成存储器", + "quests.ae2.pattern_provider.title": "ME样板供应器", "quests.ae2.pattern_provider.subtitle": "这些告诉你的机器如何合成物品", "quests.ae2.pattern_provider.desc": "&9样板供应器&r是一个现代化的&bAE2&r方块。如果你只熟悉旧版Minecraft中的AE2，那么现在这是你放入样板的地方，而不是接口。\n\n它可以在合成请求时将物品推入连接的容器，将物品推回其中会将它们发送回ME存储。\n\n如果你将这些连接到格雷科技机器，请确保在机器GUI中选中\"允许从输出面输入\"选项，这样你就可以从同一面输入和输出！\n\n与往常一样，使用&eG&r键查看游戏内指南以了解更多信息。", "quests.ae2.pattern_provider.task": "任何样板供应器", @@ -2049,6 +2052,7 @@ "quests.ae2.interface_automation.title": "接口自动化", "quests.ae2.interface_automation.desc": "实现基地内物品与流体自动化输送的最佳方案是使用&bME接口&r。由于接口不会主动推送内容，你需要在机器或管道上安装覆盖板。\n\n请记得在格雷科技机器的输出面启用&e允许输入&r选项，以便从同一侧面进行输入输出操作。\n\n在覆盖板上配置过滤器可实现多台机器从同一接口提取物资。\n\n为避免机器物品输入槽过载，需使用带过滤器的机械臂覆盖板并将其设置为&e保持精确&r模式。\n\n流体输入不存在此问题，系统会自动填充一个槽位。", "quests.ae2.crafting_accelerator.desc": "直接使用游戏内指南——它的解释远比我们在任务中的描述要好得多。\n\n这份指南非常实用，请务必花时间仔细阅读！", + "quests.ae2.export_bus.title": "输出总线", "quests.ae2.export_bus.desc": "&dME输出总线&r是将物品或流体取出&dME网络&r的强大工具。\n一旦你能够制作它们，你应该特别关注&eExtendedAE&r模组的输出总线，因为它们对于某些自动化非常有帮助。\n\n&c重要提示&r：这些设备比ME接口等设备对&4TPS的影响&r要大得多，因此最好谨慎使用。", "quests.ae2.export_bus.task": "任何输出总线", "quests.ae2.import_bus.desc": "&dME输入总线&r是将物品和流体输入&dME网络&r的一种方式。但是，你也可以将物品和流体推入接口或样板供应器以达到相同结果，因此输入总线的用途更为特定。\n\n&c重要提示&r：这些设备比ME接口等设备对&4TPS的影响&r要大得多，因此最好谨慎使用。", @@ -2077,6 +2081,8 @@ "quests.ae2.universal_circuits.title": "通用电路", "quests.ae2.universal_circuits.subtitle": "原来如此，这就是它们的用途！", "quests.ae2.universal_circuits.desc": "是不是一直好奇这些“通用电路”到底有什么用？除了当个好看的任务图标，它们主要是用在AE2里的！\n\n因为AE2的样板不怎么认物品标签，所以这些通用电路就是设计来当“万金油”的，任何需要电路的样板都能用它。这样一来，每当你解锁一种新电路，你只需要添加一个样板来将新电路转化为通用电路，而无需更新你&o所有&r的旧样板！", + "quests.ae2.stock_bridge.title": "AE仓储桥接器", + "quests.ae2.stock_bridge.desc": "如果你在机械动力的物流网络上投入了大量心血，可能会对需要将其全部拆除并替换为AE2网络而感到绝望。&b仓储桥接器&r能在你的ME网络与机械动力网络之间架起桥梁。查看其思索动画以了解如何设置。\n\n我们仍然建议最终将所有旧装置迁移至AE2，主要是因为它对游戏性能的开销要小得多。", "quests.ae2.iv.title": "IV级AE2", "quests.ae2.iv.desc": "一旦你达到&1IV&r等级，整个分支即可完全解锁。", "quests.ae2.accumulation_press.desc": "要获得这个&e新型压印模板&r，你需要投入一些资源。\n\n首先，你必须用&5两个EV级能源仓&r升级你的聚爆压缩机。\n\n然后，如果你还没有的话，为自己准备一台新的IV级激光蚀刻机。\n\n最后，准备大量的工业TNT——这是&c唯一有效&r的TNT类型。\n\n仔细计划，这一步要求相当高！", diff --git a/kubejs/assets/wan_ancient_beasts/lang/zh_cn.json b/kubejs/assets/wan_ancient_beasts/lang/zh_cn.json index e47fc462c..ad0befad8 100644 --- a/kubejs/assets/wan_ancient_beasts/lang/zh_cn.json +++ b/kubejs/assets/wan_ancient_beasts/lang/zh_cn.json @@ -3,5 +3,7 @@ "block.wan_ancient_beasts.quick_red_sand": "赤铁矿流沙", "item.wan_ancient_beasts.toxlacanth": "生毒棘鱼肉", "item.wan_ancient_beasts.raw_ancient_meat": "生噬颚兽腿肉", - "item.wan_ancient_beasts.cooked_ancient_meat": "熟噬颚兽腿肉" + "item.wan_ancient_beasts.cooked_ancient_meat": "熟噬颚兽腿肉", + "config.jade.plugin_tfc.surfer": "破浪兽", + "config.jade.plugin_tfc.soarer": "翱翔鸟" } \ No newline at end of file From a23919d54b41f8e08e021fa8c3c9a694e91ab804 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 20:11:34 +0000 Subject: [PATCH 16/66] fix broken field guide, skull emoji --- .../field_guide/en_us/entries/beneath/curious_blocks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/curious_blocks.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/curious_blocks.json index 7f23524fa..ba37f3c78 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/curious_blocks.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/curious_blocks.json @@ -14,7 +14,7 @@ "text": "Hellbricks are a building block that are also used for the Hellforge." }, { - "type": "patchouli:showcase", + "type": "patchouli:spotlight", "item": "beneath:ancient_altar", "text": "The Pyroxenite Pedestal can be used to display items you want to show off!" }, From a183ed64f296e8541cf3aae75306c05c901828ce Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 20:16:41 +0000 Subject: [PATCH 17/66] fix mossy cobble not collapsing --- kubejs/server_scripts/tfg/natural_blocks/tags.stones.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js b/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js index 37a7b2175..e94ffb1f9 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js +++ b/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js @@ -323,6 +323,11 @@ function registerTFGStoneBlockTags(event) { if (rock.cobble != null) { event.add('tfc:can_landslide', rock.cobble.block) event.add('forge:cobblestone', rock.cobble.block) + + if (rock.cobble.mossy != null) { + event.add('tfc:can_landslide', rock.cobble.mossy.block) + event.add('forge:cobblestone', rock.cobble.mossy.block) + } } if (rock.gravel != null) { From 2167fcdb6af7d1f12f6a8af2b3c505a9950f3194 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 20:22:29 +0000 Subject: [PATCH 18/66] fix #2827 Related Work Items: #28 --- kubejs/server_scripts/minecraft/recipes.js | 2 +- kubejs/server_scripts/tfc/recipes.metals.js | 8 ++++---- .../tfg/ores_and_materials/recipes.materials.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index e2ac32d73..b45eecc8c 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -479,7 +479,7 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Ведро, buckets - event.recipes.tfc.welding('minecraft:bucket', 'tfc:metal/bucket/red_steel', 'tfc:metal/bucket/blue_steel', 6) + event.recipes.tfc.welding(TFC.isp.of('minecraft:bucket').copyForgingBonus(), 'tfc:metal/bucket/red_steel', 'tfc:metal/bucket/blue_steel', 6) .id('tfg:anvil/vanilla_bucket') event.recipes.greate.compacting('minecraft:bucket', ['tfc:metal/bucket/red_steel', 'tfc:metal/bucket/blue_steel', 'tfc:powder/flux']) diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index 64d5e7378..84f0f4ff9 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -100,7 +100,7 @@ function registerTFCMetalsRecipes(event) { .EUt(4) // Слабая сталь + Чугун -> Высокоуглеродная черная сталь - event.recipes.tfc.welding('tfc:metal/ingot/high_carbon_black_steel', 'tfc:metal/ingot/weak_steel', 'tfc:metal/ingot/pig_iron', 4) + event.recipes.tfc.welding(TFC.isp.of('tfc:metal/ingot/high_carbon_black_steel').copyHeat(), 'tfc:metal/ingot/weak_steel', 'tfc:metal/ingot/pig_iron', 4) event.recipes.greate.compacting('tfc:metal/ingot/high_carbon_black_steel', ['tfc:metal/ingot/weak_steel', 'tfc:metal/ingot/pig_iron', 'tfc:powder/flux']) @@ -115,7 +115,7 @@ function registerTFCMetalsRecipes(event) { .EUt(4) // Слабая синяя сталь + Черная сталь -> Высокоуглеродная синяя сталь - event.recipes.tfc.welding('tfc:metal/ingot/high_carbon_blue_steel', 'tfc:metal/ingot/weak_blue_steel', 'tfc:metal/ingot/black_steel', 5) + event.recipes.tfc.welding(TFC.isp.of('tfc:metal/ingot/high_carbon_blue_steel').copyHeat(), 'tfc:metal/ingot/weak_blue_steel', 'tfc:metal/ingot/black_steel', 5) event.recipes.greate.compacting('tfc:metal/ingot/high_carbon_blue_steel', ['tfc:metal/ingot/weak_blue_steel', 'tfc:metal/ingot/black_steel', 'tfc:powder/flux']) @@ -130,7 +130,7 @@ function registerTFCMetalsRecipes(event) { .EUt(4) // Слабая красная сталь + Черная сталь -> Высокоуглеродная красная сталь - event.recipes.tfc.welding('tfc:metal/ingot/high_carbon_red_steel', 'tfc:metal/ingot/weak_red_steel', 'tfc:metal/ingot/black_steel', 5) + event.recipes.tfc.welding(TFC.isp.of('tfc:metal/ingot/high_carbon_red_steel').copyHeat(), 'tfc:metal/ingot/weak_red_steel', 'tfc:metal/ingot/black_steel', 5) event.recipes.greate.compacting('tfc:metal/ingot/high_carbon_red_steel', ['tfc:metal/ingot/weak_red_steel', 'tfc:metal/ingot/black_steel', 'tfc:powder/flux']) @@ -204,7 +204,7 @@ function registerTFCMetalsRecipes(event) { //#region Фикс рецептов металлических предметов // Рецепт Jacks - event.recipes.tfc.welding('tfc:jacks', '#forge:rods/brass', '#forge:plates/brass', 2) + event.recipes.tfc.welding(TFC.isp.of('tfc:jacks').copyHeat().copyForgingBonus(), '#forge:rods/brass', '#forge:plates/brass', 2) .id(`tfc:welding/jacks`) event.recipes.greate.compacting('tfc:jacks', ['#forge:rods/brass', '#forge:plates/brass', 'tfc:powder/flux']) diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js index f1854f2db..d2374773d 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js @@ -195,7 +195,7 @@ function addMaterialWelding(event, outputItem, inputItem1, inputItem2, material, if (tfcProperty !== null) { - event.recipes.tfc.welding(outputItem, inputItem1, inputItem2, tfcProperty.getTier() - 1) + event.recipes.tfc.welding(TFC.isp.of(outputItem).copyForgingBonus().copyHeat(), inputItem1, inputItem2, tfcProperty.getTier() - 1) .id(`tfc:welding/${id}`); compactingTier = tfcProperty.getTier() < tierThreshold ? 0 : 1; From 1581cd3b1aed44725acfff0691b535b7caed964a Mon Sep 17 00:00:00 2001 From: Petr211071 <55793813+Petr211071@users.noreply.github.com> Date: Fri, 23 Jan 2026 23:34:24 +0300 Subject: [PATCH 19/66] Field guide improvments (#2829) * add read_by_default * Add TFG crops * Fruits and crops translation * Earth and Mars indexes * Create drinks.json --- .../en_us/entries/tfg_ores/ore_basics.json | 1 + .../en_us/entries/the_world/wild_crops.json | 661 ++++++++++++++++++ .../pt_br/entries/tfg_ores/ore_basics.json | 1 + .../arborfirmacraft/earth_tree_index.json | 130 ++-- .../ru_ru/entries/mechanics/drinks.json | 83 +++ .../ru_ru/entries/tfg_ores/hazards.json | 1 + .../ru_ru/entries/tfg_ores/ore_basics.json | 1 + .../tfg_tips/inventory_management.json | 1 + .../entries/tfg_tips/mars_tree_index.json | 48 ++ .../ru_ru/entries/the_world/wild_crops.json | 116 ++- .../ru_ru/entries/the_world/wild_fruits.json | 101 +-- .../zh_cn/entries/tfg_ores/ore_basics.json | 1 + 12 files changed, 1001 insertions(+), 144 deletions(-) create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/the_world/wild_crops.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/drinks.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/mars_tree_index.json diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/ore_basics.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/ore_basics.json index 0e6c5c688..30e039788 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/ore_basics.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/ore_basics.json @@ -4,6 +4,7 @@ "category": "tfc:tfg_ores", "priority": true, "sortnum": 0, + "read_by_default": true, "pages": [ { "type": "patchouli:text", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/the_world/wild_crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/the_world/wild_crops.json new file mode 100644 index 000000000..25c4621d3 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/the_world/wild_crops.json @@ -0,0 +1,661 @@ +{ + "name": "Wild Crops", + "category": "tfc:the_world", + "icon": "tfc:textures/gui/book/icons/wild_crops.png", + "pages": [ + { + "type": "patchouli:text", + "text": "$(thing)Wild Crops$() can be found scattered around the world, growing in small patches. They can be harvested for food and seeds, which can then be cultivated themselves in the not-wild form.$(br2)Harvesting wild crops can be done with your fists, or with a $(thing)Knife$() or other sharp tool. When broken, they will drop $(thing)Seeds$() and some $(thing)Products$()." + }, + { + "type": "patchouli:multiblock", + "multiblock": { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/wheat[mature=true]" + } + }, + "name": "Wild Wheat", + "text": "An example of a wild crop, in this case $(l:mechanics/crops#wheat)Wheat$().", + "enable_visualize": false + }, + { + "type": "patchouli:text", + "text": "Every $(l:mechanics/crops)crop$() that can be cultivated can also be found in the wild. Wild crops will look similar to their cultivated counterparts, but are more hidden within the grass. Wild crops are only mature from June to October. Otherwise, they appear dead until the next Summer." + }, + { + "type": "tfc:multimultiblock", + "text": "All different varieties of wild crop", + "multiblocks": [ + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/barley" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/oat" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/rye" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/maize[part=top]", + "Y": "tfc:wild_crop/maize[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/barley" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/rice[fluid=water]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/beet" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/cabbage" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/carrot" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/garlic" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/green_bean[part=top]", + "Y": "tfc:wild_crop/green_bean[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/potato" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/onion" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/soybean" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/squash" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/sugarcane[part=top]", + "Y": "tfc:wild_crop/sugarcane[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/tomato[part=top]", + "Y": "tfc:wild_crop/tomato[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/jute[part=top]", + "Y": "tfc:wild_crop/jute[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/pumpkin" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/melon" + } + } + ] + }, + { + "type": "patchouli:text", + "text": "Wild crops will spawn in climates near where the crop itself can be cultivated, so if looking for a specific crop, look in the climate where the crop can be cultivated. However, unlike $(l:mechanics/crops)Crops$() that the player has planted, wild crops do not require $(l:mechanics/hydration)Hydration$(). Instead, they are found in areas depending on the average $()Temperature$() and $()Rainfall$().", + "title": "Finding Wild Crops" + }, + { + "type": "patchouli:text", + "text": "The next pages show a table of the environments where wild crops can be found." + }, + { + "type": "tfc:table", + "strings": [ + { + "text": "Crop", + "bold": true + }, + { + "text": "Temperature (°C)", + "bold": true + }, + { + "text": "Rainfall (mm)", + "bold": true + }, + { + "text": "Barley" + }, + { + "text": " -8 - 26" + }, + { + "text": " 70 - 310" + }, + { + "text": "Oat" + }, + { + "text": " 3 - 40" + }, + { + "text": "140 - 400" + }, + { + "text": "Rye" + }, + { + "text": "-11 - 30" + }, + { + "text": "100 - 350" + }, + { + "text": "Maize" + }, + { + "text": " 13 - 40" + }, + { + "text": "300 - 500" + }, + { + "text": "Wheat" + }, + { + "text": " -4 - 35" + }, + { + "text": "100 - 400" + }, + { + "text": "Rice" + }, + { + "text": " 15 - 30" + }, + { + "text": "100 - 500" + }, + { + "text": "Beet" + }, + { + "text": " -5 - 20" + }, + { + "text": " 70 - 300" + }, + { + "text": "Cabbage" + }, + { + "text": "-10 - 27" + }, + { + "text": " 60 - 280" + }, + { + "text": "Carrot" + }, + { + "text": " 3 - 30" + }, + { + "text": "100 - 400" + }, + { + "text": "Garlic" + }, + { + "text": "-20 - 18" + }, + { + "text": " 60 - 310" + }, + { + "text": "Green Bean" + }, + { + "text": " 2 - 35" + }, + { + "text": "150 - 410" + }, + { + "text": "Melon" + }, + { + "text": " 5 - 37" + }, + { + "text": "200 - 500" + } + ], + "text": "", + "title": "Wild Crop Requirements", + "legend": [], + "columns": 2, + "first_column_width": 80, + "column_width": 70, + "row_height": 10, + "left_buffer": 2, + "top_buffer": 12, + "draw_background": false + }, + { + "type": "patchouli:empty", + "draw_filler": false + }, + { + "type": "tfc:table", + "strings": [ + { + "text": "Crop", + "bold": true + }, + { + "text": "Temperature (°C)", + "bold": true + }, + { + "text": "Rainfall (mm)", + "bold": true + }, + { + "text": "Potato" + }, + { + "text": " -1 - 37" + }, + { + "text": "200 - 410" + }, + { + "text": "Pumpkin" + }, + { + "text": " 0 - 30" + }, + { + "text": "120 - 390" + }, + { + "text": "Onion" + }, + { + "text": " 0 - 30" + }, + { + "text": "100 - 390" + }, + { + "text": "Soybean" + }, + { + "text": " 8 - 30" + }, + { + "text": "160 - 410" + }, + { + "text": "Squash" + }, + { + "text": " 5 - 33" + }, + { + "text": " 90 - 390" + }, + { + "text": "Sugarcane" + }, + { + "text": " 12 - 38" + }, + { + "text": "160 - 500" + }, + { + "text": "Tomato" + }, + { + "text": " 0 - 36" + }, + { + "text": "120 - 390" + }, + { + "text": "Jute" + }, + { + "text": " 5 - 37" + }, + { + "text": "100 - 410" + }, + { + "text": "Papyrus" + }, + { + "text": " 19 - 37" + }, + { + "text": "310 - 500" + }, + { + "text": "Red Bell Pepper" + }, + { + "text": " 16 - 30" + }, + { + "text": "190 - 400" + }, + { + "text": "Yellow Bell Pepper" + }, + { + "text": " 16 - 30" + }, + { + "text": "190 - 400" + }, + { + "text": "Sunflower" + }, + { + "text": " 5 - 40" + }, + { + "text": "100 - 450" + } + ], + "text": "", + "title": "Wild Crop Requirements", + "legend": [], + "columns": 2, + "first_column_width": 80, + "column_width": 70, + "row_height": 10, + "left_buffer": 2, + "top_buffer": 12, + "draw_background": false + }, + { + "type": "patchouli:empty", + "draw_filler": false + }, +{ + "type": "tfc:table", + "strings": [ + { + "text": "Crop", + "bold": true + }, + { + "text": "Temperature (°C)", + "bold": true + }, + { + "text": "Rainfall (mm)", + "bold": true + }, + { + "text": "Canola" + }, + { + "text": " -5 - 25" + }, + { + "text": " 50 - 350" + }, + { + "text": "Flax" + }, + { + "text": " -8 - 25" + }, + { + "text": "175 - 475" + } + ], + "text": "", + "title": "Wild Crop Requirements", + "legend": [], + "columns": 2, + "first_column_width": 80, + "column_width": 70, + "row_height": 10, + "left_buffer": 2, + "top_buffer": 12, + "draw_background": false + }, + { + "type": "patchouli:empty", + "draw_filler": false + } + ], + "read_by_default": true, + "sortnum": 4, + "extra_recipe_mappings": { + "tag:tfc:wild_crops": 0 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/ore_basics.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/ore_basics.json index 197d71593..b6783362e 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/ore_basics.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/ore_basics.json @@ -4,6 +4,7 @@ "category": "tfc:tfg_ores", "priority": true, "sortnum": 0, + "read_by_default": true, "pages": [ { "type": "patchouli:text", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/arborfirmacraft/earth_tree_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/arborfirmacraft/earth_tree_index.json index 139e48c0b..423eb80ca 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/arborfirmacraft/earth_tree_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/arborfirmacraft/earth_tree_index.json @@ -1,204 +1,204 @@ { - "name": "Earth Tree Index", + "name": "Каталог земных деревьев", "category": "tfc:arborfirmacraft", "icon": "afc:wood/sapling/flame_of_the_forest", "read_by_default": true, "pages": [ { "type": "patchouli:text", - "text": "This is a list of every tree in the world, and what climates they grow in.$(br2)Looking for particular wood type to decorate your base? This should help you find it. The list is sorted alphabetically by wood type.$(br2)Also check out the $(l:tfc:tfg_tips/mars_tree_index)Mars Mushroom Index$()." + "text": "Это список всех деревьев в мире и климатических условий, в которых они растут.$(br2)Ищешь определенный вид древесины для украшения твоей базы? Это поможет тебе его найти. Список отсортирован по алфавиту по типу древесины.$(br2)Так же можешь посмотреть на $(l:tfc:tfg_tips/mars_tree_index)Каталог марсианских грибов$()." }, { "type": "patchouli:spotlight", - "title": "Acacia, Gum Arabic", + "title": "Акация", "item": "tag:tfc:acacia_logs", - "text": "$(bold)Umbrella Thorn Acacia$()$(br)$(thing)Rainfall$(): 90 — 275mm$(br)$(thing)Temperature$(): 13.4 — 40°C$(br2)$(bold)Acacia Koa$()$(br)$(thing)Rainfall$(): 350 — 500mm$(br)$(thing)Temperature$(): 15.3 — 24.4°C$(br2)$(bold)Gum Arabic$()$(br)$(thing)Rainfall$(): 90 — 275mm$(br)$(thing)Temperature$(): 11.6 — 40°C" + "text": "$(bold)Кручёная акация$()$(br)$(thing)Осадки$(): 90 — 275мм$(br)$(thing)Температура$(): 13.4 — 40°C$(br2)$(bold)Акация Коа$()$(br)$(thing)Осадки$(): 350 — 500мм$(br)$(thing)Температура$(): 15.3 — 24.4°C$(br2)$(bold)Сенегальская акация$()$(br)$(thing)Осадки$(): 90 — 275мм$(br)$(thing)Температура$(): 11.6 — 40°C" }, { "type": "patchouli:spotlight", - "title": "Ash", + "title": "Ясень", "item": "tag:tfc:ash_logs", - "text": "$(bold)White Ash$()$(br)$(thing)Rainfall$(): 60 — 240mm$(br)$(thing)Temperature$(): -13.9 — 0.7°C" + "text": "$(bold)Ясень$()$(br)$(thing)Осадки$(): 60 — 240мм$(br)$(thing)Температура$(): -13.9 — 0.7°C" }, { "type": "patchouli:spotlight", - "title": "Aspen, Poplar", + "title": "Осина, тополь", "item": "tag:tfc:aspen_logs", - "text": "$(bold)Quaking Aspen$()$(br)$(thing)Rainfall$(): 350 — 500mm$(br)$(thing)Temperature$(): -15.7 — -1.1°C$(br2)$(bold)Poplar$()$(br)$(thing)Rainfall$(): 170 — 310mm$(br)$(thing)Temperature$(): -15.7 — -6.6°C" + "text": "$(bold)Осина$()$(br)$(thing)Осадки$(): 350 — 500мм$(br)$(thing)Температура$(): -15.7 — -1.1°C$(br2)$(bold)Тополь$()$(br)$(thing)Осадки$(): 170 — 310мм$(br)$(thing)Температура$(): -15.7 — -6.6°C" }, { "type": "patchouli:spotlight", - "title": "Baobab", + "title": "Баобаб", "item": "tag:afc:baobab_logs", - "text": "$(bold)Baobab$()$(br)$(thing)Rainfall$(): 30 — 190mm$(br)$(thing)Temperature$(): 15.3 — 26.2°C" + "text": "$(bold)Баобаб$()$(br)$(thing)Осадки$(): 30 — 190мм$(br)$(thing)Температура$(): 15.3 — 26.2°C" }, { "type": "patchouli:spotlight", - "title": "Birch", + "title": "Берёза", "item": "tag:tfc:birch_logs", - "text": "$(bold)Birch$()$(br)$(thing)Rainfall$(): 125 — 310mm$(br)$(thing)Temperature$(): -13.9 — 2.5°C" + "text": "$(bold)Берёза$()$(br)$(thing)Осадки$(): 125 — 310мм$(br)$(thing)Температура$(): -13.9 — 2.5°C" }, { "type": "patchouli:spotlight", - "title": "Blackwood", + "title": "Гренадил", "item": "tag:tfc:blackwood_logs", - "text": "$(bold)Mpingo Blackwood$()$(br)$(thing)Rainfall$(): 85 — 285mm$(br)$(thing)Temperature$(): 13.4 — 22.5°C$(br2)$(bold)Mulga Blackwood$()$(br)$(thing)Rainfall$(): 35 — 150mm$(br)$(thing)Temperature$(): 9.8 — 20.7°C" + "text": "$(bold)Чернодревесный мпинго$()$(br)$(thing)Осадки$(): 85 — 285мм$(br)$(thing)Температура$(): 13.4 — 22.5°C$(br2)$(bold)Безжилковая акация$()$(br)$(thing)Осадки$(): 35 — 150мм$(br)$(thing)Температура$(): 9.8 — 20.7°C" }, { "type": "patchouli:spotlight", - "title": "Cedar", + "title": "Кедр", "item": "tag:tfc:white_cedar_logs", - "text": "$(bold)White Cedar$()$(br)$(thing)Rainfall$(): 100 — 220mm$(br)$(thing)Temperature$(): -13.9 — 4.3°C$(br2)$(bold)Atlas Cedar$()$(br)$(thing)Rainfall$(): 165 — 500mm$(br)$(thing)Temperature$(): 8.0 — 13.4°C" + "text": "$(bold)Белый кедр$()$(br)$(thing)Осадки$(): 100 — 220мм$(br)$(thing)Температура$(): -13.9 — 4.3°C$(br2)$(bold)Атласский кедр$()$(br)$(thing)Осадки$(): 165 — 500мм$(br)$(thing)Температура$(): 8.0 — 13.4°C" }, { "type": "patchouli:spotlight", - "title": "Chestnut", + "title": "Каштан", "item": "tag:tfc:chestnut_logs", - "text": "$(bold)Chestnut$()$(br)$(thing)Rainfall$(): 150 — 300mm$(br)$(thing)Temperature$(): -6.6 — 11.6°C" + "text": "$(bold)Каштан$()$(br)$(thing)Осадки$(): 150 — 300мм$(br)$(thing)Температура$(): -6.6 — 11.6°C" }, { "type": "patchouli:spotlight", - "title": "Cypress, Redcedar", + "title": "Кипарис, красный кедр", "item": "tag:afc:cypress_logs", - "text": "$(bold)Slender Cypress$()$(br)$(thing)Rainfall$(): 100 — 260mm$(br)$(thing)Temperature$(): 2.5 — 15.3°C$(br2)$(bold)Bald Cypress$()$(br)$(thing)Rainfall$(): 360 — 500mm$(br)$(thing)Temperature$(): -1.1 — 15.3°C$(br2)$(bold)Weeping Cypress$()$(br)$(thing)Rainfall$(): 290 — 415mm$(br)$(thing)Temperature$(): -8.4 — 4.3°C" + "text": "$(bold)Хиноки$()$(br)$(thing)Осадки$(): 100 — 260мм$(br)$(thing)Температура$(): 2.5 — 15.3°C$(br2)$(bold)Болотный кипарис$()$(br)$(thing)Осадки$(): 360 — 500мм$(br)$(thing)Температура$(): -1.1 — 15.3°C$(br2)$(bold)Плакучий кипарис$()$(br)$(thing)Осадки$(): 290 — 415мм$(br)$(thing)Температура$(): -8.4 — 4.3°C" }, { "type": "patchouli:text", - "text": "$(bold)Redcedar$()$(br)$(thing)Rainfall$(): 410 — 500mm$(br)$(thing)Temperature$(): -4.8 — 9.8°C" + "text": "$(bold)красный кедр$()$(br)$(thing)Осадки$(): 410 — 500мм$(br)$(thing)Температура$(): -4.8 — 9.8°C" }, { "type": "patchouli:spotlight", - "title": "(Rainbow) Eucalyptus", + "title": "Эвкалипт", "item": "tag:afc:eucalyptus_logs", - "text": "$(bold)Blue Gum$()$(br)$(thing)Rainfall$(): 170 — 325mm$(br)$(thing)Temperature$(): 8.0 — 18.9°C$(br2)$(bold)Mountain Ash$()$(br)$(thing)Rainfall$(): 390 — 500mm$(br)$(thing)Temperature$(): 9.8 — 18.9°C$(br2)$(bold)Rainbow Eucalyptus$()$(br)$(thing)Rainfall$(): 300 — 450mm$(br)$(thing)Temperature$(): 15.3 — 24.4°C" + "text": "$(bold)Голубой эвкалипт$()$(br)$(thing)Осадки$(): 170 — 325мм$(br)$(thing)Температура$(): 8.0 — 18.9°C$(br2)$(bold)Рябина$()$(br)$(thing)Осадки$(): 390 — 500мм$(br)$(thing)Температура$(): 9.8 — 18.9°C$(br2)$(bold)Радужный эвкалипт$()$(br)$(thing)Осадки$(): 300 — 450мм$(br)$(thing)Температура$(): 15.3 — 24.4°C" }, { "type": "patchouli:spotlight", - "title": "Fig, Rubber Fig", + "title": "Инжир, каучуконосный фикус", "item": "tag:afc:fig_logs", - "text": "$(bold)Rusty Fig$()$(br)$(thing)Rainfall$(): 340 — 500mm$(br)$(thing)Temperature$(): 18.9 — 26.2°C$(br2)$(bold)Rubber Fig$()$(br)$(thing)Rainfall$(): 290 — 400mm$(br)$(thing)Temperature$(): 9.8 — 20.7°C" + "text": "$(bold)Фикус рубингоза$()$(br)$(thing)Осадки$(): 340 — 500мм$(br)$(thing)Температура$(): 18.9 — 26.2°C$(br2)$(bold)Каучуконосный фикус$()$(br)$(thing)Осадки$(): 290 — 400мм$(br)$(thing)Температура$(): 9.8 — 20.7°C" }, { "type": "patchouli:spotlight", - "title": "Fir", + "title": "Пихта", "item": "tag:tfc:douglas_fir_logs", - "text": "$(bold)Douglas Fir$()$(br)$(thing)Rainfall$(): 305 — 500mm$(br)$(thing)Temperature$(): -10.3 — 6.1°C$(br2)$(bold)Mountain Fir$()$(br)$(thing)Rainfall$(): 220 — 345mm$(br)$(thing)Temperature$(): -1.1 — 11.6°C$(br2)$(bold)Balsam Fir$()$(br)$(thing)Rainfall$(): 210 — 500mm$(br)$(thing)Temperature$(): -13.9 — -1.1°C" + "text": "$(bold)Дугласовая пихта$()$(br)$(thing)Осадки$(): 305 — 500мм$(br)$(thing)Температура$(): -10.3 — 6.1°C$(br2)$(bold)Субальпийская пихта$()$(br)$(thing)Осадки$(): 220 — 345мм$(br)$(thing)Температура$(): -1.1 — 11.6°C$(br2)$(bold)Бальзамическая пихта$()$(br)$(thing)Осадки$(): 210 — 500мм$(br)$(thing)Температура$(): -13.9 — -1.1°C" }, { "type": "patchouli:spotlight", - "title": "Hevea", + "title": "Гевея", "item": "tag:afc:hevea_logs", - "text": "$(bold)Hevea$()$(br)$(thing)Rainfall$(): 390 — 500mm$(br)$(thing)Temperature$(): 17.1 — 26.2°C" + "text": "$(bold)Гевея$()$(br)$(thing)Осадки$(): 390 — 500мм$(br)$(thing)Температура$(): 17.1 — 26.2°C" }, { "type": "patchouli:spotlight", - "title": "Hickory", + "title": "Орех", "item": "tag:tfc:hickory_logs", - "text": "$(bold)Bitternut Hickory$()$(br)$(thing)Rainfall$(): 210 — 400mm$(br)$(thing)Temperature$(): -6.6 — 11.6°C$(br2)$(bold)Scrub Hickory$()$(br)$(thing)Rainfall$(): 400 — 475mm$(br)$(thing)Temperature$(): 11.6 — 17.1°C" + "text": "$(bold)Горький орех$()$(br)$(thing)Осадки$(): 210 — 400мм$(br)$(thing)Температура$(): -6.6 — 11.6°C$(br2)$(bold)Кария флоридская$()$(br)$(thing)Осадки$(): 400 — 475мм$(br)$(thing)Температура$(): 11.6 — 17.1°C" }, { "type": "patchouli:spotlight", - "title": "Ipe", + "title": "Ипе", "item": "tag:afc:ipe_logs", - "text": "$(bold)Yellow Ipe$()$(br)$(thing)Rainfall$(): 340 — 500mm$(br)$(thing)Temperature$(): 11.6 — 20.7°C" + "text": "$(bold)Жёлтый ипе$()$(br)$(thing)Осадки$(): 340 — 500мм$(br)$(thing)Температура$(): 11.6 — 20.7°C" }, { "type": "patchouli:spotlight", - "title": "Ironwood", + "title": "Железное дерево", "item": "tag:afc:ironwood_logs", - "text": "$(bold)King Ironwood$()$(br)$(thing)Rainfall$(): 320 — 430mm$(br)$(thing)Temperature$(): 20.7 — 40.0°C$(br2)$(bold)Lebombo Ironwood$()$(br)$(thing)Rainfall$(): 150 — 230mm$(br)$(thing)Temperature$(): 20.7 — 40.0°C$(br2)$(bold)Horsetail Ironwood$()$(br)$(thing)Rainfall$(): 340 — 500mm$(br)$(thing)Temperature$(): 9.8 — 20.7°C" + "text": "$(bold)Верховное железное дерево$()$(br)$(thing)Осадки$(): 320 — 430мм$(br)$(thing)Температура$(): 20.7 — 40.0°C$(br2)$(bold)Лебомбо айронвуд$()$(br)$(thing)Осадки$(): 150 — 230мм$(br)$(thing)Температура$(): 20.7 — 40.0°C$(br2)$(bold)Хвощевидное железное дерево$()$(br)$(thing)Осадки$(): 340 — 500мм$(br)$(thing)Температура$(): 9.8 — 20.7°C" }, { "type": "patchouli:spotlight", - "title": "Kapok", + "title": "Сейба", "item": "tag:tfc:kapok_logs", - "text": "$(bold)Kapok$()$(br)$(thing)Rainfall$(): 360 — 500mm$(br)$(thing)Temperature$(): 13.4 — 24.4°C$(br2)$(bold)Red Silk Cotton$()$(br)$(thing)Rainfall$(): 250 — 350mm$(br)$(thing)Temperature$(): 20.7 — 40.0°C" + "text": "$(bold)Сейба$()$(br)$(thing)Осадки$(): 360 — 500мм$(br)$(thing)Температура$(): 13.4 — 24.4°C$(br2)$(bold)Хлопковое дерево$()$(br)$(thing)Осадки$(): 250 — 350мм$(br)$(thing)Температура$(): 20.7 — 40.0°C" }, { "type": "patchouli:spotlight", - "title": "Mahogany", + "title": "Махогани", "item": "tag:afc:mahogany_logs", - "text": "$(bold)Mahogany$()$(br)$(thing)Rainfall$(): 300 — 430mm$(br)$(thing)Temperature$(): 15.3 — 26.2°C$(br2)$(bold)Small Leaf Mahogany$()$(br)$(thing)Rainfall$(): 320 — 500mm$(br)$(thing)Temperature$(): 11.6 — 18.9°C$(br2)$(bold)Sapele Mahogany$()$(br)$(thing)Rainfall$(): 330 — 500mm$(br)$(thing)Temperature$(): 13.4 — 26.2°C" + "text": "$(bold)Махогани$()$(br)$(thing)Осадки$(): 300 — 430мм$(br)$(thing)Температура$(): 15.3 — 26.2°C$(br2)$(bold)Махогани свитения$()$(br)$(thing)Осадки$(): 320 — 500мм$(br)$(thing)Температура$(): 11.6 — 18.9°C$(br2)$(bold)Сапеле$()$(br)$(thing)Осадки$(): 330 — 500мм$(br)$(thing)Температура$(): 13.4 — 26.2°C" }, { "type": "patchouli:spotlight", - "title": "Mangrove", + "title": "Мангровое дерево", "item": "tag:tfc:mangrove_logs", - "text": "$(bold)Mangrove$()$(br)$(thing)Rainfall$(): 220mm+$(br)$(thing)Temperature$(): 18.0°C+$(br)Note: only spawns in Salt Marsh biomes" + "text": "$(bold)Мангровое дерево$()$(br)$(thing)Осадки$(): 220мм+$(br)$(thing)Температура$(): 18.0°C+$(br)Заметка: спавнится только в биоме пышной лощины" }, { "type": "patchouli:spotlight", - "title": "Maple", + "title": "Клён", "item": "tag:tfc:maple_logs", - "text": "$(bold)Sugar Maple$()$(br)$(thing)Rainfall$(): 260 — 360mm$(br)$(thing)Temperature$(): -8.4 — 8.0°C$(br2)$(bold)Bigleaf Maple$()$(br)$(thing)Rainfall$(): 405 — 500mm$(br)$(thing)Temperature$(): -4.8 — 11.6°C$(br2)$(bold)Weeping Maple$()$(br)$(thing)Rainfall$(): 240 — 320mm$(br)$(thing)Temperature$(): 0.7 — 4.3°C" + "text": "$(bold)Сахарный клён$()$(br)$(thing)Осадки$(): 260 — 360мм$(br)$(thing)Температура$(): -8.4 — 8.0°C$(br2)$(bold)Крупнолистный клён$()$(br)$(thing)Осадки$(): 405 — 500мм$(br)$(thing)Температура$(): -4.8 — 11.6°C$(br2)$(bold)Дланевидный клён$()$(br)$(thing)Осадки$(): 240 — 320мм$(br)$(thing)Температура$(): 0.7 — 4.3°C" }, { "type": "patchouli:spotlight", - "title": "Oak, Black Oak", + "title": "Дуб, бархатистый дуб", "item": "tag:tfc:oak_logs", - "text": "$(bold)Pin Oak$()$(br)$(thing)Rainfall$(): 210 — 320mm$(br)$(thing)Temperature$(): -8.4 — 6.1°C$(br2)$(bold)Live Oak$()$(br)$(thing)Rainfall$(): 390 — 500mm$(br)$(thing)Temperature$(): 0.7 — 13.4°C$(br2)$(bold)Black Oak$()$(br)$(thing)Rainfall$(): 150 — 330mm$(br)$(thing)Temperature$(): 11.6 — 20.7°C" + "text": "$(bold)Болотный дуб$()$(br)$(thing)Осадки$(): 210 — 320мм$(br)$(thing)Температура$(): -8.4 — 6.1°C$(br2)$(bold)Каменный дуб$()$(br)$(thing)Осадки$(): 390 — 500мм$(br)$(thing)Температура$(): 0.7 — 13.4°C$(br2)$(bold)Бархатистый дуб$()$(br)$(thing)Осадки$(): 150 — 330мм$(br)$(thing)Температура$(): 11.6 — 20.7°C" }, { "type": "patchouli:spotlight", - "title": "Palm", + "title": "Пальма", "item": "tag:tfc:palm_logs", - "text": "$(bold)Palm$()$(br)$(thing)Rainfall$(): 0 — 250mm$(br)$(thing)Temperature$(): 17.1 — 40.0°C$(br2)$(bold)Jaggery Palm$()$(br)$(thing)Rainfall$(): 400 — 500mm$(br)$(thing)Temperature$(): 20.7 — 26.2°C" + "text": "$(bold)Пальма$()$(br)$(thing)Осадки$(): 0 — 250мм$(br)$(thing)Температура$(): 17.1 — 40.0°C$(br2)$(bold)Винная пальма$()$(br)$(thing)Осадки$(): 400 — 500мм$(br)$(thing)Температура$(): 20.7 — 26.2°C" }, { "type": "patchouli:spotlight", - "title": "Pine", + "title": "Сосна", "item": "tag:tfc:pine_logs", - "text": "$(bold)Boreal Pine$()$(br)$(thing)Rainfall$(): 60 — 270mm$(br)$(thing)Temperature$(): -19.4 — -3.0°C$(br2)$(bold)Stone Pine$()$(br)$(thing)Rainfall$(): 140 — 290mm$(br)$(thing)Temperature$(): 2.5 — 18.9°C$(br2)$(bold)Red Pine$()$(br)$(thing)Rainfall$(): 185 — 320mm$(br)$(thing)Temperature$(): -8.4 — 4.3°C" + "text": "$(bold)Сосна()$(br)$(thing)Осадки$(): 60 — 270мм$(br)$(thing)Температура$(): -19.4 — -3.0°C$(br2)$(bold)Сосна пиния$()$(br)$(thing)Осадки$(): 140 — 290мм$(br)$(thing)Температура$(): 2.5 — 18.9°C$(br2)$(bold)Красная сосна$()$(br)$(thing)Осадки$(): 185 — 320мм$(br)$(thing)Температура$(): -8.4 — 4.3°C" }, { "type": "patchouli:text", - "text": "$(bold)Tamarack$()$(br)$(thing)Rainfall$(): 150 — 500mm$(br)$(thing)Temperature$(): -17.5 — -1.1°C" + "text": "$(bold)Американская лиственница$()$(br)$(thing)Осадки$(): 150 — 500мм$(br)$(thing)Температура$(): -17.5 — -1.1°C" }, { "type": "patchouli:spotlight", - "title": "Rosewood", + "title": "Палисандр", "item": "tag:tfc:rosewood_logs", - "text": "$(bold)Shisham Rosewood$()$(br)$(thing)Rainfall$(): 245 — 360mm$(br)$(thing)Temperature$(): 15.3 — 24.4°C$(br2)$(bold)Giant Rosewood$()$(br)$(thing)Rainfall$(): 340 — 440mm$(br)$(thing)Temperature$(): 15.3 — 22.5°C" + "text": "$(bold)Индийский палисандр$()$(br)$(thing)Осадки$(): 245 — 360мм$(br)$(thing)Температура$(): 15.3 — 24.4°C$(br2)$(bold)Гигантский Палисандр$()$(br)$(thing)Осадки$(): 340 — 440мм$(br)$(thing)Температура$(): 15.3 — 22.5°C" }, { "type": "patchouli:spotlight", - "title": "Sequoia", + "title": "Секвойа", "item": "tag:tfc:sequoia_logs", - "text": "$(bold)Sequoia$()$(br)$(thing)Rainfall$(): 320 — 500mm$(br)$(thing)Temperature$(): 0.7 — 8.0°C$(br2)$(bold)Coast Redwood$()$(br)$(thing)Rainfall$(): 320 — 500mm$(br)$(thing)Temperature$(): 4.3 — 9.8°C" + "text": "$(bold)Секвойа$()$(br)$(thing)Осадки$(): 320 — 500мм$(br)$(thing)Температура$(): 0.7 — 8.0°C$(br2)$(bold)Красная секвойа$()$(br)$(thing)Осадки$(): 320 — 500мм$(br)$(thing)Температура$(): 4.3 — 9.8°C" }, { "type": "patchouli:spotlight", - "title": "Spruce", + "title": "Ель", "item": "tag:tfc:spruce_logs", - "text": "$(bold)Blue Spruce$()$(br)$(thing)Rainfall$(): 330 — 500mm$(br)$(thing)Temperature$(): -19.4 — 2.5°C$(br2)$(bold)Coast Spruce$()$(br)$(thing)Rainfall$(): 320 — 390mm$(br)$(thing)Temperature$(): -12.1 — 6.1°C$(br2)$(bold)Sitka Spruce$()$(br)$(thing)Rainfall$(): 370 — 500mm$(br)$(thing)Temperature$(): 2.5 — 8.0°C" + "text": "$(bold)Голубая ель$()$(br)$(thing)Осадки$(): 330 — 500мм$(br)$(thing)Температура$(): -19.4 — 2.5°C$(br2)$(bold)Побережная ель$()$(br)$(thing)Осадки$(): 320 — 390мм$(br)$(thing)Температура$(): -12.1 — 6.1°C$(br2)$(bold)Ситкинская ель$()$(br)$(thing)Осадки$(): 370 — 500мм$(br)$(thing)Температура$(): 2.5 — 8.0°C" }, { "type": "patchouli:text", - "text": "$(bold)Black Spruce$()$(br)$(thing)Rainfall$(): 220 — 360mm$(br)$(thing)Temperature$(): -17.5 — -1.1°C" + "text": "$(bold)Чёрная ель$()$(br)$(thing)Осадки$(): 220 — 360мм$(br)$(thing)Температура$(): -17.5 — -1.1°C" }, { "type": "patchouli:spotlight", - "title": "Sycamore", + "title": "Платан", "item": "tag:tfc:sycamore_logs", - "text": "$(bold)Sycamore$()$(br)$(thing)Rainfall$(): 330 — 480mm$(br)$(thing)Temperature$(): -6.6 — 11.6°C" + "text": "$(bold)Платан$()$(br)$(thing)Осадки$(): 330 — 480мм$(br)$(thing)Температура$(): -6.6 — 11.6°C" }, { "type": "patchouli:spotlight", - "title": "Teak", + "title": "Тик", "item": "tag:afc:teak_logs", - "text": "$(bold)True Teak$()$(br)$(thing)Rainfall$(): 215 — 330mm$(br)$(thing)Temperature$(): 13.4 — 26.2°C$(br2)$(bold)Iroko Teak$()$(br)$(thing)Rainfall$(): 210 — 320mm$(br)$(thing)Temperature$(): 17.1 — 40.0°C$(br2)$(bold)Flame of the Forest$()$(br)$(thing)Rainfall$(): 340 — 500mm$(br)$(thing)Temperature$(): 13.4 — 24.4°C" + "text": "$(bold)Тектона великая$()$(br)$(thing)Осадки$(): 215 — 330мм$(br)$(thing)Температура$(): 13.4 — 26.2°C$(br2)$(bold)Тиковый ироко$()$(br)$(thing)Осадки$(): 210 — 320мм$(br)$(thing)Температура$(): 17.1 — 40.0°C$(br2)$(bold)Лесное пламя$()$(br)$(thing)Осадки$(): 340 — 500мм$(br)$(thing)Температура$(): 13.4 — 24.4°C" }, { "type": "patchouli:spotlight", - "title": "Tualang", + "title": "Компассия", "item": "tag:afc:tualang_logs", - "text": "$(bold)Tualang$()$(br)$(thing)Rainfall$(): 360 — 500mm$(br)$(thing)Temperature$(): 20.7 — 40.0°C" + "text": "$(bold)Компассия$()$(br)$(thing)Осадки$(): 360 — 500мм$(br)$(thing)Температура$(): 20.7 — 40.0°C" }, { "type": "patchouli:spotlight", - "title": "Willow", + "title": "Ива", "item": "tag:tfc:willow_logs", - "text": "$(bold)Corkscrew Willow$()$(br)$(thing)Rainfall$(): 330 — 500mm$(br)$(thing)Temperature$(): -6.6 — 9.8°C$(br2)$(bold)Weeping Willow$()$(br)$(thing)Rainfall$(): 355 — 500mm$(br)$(thing)Temperature$(): 9.8 — 17.1°C" + "text": "$(bold)Ива$()$(br)$(thing)Осадки$(): 330 — 500мм$(br)$(thing)Температура$(): -6.6 — 9.8°C$(br2)$(bold)Плакучая ива$()$(br)$(thing)Осадки$(): 355 — 500мм$(br)$(thing)Температура$(): 9.8 — 17.1°C" } ] diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/drinks.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/drinks.json new file mode 100644 index 000000000..2b432fe19 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/drinks.json @@ -0,0 +1,83 @@ +{ + "name": "Питьевые эффекты", + "icon": "firmalife:olivine_wine_bottle", + "category": "tfc:mechanics", + "read_by_default": true, + "pages": [ + { + "type": "patchouli:text", + "text": "Зелья и магия не существуют в мире TerraFirmaCraft,но есть множество других напитков, которые могут оказывать схожий эффект!$(br2)В этой главе представлен список всех различных эффектов, а в качестве бонуса, все они также способствуют поддержанию водного баланса." + }, + { + "type": "patchouli:spotlight", + "title": "Резервуары для напитков", + "text": "Напитки можно пить из $(l:getting_started/pottery#jug)кувшина$(), $(l:waterflasks/recipes)бурдюка$() или $(l:mechanics/glassworking_applications#glass_bottle)пузырька$(). Кувшины вмещают только один глоток и легко разбиваются. Пузырьки вмещают лишь небольшое количество глотков и тоже могут разбиться. Бурдюки могут вмещать ещё больше и при этом постепенно теряют свою прочность, кроме $(item)фляги(красная сталь)$() вмещает 20 напитков и никогда не ломается.", + "item": "tfc:ceramic/jug,tfc:silica_glass_bottle,tfc:olivine_glass_bottle,tfc:hematitic_glass_bottle,tfc:volcanic_glass_bottle,waterflasks:leather_flask,waterflasks:iron_flask,waterflasks:red_steel_flask" + }, + { + "type": "patchouli:spotlight", + "title": "Выдержанный алкоголь", + "text": "$(thing)Выдержанный алкоголь$() приготовляется путём выдержки обычного алкоголя, который, в свою очередь, получают путем оставления различных фруктов, муки или других ингридиентов в бочке с водой. В качестве бонуса, они влияют на вашу речь в чате!", + "item": "tfcagedalcohol:bucket/aged_beer,tfcagedalcohol:bucket/aged_cider,tfcagedalcohol:bucket/aged_rum,tfcagedalcohol:bucket/aged_sake,tfcagedalcohol:bucket/aged_vodka,tfcagedalcohol:bucket/aged_whiskey,tfcagedalcohol:bucket/aged_corn_whiskey,tfcagedalcohol:bucket/aged_rye_whiskey" + }, + { + "type": "patchouli:text", + "text": "$(li)Выдержанное пиво: Поглощение II (20:00)$(li)Выдержанный сидр: Скорость (5:20)$(li)Выдержанный ром: Скорость II (2:40)$(li)Выдержанное саке: Сопротивление (5:20)$(li)Выдержанная водка: Сопротивление II (2:40)$(li)Выдержанный кукурузное виски: Спешка (5:20)$(li)Выдержанный ржаной виски: Спешка (5:20)$(li)Выдержанный виски: Спешка II (2:40)$(li)Выдержанная медовуха: Регенерация (5:20)" + }, + { + "type": "patchouli:text", + "title": "Wine", + "text": "$(thing)Вино$() — это ещё один вид алкоголя, который производится иначе, чем другие. Это сложный, но увлекательный процесс, который невозможно автоматизировать с помощью машины. Проверь главу $(l:firmalife/wine)Винаделия$() для изучения, как его производить.", + "item": "firmalife:bucket/red_wine,firmalife:bucket/white_wine,firmalife:bucket/rose_wine,firmalife:bucket/sparkling_wine,firmalife:bucket/dessert_wine" + }, + { + "type": "patchouli:text", + "text": "$(li)Красное вино: Сила (5:20)$(li)Белое вино: Устойчивость к иссушению (5:20)$(li)Розовое вино: Скорость плавания (5:20)$(li)Игристое вино: Прыгучесть II (5:20)$(li)Десертное вино: Упёртость (5:20)" + }, + { + "type": "patchouli:spotlight", + "title": "Чаи", + "text": "$(thing)Чаи$() можно заваривать, используя высушенные версии некоторых растений.$(br2)Они дают кратковременные, но эффективные эффекты и согревают на 4°C. Идеально подходят для зимы!", + "item": "tfc_gurman:tea_mint_bucket,tfc_gurman:tea_chamomile_bucket,tfc_gurman:tea_rosehip_bucket,tfc_gurman:tea_nettle_bucket" + }, + { + "type": "patchouli:text", + "text": "$(li)Мятный чай: Регенерация II (0:30)$(li)Ромашковый чай: Сопротивление II (0:30)$(li)Шиповниковый чай: Поглощение (0:30)$(li)Крапивный чай: Плавное падение (0:30)" + }, + { + "type": "patchouli:spotlight", + "title": "Сладости", + "text": "Это категория для других разнообразных напитков с восхитительным вкусом и особыми эффектами. Приятного аппетита!", + "item": "tfc_gurman:cocoa_bucket,tfc_gurman:coffee_bucket,tfc_gurman:nalivka_bucket,tfc_gurman:kvass_bucket,tfc_gurman:compote_bucket,tfc_gurman:lemonade_bucket" + }, + { + "type": "patchouli:text", + "text": "$(li)Какао: Спешка (0:30), согревает тебя на 4°C$(li)Кофе: Скорость (0:30), согревает тебя на 4°C$(li)Лимонад: Спешка (0:30), охлаждает тебя на 2°C$(li)Наливка: Сила (2:40), охлаждает тебя на 2°C$(li)Квас: Сила (1:20), охлаждает тебя на 2°C$(li)Компот: Прыгучесть II (0:30)" + }, + { + "type": "patchouli:spotlight", + "title": "Молоко", + "text": "$(thing)Молоко$() можно получить от большинства самок молочных животных, просто щелкнув по ним правой кнопкой мыши с деревянным или металлическим ведром, когда уровень прирученности достигнет достаточно высокого уровня. (Если доение не работает, убедитесь, что ведра не состаканы!)$(br)Хотя этот напиток не дает никаких бонусов, он обеспечивает организм молочными продуктами, если его выпить после еды, и из него впоследствии можно приготовить сыр.", + "item": "minecraft:milk_bucket,firmalife:bucket/yak_milk,firmalife:bucket/goat_milk,tfc_gurman:ox_milk_bucket,tfc_gurman:sheep_milk_bucket,tfc_gurman:alpaca_milk_bucket" + }, + { + "title": "Родниковая вода", + "text": "Питьё $(thing)Родниковой воды$() согревает тебя на 4°C и при стоянии в ней даёт эффект регенерация, а также согревает", + "item": "tfc:bucket/spring_water", + "type": "patchouli:spotlight" + }, + { + "title": "Морская вода", + "text": "Питьё $(thing)Морской воды$() не утоляет жажду, а наоборот, усиливает её. Высокая температура тела также может усиливать жажду. Заблудились в море? Посмотрите вверх, когда идёт дождь, так легко можно утолить жажду!", + "type": "patchouli:spotlight", + "item": "tfc:bucket/salt_water" + }, + { + "title": "Ледяная слякоть", + "text": "Питьё $(thing)Ледяной слякоти$() охлаждает тебя на 4°C, идеально для лета! Также удобно для передвижения в бездне.", + "type": "patchouli:spotlight", + "item": "gtceu:ice_bucket" + } + ] +} + diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/hazards.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/hazards.json index 92418ecc6..2f5f301df 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/hazards.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/hazards.json @@ -4,6 +4,7 @@ "category": "tfc:tfg_ores", "priority": true, "sortnum": 1, + "read_by_default": true, "pages": [ { "type": "patchouli:text", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/ore_basics.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/ore_basics.json index ee7f6b924..12d3a141d 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/ore_basics.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/ore_basics.json @@ -4,6 +4,7 @@ "category": "tfc:tfg_ores", "priority": true, "sortnum": 0, + "read_by_default": true, "pages": [ { "type": "patchouli:text", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/inventory_management.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/inventory_management.json index 68ddb6fa9..faa327c7d 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/inventory_management.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/inventory_management.json @@ -2,6 +2,7 @@ "name": "Хранение предметов", "category": "tfc:tfg_tips", "icon": "minecraft:chest", + "read_by_default": true, "pages": [ { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/mars_tree_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/mars_tree_index.json new file mode 100644 index 000000000..c2ebc921e --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_tips/mars_tree_index.json @@ -0,0 +1,48 @@ +{ + "name": "Каталог марсианских грибов", + "category": "tfc:tfg_tips", + "icon": "tfg:saplings/aeronos", + "read_by_default": true, + "pages": [ + { + "type": "patchouli:text", + "text": "Это список каждого большого марсианского гриба, и в каком климате они растут.$(br2)Ищете конкретный вид гриба для украшения базы? Этот список должен помочь тебе найти их. Список отсортирован по алфавиту.$(br2)Так же можешь посмотреть на $(l:tfc:arborfirmacraft/earth_tree_index)Каталог земных деревьев$()." + }, + { + "type": "patchouli:spotlight", + "title": "Конусообразный", + "item": "ad_astra:aeronos_stem", + "text": "$(bold)Конусообразный гриб$()$(br)$(thing)Температура$(): -100°C и выше$(br)Чаще встречается на востоке." + }, + { + "type": "patchouli:spotlight", + "title": "Альфанценовый", + "item": "species:alphacene_mushroom_block", + "text": "$(bold)Альфанценовый гриб$()$(br)$(thing)Температура$(): -85°C и выше$(br)Встречается на востоке и западе." + }, + { + "type": "patchouli:spotlight", + "title": "Багряный", + "item": "beneath:wood/log/crimson", + "text": "$(bold)Багряное дерево$()$(br)$(thing)Температура$(): -109 — -13°C$(br)Чаще встречается на востоке." + }, + { + "type": "patchouli:spotlight", + "title": "Гласивник", + "item": "ad_astra:glacian_log", + "text": "$(bold)Гласивник$()$(br)$(thing)Температура$(): -107°C и ниже$(br)Встречается на востоке и западе." + }, + { + "type": "patchouli:spotlight", + "title": "Строфаровый", + "item": "ad_astra:strophar_stem", + "text": "$(bold)Строфаровый гриб$()$(br)$(thing)Температура$(): -100°C и выше$(br)Чаще встречается на западе." + }, + { + "type": "patchouli:spotlight", + "title": "Искажённый", + "item": "beneath:wood/log/warped", + "text": "$(bold)Искажёное дерево$()$(br)$(thing)Температура$(): -109 — -13°C$(br)Чаще встречается на западе." + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/the_world/wild_crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/the_world/wild_crops.json index fc4058ace..6a6e3ee3c 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/the_world/wild_crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/the_world/wild_crops.json @@ -330,19 +330,19 @@ "type": "tfc:table", "strings": [ { - "text": "Crop", + "text": "Растение", "bold": true }, { - "text": "Temperature (°C)", + "text": "Температура (°C)", "bold": true }, { - "text": "Rainfall (mm)", + "text": "Осадки (мм)", "bold": true }, { - "text": "Barley" + "text": "Ячмень" }, { "text": " -8 - 26" @@ -351,7 +351,7 @@ "text": " 70 - 310" }, { - "text": "Oat" + "text": "Овёс" }, { "text": " 3 - 40" @@ -360,7 +360,7 @@ "text": "140 - 400" }, { - "text": "Rye" + "text": "Рожь" }, { "text": "-11 - 30" @@ -369,7 +369,7 @@ "text": "100 - 350" }, { - "text": "Maize" + "text": "Кукуруза" }, { "text": " 13 - 40" @@ -378,7 +378,7 @@ "text": "300 - 500" }, { - "text": "Wheat" + "text": "Пщеница" }, { "text": " -4 - 35" @@ -387,7 +387,7 @@ "text": "100 - 400" }, { - "text": "Rice" + "text": "Рис" }, { "text": " 15 - 30" @@ -396,7 +396,7 @@ "text": "100 - 500" }, { - "text": "Beet" + "text": "Свёкла" }, { "text": " -5 - 20" @@ -405,7 +405,7 @@ "text": " 70 - 300" }, { - "text": "Cabbage" + "text": "Капуста" }, { "text": "-10 - 27" @@ -414,7 +414,7 @@ "text": " 60 - 280" }, { - "text": "Carrot" + "text": "Морковь" }, { "text": " 3 - 30" @@ -423,7 +423,7 @@ "text": "100 - 400" }, { - "text": "Garlic" + "text": "Чеснок" }, { "text": "-20 - 18" @@ -432,7 +432,7 @@ "text": " 60 - 310" }, { - "text": "Green Bean" + "text": "Горох" }, { "text": " 2 - 35" @@ -441,7 +441,7 @@ "text": "150 - 410" }, { - "text": "Melon" + "text": "Арбуз" }, { "text": " 5 - 37" @@ -469,19 +469,19 @@ "type": "tfc:table", "strings": [ { - "text": "Crop", + "text": "Растение", "bold": true }, { - "text": "Temperature (°C)", + "text": "Температура (°C)", "bold": true }, { - "text": "Rainfall (mm)", + "text": "Осадки (мм)", "bold": true }, { - "text": "Potato" + "text": "Картошка" }, { "text": " -1 - 37" @@ -490,7 +490,7 @@ "text": "200 - 410" }, { - "text": "Pumpkin" + "text": "Тыква" }, { "text": " 0 - 30" @@ -499,7 +499,7 @@ "text": "120 - 390" }, { - "text": "Onion" + "text": "Лук" }, { "text": " 0 - 30" @@ -508,7 +508,7 @@ "text": "100 - 390" }, { - "text": "Soybean" + "text": "Соевые бобы" }, { "text": " 8 - 30" @@ -517,7 +517,7 @@ "text": "160 - 410" }, { - "text": "Squash" + "text": "Кабачок" }, { "text": " 5 - 33" @@ -526,7 +526,7 @@ "text": " 90 - 390" }, { - "text": "Sugarcane" + "text": "Сахарный тростник" }, { "text": " 12 - 38" @@ -535,7 +535,7 @@ "text": "160 - 500" }, { - "text": "Tomato" + "text": "Помидор" }, { "text": " 0 - 36" @@ -544,7 +544,7 @@ "text": "120 - 390" }, { - "text": "Jute" + "text": "Джут" }, { "text": " 5 - 37" @@ -553,7 +553,7 @@ "text": "100 - 410" }, { - "text": "Papyrus" + "text": "Папирус" }, { "text": " 19 - 37" @@ -562,7 +562,7 @@ "text": "310 - 500" }, { - "text": "Red Bell Pepper" + "text": "Красный перец" }, { "text": " 16 - 30" @@ -571,13 +571,71 @@ "text": "190 - 400" }, { - "text": "Yellow Bell Pepper" + "text": "Жёлтый перец" }, { "text": " 16 - 30" }, { "text": "190 - 400" + }, + { + "text": "Подсолнух" + }, + { + "text": " 5 - 40" + }, + { + "text": "100 - 450" + } + ], + "text": "", + "title": "Требования к диким культурам", + "legend": [], + "columns": 2, + "first_column_width": 80, + "column_width": 70, + "row_height": 10, + "left_buffer": 2, + "top_buffer": 12, + "draw_background": false + }, + { + "type": "patchouli:empty", + "draw_filler": false + }, +{ + "type": "tfc:table", + "strings": [ + { + "text": "Растение", + "bold": true + }, + { + "text": "Температура (°C)", + "bold": true + }, + { + "text": "Осадки (мм)", + "bold": true + }, + { + "text": "Канола" + }, + { + "text": " -5 - 25" + }, + { + "text": " 50 - 350" + }, + { + "text": "Лён" + }, + { + "text": " -8 - 25" + }, + { + "text": "175 - 475" } ], "text": "", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/the_world/wild_fruits.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/the_world/wild_fruits.json index 09392db65..33e26c1e9 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/the_world/wild_fruits.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/the_world/wild_fruits.json @@ -1941,43 +1941,43 @@ "text": "" }, { - "text": "Jan" + "text": "Янв" }, { - "text": "Feb" + "text": "Фев" }, { - "text": "Mar" + "text": "Мар" }, { - "text": "Apr" + "text": "Апр" }, { - "text": "May" + "text": "Май" }, { - "text": "Jun" + "text": "Июн" }, { - "text": "Jul" + "text": "Июл" }, { - "text": "Aug" + "text": "Авг" }, { - "text": "Sep" + "text": "Сен" }, { - "text": "Oct" + "text": "Окт" }, { - "text": "Nov" + "text": "Ноя" }, { - "text": "Dec" + "text": "Дек" }, { - "text": "Cherry" + "text": "Вишня" }, { "fill": "0x6ab553" @@ -2016,7 +2016,7 @@ "fill": "0xa8986a" }, { - "text": "Apple" + "text": "Яблоня" }, { "fill": "0xa8986a" @@ -2055,7 +2055,7 @@ "fill": "0xa8986a" }, { - "text": "Lemon" + "text": "Лимон" }, { "fill": "0xa8986a" @@ -2094,7 +2094,7 @@ "fill": "0xa8986a" }, { - "text": "Olive" + "text": "Олива" }, { "fill": "0xa8986a" @@ -2133,7 +2133,7 @@ "fill": "0xa8986a" }, { - "text": "Orange" + "text": "Апельсин" }, { "fill": "0xa8986a" @@ -2172,7 +2172,7 @@ "fill": "0xa8986a" }, { - "text": "Peach" + "text": "Персик" }, { "fill": "0x6ab553" @@ -2211,7 +2211,7 @@ "fill": "0x6ab553" }, { - "text": "Plum" + "text": "Слива" }, { "fill": "0x6ab553" @@ -2250,7 +2250,7 @@ "fill": "0xa8986a" }, { - "text": "Banana" + "text": "Банан" }, { "fill": "0xa8986a" @@ -2293,19 +2293,19 @@ "title": "Фруктовые деревья", "legend": [ { - "text": "Dormant", + "text": "Спящее", "color": "0xa8986a" }, { - "text": "Healthy", + "text": "Здоровое", "color": "0x6ab553" }, { - "text": "Flowering", + "text": "Цветущее", "color": "0xcca0db" }, { - "text": "Fruiting", + "text": "Плодоносящее", "color": "0xa217ff" } ], @@ -3117,12 +3117,12 @@ { "type": "patchouli:text", "anchor": "wintergreen_berry", - "text": "$(bold)$(l:the_world/climate#temperature)Температура$(): -6 - 17 °C$(br)$(bold)$(l:mechanics/hydration)Увлажненность$(): 12 - 100 %$(br2)Кусты черники зимнего сорта растут с мая по сентябрь, начинают цветение в октябре и ноябре, и приносят плоды в декабре.$(br2)Их можно найти в лесах.", - "title": "Куст черники зимнего сорта" + "text": "$(bold)$(l:the_world/climate#temperature)Температура$(): -6 - 17 °C$(br)$(bold)$(l:mechanics/hydration)Увлажненность$(): 12 - 100 %$(br2)Кусты брусники растут с мая по сентябрь, начинают цветение в октябре и ноябре, и приносят плоды в декабре.$(br2)Их можно найти в лесах.", + "title": "Куст брусники" }, { "type": "tfc:multimultiblock", - "text": "Стадии куста черники зимнего сорта по месяцам.", + "text": "Стадии куста брусники по месяцам.", "multiblocks": [ { "pattern": [ @@ -3249,43 +3249,43 @@ "text": "" }, { - "text": "Jan" + "text": "Янв" }, { - "text": "Feb" + "text": "Фев" }, { - "text": "Mar" + "text": "Мар" }, { - "text": "Apr" + "text": "Апр" }, { - "text": "May" + "text": "Май" }, { - "text": "Jun" + "text": "Июн" }, { - "text": "Jul" + "text": "Июл" }, { - "text": "Aug" + "text": "Авг" }, { - "text": "Sep" + "text": "Сен" }, { - "text": "Oct" + "text": "Окт" }, { - "text": "Nov" + "text": "Ноя" }, { - "text": "Dec" + "text": "Дек" }, { - "text": "Snowberry" + "text": "Снежноягодник" }, { "fill": "0xa8986a" @@ -3324,7 +3324,7 @@ "fill": "0xa8986a" }, { - "text": "Bunchberry" + "text": "Кизил" }, { "fill": "0xa8986a" @@ -3363,7 +3363,7 @@ "fill": "0xa8986a" }, { - "text": "Gooseberry" + "text": "Крыжовник" }, { "fill": "0xa8986a" @@ -3402,7 +3402,7 @@ "fill": "0xa8986a" }, { - "text": "Cloudberry" + "text": "Морошка" }, { "fill": "0xa8986a" @@ -3441,7 +3441,7 @@ "fill": "0xa8986a" }, { - "text": "Strawberry" + "text": "Клубника" }, { "fill": "0xcca0db" @@ -3480,7 +3480,7 @@ "fill": "0x6ab553" }, { - "text": "Wintergreen" + "text": "Брусника" }, { "fill": "0xa8986a" @@ -3519,7 +3519,7 @@ "fill": "0xa8986a" }, { - "text": "Cranberry" + "text": "Клюква" }, { "fill": "0xa8986a" @@ -3562,21 +3562,22 @@ "title": "Ягодные кусты", "legend": [ { - "text": "Dormant", + "text": "Спящий", "color": "0xa8986a" }, { - "text": "Healthy", + "text": "Здоровый", "color": "0x6ab553" }, { - "text": "Flowering", + "text": "Цветущий", "color": "0xcca0db" }, { - "text": "Fruiting", + "text": "Плодоносящий", "color": "0xa217ff" } + ], "columns": 12, "first_column_width": 45, diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/ore_basics.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/ore_basics.json index e57b38e59..b38bdbdc2 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/ore_basics.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/ore_basics.json @@ -4,6 +4,7 @@ "category": "tfc:tfg_ores", "priority": true, "sortnum": 0, + "read_by_default": true, "pages": [ { "type": "patchouli:text", From 8fba57695e2533929a0ac9940c355ddbbd25d3a6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 21:10:24 +0000 Subject: [PATCH 20/66] fix drinks giving too much hydration --- kubejs/data/firmalife/tfc/drinkables/red_wine.json | 4 +++- kubejs/data/firmalife/tfc/drinkables/rose_wine.json | 6 ++++-- kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json | 6 ++++-- kubejs/data/firmalife/tfc/drinkables/white_wine.json | 4 +++- kubejs/data/gtceu/tfc/drinkables/ethanol.json | 1 + kubejs/data/gtceu/tfc/drinkables/ice_slush.json | 1 + kubejs/data/gtceu/tfc/drinkables/methanol.json | 1 + kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/coffee.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/compote.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/kvass.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json | 4 +++- kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json | 3 ++- 17 files changed, 38 insertions(+), 16 deletions(-) diff --git a/kubejs/data/firmalife/tfc/drinkables/red_wine.json b/kubejs/data/firmalife/tfc/drinkables/red_wine.json index 12c0c6a23..80917d52f 100644 --- a/kubejs/data/firmalife/tfc/drinkables/red_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/red_wine.json @@ -1,6 +1,8 @@ { "ingredient": "firmalife:red_wine", - "thirst": 15, + "thirst": 10, + "intoxication": 4000, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:strength", diff --git a/kubejs/data/firmalife/tfc/drinkables/rose_wine.json b/kubejs/data/firmalife/tfc/drinkables/rose_wine.json index 3c0747575..ce11502bc 100644 --- a/kubejs/data/firmalife/tfc/drinkables/rose_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/rose_wine.json @@ -1,9 +1,11 @@ { "ingredient": "firmalife:rose_wine", - "thirst": 15, + "thirst": 10, + "intoxication": 4000, + "may_drink_when_full": true, "effects": [ { - "type": "minecraft:dolphins_grace", + "type": "minecraft:strength", "duration": 6400, "amplifier": 0 } diff --git a/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json b/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json index e0004b982..77749fdda 100644 --- a/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json @@ -1,6 +1,8 @@ { - "ingredient": "firmalife:dessert_wine", - "thirst": 15, + "ingredient": "firmalife:sparkling_wine", + "thirst": 10, + "intoxication": 4000, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:jump_boost", diff --git a/kubejs/data/firmalife/tfc/drinkables/white_wine.json b/kubejs/data/firmalife/tfc/drinkables/white_wine.json index 7b7bc3c28..da19eb209 100644 --- a/kubejs/data/firmalife/tfc/drinkables/white_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/white_wine.json @@ -1,6 +1,8 @@ { "ingredient": "firmalife:white_wine", - "thirst": 15, + "thirst": 10, + "intoxication": 4000, + "may_drink_when_full": true, "effects": [ { "type": "species:wither_resistance", diff --git a/kubejs/data/gtceu/tfc/drinkables/ethanol.json b/kubejs/data/gtceu/tfc/drinkables/ethanol.json index 96e808d58..653b9e83b 100644 --- a/kubejs/data/gtceu/tfc/drinkables/ethanol.json +++ b/kubejs/data/gtceu/tfc/drinkables/ethanol.json @@ -1,6 +1,7 @@ { "ingredient": "gtceu:ethanol", "thirst": 5, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:nausea", diff --git a/kubejs/data/gtceu/tfc/drinkables/ice_slush.json b/kubejs/data/gtceu/tfc/drinkables/ice_slush.json index 1f05cb9c9..ed162e575 100644 --- a/kubejs/data/gtceu/tfc/drinkables/ice_slush.json +++ b/kubejs/data/gtceu/tfc/drinkables/ice_slush.json @@ -1,6 +1,7 @@ { "ingredient": "gtceu:ice", "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "tfg:cooling", diff --git a/kubejs/data/gtceu/tfc/drinkables/methanol.json b/kubejs/data/gtceu/tfc/drinkables/methanol.json index cba19d83e..84fc684f1 100644 --- a/kubejs/data/gtceu/tfc/drinkables/methanol.json +++ b/kubejs/data/gtceu/tfc/drinkables/methanol.json @@ -1,6 +1,7 @@ { "ingredient": "gtceu:methanol", "thirst": 5, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:blindness", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json b/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json index 5d403ba69..0f59bce41 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:cocoa", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:haste", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json b/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json index 13dec7feb..c64e29166 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:coffee", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:speed", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/compote.json b/kubejs/data/tfc_gurman/tfc/drinkables/compote.json index 6956998dd..d86db6987 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/compote.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/compote.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:compote", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:jump_boost", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json b/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json index 052d6cd35..2f70a543d 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:kvass", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:strength", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json b/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json index 66d8a3f8c..d5d810fe4 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:lemonade", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:haste", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json b/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json index 8e4d8f5a0..563b57b30 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json @@ -1,6 +1,8 @@ { "ingredient": "tfc_gurman:nalivka", - "thirst": 15, + "thirst": 10, + "intoxication": 4000, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:strength", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json index 6e8dda27f..bb7a5223f 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:tea_chamomile", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:resistance", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json index e96941a4c..e43e41414 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:tea_mint", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:regeneration", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json index cc2c300bb..a9e53654d 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:tea_nettle", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:slow_falling", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json index ad3d523f9..9f45aa167 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:tea_rosehip", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:absorption", From 8d17dca5c61787234de9023ab9b33db7ad773aba Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 21:12:18 +0000 Subject: [PATCH 21/66] move saltpeter chem reactor to a circuit --- CHANGELOG.md | 6 +++++- kubejs/data/firmalife/tfc/drinkables/dessert_wine.json | 4 +++- kubejs/startup_scripts/gtceu/constants.js | 5 ++++- kubejs/startup_scripts/tfg/stone_types/constants.rocks.js | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05ad054d2..c3710241a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # Changelog ## Unreleased -### Important note +### Important notes - OC has been fixed on the Pisciculture Fishery and Hydroponics Facility. You will have to break and replace the machine for the fix to take effect. +- The Saltpeter chemical reactor recipe is now on circuit 2, to avoid a conflict with Nitrous Oxide (#2826) @Pyritie ### Breaking changes we forgot to write last time - Water wheels now *require* flowing water to work correctly. So you can't just put them in a lake, but you can make little flows off the side of it or use aqueducts and those should work. Other than that, they should have their same stress numbers as before. #### Stone dusts and other rock-related changes @@ -19,6 +20,7 @@ - The food meter's saturation level is now indicated by a gold outline instead of a red one, so it's less difficult to see (#2812) @TreyR9 - Changed some of the colors of Greate things to make the different tiers more visually distinct @Pyritie - Buffed ore washing and ore maceration recipes so at least they aren't so awful compared to Greate's methods @Pyritie +- Added TFG's crops to the field guide's Wild Crops entry @Petr211071 ### Bug fixes - Fixed a config bug causing waves to deposit shells etc with 100% chance. @Mqrius - Fixed a bug preventing the Pisciculture Fishery and Hydroponics Facility from overclocking. @Redeix @@ -29,6 +31,8 @@ - Fixed the Ad Astra airlock not counting as a cleanroom door (#2808) @thederpysockdude123 - Removed some leftover rock dust centrifuge recipes (#2804) @thederpysockdude123 - Fixed some mars plants self-destructing @Pyritie +- Fixed mossy cobblestone not collapsing @Pyritie +- Fixed welding not preserving forging bonuses (#2827) @Pyritie ### Translation updates - Spanish @NikoNeko17 - Russian @Petr211071 diff --git a/kubejs/data/firmalife/tfc/drinkables/dessert_wine.json b/kubejs/data/firmalife/tfc/drinkables/dessert_wine.json index 686a1157f..d85b72fa4 100644 --- a/kubejs/data/firmalife/tfc/drinkables/dessert_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/dessert_wine.json @@ -1,6 +1,8 @@ { "ingredient": "firmalife:dessert_wine", - "thirst": 15, + "thirst": 10, + "intoxication": 4000, + "may_drink_when_full": true, "effects": [ { "type": "species:iron_will", diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 40e7aa930..2be0de5fd 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -438,7 +438,10 @@ global.ADD_CIRCUIT = /** @type {const} */ ([ { recipeId: "gtceu:large_chemical_reactor/acetic_acid_from_methanol", circuitNumber: 1 }, { recipeId: "gtceu:chemical_reactor/butraldehyde", circuitNumber: 5 }, - { recipeId: "gtceu:large_chemical_reactor/butraldehyde", circuitNumber: 5 } + { recipeId: "gtceu:large_chemical_reactor/butraldehyde", circuitNumber: 5 }, + + { recipeId: "gtceu:chemical_reactor/saltpeter", circuitNumber: 2 }, + { recipeId: "gtceu:large_chemical_reactor/saltpeter", circuitNumber: 2 } ]); //#endregion diff --git a/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js b/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js index fab336d36..5e13faaa9 100644 --- a/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js +++ b/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js @@ -772,7 +772,7 @@ global.BIG_ROCK_TABLE = /** @type {{String, RockType}} */ ({ }), // Thermal Vent Deposit "sulphuric_rock": { - material: 'tfg:igneous_mafic', + material: 'tfg:sedimentary_organic', collapsible: false, isTFC: false, sound: 'dripstone_block', From a844e5028467e3ac89926622d615037ad72b9a63 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 21:31:48 +0000 Subject: [PATCH 22/66] drinkable concrete --- kubejs/client_scripts/tooltips.js | 20 ++++++++++------- .../data/gtceu/tfc/drinkables/concrete.json | 22 +++++++++++++++++++ kubejs/data/rnr/tfc/drinkables/concrete.json | 22 +++++++++++++++++++ kubejs/server_scripts/tfg/tags.js | 4 ++++ 4 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 kubejs/data/gtceu/tfc/drinkables/concrete.json create mode 100644 kubejs/data/rnr/tfc/drinkables/concrete.json diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index a18865b76..9ec39e3f0 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -464,14 +464,18 @@ const registerTooltips = (event) => { event.addAdvanced(['firmalife:bucket/sparkling_wine'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.jump_boost").append(Text.of(" II (05:20)")).blue()); }) - event.addAdvanced(['gtceu:ethanol_bucket'], (item, advanced, text) => { - text.add(1, Text.translate("effect.minecraft.nausea").append(Text.of(" (01:00)")).red()); - text.add(2, Text.translate("effect.minecraft.poison").append(Text.of(" II (00:30)")).red()); - }) - event.addAdvanced(['gtceu:methanol_bucket'], (item, advanced, text) => { - text.add(1, Text.translate("effect.minecraft.blindness").append(Text.of(" (05:00)")).red()); - text.add(2, Text.translate("effect.minecraft.wither").append(Text.of(" II (01:00)")).red()); - }) + //event.addAdvanced(['gtceu:ethanol_bucket'], (item, advanced, text) => { + // text.add(1, Text.translate("effect.minecraft.nausea").append(Text.of(" (01:00)")).red()); + // text.add(2, Text.translate("effect.minecraft.poison").append(Text.of(" II (00:30)")).red()); + //}) + //event.addAdvanced(['gtceu:methanol_bucket'], (item, advanced, text) => { + // text.add(1, Text.translate("effect.minecraft.blindness").append(Text.of(" (05:00)")).red()); + // text.add(2, Text.translate("effect.minecraft.wither").append(Text.of(" II (01:00)")).red()); + //}) + //event.addAdvanced(['gtceu:concrete_bucket', 'rnr:bucket/concrete'], (item, advanced, text) => { + // text.add(1, Text.translate("effect.minecraft.slowness").append(Text.of(" II (05:00)")).red()); + // text.add(2, Text.translate("effect.minecraft.nausea").append(Text.of(" (01:00)")).red()); + //}) event.addAdvanced(['gtceu:ice_bucket'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.cooling_foods')); }) diff --git a/kubejs/data/gtceu/tfc/drinkables/concrete.json b/kubejs/data/gtceu/tfc/drinkables/concrete.json new file mode 100644 index 000000000..431c6199a --- /dev/null +++ b/kubejs/data/gtceu/tfc/drinkables/concrete.json @@ -0,0 +1,22 @@ +{ + "ingredient": "gtceu:concrete", + "thirst": 0, + "may_drink_when_full": true, + "effects": [ + { + "type": "minecraft:slowness", + "duration": 12000, + "amplifier": 2 + }, + { + "type": "species:tanked", + "duration": 12000, + "amplifier": 0 + }, + { + "type": "minecraft:mining_fatigue", + "duration": 1200, + "amplifier": 0 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/rnr/tfc/drinkables/concrete.json b/kubejs/data/rnr/tfc/drinkables/concrete.json new file mode 100644 index 000000000..841e9d0d2 --- /dev/null +++ b/kubejs/data/rnr/tfc/drinkables/concrete.json @@ -0,0 +1,22 @@ +{ + "ingredient": "rnr:concrete", + "thirst": 0, + "may_drink_when_full": true, + "effects": [ + { + "type": "minecraft:slowness", + "duration": 12000, + "amplifier": 2 + }, + { + "type": "species:tanked", + "duration": 12000, + "amplifier": 0 + }, + { + "type": "minecraft:mining_fatigue", + "duration": 1200, + "amplifier": 0 + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 240456478..119a5b49b 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -179,6 +179,10 @@ const registerTFGFluidTags = (event) => { event.add('tfc:any_drinkables', 'gtceu:ethanol') event.add('tfc:drinkables', 'gtceu:methanol') event.add('tfc:any_drinkables', 'gtceu:methanol') + event.add('tfc:drinkables', 'gtceu:concrete') + event.add('tfc:any_drinkables', 'gtceu:concrete') + event.add('tfc:drinkables', 'rnr:concrete') + event.add('tfc:any_drinkables', 'gtceu:concrete') event.add('tfc:drinkables', 'gtceu:ice') event.add('tfc:any_drinkables', 'gtceu:ice') From e4fe7ee8eaf5346c8801eb772ae6465968efca29 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 21:33:36 +0000 Subject: [PATCH 23/66] 0.11.18 --- CHANGELOG.md | 7 ++ config/crash_assistant/modlist.json | 64 ++++++---- .../quests/chapters/queststfc_tips.snbt | 2 +- pakku-lock.json | 113 +++++++++--------- 4 files changed, 103 insertions(+), 83 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3710241a..f11a43eb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ # Changelog ## Unreleased +### Changes +### Bug fixes +### Translation updates + +## [0.11.18] - 23-01-2026 ### Important notes +If you missed it, 0.11.17 was a Beta version with other important breaking changes. Be sure to [read it](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/releases/tag/0.11.17) as well! - OC has been fixed on the Pisciculture Fishery and Hydroponics Facility. You will have to break and replace the machine for the fix to take effect. - The Saltpeter chemical reactor recipe is now on circuit 2, to avoid a conflict with Nitrous Oxide (#2826) @Pyritie ### Breaking changes we forgot to write last time @@ -21,6 +27,7 @@ - Changed some of the colors of Greate things to make the different tiers more visually distinct @Pyritie - Buffed ore washing and ore maceration recipes so at least they aren't so awful compared to Greate's methods @Pyritie - Added TFG's crops to the field guide's Wild Crops entry @Petr211071 +- You can now drink concrete @Pyritie ### Bug fixes - Fixed a config bug causing waves to deposit shells etc with 100% chance. @Mqrius - Fixed a bug preventing the Pisciculture Fishery and Hydroponics Facility from overclocking. @Redeix diff --git a/config/crash_assistant/modlist.json b/config/crash_assistant/modlist.json index 531b8217d..4ac65046b 100644 --- a/config/crash_assistant/modlist.json +++ b/config/crash_assistant/modlist.json @@ -452,6 +452,13 @@ "curseForgeHash": 3915242941, "modrinthHash": "338704cdf6623ad96983e72e81e8a9d97e8b28d8" }, + "createstockbridge-1.20-0.1.5.jar": { + "jarName": "createstockbridge-1.20-0.1.5.jar", + "modId": "createstockbridge", + "version": "0.1.5", + "curseForgeHash": 3147522607, + "modrinthHash": "0fa15f11788e3bc3a812fc597ade17af33888952" + }, "CreativeCore_FORGE_v2.12.32_mc1.20.1.jar": { "jarName": "CreativeCore_FORGE_v2.12.32_mc1.20.1.jar", "modId": "creativecore", @@ -718,12 +725,12 @@ "curseForgeHash": 1064675696, "modrinthHash": "1ef101b4c5991cc239d9b56a95500e3b404228f7" }, - "ftb-teams-forge-2001.3.1.jar": { - "jarName": "ftb-teams-forge-2001.3.1.jar", + "ftb-teams-forge-2001.3.2.jar": { + "jarName": "ftb-teams-forge-2001.3.2.jar", "modId": "ftbteams", - "version": "2001.3.1", - "curseForgeHash": 1240744296, - "modrinthHash": "c2af94e0b86631cb75daa8de2377ff72527651ca" + "version": "2001.3.2", + "curseForgeHash": 816412664, + "modrinthHash": "c49023f5d471aa1ba7fc624d2565fe9e82b7117e" }, "ftb-xmod-compat-forge-2.1.3.jar": { "jarName": "ftb-xmod-compat-forge-2.1.3.jar", @@ -1017,12 +1024,12 @@ "curseForgeHash": 544928077, "modrinthHash": "24e6611df470afd957eafd16c43890b7214e3da9" }, - "modernfix-forge-5.25.2+mc1.20.1.jar": { - "jarName": "modernfix-forge-5.25.2+mc1.20.1.jar", + "modernfix-forge-5.26.1+mc1.20.1.jar": { + "jarName": "modernfix-forge-5.26.1+mc1.20.1.jar", "modId": "modernfix", - "version": "5.25.2+mc1.20.1", - "curseForgeHash": 3074548209, - "modrinthHash": "4069534174e618393f0c14d9dc61ac27a04bb992" + "version": "5.26.1+mc1.20.1", + "curseForgeHash": 424935770, + "modrinthHash": "fa0163b33e911b69af61fee8a3920820e7c617a0" }, "ModernUI-Forge-1.20.1-3.12.0.1-universal.jar": { "jarName": "ModernUI-Forge-1.20.1-3.12.0.1-universal.jar", @@ -1122,12 +1129,12 @@ "curseForgeHash": 3233971835, "modrinthHash": "cc0332d3bbf7824b673abc59e231f1f5aafc6420" }, - "particle_core-0.2.6+1.20.1+forge.jar": { - "jarName": "particle_core-0.2.6+1.20.1+forge.jar", + "particle_core-0.3.1+1.20.1+forge.jar": { + "jarName": "particle_core-0.3.1+1.20.1+forge.jar", "modId": "particle_core", - "version": "0.2.6+1.20.1+forge", - "curseForgeHash": 4189650687, - "modrinthHash": "91f302ab9b85016aeb3a9a0e85b80650a1d2e984" + "version": "0.3.1+1.20.1+forge", + "curseForgeHash": 4077743380, + "modrinthHash": "935a8c19cc7a72364fdfe494d9ddbd599f01588d" }, "particular-1.20.1-Forge-1.2.7.jar": { "jarName": "particular-1.20.1-Forge-1.2.7.jar", @@ -1367,12 +1374,12 @@ "curseForgeHash": 218830698, "modrinthHash": "7d4f578a42c9b880744ea6058a495847aac9e4c3" }, - "tacz-tweaks-2.11.2-all.jar": { - "jarName": "tacz-tweaks-2.11.2-all.jar", + "tacz-tweaks-2.12.1-all.jar": { + "jarName": "tacz-tweaks-2.12.1-all.jar", "modId": "tacztweaks", - "version": "2.11.2", - "curseForgeHash": 2376197194, - "modrinthHash": "889c0885b6388fc7966b956a5df4efbb1c758965" + "version": "2.12.1", + "curseForgeHash": 769672337, + "modrinthHash": "92c9981e2e2f2edecab25ee48c5bade7a14298a8" }, "taczammoquery-1.20.1-1.0.0.jar": { "jarName": "taczammoquery-1.20.1-1.0.0.jar", @@ -1395,12 +1402,12 @@ "curseForgeHash": 2679626739, "modrinthHash": "ea725f5bed9662aa22d4ec089a009bd52fb82275" }, - "TerraFirmaGreg-Core-Modern-0.8.17.jar": { - "jarName": "TerraFirmaGreg-Core-Modern-0.8.17.jar", + "TerraFirmaGreg-Core-Modern-0.8.18.jar": { + "jarName": "TerraFirmaGreg-Core-Modern-0.8.18.jar", "modId": "tfg", - "version": "0.8.17", - "curseForgeHash": 2296143699, - "modrinthHash": "8a92b1d2a0a88eb0d7ffdfcdab93b0fb31e2e312" + "version": "0.8.18", + "curseForgeHash": 3264017794, + "modrinthHash": "b4f98b976aa7096b6ec0a6bd291fb16415dfeb3a" }, "tfc_gurman-1.3.0.jar": { "jarName": "tfc_gurman-1.3.0.jar", @@ -1626,6 +1633,13 @@ "curseForgeHash": 2333549546, "modrinthHash": "7298a59e383d2327e2acc49d8f1b132cedb8860b" }, + "wakes-1.20.1-Forge-1.0.9.jar": { + "jarName": "wakes-1.20.1-Forge-1.0.9.jar", + "modId": "wakes", + "version": "1.0.9", + "curseForgeHash": 650217522, + "modrinthHash": "4e2f19e3c2d36968630f66b370ad0ab984aa5b25" + }, "waterflasks-3.0.10.jar": { "jarName": "waterflasks-3.0.10.jar", "modId": "waterflasks", diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 7d9558338..ed36edbd7 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1185,7 +1185,7 @@ Count: 1 ForgeCaps: { "tfc:food": { - creationDate: 53316000L + creationDate: -9223372036854775808L traits: [ ] } } diff --git a/pakku-lock.json b/pakku-lock.json index b6e73220b..1d4e80d90 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4651,7 +4651,7 @@ "pakku_links": [ "6k7DoFyO7bpHnhyk", "znIzfNElWkwpdz2V", - "pB7ARGecP03UXpd6" + "ihA4iuyUc3fA0D4q" ], "type": "MOD", "side": "BOTH", @@ -4793,7 +4793,7 @@ "pakku_links": [ "0DMPJ1AWW6qfYubI", "64uacGcEw697jVGs", - "pB7ARGecP03UXpd6" + "ihA4iuyUc3fA0D4q" ], "type": "MOD", "side": "BOTH", @@ -5167,7 +5167,7 @@ "zQAe1eid9EE5PMwK", "WlWexjDJnb3iikHc", "V83DMpywbmyrQqvg", - "pB7ARGecP03UXpd6" + "ihA4iuyUc3fA0D4q" ], "type": "MOD", "side": "BOTH", @@ -6883,9 +6883,9 @@ ] }, { - "pakku_id": "pB7ARGecP03UXpd6", + "pakku_id": "ihA4iuyUc3fA0D4q", "type": "MOD", - "side": "BOTH", + "side": "CLIENT", "slug": { "curseforge": "geckolib", "modrinth": "geckolib" @@ -6899,6 +6899,27 @@ "modrinth": "8BmcQJ2H" }, "files": [ + { + "type": "curseforge", + "file_name": "geckolib-forge-1.20.1-4.8.2.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7025/129/geckolib-forge-1.20.1-4.8.2.jar", + "id": "7025129", + "parent_id": "388172", + "hashes": { + "sha1": "395a9f21a36dc8466d67c2af67a904e7013460d1", + "md5": "d1ff73da16b6fc163d6c5ed3d9734dde" + }, + "required_dependencies": [], + "size": 1038979, + "date_published": "2025-09-23T10:08:54.570Z" + }, { "type": "modrinth", "file_name": "geckolib-forge-1.20.1-4.8.2.jar", @@ -6919,28 +6940,6 @@ "required_dependencies": [], "size": 1038979, "date_published": "2025-09-23T10:09:01.034935Z" - }, - { - "type": "curseforge", - "file_name": "geckolib-forge-1.20.1-4.7.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6027/567/geckolib-forge-1.20.1-4.7.jar", - "id": "6027567", - "parent_id": "388172", - "hashes": { - "sha1": "698d4374fb062edf68b93e05f3bf3b5873cdd260", - "md5": "96dddfb78d375bdd330ae1577ee28bfe" - }, - "required_dependencies": [], - "size": 1004042, - "date_published": "2024-12-27T16:27:17.200Z" } ] }, @@ -9436,7 +9435,7 @@ "files": [ { "type": "modrinth", - "file_name": "modernfix-forge-5.25.2+mc1.20.1.jar", + "file_name": "modernfix-forge-5.26.1+mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9444,20 +9443,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/nmDcB62a/versions/scXW7F8Q/modernfix-forge-5.25.2+mc1.20.1.jar", - "id": "scXW7F8Q", + "url": "https://cdn.modrinth.com/data/nmDcB62a/versions/zSQuM6f3/modernfix-forge-5.26.1+mc1.20.1.jar", + "id": "zSQuM6f3", "parent_id": "nmDcB62a", "hashes": { - "sha512": "016940bd76b36865f507c07fc7834ea7dc6f7a6c0016aebf6375ee05a9405f2730e07c555ab8ce920775fce3b5a29ff5b638b67f29c03458074650478d37242a", - "sha1": "4069534174e618393f0c14d9dc61ac27a04bb992" + "sha512": "af689fc986ea90026881cb928cef4d1cdb94030c77e111a4a4b560206c2754ad63b58a7df2990942c6808d692500a7b701a87ebb1665b0d2832d6119ad80c81c", + "sha1": "fa0163b33e911b69af61fee8a3920820e7c617a0" }, "required_dependencies": [], - "size": 895444, - "date_published": "2025-12-08T02:42:23.149141Z" + "size": 826829, + "date_published": "2026-01-23T00:51:21.409054Z" }, { "type": "curseforge", - "file_name": "modernfix-forge-5.25.2+mc1.20.1.jar", + "file_name": "modernfix-forge-5.26.1+mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9465,16 +9464,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7306/749/modernfix-forge-5.25.2+mc1.20.1.jar", - "id": "7306749", + "url": "https://edge.forgecdn.net/files/7509/729/modernfix-forge-5.26.1+mc1.20.1.jar", + "id": "7509729", "parent_id": "790626", "hashes": { - "sha1": "4069534174e618393f0c14d9dc61ac27a04bb992", - "md5": "893b2aba13f35bd7ed3fdad2ca15a4d4" + "sha1": "fa0163b33e911b69af61fee8a3920820e7c617a0", + "md5": "63bb05ac16ae0ecc3e2b039148edab3e" }, "required_dependencies": [], - "size": 895444, - "date_published": "2025-12-08T02:42:18.980Z" + "size": 826829, + "date_published": "2026-01-23T00:51:20.560Z" } ] }, @@ -10964,7 +10963,7 @@ { "pakku_id": "fyLOnDQ4LT0IYTlR", "pakku_links": [ - "pB7ARGecP03UXpd6" + "ihA4iuyUc3fA0D4q" ], "type": "MOD", "side": "BOTH", @@ -14115,7 +14114,7 @@ "files": [ { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.17.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.18.jar", "mc_versions": [ "1.20.1" ], @@ -14124,23 +14123,23 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/ddL8gH3n/TerraFirmaGreg-Core-Modern-0.8.17.jar", - "id": "ddL8gH3n", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/xA84bf76/TerraFirmaGreg-Core-Modern-0.8.18.jar", + "id": "xA84bf76", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "e94af5ba14173453d2193f6c2d5d38e8718089a49cbbd0d179ac35426f66aa2994567b4a83e834fc214af92a1c2168f08915e7ed111bb89d0beb52b51e02b8d0", - "sha1": "8a92b1d2a0a88eb0d7ffdfcdab93b0fb31e2e312" + "sha512": "8a6e5bdd978ff3352df0e6a5723da09a6495f30850b68e5c191a976bf628f2ce537cd1be354ca214859a9e63f6398f2147d186156654946b38159d8a73ea860c", + "sha1": "b4f98b976aa7096b6ec0a6bd291fb16415dfeb3a" }, "required_dependencies": [ "JaCEZUhg", "7tG215v7" ], - "size": 9460832, - "date_published": "2026-01-20T15:49:12.042661Z" + "size": 9461778, + "date_published": "2026-01-23T05:43:54.009706Z" }, { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.17.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.18.jar", "mc_versions": [ "1.20.1" ], @@ -14149,19 +14148,19 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7494/761/TerraFirmaGreg-Core-Modern-0.8.17.jar", - "id": "7494761", + "url": "https://edge.forgecdn.net/files/7510/518/TerraFirmaGreg-Core-Modern-0.8.18.jar", + "id": "7510518", "parent_id": "513402", "hashes": { - "sha1": "8a92b1d2a0a88eb0d7ffdfcdab93b0fb31e2e312", - "md5": "cd491082cfcd037400291a39c466b4c5" + "sha1": "b4f98b976aa7096b6ec0a6bd291fb16415dfeb3a", + "md5": "98d393ea8d2bedda684ba69b5546c438" }, "required_dependencies": [ "890405", "302973" ], - "size": 9460832, - "date_published": "2026-01-20T15:49:06.947Z" + "size": 9461778, + "date_published": "2026-01-23T05:43:16.570Z" } ] }, @@ -14894,7 +14893,7 @@ { "pakku_id": "qM5Yyq0zqqJc8XtT", "pakku_links": [ - "pB7ARGecP03UXpd6" + "ihA4iuyUc3fA0D4q" ], "type": "MOD", "side": "BOTH", From 5052714c84e98aaf8ae101f62d87ba881b6e8dd4 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 22:31:46 +0000 Subject: [PATCH 24/66] fix gt glass lens --- kubejs/server_scripts/gregtech/recipes.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index cc007dfc9..7e8ede4e7 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -413,4 +413,11 @@ const registerGTCEURecipes = (event) => { .itemOutputs('tfg:paracetamol_pill') .duration(3 * 20) .EUt(GTValues.VA[GTValues.LV]) + + // Glass lens + event.recipes.gtceu.lathe('tfg:gt_glass_lens') + .itemInputs('#forge:plates/glass') + .itemOutputs('#forge:lenses/glass', '#forge:small_dusts/glass') + .duration(60 * 20) + .EUt(GTValues.VA[GTValues.MV]) } From 80f235448093a13d8d222dfe199c22d425a5c288 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 24 Jan 2026 13:59:30 +0000 Subject: [PATCH 25/66] fix kaolinite recipe conflict --- CHANGELOG.md | 2 ++ kubejs/server_scripts/tfg/machines/recipes.ender_pearls.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f11a43eb2..872214b6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## Unreleased +### Breaking changes +- The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie ### Changes ### Bug fixes ### Translation updates diff --git a/kubejs/server_scripts/tfg/machines/recipes.ender_pearls.js b/kubejs/server_scripts/tfg/machines/recipes.ender_pearls.js index 84162e695..803ced4f3 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.ender_pearls.js +++ b/kubejs/server_scripts/tfg/machines/recipes.ender_pearls.js @@ -6,6 +6,7 @@ function registerTFGEnderPearlRecipes(event) { .inputFluids(Fluid.of('gtceu:distilled_water', 6000), Fluid.of('gtceu:chlorine', 8000)) .itemOutputs('17x tfc:powder/kaolinite') .outputFluids(Fluid.of('gtceu:hydrochloric_acid', 8000)) + .circuit(3) .duration(20 * 10) .EUt(GTValues.VA[GTValues.HV]) @@ -14,6 +15,7 @@ function registerTFGEnderPearlRecipes(event) { .inputFluids(Fluid.of('gtceu:distilled_water', 6000), Fluid.of('gtceu:chlorine', 8000)) .itemOutputs('17x tfc:powder/kaolinite', '1x #forge:dusts/chromium') .outputFluids(Fluid.of('gtceu:hydrochloric_acid', 8000)) + .circuit(3) .duration(20 * 10) .EUt(GTValues.VA[GTValues.HV]) From e9e6530a6110f2907758749b9a4ab9287f139666 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 24 Jan 2026 15:27:11 +0000 Subject: [PATCH 26/66] fix large miners and deepslate/red granite loot tables --- CHANGELOG.md | 2 ++ kubejs/startup_scripts/gtceu/constants.js | 3 ++- .../tfg/stone_types/tag_prefixes.rocks.js | 22 ++++++++++++++++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 872214b6e..24b6e1e31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ - The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie ### Changes ### Bug fixes +- Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie +- Fixed red granite ores never dropping poor or rich raw ores @Pyritie ### Translation updates ## [0.11.18] - 23-01-2026 diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 2be0de5fd..38e7473b7 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -415,7 +415,8 @@ global.ORE_BEARING_STONES = /** @type {const} */ ([ "mars_stone", "venus_stone", "mercury_stone", - "glacio_stone" + "glacio_stone", + "red_granite" ]); //#endregion diff --git a/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js b/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js index 81354e3ef..0595b7243 100644 --- a/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js +++ b/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js @@ -2,7 +2,8 @@ "use strict"; const registerTFGRocksTagPrefixes = (event) => { - + + TagPrefix.ORES.remove(TagPrefix.oreDeepslate) TagPrefix.ORES.remove(TagPrefix.oreTuff) TagPrefix.ORES.remove(TagPrefix.oreSand) TagPrefix.ORES.remove(TagPrefix.oreRedSand) @@ -15,6 +16,7 @@ const registerTFGRocksTagPrefixes = (event) => { TagPrefix.ORES.remove(TagPrefix.oreAndesite) TagPrefix.ORES.remove(TagPrefix.oreDiorite) TagPrefix.ORES.remove(TagPrefix.oreGranite) + TagPrefix.ORES.remove(TagPrefix.oreRedGranite) const shouldGenerateOre = (material) => { return material.hasProperty(PropertyKey.ORE); @@ -46,6 +48,15 @@ const registerTFGRocksTagPrefixes = (event) => { TFGHelpers.registerCobbleBlock('pyroxenite', 'tfg:rock/cobble_blackstone'); + event.create('deepslate', 'ore') + .stateSupplier(() => Block.getBlock('minecraft:deepslate').defaultBlockState()) + .baseModelLocation('minecraft:block/deepslate') + .unificationEnabled(true) + .materialIconType(GTMaterialIconType.ore) + .generationCondition(shouldGenerateOre) + + TFGHelpers.registerCobbleBlock('deepslate', 'minecraft:cobbled_deepslate'); + event.create('dripstone', 'ore') .stateSupplier(() => Block.getBlock('minecraft:dripstone_block').defaultBlockState()) .baseModelLocation('minecraft:block/dripstone_block') @@ -108,4 +119,13 @@ const registerTFGRocksTagPrefixes = (event) => { .generationCondition(shouldGenerateOre) TFGHelpers.registerCobbleBlock('glacio_stone', 'ad_astra:glacio_cobblestone'); + + event.create('red_granite', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_red_granite').defaultBlockState()) + .baseModelLocation('gtceu:block/red_granite') + .unificationEnabled(true) + .materialIconType(GTMaterialIconType.ore) + .generationCondition(shouldGenerateOre) + + TFGHelpers.registerCobbleBlock('red_granite', 'gtceu:red_granite_cobblestone'); } \ No newline at end of file From e02c36bb9d3d5dbef329ab3b8be2d0e506b62782 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 24 Jan 2026 15:28:16 +0000 Subject: [PATCH 27/66] fix #2836 Related Work Items: #28 --- CHANGELOG.md | 1 + kubejs/server_scripts/afc/tags.js | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24b6e1e31..3643d8c44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie +- Fixed rosin leaves and saplings having tags the wrong way around (#2836) @Pyritie ### Translation updates ## [0.11.18] - 23-01-2026 diff --git a/kubejs/server_scripts/afc/tags.js b/kubejs/server_scripts/afc/tags.js index 771ed2740..016e998b6 100644 --- a/kubejs/server_scripts/afc/tags.js +++ b/kubejs/server_scripts/afc/tags.js @@ -69,21 +69,21 @@ const registerAFCItemTags = (event) => { event.add("tfg:rosin_logs", "#tfc:white_cedar_logs") event.add("tfg:rosin_logs", "#tfc:douglas_fir_logs") - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/aspen') - event.add("tfg:rosin_saplings", 'afc:wood/leaves/coast_spruce') - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/spruce') - event.add("tfg:rosin_saplings", 'afc:wood/leaves/black_spruce') - event.add("tfg:rosin_saplings", 'afc:wood/leaves/sitka_spruce') - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/douglas_fir') - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/white_cedar') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/aspen') + event.add("tfg:rosin_leaves", 'afc:wood/leaves/coast_spruce') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/spruce') + event.add("tfg:rosin_leaves", 'afc:wood/leaves/black_spruce') + event.add("tfg:rosin_leaves", 'afc:wood/leaves/sitka_spruce') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/douglas_fir') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/white_cedar') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/aspen') - event.add("tfg:rosin_leaves", 'afc:wood/sapling/coast_spruce') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/spruce') - event.add("tfg:rosin_leaves", 'afc:wood/sapling/black_spruce') - event.add("tfg:rosin_leaves", 'afc:wood/sapling/sitka_spruce') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/douglas_fir') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/white_cedar') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/aspen') + event.add("tfg:rosin_saplings", 'afc:wood/sapling/coast_spruce') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/spruce') + event.add("tfg:rosin_saplings", 'afc:wood/sapling/black_spruce') + event.add("tfg:rosin_saplings", 'afc:wood/sapling/sitka_spruce') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/douglas_fir') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/white_cedar') // Maple Syrup Tag From d89ea918732db438f53d89e13b098ae839d8e55e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 24 Jan 2026 15:40:33 +0000 Subject: [PATCH 28/66] make vanadium magnetite meltable #2834 --- CHANGELOG.md | 1 + kubejs/startup_scripts/gtceu/material_modification.js | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3643d8c44..5db9975c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Breaking changes - The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie ### Changes +- Vanadium magnetite is now usable as an iron ore for TFC purposes (#2834) @Pyritie ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index fbcf005a3..985f022e4 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -123,8 +123,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Magnetite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); GTMaterials.Pyrite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); GTMaterials.Goethite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); - GTMaterials.BasalticMineralSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); - GTMaterials.GraniticMineralSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 90)); + GTMaterials.BasalticMineralSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 80)); + GTMaterials.GraniticMineralSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 80)); + GTMaterials.VanadiumMagnetite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(921, 1228, 1535, GTMaterials.Iron, 3, 80)); GTMaterials.Malachite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1080, GTMaterials.Copper, 1, 90)); GTMaterials.Tetrahedrite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1080, GTMaterials.Copper, 1, 90)); @@ -133,7 +134,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Bornite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1080, GTMaterials.Copper, 1, 90)); GTMaterials.Cassiterite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(648, 864, 230, GTMaterials.Tin, 1, 100)); - GTMaterials.CassiteriteSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 230, GTMaterials.Tin, 1, 85)); + GTMaterials.CassiteriteSand.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 230, GTMaterials.Tin, 1, 80)); GTMaterials.Sphalerite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 420, GTMaterials.Zinc, 1, 90)); GTMaterials.Garnierite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1453, GTMaterials.Nickel, 1, 100)); GTMaterials.Pentlandite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(138, 184, 1453, GTMaterials.Nickel, 1, 85)); From 32e451eb56274fb07c4555a0f46adbdd620396e5 Mon Sep 17 00:00:00 2001 From: TanJeeSchuan <89920999+TanJeeSchuan@users.noreply.github.com> Date: Sat, 24 Jan 2026 23:46:25 +0800 Subject: [PATCH 29/66] Fix swapped tags for rosin saplings and leaves (#2840) * Fix swapped tags for rosin saplings and leaves Corrected the tags of sapling and leaf items to the 'tfg:rosin_saplings' and 'tfg:rosin_leaves'. * remove comment Signed-off-by: Pyritie --------- Signed-off-by: Pyritie Co-authored-by: Pyritie --- kubejs/server_scripts/afc/tags.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/kubejs/server_scripts/afc/tags.js b/kubejs/server_scripts/afc/tags.js index 771ed2740..cd32cca68 100644 --- a/kubejs/server_scripts/afc/tags.js +++ b/kubejs/server_scripts/afc/tags.js @@ -69,21 +69,21 @@ const registerAFCItemTags = (event) => { event.add("tfg:rosin_logs", "#tfc:white_cedar_logs") event.add("tfg:rosin_logs", "#tfc:douglas_fir_logs") - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/aspen') - event.add("tfg:rosin_saplings", 'afc:wood/leaves/coast_spruce') - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/spruce') - event.add("tfg:rosin_saplings", 'afc:wood/leaves/black_spruce') - event.add("tfg:rosin_saplings", 'afc:wood/leaves/sitka_spruce') - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/douglas_fir') - event.add("tfg:rosin_saplings", 'tfc:wood/leaves/white_cedar') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/aspen') + event.add("tfg:rosin_saplings", 'afc:wood/sapling/coast_spruce') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/spruce') + event.add("tfg:rosin_saplings", 'afc:wood/sapling/black_spruce') + event.add("tfg:rosin_saplings", 'afc:wood/sapling/sitka_spruce') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/douglas_fir') + event.add("tfg:rosin_saplings", 'tfc:wood/sapling/white_cedar') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/aspen') - event.add("tfg:rosin_leaves", 'afc:wood/sapling/coast_spruce') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/spruce') - event.add("tfg:rosin_leaves", 'afc:wood/sapling/black_spruce') - event.add("tfg:rosin_leaves", 'afc:wood/sapling/sitka_spruce') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/douglas_fir') - event.add("tfg:rosin_leaves", 'tfc:wood/sapling/white_cedar') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/aspen') + event.add("tfg:rosin_leaves", 'afc:wood/leaves/coast_spruce') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/spruce') + event.add("tfg:rosin_leaves", 'afc:wood/leaves/black_spruce') + event.add("tfg:rosin_leaves", 'afc:wood/leaves/sitka_spruce') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/douglas_fir') + event.add("tfg:rosin_leaves", 'tfc:wood/leaves/white_cedar') // Maple Syrup Tag From 07bc872b0e4338298d7f2132f106c6eea690f360 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 24 Jan 2026 15:51:08 +0000 Subject: [PATCH 30/66] update greate, pakku --- CHANGELOG.md | 2 +- config/greate-recipes.yaml | 4 + .../server_scripts/greate/recipes.removes.js | 2 + pakku-lock.json | 98 +++++++++---------- 4 files changed, 56 insertions(+), 50 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5db9975c3..29848e793 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie -- Fixed rosin leaves and saplings having tags the wrong way around (#2836) @Pyritie +- Fixed rosin leaves and saplings having tags the wrong way around (#2840) @TanJeeSchuan ### Translation updates ## [0.11.18] - 23-01-2026 diff --git a/config/greate-recipes.yaml b/config/greate-recipes.yaml index 352b7b5fd..50dd46256 100644 --- a/config/greate-recipes.yaml +++ b/config/greate-recipes.yaml @@ -9,6 +9,10 @@ enableHardCreateRecipes: false # If false, GTCEu items will be used instead. useCreateItemsInRecipes: false +# Should recipes from create that conflict with GTCEu recipes be enabled? +# [WARNING]: This will not cover every single recipe conflict, only common conflicts (like components (plates/sheets)), or ore processing conflicts. +disableConflictingRecipes: true + # Recipe types that should not be copied to Greate machines. Ex. 'gtceu:macerator' for macerator recipes ignoredRecipeTypes: - gtceu:ore_washer diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 1c267e4cb..902e945f8 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -82,4 +82,6 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_honeycomb' }) event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_honeycomb_block'}) event.remove({ id: 'greate:milling/integration/gtceu/macerator/quartz_sand_from_sand' }) + + evevt.remove({ id: 'greate:mixing/brass_ingot' }) } diff --git a/pakku-lock.json b/pakku-lock.json index 1d4e80d90..b98f4acab 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -6885,7 +6885,7 @@ { "pakku_id": "ihA4iuyUc3fA0D4q", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "geckolib", "modrinth": "geckolib" @@ -7101,7 +7101,7 @@ "files": [ { "type": "modrinth", - "file_name": "greate-0.0.62.jar", + "file_name": "greate-0.0.64.jar", "mc_versions": [ "1.20.1" ], @@ -7110,23 +7110,23 @@ "neoforge" ], "release_type": "alpha", - "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/FDjUACYa/greate-0.0.62.jar", - "id": "FDjUACYa", + "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/9flLlqpd/greate-0.0.64.jar", + "id": "9flLlqpd", "parent_id": "8wDcQuht", "hashes": { - "sha512": "8458d070ec94b6a130944f80a67a72fbf89d099e8378ab0a76eb0130eaa60f5e9af3d61b43f968694c78653a4c6f453b63a9fb8947910c06ad9934bd3c7c120e", - "sha1": "0e4ffe5e88f97df724172b3061a1691028f45582" + "sha512": "9f7d4f37fa720eeca5177263c4cd00f6812cd77063214061f31ef416123d51bc0a553f46393c1e0e3a548ef6d15b2da2bd6f703d80379d3ad084ee749c12b2c0", + "sha1": "7e779ac568c27ebb8cb9b16c6b8797b633ffdcdf" }, "required_dependencies": [ - "LNytGWDc", - "7tG215v7" + "7tG215v7", + "LNytGWDc" ], - "size": 1253198, - "date_published": "2026-01-13T16:37:04.520883Z" + "size": 1257336, + "date_published": "2026-01-24T05:55:41.391475Z" }, { "type": "curseforge", - "file_name": "greate-0.0.62.jar", + "file_name": "greate-0.0.64.jar", "mc_versions": [ "1.20.1" ], @@ -7135,19 +7135,19 @@ "neoforge" ], "release_type": "alpha", - "url": "https://edge.forgecdn.net/files/7455/72/greate-0.0.62.jar", - "id": "7455072", + "url": "https://edge.forgecdn.net/files/7516/28/greate-0.0.64.jar", + "id": "7516028", "parent_id": "901996", "hashes": { - "sha1": "0e4ffe5e88f97df724172b3061a1691028f45582", - "md5": "b4c8e38c9c69a88266d5eb64fcc21f18" + "sha1": "7e779ac568c27ebb8cb9b16c6b8797b633ffdcdf", + "md5": "31e92230efe5fc01d683e25fbe6a561c" }, "required_dependencies": [ - "328085", - "890405" + "890405", + "328085" ], - "size": 1253198, - "date_published": "2026-01-13T16:35:06.893Z" + "size": 1257336, + "date_published": "2026-01-24T05:55:39.687Z" } ] }, @@ -9435,7 +9435,7 @@ "files": [ { "type": "modrinth", - "file_name": "modernfix-forge-5.26.1+mc1.20.1.jar", + "file_name": "modernfix-forge-5.26.2+mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9443,20 +9443,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/nmDcB62a/versions/zSQuM6f3/modernfix-forge-5.26.1+mc1.20.1.jar", - "id": "zSQuM6f3", + "url": "https://cdn.modrinth.com/data/nmDcB62a/versions/Uvlhuprw/modernfix-forge-5.26.2+mc1.20.1.jar", + "id": "Uvlhuprw", "parent_id": "nmDcB62a", "hashes": { - "sha512": "af689fc986ea90026881cb928cef4d1cdb94030c77e111a4a4b560206c2754ad63b58a7df2990942c6808d692500a7b701a87ebb1665b0d2832d6119ad80c81c", - "sha1": "fa0163b33e911b69af61fee8a3920820e7c617a0" + "sha512": "46e6fb85c3097d3dedca0409fda83d58b3724a0905a5f5417b8bfaa2cb8bce388e6d42c762ee615413a9bc2692fa4b302d7e2405fe6fd7ad82c9def6a5da9028", + "sha1": "0adfc122e9f632d8847688c4c3ed20a1af182afa" }, "required_dependencies": [], "size": 826829, - "date_published": "2026-01-23T00:51:21.409054Z" + "date_published": "2026-01-24T01:51:58.806460Z" }, { "type": "curseforge", - "file_name": "modernfix-forge-5.26.1+mc1.20.1.jar", + "file_name": "modernfix-forge-5.26.2+mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9464,16 +9464,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7509/729/modernfix-forge-5.26.1+mc1.20.1.jar", - "id": "7509729", + "url": "https://edge.forgecdn.net/files/7515/215/modernfix-forge-5.26.2+mc1.20.1.jar", + "id": "7515215", "parent_id": "790626", "hashes": { - "sha1": "fa0163b33e911b69af61fee8a3920820e7c617a0", - "md5": "63bb05ac16ae0ecc3e2b039148edab3e" + "sha1": "0adfc122e9f632d8847688c4c3ed20a1af182afa", + "md5": "61332114c9c317080faaf35f8183d67b" }, "required_dependencies": [], "size": 826829, - "date_published": "2026-01-23T00:51:20.560Z" + "date_published": "2026-01-24T01:51:57.657Z" } ] }, @@ -13972,7 +13972,7 @@ "files": [ { "type": "modrinth", - "file_name": "tacz-tweaks-2.12.1-all.jar", + "file_name": "tacz-tweaks-2.12.2-all.jar", "mc_versions": [ "1.20", "1.20.1" @@ -13981,24 +13981,24 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/H8peNuJG/versions/RMgTVnMg/tacz-tweaks-2.12.1-all.jar", - "id": "RMgTVnMg", + "url": "https://cdn.modrinth.com/data/H8peNuJG/versions/JnqIQ9EH/tacz-tweaks-2.12.2-all.jar", + "id": "JnqIQ9EH", "parent_id": "H8peNuJG", "hashes": { - "sha512": "1ba717c181bd2211dbb82f23646d5e152bb8308475a74559b65f0ed027c55e89184ef058512cb5bb1a707e13155c609c929085510710e40f6df9baec1fc0bbf4", - "sha1": "92c9981e2e2f2edecab25ee48c5bade7a14298a8" + "sha512": "6ff5680072a972f9a597928745525a89c194d9c7701cda33ba386d1bf8a0ff0fe010d5bf63f467c3ef7d746896ac6a7678e98a7285b0254b926075d4170ac353", + "sha1": "f726c2d0ac2c77e3cc7f93fad7fd4338117c7a80" }, "required_dependencies": [ + "1eAoo2KR", "ordsPcFz", - "SzzJttH8", - "1eAoo2KR" + "SzzJttH8" ], - "size": 1894147, - "date_published": "2026-01-22T14:38:58.126712Z" + "size": 1894239, + "date_published": "2026-01-24T10:14:48.372979Z" }, { "type": "curseforge", - "file_name": "tacz-tweaks-2.12.1-all.jar", + "file_name": "tacz-tweaks-2.12.2-all.jar", "mc_versions": [ "1.20.1", "1.20" @@ -14007,20 +14007,20 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7506/850/tacz-tweaks-2.12.1-all.jar", - "id": "7506850", + "url": "https://edge.forgecdn.net/files/7517/23/tacz-tweaks-2.12.2-all.jar", + "id": "7517023", "parent_id": "1193263", "hashes": { - "sha1": "92c9981e2e2f2edecab25ee48c5bade7a14298a8", - "md5": "d616e17cf5713a027acda0c47f7c98c7" + "sha1": "f726c2d0ac2c77e3cc7f93fad7fd4338117c7a80", + "md5": "2b74092c813b98a27dad4b543808f61f" }, "required_dependencies": [ + "1028108", "667299", - "351264", - "1028108" + "351264" ], - "size": 1894147, - "date_published": "2026-01-22T14:38:49.923Z" + "size": 1894239, + "date_published": "2026-01-24T10:14:48.150Z" } ] }, From 77f52551f29ece71d9b4c767391c72efb84e1855 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 24 Jan 2026 16:09:50 +0000 Subject: [PATCH 31/66] fix steel dupe via steel supports --- .../tfg/food/recipes.meal_bags.js | 21 +------------------ .../tfg/primitive/recipes.supports.js | 20 ++++-------------- 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/kubejs/server_scripts/tfg/food/recipes.meal_bags.js b/kubejs/server_scripts/tfg/food/recipes.meal_bags.js index f1d7cd128..4ac8c515a 100644 --- a/kubejs/server_scripts/tfg/food/recipes.meal_bags.js +++ b/kubejs/server_scripts/tfg/food/recipes.meal_bags.js @@ -85,24 +85,5 @@ function registerTFGMealBagRecipes(event) { ]).id(`tfg:shapeless/emptying/freeze_dried/${fruit.name}`) }) - // Recycling - event.recipes.gtceu.macerator('gtceu:macerator/recycling/clean_foil_pack') - .itemInputs('tfg:clean_foil_pack') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Aluminium, 1), - ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Polyethylene, 1) - ) - .duration(GTMaterials.Aluminium.getMass() * 1) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('gtceu:arc_furnace/recycling/clean_foil_pack') - .itemInputs('tfg:clean_foil_pack') - .itemOutputs( - ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Aluminium, 2), - ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Ash, 1) - ) - .duration(GTMaterials.Aluminium.getMass() * 1) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) + TFGHelpers.registerMaterialInfo('tfg:clean_foil_pack', [GTMaterials.Aluminium, 0.25, GTMaterials.Polyethylene, 0.25]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/primitive/recipes.supports.js b/kubejs/server_scripts/tfg/primitive/recipes.supports.js index dc5311736..e86cba890 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.supports.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.supports.js @@ -103,16 +103,10 @@ function registerTFGSupportRecipes(event) { .circuit(11) .itemOutputs('8x tfg:rebar_support') .itemInputs(ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2), ChemicalHelper.get(TagPrefix.wireFine, GTMaterials.Steel, 1)) + .addMaterialInfo(true) .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.macerator(`rebar_support_to_dust`) - .itemInputs(`tfg:rebar_support`) - .itemOutputs(`gtceu:tiny_steel_dust`) - .duration(150) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING); - event.recipes.tfc.anvil( '1x tfg:steel_support', '#forge:double_ingots/steel', @@ -124,16 +118,10 @@ function registerTFGSupportRecipes(event) { event.recipes.gtceu.assembler('tfg:gtceu/assembler/steel_support') .circuit(11) - .itemOutputs('4x tfg:steel_support') - .itemInputs('2x #forge:double_ingots/steel') + .itemOutputs('2x tfg:steel_support') + .itemInputs('1x #forge:double_ingots/steel') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - .addMaterialInfo(true) - event.recipes.gtceu.macerator("steel_support_to_dust") - .itemInputs('tfg:steel_support') - .itemOutputs('2x gtceu:steel_dust') - .duration(150) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING); + TFGHelpers.registerMaterialInfo('tfg:steel_support', [GTMaterials.Steel, 1]) } From e6a32b5b2e326ac937a3f31a74d0174b033aea4b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 24 Jan 2026 18:54:48 +0000 Subject: [PATCH 32/66] add missing borax recipe, remove some other greate crap --- CHANGELOG.md | 1 + kubejs/server_scripts/greate/recipes.removes.js | 3 ++- kubejs/server_scripts/tfc/recipes.js | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29848e793..01a84b855 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie - Fixed rosin leaves and saplings having tags the wrong way around (#2840) @TanJeeSchuan +- Fixed missing borax to flux recipe @Pyritie ### Translation updates ## [0.11.18] - 23-01-2026 diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 902e945f8..d50b81cc9 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -83,5 +83,6 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_honeycomb_block'}) event.remove({ id: 'greate:milling/integration/gtceu/macerator/quartz_sand_from_sand' }) - evevt.remove({ id: 'greate:mixing/brass_ingot' }) + event.remove({ id: 'greate:mixing/brass_ingot' }) + event.remove({ id: /^greate:.*\/integration\/createaddition/ }) } diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 4289b3b0e..6bc85679e 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -240,4 +240,14 @@ const registerTFCRecipes = (event) => { .inputs('#tfc:foods/fruits', TFC.fluidStackIngredient('#tfg:alcohols', 250)) .outputFluid(Fluid.of('tfc:vinegar', 250)) .id('tfc:barrel/vinegar') + + // Borax to flux + event.recipes.tfc.quern('4x tfc:powder/flux', 'gtceu:borax_dust') + .id(`tfg:quern/borax`) + + event.recipes.gtceu.macerator('borax_to_flux') + .itemInputs("#forge:dusts/borax") + .itemOutputs("4x tfc:powder/flux") + .duration(50) + .EUt(2); } From 2f0b30cede7e75bf3761b408c502359514891cff Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 24 Jan 2026 18:54:53 +0000 Subject: [PATCH 33/66] music! --- config/defaultoptions/options.txt | 4 +- .../occlusion.properties | 2 +- kubejs/assets/minecraft/sounds.json | 210 ++++++++++++++++++ kubejs/assets/tfg/sounds.json | 181 +++++++++++++++ .../data/ad_astra/worldgen/biome/orbit.json | 36 +++ .../biome/glacio/placeholder_biome.json | 8 +- .../tfg/worldgen/biome/mars/amber_edge.json | 2 +- .../tfg/worldgen/biome/mars/amber_hills.json | 2 +- .../tfg/worldgen/biome/mars/amber_plains.json | 2 +- .../biome/mars/martian_deep_desert.json | 2 +- .../biome/mars/martian_dune_edge.json | 2 +- .../worldgen/biome/mars/martian_dunes.json | 2 +- .../biome/mars/martian_mountains.json | 2 +- .../worldgen/biome/mars/martian_river.json | 2 +- .../worldgen/biome/mars/rusticus_edge.json | 2 +- .../worldgen/biome/mars/rusticus_hills.json | 2 +- .../worldgen/biome/mars/rusticus_plains.json | 2 +- .../tfg/worldgen/biome/mars/sangnum_edge.json | 2 +- .../worldgen/biome/mars/sangnum_hills.json | 2 +- .../worldgen/biome/mars/sangnum_plains.json | 2 +- .../biome/moon/lunar_asurine_dense.json | 8 +- .../biome/moon/lunar_asurine_sparse.json | 8 +- .../biome/moon/lunar_chorus_dense.json | 8 +- .../biome/moon/lunar_chorus_sparse.json | 8 +- .../biome/moon/lunar_corals_dense.json | 8 +- .../biome/moon/lunar_corals_sparse.json | 8 +- .../biome/moon/lunar_lights_dense.json | 8 +- .../biome/moon/lunar_lights_sparse.json | 8 +- .../tfg/worldgen/biome/moon/lunar_plains.json | 8 +- .../tfg/worldgen/biome/moon/lunar_sands.json | 8 +- .../tfg/worldgen/biome/nether/ash_forest.json | 2 +- .../worldgen/biome/nether/basalt_deltas.json | 2 +- .../biome/nether/decaying_caverns.json | 2 +- .../worldgen/biome/nether/diorite_caves.json | 2 +- .../worldgen/biome/nether/gabbro_caves.json | 2 +- .../worldgen/biome/nether/gneiss_caves.json | 2 +- .../worldgen/biome/nether/granite_caves.json | 2 +- .../tfg/worldgen/biome/nether/lava_floes.json | 2 +- .../worldgen/biome/nether/lush_hollow.json | 2 +- .../worldgen/biome/nether/schist_caves.json | 2 +- .../worldgen/biome/nether/webbed_lair.json | 2 +- .../tfg/worldgen/biome/venus/arachnoids.json | 6 + .../worldgen/biome/venus/fractured_pools.json | 6 + .../tfg/worldgen/biome/venus/fumaroles.json | 6 + .../tfg/worldgen/biome/venus/geysers.json | 6 + .../biome/venus/jagged_tablelands.json | 6 + .../tfg/worldgen/biome/venus/salt_flats.json | 6 + .../biome/venus/scorching_volcanoes.json | 6 + .../biome/venus/stromatolite_beach.json | 6 + .../worldgen/biome/venus/sulfuric_ravine.json | 6 + pakku-lock.json | 3 +- 51 files changed, 588 insertions(+), 40 deletions(-) create mode 100644 kubejs/assets/minecraft/sounds.json create mode 100644 kubejs/data/ad_astra/worldgen/biome/orbit.json diff --git a/config/defaultoptions/options.txt b/config/defaultoptions/options.txt index 67d33be82..d5b550ee3 100644 --- a/config/defaultoptions/options.txt +++ b/config/defaultoptions/options.txt @@ -3,12 +3,12 @@ resourcePacks:["vanilla","mod_resources","gtceu:dynamic_assets","Moonlight Mods incompatibleResourcePacks:["firmalife_data","file/Perfected Anvil Helper.zip"] narrator:0 soundCategory_master:1.0 -soundCategory_music:0.3 +soundCategory_music:0.4 soundCategory_record:1.0 soundCategory_weather:1.0 soundCategory_block:1.0 soundCategory_hostile:1.0 soundCategory_neutral:1.0 soundCategory_player:1.0 -soundCategory_ambient:0.3 +soundCategory_ambient:0.7 soundCategory_voice:1.0 \ No newline at end of file diff --git a/config/sound_physics_remastered/occlusion.properties b/config/sound_physics_remastered/occlusion.properties index 53adea71f..d9f11a406 100644 --- a/config/sound_physics_remastered/occlusion.properties +++ b/config/sound_physics_remastered/occlusion.properties @@ -216,4 +216,4 @@ minecraft\:jukebox=0.0 # Lava (Block) minecraft\:lava=0.75 # Water (Block) -minecraft\:water=0.25 +\#minecraft\:water=0.25 diff --git a/kubejs/assets/minecraft/sounds.json b/kubejs/assets/minecraft/sounds.json new file mode 100644 index 000000000..1580bf5cf --- /dev/null +++ b/kubejs/assets/minecraft/sounds.json @@ -0,0 +1,210 @@ +{ + "music.game": { + "replace": true, + "sounds": [ + { + "name": "tfc:music/m0-dreams_of_the_phae", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m1-firmavista", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m2-sycamore_heights", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m3-terrafirmacraft", + "stream": true, + "weight": 4 + }, + { + "name": "tfc:music/m4-through_the_willows", + "stream": true, + "weight": 4 + }, + { + "name": "minecraft:music/game/creative/creative2", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative3", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative4", + "stream": true + }, + { + "name": "minecraft:music/game/nether/nether2", + "stream": true + }, + { + "name": "minecraft:music/game/swamp/aerie", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/swamp/firebugs", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/swamp/labyrinthine", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/axolotl", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/dragon_fish", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/shuniji", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/a_familiar_room", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/an_ordinary_day", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/bromeliad", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/comforting_memories", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/crescent_dunes", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/echo_in_the_wind", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/floating_dream", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/hal1", + "stream": true + }, + { + "name": "minecraft:music/game/hal2", + "stream": true + }, + { + "name": "minecraft:music/game/hal3", + "stream": true + }, + { + "name": "minecraft:music/game/hal4", + "stream": true + }, + { + "name": "minecraft:music/game/infinite_amethyst", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/left_to_bloom", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/one_more_day", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/stand_tall", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/wending", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/menu/menu1", + "stream": true + }, + { + "name": "minecraft:music/menu/menu2", + "stream": true + }, + { + "name": "minecraft:music/menu/menu3", + "stream": true + }, + { + "name": "minecraft:music/menu/menu4", + "stream": true + }, + { + "name": "minecraft:records/blocks", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:records/mall", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:records/strad", + "stream": true, + "volume": 0.4 + } + ] + }, + "music.menu": { + "replace": true, + "sounds": [ + { + "name": "tfc:music/m0-dreams_of_the_phae", + "stream": true + }, + { + "name": "tfc:music/m1-firmavista", + "stream": true + }, + { + "name": "tfc:music/m2-sycamore_heights", + "stream": true + }, + { + "name": "tfc:music/m3-terrafirmacraft", + "stream": true + }, + { + "name": "tfc:music/m4-through_the_willows", + "stream": true + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/sounds.json b/kubejs/assets/tfg/sounds.json index 56ed1adba..45cc75407 100644 --- a/kubejs/assets/tfg/sounds.json +++ b/kubejs/assets/tfg/sounds.json @@ -311,6 +311,58 @@ "minecraft:ambient/nether/nether_wastes/mood5" ] }, + "music.nether": { + "sounds": [ + { + "name": "minecraft:music/game/nether/nether1", + "stream": true + }, + { + "name": "minecraft:music/game/nether/nether3", + "stream": true + }, + { + "name": "minecraft:music/game/nether/nether_wastes/rubedo", + "stream": true, + "volume": 0.5 + }, + { + "name": "minecraft:music/game/water/axolotl", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/nether/soulsand_valley/so_below", + "stream": true, + "volume": 0.5 + }, + { + "name": "minecraft:music/game/ancestry", + "stream": true, + "volume": 0.4 + } + ] + }, + "music.orbit": { + "sounds": [ + { + "name": "minecraft:music/game/piano3", + "stream": true + }, + { + "name": "minecraft:music/game/calm1", + "stream": true + }, + { + "name": "minecraft:music/game/calm2", + "stream": true + }, + { + "name": "minecraft:music/game/calm3", + "stream": true + } + ] + }, "ambient.moon.additions": { "sounds": [ { @@ -377,6 +429,31 @@ "minecraft:ambient/nether/warped_forest/mood8" ] }, + "music.moon": { + "sounds": [ + { + "name": "minecraft:music/game/end/end", + "stream": true + }, + { + "name": "minecraft:music/game/floating_dream", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/nuance1", + "stream": true + }, + { + "name": "minecraft:music/game/nuance2", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative6", + "stream": true + } + ] + }, "ambient.mars_desert.loop": { "sounds": [ { @@ -583,6 +660,49 @@ "minecraft:ambient/nether/warped_forest/creak5" ] }, + "music.mars": { + "sounds": [ + { + "name": "minecraft:music/game/creative/creative1", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative2", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative3", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative4", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative5", + "stream": true + }, + { + "name": "minecraft:music/game/creative/creative6", + "stream": true + }, + { + "name": "minecraft:music/game/crescent_dunes", + "stream": true, + "volume": 0.4, + "weight": 2 + }, + { + "name": "minecraft:records/far", + "stream": true + }, + { + "name": "minecraft:records/otherside", + "stream": true, + "volume": 0.3 + } + ] + }, "ambient.venus_surface.loop": { "sounds": [ { @@ -754,5 +874,66 @@ "minecraft:ambient/nether/crimson_forest/shine2", "minecraft:ambient/nether/crimson_forest/shine3" ] + }, + "music.venus": { + "sounds": [ + { + "name": "minecraft:music/game/nether/nether1", + "stream": true, + "weight": 2 + }, + { + "name": "minecraft:music/game/nether/nether3", + "stream": true, + "weight": 2 + }, + { + "name": "minecraft:music/game/nether/nether4", + "stream": true, + "weight": 2 + }, + { + "name": "minecraft:music/game/nether/crimson_forest/chrysopoeia", + "stream": true, + "volume": 0.5, + "weight": 3 + }, + { + "name": "minecraft:music/game/nether/nether_wastes/rubedo", + "stream": true, + "volume": 0.5, + "weight": 3 + }, + { + "name": "minecraft:music/game/nether/soulsand_valley/so_below", + "stream": true, + "volume": 0.5, + "weight": 3 + }, + { + "name": "minecraft:music/game/piano3", + "stream": true + } + ] + }, + + "music.europa": { + "sounds": [ + { + "name": "minecraft:music/game/water/axolotl", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/dragon_fish", + "stream": true, + "volume": 0.4 + }, + { + "name": "minecraft:music/game/water/shuniji", + "stream": true, + "volume": 0.4 + } + ] } } \ No newline at end of file diff --git a/kubejs/data/ad_astra/worldgen/biome/orbit.json b/kubejs/data/ad_astra/worldgen/biome/orbit.json new file mode 100644 index 000000000..6ca112af5 --- /dev/null +++ b/kubejs/data/ad_astra/worldgen/biome/orbit.json @@ -0,0 +1,36 @@ +{ + "carvers": {}, + "downfall": 0.0, + "effects": { + "fog_color": 0, + "mood_sound": { + "block_search_extent": 8, + "offset": 2.0, + "sound": "minecraft:ambient.cave", + "tick_delay": 6000 + }, + "sky_color": 0, + "water_color": 4159204, + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.orbit" + } + }, + "features": [], + "has_precipitation": false, + "spawn_costs": {}, + "spawners": { + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": 0.5 +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json b/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json index 3af86fa03..11a0ae5ca 100644 --- a/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json +++ b/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json @@ -13,7 +13,13 @@ }, "sky_color": 12638463, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.europa" + } }, "features": [ [ diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json index ff69d8291..d33b3d3a3 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 123397ed4..c8264b7a0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 449c418df..b364fb13d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json index 55dc40cb3..e0b3ae626 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -22,7 +22,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index bc287325a..27cee44c3 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -22,7 +22,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index 5a6be0ee6..c8643ae89 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -22,7 +22,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 36fc33433..fcddd858c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 526e0aac2..6d52544c7 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json index 426622e37..d6eda6457 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 51da6391a..972f04a2a 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index fc74372ce..baec9fb2f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json index 9ec2931ea..8c54913ea 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index ea1dd0460..9fb85c03b 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index c121e5c92..799884b3d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -23,7 +23,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" + "sound": "tfg:music.mars" }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json index bdcadd76f..4cac815ef 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json index 01404bf9a..f02dcffe1 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json index e1b31499f..3ad07802a 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json index 78f29f76c..ca03953f6 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json index 71e451418..2ed2f3417 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json index 7fa136647..00f00a73d 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json index daaa5ff95..6543331b8 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json index 2318e94fa..c3b22c181 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index ce6e50d86..70de199b4 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json index 1413884ea..ac2bd7dd3 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json @@ -20,7 +20,13 @@ }, "sky_color": 0, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 329011, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.moon" + } }, "features": [ [], diff --git a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json index 4e1407e4f..373ec8433 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json +++ b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.basalt_deltas" + "sound": "tfg:music.nether" }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json index 021ca0904..000b82cee 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json +++ b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.basalt_deltas" + "sound": "tfg:music.nether" }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json index 46ba6d62b..ecd04d04b 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json +++ b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.swamp" + "sound": "tfg:music.nether" }, "sky_color": 7369031, "water_color": 6388580, diff --git a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json index 2eda606b4..e6151c614 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": "tfg:music.nether" }, "sky_color": 9868701, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json index 924c75418..be32b9025 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": "tfg:music.nether" }, "sky_color": 5855333, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json index 318f7de01..8704fd4fc 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": "tfg:music.nether" }, "sky_color": 5799235, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json index 5ff94fd88..245b0efaa 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": "tfg:music.nether" }, "sky_color": 9533575, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json b/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json index 1772b420e..34acd86f3 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json +++ b/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.basalt_deltas" + "sound": "tfg:music.nether" }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json index d7992093e..37ad103be 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json +++ b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.lush_caves" + "sound": "tfg:music.nether" }, "sky_color": 5799235, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json index 77e64f7b3..62179da9d 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json @@ -20,7 +20,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" + "sound": "tfg:music.nether" }, "sky_color": 7175789, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json index 709636995..3649311ef 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json +++ b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json @@ -15,7 +15,7 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "minecraft:music.overworld.dripstone_caves" + "sound": "tfg:music.nether" }, "additions_sound": { "sound": "tfg:ambient.upper_nether_cave.additions", diff --git a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json index b5131ddc6..d25e960e3 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json +++ b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json @@ -24,6 +24,12 @@ "type": "minecraft:ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json index cb3acbedb..42778b30b 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json @@ -24,6 +24,12 @@ "type": "minecraft:ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json index f5cddc92c..d804e9ef3 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json @@ -24,6 +24,12 @@ "type": "minecraft:white_ash" }, "probability": 0.03 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/geysers.json b/kubejs/data/tfg/worldgen/biome/venus/geysers.json index 63937fc35..2300b4e28 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/geysers.json +++ b/kubejs/data/tfg/worldgen/biome/venus/geysers.json @@ -24,6 +24,12 @@ "type": "minecraft:ash" }, "probability": 0.07 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json index 2a092a303..8ab9b85f4 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json +++ b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json @@ -24,6 +24,12 @@ "type": "minecraft:white_ash" }, "probability": 0.02 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json index 8415a8167..ab90d033f 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json +++ b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json @@ -24,6 +24,12 @@ "type": "minecraft:white_ash" }, "probability": 0.02 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json index 7bd62eebb..e17187968 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json +++ b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json @@ -24,6 +24,12 @@ "type": "minecraft:ash" }, "probability": 0.1 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json index 7ac1a7cf5..504b50089 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json +++ b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json @@ -24,6 +24,12 @@ "type": "minecraft:white_ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json index 2088c8478..841f118df 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json +++ b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json @@ -24,6 +24,12 @@ "type": "minecraft:ash" }, "probability": 0.05 + }, + "music": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "tfg:music.venus" } }, "features": [ diff --git a/pakku-lock.json b/pakku-lock.json index b98f4acab..476d7096d 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -187,7 +187,8 @@ }, { "pakku_id": "tIIGT85PQd5pJGf0", - "type": "MOD", + "type": "RESOURCE_PACK", + "side": "CLIENT", "slug": { "github": "Frontiers-PackForge/AE2-Midnight-and-Daybreak" }, From 6f55cde40fadac72c8100750e73c4e1ea0b787a2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 25 Jan 2026 16:58:06 +0000 Subject: [PATCH 34/66] steam alloy smelter glass batch recipes #2853 --- CHANGELOG.md | 2 + kubejs/assets/tfg/sounds.json | 10 +++- .../ores_and_materials/recipes.quartzes.js | 52 ++++++++++++++----- 3 files changed, 50 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01a84b855..aee86aa42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,9 @@ ### Breaking changes - The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie ### Changes +- Added much more music to the different dimensions @Pyritie - Vanadium magnetite is now usable as an iron ore for TFC purposes (#2834) @Pyritie +- Added steam alloy smelter glass batch recipes (#2853) @Pyritie ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie diff --git a/kubejs/assets/tfg/sounds.json b/kubejs/assets/tfg/sounds.json index 45cc75407..7adb8d046 100644 --- a/kubejs/assets/tfg/sounds.json +++ b/kubejs/assets/tfg/sounds.json @@ -916,7 +916,15 @@ } ] }, - + "music.mercury": { + "sounds": [ + { + "name": "minecraft:records/13", + "stream": true, + "volume": 0.4 + } + ] + }, "music.europa": { "sounds": [ { diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js index 3214c5bed..eee2285b4 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js @@ -35,11 +35,12 @@ function registerTFGQuartzRecipes(event) { { input: "tfc:silica_glass_batch", output: "tfc:silica_glass_bottle", name: "silica_glass_bottle" }, { input: "tfc:hematitic_glass_batch", output: "tfc:hematitic_glass_bottle", name: "hematitic_glass_bottle" }, { input: "tfc:olivine_glass_batch", output: "tfc:olivine_glass_bottle", name: "olivine_glass_bottle" }, - { input: "tfc:volcanic_glass_batch", output: "tfc:volcanic_glass_bottle", name: "volcanic_glass_bottle" } + { input: "tfc:volcanic_glass_batch", output: "tfc:volcanic_glass_bottle", name: "volcanic_glass_bottle" }, + { input: '#forge:dusts/glass', output: "tfc:silica_glass_bottle", name: "glass_dust_to_bottle" } ]); TFC_BATCH_TO_BOTTLE_ASSEMBLING_RECIPE_COMPONENTS.forEach(element => { - event.recipes.gtceu.alloy_smelter(`tfg:tfc/${element.name}`) + event.recipes.gtceu.alloy_smelter(`tfg:${element.name}`) .itemInputs(element.input) .notConsumable('gtceu:bottle_casting_mold') .itemOutputs(element.output) @@ -95,12 +96,14 @@ function registerTFGQuartzRecipes(event) { .duration(50) .EUt(2) + // Extracting event.recipes.gtceu.extractor('tfg:glass_batch_extraction') .itemInputs('#tfc:glass_batches') .outputFluids(Fluid.of('gtceu:glass', 144)) .duration(50) .EUt(2) + // TFC lens event.recipes.gtceu.lathe('tfg:tfc_lens') .itemInputs('#forge:glass') .itemOutputs('tfc:lens') @@ -131,26 +134,49 @@ function registerTFGQuartzRecipes(event) { "#forge:glass" ); - - event.recipes.gtceu.alloy_smelter('glass_bottle') - .itemInputs('#forge:dusts/glass') - .itemOutputs('tfc:silica_glass_bottle') - .notConsumable('gtceu:bottle_casting_mold') - .EUt(2) - .duration(20 * 5) - .category(GTRecipeCategories.INGOT_MOLDING) + // Glass blocks + event.recipes.gtceu.alloy_smelter('tfg:clear_glass_block_from_batch') + .itemInputs('tfc:silica_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); + event.recipes.gtceu.alloy_smelter('tfg:orange_glass_block_from_batch') + .itemInputs('tfc:hematitic_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:orange_stained_glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); + + event.recipes.gtceu.alloy_smelter('tfg:green_glass_block_from_batch') + .itemInputs('tfc:olivine_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:green_stained_glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); + + event.recipes.gtceu.alloy_smelter('tfg:blue_glass_block_from_batch') + .itemInputs('tfc:volcanic_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:blue_stained_glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); // Glass Tube event.recipes.tfc.glassworking('gtceu:glass_tube', '#tfc:glass_batches_tier_3', ['blow', 'stretch', 'stretch']) .id('tfg:gtceu/glassworking/glass_tube') event.recipes.gtceu.alloy_smelter('tfg:glass_tube_from_batch') - .itemInputs('#tfc:glass_batches') + .itemInputs('#tfc:glass_batches_tier_3') .notConsumable('gtceu:ball_casting_mold') .itemOutputs('gtceu:glass_tube') - .duration(8 * 20) - .EUt(GTValues.VA[GTValues.LV]) + .duration(16 * 20) + .EUt(16) .category(GTRecipeCategories.INGOT_MOLDING); //#endregion } From 1f3e72206d112ad358bc245a432631e221c3f4cb Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 25 Jan 2026 17:07:25 +0000 Subject: [PATCH 35/66] put this deprecated tooltip on the FE p2p tunnel --- kubejs/client_scripts/tooltips.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 9ec39e3f0..6f8c264c6 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -402,7 +402,7 @@ const registerTooltips = (event) => { }) // Deprecated Items - event.addAdvanced(['vintageimprovements:lathe'], (item, advanced, text) => { + event.addAdvanced(['vintageimprovements:lathe', 'ae2:fe_p2p_tunnel'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.obsolete.depreciated')) }) From 91f41fc8d753d8b0d22ba20ca2dbbe29e54198b5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 25 Jan 2026 18:57:38 +0000 Subject: [PATCH 36/66] does this fix music? --- kubejs/data/tfg/worldgen/biome/mars/amber_edge.json | 4 +++- kubejs/data/tfg/worldgen/biome/mars/amber_hills.json | 4 +++- .../data/tfg/worldgen/biome/mars/amber_plains.json | 4 +++- .../tfg/worldgen/biome/mars/martian_deep_desert.json | 4 +++- .../tfg/worldgen/biome/mars/martian_dune_edge.json | 4 +++- .../data/tfg/worldgen/biome/mars/martian_dunes.json | 4 +++- .../tfg/worldgen/biome/mars/martian_mountains.json | 4 +++- .../data/tfg/worldgen/biome/mars/martian_river.json | 4 +++- .../data/tfg/worldgen/biome/mars/rusticus_edge.json | 4 +++- .../data/tfg/worldgen/biome/mars/rusticus_hills.json | 4 +++- .../tfg/worldgen/biome/mars/rusticus_plains.json | 4 +++- .../data/tfg/worldgen/biome/mars/sangnum_edge.json | 4 +++- .../data/tfg/worldgen/biome/mars/sangnum_hills.json | 4 +++- .../data/tfg/worldgen/biome/mars/sangnum_plains.json | 4 +++- kubejs/startup_scripts/tfg/sounds.js | 12 ++++++++++-- 15 files changed, 52 insertions(+), 16 deletions(-) diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json index d33b3d3a3..6a32c043f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index c8264b7a0..c4197ddb0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index b364fb13d..9db57c216 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json index e0b3ae626..995e337d6 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -22,7 +22,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index 27cee44c3..455793a48 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -22,7 +22,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index c8643ae89..21b1c4bba 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -22,7 +22,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index fcddd858c..56f61b571 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 6d52544c7..ea6e3cd87 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json index d6eda6457..add6a2c08 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 972f04a2a..e5d56f973 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index baec9fb2f..209823d94 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json index 8c54913ea..f14203a29 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 9fb85c03b..cc71e25bc 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 799884b3d..cce3e0a2c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -23,7 +23,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.mars" + "sound": { + "sound_id": "tfg:music.mars" + } }, "sky_color": 15117444, "water_color": 4159204, diff --git a/kubejs/startup_scripts/tfg/sounds.js b/kubejs/startup_scripts/tfg/sounds.js index b169ac3d1..f6325cc71 100644 --- a/kubejs/startup_scripts/tfg/sounds.js +++ b/kubejs/startup_scripts/tfg/sounds.js @@ -7,23 +7,31 @@ function registerTFGSounds(event) { event.create('tfg:ambient.upper_nether_cave.loop') event.create('tfg:ambient.upper_nether.additions') event.create('tfg:ambient.upper_nether.mood') - event.create('tfg:ambient.lower_nether.loop') event.create('tfg:ambient.lower_nether.additions') event.create('tfg:ambient.lower_nether.mood') + event.create('tfg:music.nether') + + event.create('tfg:music.orbit') event.create('tfg:ambient.moon.additions') event.create('tfg:ambient.moon.mood') + event.create('tfg:music.moon') event.create('tfg:ambient.mars_desert.loop') event.create('tfg:ambient.mars_desert.additions') event.create('tfg:ambient.mars_desert.mood') - event.create('tfg:ambient.mars_land.loop') event.create('tfg:ambient.mars_land.additions') event.create('tfg:ambient.mars_land.mood') + event.create('tfg:music.mars') event.create('tfg:ambient.venus_surface.loop') event.create('tfg:ambient.venus_surface.additions') event.create('tfg:ambient.venus_surface.mood') + event.create('tfg:music.venus') + + event.create('tfg:music.mercury') + + event.create('tfg:music.europa') } \ No newline at end of file From 4b8b03ebeeef7c8b670aeaf1a312370b9a0f440f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 25 Jan 2026 19:52:33 +0000 Subject: [PATCH 37/66] fixed rolling mill not creating horseshoes --- kubejs/server_scripts/sacksnstuff/recipes.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/sacksnstuff/recipes.js b/kubejs/server_scripts/sacksnstuff/recipes.js index fc0ba14d7..95b7d2e84 100644 --- a/kubejs/server_scripts/sacksnstuff/recipes.js +++ b/kubejs/server_scripts/sacksnstuff/recipes.js @@ -247,10 +247,11 @@ const registerSNSRecipes = (event) => { .circuit(4) .duration(40) .EUt(GTValues.VA[GTValues.LV]) + event.custom({ type: "createaddition:rolling", input: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 1), - result: 'sns:metal/horseshoe/steel' + result: { item: 'sns:metal/horseshoe/steel' } }).id(`tfg:rolling/steel_horseshoe`) event.recipes.gtceu.bender('sns:horseshoe_black_steel_electric_only') @@ -262,7 +263,7 @@ const registerSNSRecipes = (event) => { event.custom({ type: "createaddition:rolling", input: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1), - result: 'sns:metal/horseshoe/black_steel' + result: { item: 'sns:metal/horseshoe/black_steel' } }).id(`tfg:rolling/black_steel_horseshoe`) event.recipes.gtceu.bender('sns:horseshoe_blue_steel_electric_only') @@ -274,7 +275,7 @@ const registerSNSRecipes = (event) => { event.custom({ type: "createaddition:rolling", input: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlueSteel, 1), - result: 'sns:metal/horseshoe/blue_steel' + result: { item: 'sns:metal/horseshoe/blue_steel' } }).id(`tfg:rolling/blue_steel_horseshoe`) event.recipes.gtceu.bender('sns:horseshoe_red_steel_electric_only') @@ -286,6 +287,6 @@ const registerSNSRecipes = (event) => { event.custom({ type: "createaddition:rolling", input: ChemicalHelper.get(TagPrefix.rod, GTMaterials.RedSteel, 1), - result: 'sns:metal/horseshoe/red_steel' + result: { item: 'sns:metal/horseshoe/red_steel' } }).id(`tfg:rolling/red_steel_horseshoe`) } From 84368b249c01ddc294bcb3fd7c092d0b93791e57 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 25 Jan 2026 22:21:07 +0000 Subject: [PATCH 38/66] fix music for realsies --- kubejs/data/ad_astra/worldgen/biome/orbit.json | 4 +++- kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json | 4 +++- kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json | 4 +++- kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json | 4 +++- kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json | 4 +++- kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json | 4 +++- kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json | 4 +++- kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json | 4 +++- kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json | 4 +++- kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json | 4 +++- kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json | 4 +++- kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json | 4 +++- kubejs/data/tfg/worldgen/biome/nether/ash_forest.json | 4 +++- kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json | 4 +++- kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json | 4 +++- kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json | 4 +++- kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json | 4 +++- kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json | 4 +++- kubejs/data/tfg/worldgen/biome/nether/granite_caves.json | 4 +++- kubejs/data/tfg/worldgen/biome/nether/lava_floes.json | 4 +++- kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json | 4 +++- kubejs/data/tfg/worldgen/biome/nether/schist_caves.json | 4 +++- kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json | 4 +++- kubejs/data/tfg/worldgen/biome/venus/arachnoids.json | 4 +++- kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json | 4 +++- kubejs/data/tfg/worldgen/biome/venus/fumaroles.json | 4 +++- kubejs/data/tfg/worldgen/biome/venus/geysers.json | 4 +++- kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json | 4 +++- kubejs/data/tfg/worldgen/biome/venus/salt_flats.json | 4 +++- kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json | 4 +++- kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json | 4 +++- kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json | 4 +++- 32 files changed, 96 insertions(+), 32 deletions(-) diff --git a/kubejs/data/ad_astra/worldgen/biome/orbit.json b/kubejs/data/ad_astra/worldgen/biome/orbit.json index 6ca112af5..876da29bb 100644 --- a/kubejs/data/ad_astra/worldgen/biome/orbit.json +++ b/kubejs/data/ad_astra/worldgen/biome/orbit.json @@ -16,7 +16,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.orbit" + "sound": { + "sound_id": "tfg:music.orbit" + } } }, "features": [], diff --git a/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json b/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json index 11a0ae5ca..228206b0c 100644 --- a/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json +++ b/kubejs/data/tfg/worldgen/biome/glacio/placeholder_biome.json @@ -18,7 +18,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.europa" + "sound": { + "sound_id": "tfg:music.europa" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json index 4cac815ef..357b5aab2 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json @@ -25,7 +25,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.moon" + "sound": { + "sound_id": "tfg:music.moon" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json index f02dcffe1..21e7a52e9 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json @@ -25,7 +25,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.moon" + "sound": { + "sound_id": "tfg:music.moon" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json index 3ad07802a..bba025310 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json @@ -25,7 +25,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.moon" + "sound": { + "sound_id": "tfg:music.moon" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json index ca03953f6..98b98947b 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json @@ -25,7 +25,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.moon" + "sound": { + "sound_id": "tfg:music.moon" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json index 2ed2f3417..70d22cd44 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json @@ -25,7 +25,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.moon" + "sound": { + "sound_id": "tfg:music.moon" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json index 00f00a73d..39daf8d7f 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -25,7 +25,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.moon" + "sound": { + "sound_id": "tfg:music.moon" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json index 6543331b8..6001fb80e 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json @@ -25,7 +25,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.moon" + "sound": { + "sound_id": "tfg:music.moon" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json index c3b22c181..318c3c8a7 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json @@ -25,7 +25,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.moon" + "sound": { + "sound_id": "tfg:music.moon" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index 70de199b4..6d378c21f 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -25,7 +25,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.moon" + "sound": { + "sound_id": "tfg:music.moon" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json index ac2bd7dd3..cf1517a6a 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json @@ -25,7 +25,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.moon" + "sound": { + "sound_id": "tfg:music.moon" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json index 373ec8433..6a3b7836d 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json +++ b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.nether" + "sound": { + "sound_id": "tfg:music.nether" + } }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json index 000b82cee..f5ccb984a 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json +++ b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.nether" + "sound": { + "sound_id": "tfg:music.nether" + } }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json index ecd04d04b..d4a164b95 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json +++ b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.nether" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 7369031, "water_color": 6388580, diff --git a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json index e6151c614..1d524fbab 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.nether" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 9868701, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json index be32b9025..72f3bfcea 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.nether" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 5855333, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json index 8704fd4fc..a0b779890 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.nether" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 5799235, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json index 245b0efaa..4aba461b6 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.nether" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 9533575, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json b/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json index 34acd86f3..76e2de4ed 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json +++ b/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.nether" + "sound": { + "sound_id": "tfg:music.nether" + } }, "particle": { "options": { diff --git a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json index 37ad103be..a5a9a0a28 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json +++ b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.nether" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 5799235, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json index 62179da9d..d75fbfb33 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json @@ -20,7 +20,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.nether" + "sound": { + "sound_id": "tfg:music.nether" + } }, "sky_color": 7175789, "water_color": 7255466, diff --git a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json index 3649311ef..53a8dba20 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json +++ b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json @@ -15,7 +15,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.nether" + "sound": { + "sound_id": "tfg:music.nether" + } }, "additions_sound": { "sound": "tfg:ambient.upper_nether_cave.additions", diff --git a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json index d25e960e3..95fb1affa 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json +++ b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json @@ -29,7 +29,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.venus" + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json index 42778b30b..9f2b96211 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json @@ -29,7 +29,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.venus" + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json index d804e9ef3..143ac2e11 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json @@ -29,7 +29,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.venus" + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/geysers.json b/kubejs/data/tfg/worldgen/biome/venus/geysers.json index 2300b4e28..843cfe253 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/geysers.json +++ b/kubejs/data/tfg/worldgen/biome/venus/geysers.json @@ -29,7 +29,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.venus" + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json index 8ab9b85f4..61ec76bf1 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json +++ b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json @@ -29,7 +29,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.venus" + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json index ab90d033f..2e46cbaf2 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json +++ b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json @@ -29,7 +29,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.venus" + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json index e17187968..720efe591 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json +++ b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json @@ -29,7 +29,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.venus" + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json index 504b50089..820b5ad67 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json +++ b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json @@ -29,7 +29,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.venus" + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json index 841f118df..fc2615b45 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json +++ b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json @@ -29,7 +29,9 @@ "max_delay": 24000, "min_delay": 12000, "replace_current_music": false, - "sound": "tfg:music.venus" + "sound": { + "sound_id": "tfg:music.venus" + } } }, "features": [ From af57d9a37c7ce0bffbb8368387f9a89f6f36b1e3 Mon Sep 17 00:00:00 2001 From: silllil Date: Mon, 26 Jan 2026 01:48:52 +0100 Subject: [PATCH 39/66] changed the colors required for different coloured bricks (#2859) Co-authored-by: Lily Oelbeck --- kubejs/server_scripts/createdeco/recipes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index ff015f84f..bf47b6af5 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -138,7 +138,7 @@ const registerCreatedecoRecipes = (event) => { //#endregion //#region Brick Recipes - const dyeTypes = ['blue', 'green', 'white', 'yellow', 'black', 'red', 'brown'] + const dyeTypes = ['black', 'red', 'gray', 'green', 'blue', 'white', 'brown'] global.CREATE_DECO_BRICK_TYPES.forEach((type, index) => { event.remove({ output: `createdeco:${type}_bricks` }); From 75b0cea0000f0982faf8ea11287ee5eddffa4f41 Mon Sep 17 00:00:00 2001 From: Redeix Date: Sun, 25 Jan 2026 19:22:50 -0600 Subject: [PATCH 40/66] Artisan Table (#2857) * artisan table merging (#2766) * these should be good * Update recipes.miscellaneous.js * little typo Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * fix typo, my bad gang * fix charnia * fixed recycling issues from the material rewrite, updated everything to the new recycling helper method * I'll move these eventually --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> Co-authored-by: Pyritie * artisan table assets * asset update * Update recipes.artisan_table.js * asset update * lang * tag refactor * waiter! more assets please * recipes * done? * I forgor --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> Co-authored-by: Pyritie --- .../quests/chapters/questssteam_age.snbt | 21 +- .../assets/tfg/blockstates/artisan_table.json | 19 + kubejs/assets/tfg/lang/en_us.json | 6 +- .../tfg/models/block/artisan_table.json | 468 ++++++++++++++ .../assets/tfg/models/item/artisan_table.json | 3 + .../tfg/textures/block/artisan_table.png | Bin 0 -> 1157 bytes .../tfg/textures/block/artisan_table_n.png | Bin 0 -> 104 bytes .../tfg/textures/block/artisan_table_s.png | Bin 0 -> 330 bytes .../gui/artisan_table/artisan_table.png | Bin 0 -> 3744 bytes .../artisan_table/blank_phenolic_board.png | Bin 0 -> 220 bytes .../gui/artisan_table/blank_resin_board.png | Bin 0 -> 230 bytes .../gui/artisan_table/casting_mold_active.png | Bin 0 -> 204 bytes .../gui/artisan_table/casting_mold_border.png | Bin 0 -> 1646 bytes .../artisan_table/casting_mold_inactive.png | Bin 0 -> 212 bytes .../artisan_table/extruder_mold_active.png | Bin 0 -> 208 bytes .../artisan_table/extruder_mold_border.png | Bin 0 -> 1367 bytes .../artisan_table/phenolic_board_border.png | Bin 0 -> 1054 bytes .../phenolic_board_border_4x.png | Bin 0 -> 1197 bytes .../artisan_table/printed_phenolic_board.png | Bin 0 -> 451 bytes .../gui/artisan_table/printed_resin_board.png | Bin 0 -> 439 bytes .../gui/artisan_table/resin_board_border.png | Bin 0 -> 1068 bytes .../artisan_table/resin_board_border_4x.png | Bin 0 -> 1216 bytes .../tfg/loot_tables/blocks/artisan_table.json | 20 + kubejs/server_scripts/tacz/recipes.misc.js | 32 - .../tfg/machines/recipes.molds.js | 340 ++--------- .../tfg/primitive/recipes.artisan_table.js | 572 ++++++++++++++++++ .../tfg/primitive/tags.primitive.js | 17 +- kubejs/server_scripts/tfg/recipes.js | 1 + .../tfg/recipes.miscellaneous.js | 1 + kubejs/server_scripts/tfg/tags.js | 1 + 30 files changed, 1170 insertions(+), 331 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/artisan_table.json create mode 100644 kubejs/assets/tfg/models/block/artisan_table.json create mode 100644 kubejs/assets/tfg/models/item/artisan_table.json create mode 100644 kubejs/assets/tfg/textures/block/artisan_table.png create mode 100644 kubejs/assets/tfg/textures/block/artisan_table_n.png create mode 100644 kubejs/assets/tfg/textures/block/artisan_table_s.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/artisan_table.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/blank_phenolic_board.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/blank_resin_board.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_active.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_border.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_inactive.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_active.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_border.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/phenolic_board_border.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/phenolic_board_border_4x.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/printed_phenolic_board.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/printed_resin_board.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/resin_board_border.png create mode 100644 kubejs/assets/tfg/textures/gui/artisan_table/resin_board_border_4x.png create mode 100644 kubejs/data/tfg/loot_tables/blocks/artisan_table.json create mode 100644 kubejs/server_scripts/tfg/primitive/recipes.artisan_table.js diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 063f32332..433379c42 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -695,14 +695,21 @@ shape: "square" size: 1.0d subtitle: "{quests.steam_age.circuit_boards.subtitle}" - tasks: [{ - id: "2B8B038789480789" - item: "gtceu:resin_printed_circuit_board" - type: "item" - }] + tasks: [ + { + id: "2B8B038789480789" + item: "gtceu:resin_printed_circuit_board" + type: "item" + } + { + id: "171A20DD9F208437" + item: "tfg:artisan_table" + type: "item" + } + ] title: "{quests.steam_age.circuit_boards.title}" - x: -9.5d - y: 10.5d + x: -10.0d + y: 10.0d } { dependencies: ["46FA9DD4755A5548"] diff --git a/kubejs/assets/tfg/blockstates/artisan_table.json b/kubejs/assets/tfg/blockstates/artisan_table.json new file mode 100644 index 000000000..ab7af4fcc --- /dev/null +++ b/kubejs/assets/tfg/blockstates/artisan_table.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/artisan_table", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/artisan_table" + }, + "facing=south": { + "model": "tfg:block/artisan_table", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/artisan_table", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 3075912c4..c7ae766bd 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -810,6 +810,8 @@ "block.tfg.impure_moderate_core": "Impure Moderate Core", "block.tfg.moderate_core_frame": "Moderate Core Frame", "block.tfg.impure_moderate_core_frame": "Impure Moderate Core Frame", + "tfg.block_entity.artisan_table": "Artisan Table", + "block.tfg.artisan_table": "Artisan Table", "fluid.tfg.heavy_ammoniacal_water": "Heavy Ammoniacal Water", "fluid.tfg.semiheavy_ammoniacal_water": "Semiheavy Ammoniacal Water", "fluid.tfg.sulfur_fumes": "Dense Sulfuric Fumes", @@ -1746,6 +1748,8 @@ "tfg.tooltip.component.nuclear_turbine_2": "Each Rotor Holder above §5EV§r §7adds§r 10% efficiency and multiplies EU/t by 2.", "tfg.tooltip.component.smr_generator_1": "§eBase Production:§r 4096 EU/t", "tfg.tooltip.component.smr_generator_2": "Dedicated to produce power from sCO2 and the Small Modular Reactor.\n Use Lubricant and Booster to increase its efficiency and manage the cooling loop of the SMR.", + "tfg.tooltip.show_recipes": "Show Recipes", + "emi.category.tfg.artisan_table": "Artisan Table", "tfg.gui.refrigerator.unify_dates.enabled": "Expiration Date Unification is: §aOn", "tfg.gui.refrigerator.unify_dates.disabled": "Expiration Date Unification is: §cOff", "tfg.machine.food_refrigerator_power_usage": "§7Consumes§r %s EU/t §7while active to keep your food fresh.§r", @@ -4017,7 +4021,7 @@ "quests.steam_age.resin_boards.desc": "Did you know tree taps can drip directly into GregTech pipes and drums? Now you do!", "quests.steam_age.circuit_boards.title": "Electronics #2: Circuit Boards", "quests.steam_age.circuit_boards.subtitle": "The easier component for circuits", - "quests.steam_age.circuit_boards.desc": "Combine those Resin Circuit Boards with some Copper Wires and you've got the base for your first &aCircuit&r!", + "quests.steam_age.circuit_boards.desc": "Some delicate craftsmanship in an &3Artisan Table&r will allow you to combine those Resin Circuit Boards with some Copper Wires to create your first &aCircuit&r!\n\nThe Artisan Table works on the same principal as Knapping, but this time with additional item and tool inputs.", "quests.steam_age.vacuum_chamber.title": "Vacuum Chamber", "quests.steam_age.vacuum_chamber.subtitle": "Putting the Vacuum in Vacuum Tubes", "quests.steam_age.vacuum_chamber.desc": "This machine is the final step in making your first Vacuum Tubes. Place it above a Basin and give it some power, and make sure the machine is set to Vacuumizing mode.\n\nThis machine can also help liquefy glue and rubber while being heated by either a Charcoal Forge or a Blaze Burner.", diff --git a/kubejs/assets/tfg/models/block/artisan_table.json b/kubejs/assets/tfg/models/block/artisan_table.json new file mode 100644 index 000000000..5219925d6 --- /dev/null +++ b/kubejs/assets/tfg/models/block/artisan_table.json @@ -0,0 +1,468 @@ +{ + "format_version": "1.9.0", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "tfg:block/artisan_table", + "particle": "#0" + }, + "elements": [ + { + "from": [0.98, 0, 1], + "to": [2.98, 17, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 1, 3]}, + "faces": { + "north": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "up": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"} + } + }, + { + "from": [1, 0, 12], + "to": [3, 13, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 1, 14]}, + "faces": { + "north": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "east": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "south": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "west": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "up": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"} + } + }, + { + "from": [13, 0, 12], + "to": [15, 13, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 1, 14]}, + "faces": { + "north": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "east": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "south": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "west": {"uv": [15, 1.5, 16, 8], "texture": "#0"}, + "up": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"} + } + }, + { + "from": [13.02, 0, 1], + "to": [15.02, 17, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [15.1, 1, 3]}, + "faces": { + "north": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "up": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"}, + "down": {"uv": [3.5, 2.5, 2.5, 1.5], "texture": "#0"} + } + }, + { + "from": [0.5, 3, 14], + "to": [3.5, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 3, 16]}, + "faces": { + "north": {"uv": [0, 0, 1.5, 6], "texture": "#0"}, + "east": {"uv": [1.5, 0, 2.5, 6], "texture": "#0"}, + "south": {"uv": [0, 0, 1.5, 6], "texture": "#0"}, + "west": {"uv": [2.5, 0, 1.5, 6], "texture": "#0"}, + "up": {"uv": [2.5, 0, 4, 1], "texture": "#0"}, + "down": {"uv": [2.5, 1, 4, 0], "texture": "#0"} + } + }, + { + "from": [0.4, 13.1, 14.5], + "to": [3.6, 15.1, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [3.5, 14.1, 15.5]}, + "faces": { + "north": {"uv": [14.5, 15, 16, 16], "texture": "#0"}, + "east": {"uv": [3.5, 1, 4, 1.5], "texture": "#0"}, + "south": {"uv": [14.5, 15, 16, 16], "texture": "#0"}, + "west": {"uv": [2.5, 1, 3.5, 1.5], "texture": "#0"}, + "up": {"uv": [4, 1.5, 2.5, 1], "texture": "#0"}, + "down": {"uv": [16, 16, 14.5, 15.5], "texture": "#0"} + } + }, + { + "from": [1.5, 7.5, 11], + "to": [2.5, 8.5, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 7.5, 17]}, + "faces": { + "north": {"uv": [0, 6, 0.5, 6.5], "texture": "#0"}, + "east": {"uv": [3, 6, 0, 6.5], "texture": "#0"}, + "south": {"uv": [2.5, 6, 3, 6.5], "texture": "#0"}, + "west": {"uv": [0, 6, 3, 6.5], "texture": "#0"}, + "up": {"uv": [0, 6.5, 3, 6], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3, 6.5, 0, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0.6, 5.7, 16.5], + "to": [1.6, 9.7, 16.5], + "rotation": {"angle": -22.5, "axis": "z", "origin": [1.6, 5.7, 16.5]}, + "faces": { + "north": {"uv": [0, 6, 2, 6.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 6, 2, 6.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "up": {"uv": [16, 16, 15.5, 15.5], "texture": "#0"}, + "down": {"uv": [16, 15.5, 15.5, 16], "texture": "#0"} + } + }, + { + "from": [13.5, 9, 3], + "to": [14.5, 13, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14.5, 11, 11]}, + "faces": { + "north": {"uv": [9.5, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [5.5, 0, 10, 2], "texture": "#0"}, + "south": {"uv": [5.5, 0, 6, 2], "texture": "#0"}, + "west": {"uv": [5.5, 0, 10, 2], "texture": "#0"}, + "up": {"uv": [10, 0.5, 5.5, 0], "rotation": 90, "texture": "#0"}, + "down": {"uv": [5.5, 2, 10, 1.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [1.5, 9, 3], + "to": [2.5, 13, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 11, 11]}, + "faces": { + "north": {"uv": [9.5, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [5.5, 0, 10, 2], "texture": "#0"}, + "south": {"uv": [5.5, 0, 6, 2], "texture": "#0"}, + "west": {"uv": [5.5, 0, 10, 2], "texture": "#0"}, + "up": {"uv": [10, 0.5, 5.5, 0], "rotation": 90, "texture": "#0"}, + "down": {"uv": [5.5, 2, 10, 1.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [3, 9, 12.5], + "to": [7, 13, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 11, 13.5]}, + "faces": { + "north": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "east": {"uv": [7.5, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "west": {"uv": [6, 0, 6.5, 2], "texture": "#0"}, + "up": {"uv": [8, 0.5, 6, 0], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 2, 8, 1.5], "texture": "#0"} + } + }, + { + "from": [3, 9, 1.5], + "to": [13, 18, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 9, 3.5]}, + "faces": { + "north": {"uv": [10, 0, 15, 4.5], "texture": "#0"}, + "east": {"uv": [10, 0, 10.5, 4.5], "texture": "#0"}, + "south": {"uv": [15, 0, 10, 4.5], "texture": "#0"}, + "west": {"uv": [14.5, 0, 15, 4.5], "texture": "#0"}, + "up": {"uv": [15, 0.5, 10, 0], "texture": "#0"}, + "down": {"uv": [15, 4.5, 10, 4], "texture": "#0"} + } + }, + { + "from": [3, 7, 1], + "to": [13, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 7, 3]}, + "faces": { + "north": {"uv": [15, 2.5, 16, 7.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [2.5, 1.5, 3.5, 2.5], "texture": "#0"}, + "south": {"uv": [15, 2.5, 16, 7.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [2.5, 1.5, 3.5, 2.5], "texture": "#0"}, + "up": {"uv": [16, 7.5, 15, 2.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [16, 7.5, 15, 2.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [7, 9, 5.5], + "to": [13, 13, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 11, 14.5]}, + "faces": { + "north": {"uv": [0, 6.5, 3, 8.5], "texture": "#0"}, + "east": {"uv": [0.5, 12.5, 2.5, 8], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 6.5, 3, 8.5], "texture": "#0"}, + "west": {"uv": [2.5, 8, 0.5, 12.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 8, 3, 12.5], "texture": "#0"}, + "down": {"uv": [0, 8, 3, 12.5], "texture": "#0"} + } + }, + { + "from": [8.5, 9.5, 14.5], + "to": [11.5, 11.5, 14.5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [11.5, 11.5, 14.5]}, + "faces": { + "north": {"uv": [2.5, 2.5, 4, 3.5], "texture": "#0"}, + "east": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "south": {"uv": [2.5, 2.5, 4, 3.5], "texture": "#0"}, + "west": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "up": {"uv": [16, 16, 15.5, 15.5], "texture": "#0"}, + "down": {"uv": [16, 15.5, 15.5, 16], "texture": "#0"} + } + }, + { + "name": "mold", + "from": [6, 14.2, 5.5], + "to": [11, 14.2, 10.5], + "rotation": {"angle": 22.5, "axis": "y", "origin": [11, 14.2, 10.5]}, + "faces": { + "north": {"uv": [0, 1, 2.5, 1], "texture": "#0"}, + "east": {"uv": [0, 1, 2.5, 1], "texture": "#0"}, + "south": {"uv": [0, 1, 2.5, 1], "texture": "#0"}, + "west": {"uv": [0, 1, 2.5, 1], "texture": "#0"}, + "up": {"uv": [7, 15, 4.5, 12.5], "texture": "#0"}, + "down": {"uv": [2.5, 2.5, 0, 0], "texture": "#0"} + } + }, + { + "name": "top", + "from": [1, 13, 2], + "to": [15, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 13, 6]}, + "faces": { + "north": {"uv": [15, 4.5, 8, 5], "texture": "#0"}, + "east": {"uv": [14.5, 4.5, 15, 10.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8, 10, 15, 10.5], "texture": "#0"}, + "west": {"uv": [8.5, 10.5, 8, 4.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8, 4.5, 15, 10.5], "texture": "#0"}, + "down": {"uv": [8, 10.5, 15, 4.5], "texture": "#0"} + } + }, + { + "name": "paper", + "from": [1.8, 14.1, 5.8], + "to": [10.8, 14.1, 12.8], + "rotation": {"angle": -22.5, "axis": "y", "origin": [8.8, 14.1, 12.8]}, + "faces": { + "north": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "east": {"uv": [15.5, 16, 16, 15.5], "texture": "#0"}, + "south": {"uv": [15.5, 16, 16, 15.5], "texture": "#0"}, + "west": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 12.5, 4.5, 16], "texture": "#0"}, + "down": {"uv": [4.5, 16, 0, 12.5], "texture": "#0"} + } + }, + { + "from": [11, 14, 2.5], + "to": [12, 17, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 14, 3.5]}, + "faces": { + "north": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "east": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "south": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "west": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "up": {"uv": [3.5, 6.5, 3, 6], "texture": "#0"}, + "down": {"uv": [3.5, 7.5, 3, 7], "texture": "#0"} + } + }, + { + "from": [10.9, 17, 2.6], + "to": [11.9, 21, 2.6], + "rotation": {"angle": 45, "axis": "y", "origin": [11.9, 17, 2.6]}, + "faces": { + "north": {"uv": [3.5, 4, 4, 6], "texture": "#0"}, + "east": {"uv": [0, 1.5, 0, 3], "texture": "#0"}, + "south": {"uv": [3.5, 4, 4, 6], "texture": "#0"}, + "west": {"uv": [1, 1.5, 1, 3], "texture": "#0"}, + "up": {"uv": [0.5, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0.5, 1, 0, 1], "texture": "#0"} + } + }, + { + "from": [9.5, 14, 2.5], + "to": [10.5, 17, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10.5, 14, 3.5]}, + "faces": { + "north": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "east": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "south": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "west": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "up": {"uv": [3.5, 6.5, 3, 6], "texture": "#0"}, + "down": {"uv": [3.5, 7.5, 3, 7], "texture": "#0"} + } + }, + { + "from": [9.5, 17, 3], + "to": [10.5, 20, 3], + "rotation": {"angle": 45, "axis": "y", "origin": [10, 17, 3]}, + "faces": { + "north": {"uv": [3.5, 6, 4, 7.5], "texture": "#0"}, + "east": {"uv": [0, 1.5, 0, 3], "texture": "#0"}, + "south": {"uv": [3.5, 6, 4, 7.5], "texture": "#0"}, + "west": {"uv": [1, 1.5, 1, 3], "texture": "#0"}, + "up": {"uv": [0.5, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0.5, 1, 0, 1], "texture": "#0"} + } + }, + { + "from": [8, 14, 2.5], + "to": [9, 17, 3.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 14, 3.5]}, + "faces": { + "north": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "east": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "south": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "west": {"uv": [3, 6, 3.5, 7.5], "texture": "#0"}, + "up": {"uv": [3.5, 6.5, 3, 6], "texture": "#0"}, + "down": {"uv": [3.5, 7.5, 3, 7], "texture": "#0"} + } + }, + { + "from": [8, 17, 3], + "to": [9, 20, 3], + "rotation": {"angle": 45, "axis": "y", "origin": [8.5, 17, 3]}, + "faces": { + "north": {"uv": [3.5, 6, 4, 7.5], "texture": "#0"}, + "east": {"uv": [0, 1.5, 0, 3], "texture": "#0"}, + "south": {"uv": [3.5, 6, 4, 7.5], "texture": "#0"}, + "west": {"uv": [1, 1.5, 1, 3], "texture": "#0"}, + "up": {"uv": [0.5, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0.5, 1, 0, 1], "texture": "#0"} + } + }, + { + "name": "cutter", + "from": [15, 9, 5.7], + "to": [15, 15, 11.7], + "rotation": {"angle": -45, "axis": "x", "origin": [15, 9, 11.7]}, + "faces": { + "north": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "east": {"uv": [5, 2, 8, 5], "texture": "#0"}, + "south": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 2, 5, 5], "texture": "#0"}, + "up": {"uv": [0, 2, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 2, 0, 0], "texture": "#0"} + } + }, + { + "from": [2.84814, 14.2, 5.84814], + "to": [7.84814, 15.2, 7.84814], + "rotation": {"angle": 0, "axis": "y", "origin": [2.84814, 14.2, 7.84814]}, + "faces": { + "north": {"uv": [5.5, 5, 6, 7.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [5, 5, 6, 5.5], "texture": "#0"}, + "south": {"uv": [5.5, 7.5, 5, 5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [6, 7, 5, 7.5], "texture": "#0"}, + "up": {"uv": [6, 7.5, 5, 5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3.5, 6, 2.5, 3.5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [4, 15.96444, 5.84814], + "to": [5, 15.96444, 7.84814], + "rotation": {"angle": -22.5, "axis": "z", "origin": [3, 15.96444, 7.84814]}, + "faces": { + "north": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "east": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "south": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "west": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "up": {"uv": [7, 7.5, 6, 6.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [7, 7.5, 6, 6.5], "rotation": 270, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 153, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, -149, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, -45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 45, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [0, -180, 0], + "translation": [0, 6.75, 0], + "scale": [1.5, 1.5, 1.5] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, -2], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "legs", + "origin": [12, 0, 12], + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "vise", + "origin": [12.5, 1, 1], + "color": 0, + "children": [4, 5, 6, 7] + }, + { + "name": "sides", + "origin": [2.5, 10, 5], + "color": 0, + "children": [8, 9, 10, 11, 12] + }, + { + "name": "drawer", + "origin": [4, 10, 2.5], + "color": 0, + "children": [13, 14] + }, + { + "name": "table_top", + "origin": [5, 13.2, 5.5], + "color": 0, + "children": [15, 16, 17] + }, + { + "name": "tool_rack", + "origin": [4, 13, 11.5], + "color": 0, + "children": [ + { + "name": "tool1", + "origin": [4, 13, 11.5], + "color": 0, + "children": [18, 19] + }, + { + "name": "tool2", + "origin": [4, 13, 11.5], + "color": 0, + "children": [20, 21] + }, + { + "name": "tool3", + "origin": [4, 13, 11.5], + "color": 0, + "children": [22, 23] + }, + 24, + { + "name": "plane", + "origin": [13.15186, 13, 8.15186], + "color": 0, + "children": [25, 26] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/artisan_table.json b/kubejs/assets/tfg/models/item/artisan_table.json new file mode 100644 index 000000000..403b73459 --- /dev/null +++ b/kubejs/assets/tfg/models/item/artisan_table.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/artisan_table" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/artisan_table.png b/kubejs/assets/tfg/textures/block/artisan_table.png new file mode 100644 index 0000000000000000000000000000000000000000..074b058721c3fa9dc947a47e446dbbb66cb46f3a GIT binary patch literal 1157 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANMUR-P`7Ar*7>gq_b;4wd#^j;aqErr1{8>b_QgP|ij~-&I7vNhde;sJHEk z_9k}0R=I0?wZMxKywr#T*7bKkDK%GTQYwaR4A8{2v(zxnpfY@Rf0o4eb__*=G@@7=a^ z*%{L|ujl28H+f2yHhixasJiTY$mDnU)-9<`H+5EBeP!rSfu# z%W}I|`2uys7OtMo&d!@r<#bDbZ>jg4%_jEpoRf-sv`u-Kf7bk)5&B?JlUc_Cg@5iW z8ScE2D`rpA(7AqkkzUWqlb$~Q{_X{A>*985S{{Ah;^-)|JoQ|_4!3dx78#$TrZay$ zylpjY`gG;*;_H8M?%J^7!J2jJ9_^J5m$hM<*X{qlTf)4MQ}?~Mgd@fwgdiv@&mrzrEkIzA`u^R&(Z@8EY}DWUGT8XanB@_pt(d!&psSkb_sJ7> zOgP(lyO8bB6RxzaIxbt5e--_5ZQ=9=kwudxtdZvbp0Iw6%x{Zu`7ej=+?k_4sn9eg z`{lb=dj1Cz<`lC^yi4=gRoh*B=ilGEMrvvbo-5ez9#YBKvF_CFcgxv@ZvOvf;u#tt zvXe~A15h#TIFW(-Ltjw$IhJT z5!UhO`CWO^wLxi0|5oj!!$wbKI@p~K{3vhEJ2A6nAH%;DL1(%=Ox{jPv3^(g(*Mi0 zJ8idjwbz{xtytH=ux_4q*pY)?S9wDmUrw9zK9ceIZT7k6HqU-;{Cca^-lo-fg6|4SCntD+m>kGaivGr z@_h12ompYOqr@_9f3@wg`I+-%>dMzf`cvf&@!zkz8-B-{#U$tS%D3W6A6w|U+Ee#r@-=PU)AhXV=bul^&dyFydLp&PHQC8e##C4EAp2WG)=BYFl5T3BS=dzopr0M+Iwod5s; literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/artisan_table_n.png b/kubejs/assets/tfg/textures/block/artisan_table_n.png new file mode 100644 index 0000000000000000000000000000000000000000..e17ca0db4dfcef4b8bef12e9dd39d1e3b8f973fe GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}`kpS1ArY-_&lxf@FmN2+ r&{#C5nP=V=hhXE~m22#uGoS*`BEL{(JJ%lJK#;hntDnm{r-UW|vyd1+ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/artisan_table_s.png b/kubejs/assets/tfg/textures/block/artisan_table_s.png new file mode 100644 index 0000000000000000000000000000000000000000..e14c94986d18aa9607a98f873ad5e9ad869daa2b GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNff}SppArY-_r`ZZMD+sj8 zORoIrqbcj3oZ&n1)}3P;zsSTj&r;Il=@WXYe!yVn$IuSzchBE#(s?OSdr(2|$)_&Q!@dMvvne(Lh5 z@-u5sG%?umnJ-_gb|B;utCH9Wy#paZKB|AYwp&e#@hDJS>>%OqnEyuLw%o_nd%6NF z-%7;Jd3`psL4HcHe8h9xWAm$-mjo@G)u(rTo*d7E*B+wF)++AQs^{v9D^O%yWXn8z z?-GWUOZ9fW(X?RP#LOa|_~ObGTPAe|#so?0w6*P%Bfc{{kYKDe+T`nXkum6%J;Rqd l$Ja1ESMpi7Fi*Ar*7p-rbvb+e5tJ zq4L37cNvN{HZYn8C8(U`(%T+9_1xckO?pR8w5I4MtWVMo^~+50J{-8XOmvO#(GB~Q zBx)ZUw##%mf9iQw+t9EuLoTp0-DJ-E!;Kv$O04egt^Xgl;PTh6TRS>x{{5-E@OkNj z6Fi!Ke(8#F3;qlY{9dDJVRU$(K0~69D#H;MR)&-}M`|Db`?s(EwL_=>e7mo;oEAan zqZmZ$6!h;fF-R_EVlZ-JWk~7aVmKio$}quDi$Nhdgu&t13WkQBKt@aj8^upIF1$Uz z{@={num!JQXJ1cp*}xFqj);>L&xa=Md_={D^D|IhkRs?7HC_xHZma=NE)j5yKG zFJHEWWmabq_lIX^XGhup|9sy5`mdk)_xGvF{{Q;=x=M7T*Tr89Y|Y=a9+@SV3-0H& z4A)rV(XE~(f8gZF&NpSdPrc1BS+$k7ceQCr{Uif9vc7`+C)(BkHw0S1I%TMvDnEcl@VcL=Fue%3M%)DO3ePB;szVAYgyT2YS z5!l}^*6{J;V|Pn?`}c4EzK&Xdy{N8E@AcPR@4ZjDUEx~rYWC&juV!z0RkQZv?>xpC zhf3<|^iDtBRJiA7&A&%mXB2AwxtqO~HQ}4<6IaE8_PeW&U0uyJaodk&&-cFI?p! zjlYs(XK6Wc`SRt9@9r|$!cZe8C)f1vNR9rB%bxNLf!n{|$uXaO*713%a`x4=1`;O{3?@vTEPOL>`=;A(zkPmxcdcg6x7W*;FaKR}`|Y=z`*y$8 z{#Ukp>caw!-FM&J{HPzl&*bm(-ebB;_H`YQ*<8Ob$7EsFl7n^fzuzl9Ulbdd&-g~N z;M+C3cju-QZ(k{=|7+QLDccv5|K`3CtD9KCdby5&bA5TaxT@K#?kL6`kMHL#EQq&X zmV0sUKHJ_1>G;j}_lQm2*=kUDHkad<_+D0ls{9(B8eLiEVs3{edp_)5Z=RT^{>JOT zp1wNQw=7?35C86KzqCtcN7lLh&%_);ANF76+Q7a4?w|BM@$GTH8FJp4FWsB3f7G=8 z)VI}-OgrEIwpsa=@k`(j*MIlb6ZW_L`*Mptp*US2>)!X;xarTt8rH5plphll6Yyhd zz*Y8u^3b^H(Z#jzo^Ra#?fC}#{;;&1xF@L(^Do)xYyY{RTE)G?Dw>D12LqprUfZDH6~`+M8`*Z-fM7MJXGJOAv| z?QBM~*=Ot4?KPC(`4(B?d(QTE#N9oAOVu~l{QdRy=04jy>Gy80n{#I?K?7#s0jZ z%W*%W;r-_wwG6kyn8idB&K6$W=l7ZM%3Ed)t2mMSclD)uHEw_3n}4~I;ke0L$>S@x zK4%K4O%9tYFSS1-y4-gE`&$0D%qyZ)IWjJK`Z*jHvD(gmpu8@lraZdbbpHD3`&Y0g zgfs0Ea|k`XfL~LE)%E+Nm&_I^^BVHyns&dJer~_bu0do{)1v5;Um35=R1YxWUzjo9 zj^W9w>vI}HpSR2COMT~`$(_LewRH=_nSEN4=2A=H) z!b2I}ZMvsc%aA&?;g}eMr(IflRxu*oVqvvTrGnNYpX}oXNEUxwNviw zKlfYivkk+fCMTDJ#f&+NFTOY$#WYcV|C(=K;&$^NJhH9d-q!Z*^Y63Y?*IR9w|(CE z>*5pt#{9c{Ik>W>=8pXK=YMY3vV6PMIAtF9gICJ>3+`?zm@nAyZsjS?h-*w7Zws_{ zi+@jjx6&%^+MJnR}Se6H1)}f34%)^NU42 z9Scip8B(ubbdz^Dk=yI0!rI#LX->noP19Oy_hdzzTwecbNB*(}x7jCn`8iB#I@B>w zbjKPYgWs-^jjppwS@_zWD{E?|JS^Cu-;;L#URdn**pBXNOg}a;UH>T~H96YxtQ(RWyJ9_iota?>*+lGH=lne z^>5GiOF z*zZFw3!D6f&a?jb_4W0?A8DH>Ud-4szdwFU{-gh&PV1k)#`ojf{CV@f6`qM={Jptz z$=4W$-5;1!`;^oZZkkt}xF+&%Q;&n5z|#)_ONZH z_fIUG>M*&-;oI|~-wdbn_-{Qsy^H0>q?7Ch5?|G4^Y%{eva zoOe5Od9LrAwdPc^YrIv6t@r}1It}amdg+gEv-vCa80IEk@ba}|_+1fM<9posGh@x4 z9~Y&Al{X)gKkn~q$56aSYu~cRrJoot=(M@*wG)4EW1F7uC6g!c?ZzW$*N+d;elI zx|k{Na4{(6@b-}F<#BUA@9uiPDVo9e*fC$$OW*GNI(^#PO~>eRq@P1|Yh3*4>fOJ7 zZWA+`+2^8mOJSPdFNQlzm&+M*e?Pywl_fnr{nP#W|5vN{lQ-YoQ?a&p=~mbG&5y62 z+{{?J_i3o{+cW##{}Fj)p38Wn_3xWEKIhJzlRC;>DgQ+I*W|`C+g5GAv;Eb%*pA26 z_EUf4EuFwM@7v^dkPS|$LGA5p_8DL94(^*j>t~JL^y$-!Dl2b(U%DW*SG%G7{k_sn z7OW4?MD@&`E&cQD_WN1$?PvN_N%Ce?-Cd#Y#r@#lKRY*xFK@nmGn;A2-J$$Sm!V|G z&YhMo_FTSvIqv;^{=IoJeOwPXOf&7iTS_@>-d`Q)&d9K&6|-eHVG5)r>E4=npd}_g z{&dpD1p*3EQ4F0wKRk54KYhWWqMcLD&$s9QwXg5WMJA6UIcAeruU@@R-?{bm>uj!i zl`RZH2D8sb6r}!q+;5*^HTT--M@>#43?Ap!@BgROeYD9-fk~^u<<9;4n_mfCyvRO5 zLW{ADDR~hqL&};htOCg=GVSJ{F50QWSIF0AJo~KFamS6Pq8qm7-#4pjUcFj7Qg8YZ z#d8M>cf8Hy-;UOl6|><#U^8PA-*?4n?MD>+<`q^jWSK|hGT!+AvHhQsp!$7_jQCXU zhW`#<8t?DUyTFd4WgHsDP-~|r^>dbw+Mjo&3M*I(UeveL#!de3^XQ2r`&;d~947P6 zKmGJ6$R%aJZA<566}G}pz0KcvmR)}N?(gsKN}r7G%SbkMELQBBEqLMy%aex+XD14F zSiE{XL2!j_53F5o$M9%HkF#Av-UR*zi>${BYM(GSc>TFo+H6Otk$$SvL2cpTtgTsp zlNg#^l#zp22LO^gWs$=2 ziVY-Z#&^rzO<~26_p#|!%t-_+%cgrFp{zFuQ#Q%vK>m)lSr^_4> zpCh<}^N|3%)zmZ=CKDy)02{bR!4WGwVabCoQmM;WFp`T02#)uF7-AgX8U%2y6KHqBYyJw#(=U-=HS^VMn$2am9wy-h0)%e3e dGtf}ii{ zy9&Q`&EJ+KnW)V>lTr4QIpZI*|LQJx4{mgTe~DWM4ft94t! literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_active.png b/kubejs/assets/tfg/textures/gui/artisan_table/casting_mold_active.png new file mode 100644 index 0000000000000000000000000000000000000000..a57ab6c55499f9da3dcecc804bf53f588e343845 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0y~yVBi5^4mJh`hOp9@=L`%ClRaG=Lo_C~PBaudtiaevfcBa0BBQTt3>^VickJeSE;7+1 z%4qh~_SZbj?rV#+_uCm-uA8YG@*!%g%8wIky37tQ|8wsHtGYrV`>zL+Z!s`1FnGH9 KxvX)(IdMdH}} z@?&LYcXL?P{ib!fsP1E6|F<$@Vd_I|g|a>P`;>h-%c^Uk+3A3nIzDXcE{zcbnTr>FMOj}_0(K0ZFLa_w1ZC%&B9VU>OB zrT*5<-z2xXHepVN`*r@merkI)cq1*7cR4?E@|bzUO>;l*MET3*{B>~|i?#ET7CRg$ z&-<~c@YtcozX>&pQzvygEfciiFEV0Sd{y3Gi}f4_1G9l>oCm8WE5n1|^72d`VkIxn zIUFd@-@|!KlHwX?zQMhu3VAmXnDM4wo_AfeiwO2Ry&cT0i>$fimd~z=T_BN|M z-%j0PzH1Vhq`c^Z-M8=a_v?4;G-!Rd_14Wrr%&cAm@VV){-mrr|KZ*MkK5a>Ui@nQ z>Buy#8CHh+yF`Tk|N9(%WU8RM(W41oQ$*uEX6A)>&8)n`!NA2e=ktkb9*%dt>yzH} zJhbq8=TKZ4VED+TTt?jgUv-ncoc*DXA2%{3y_>lB;)So%u+|}3P>Npt=x!7`Np3l0Or?bod7%#(tzxwYV{`e8m+E;QnZTH3% zr>n%y&-OdR#t<=$RjFzE$A1w|J=OB9c5ofO;k^58degBteKy8rQm>})=^ZvX^O8Bt zr=>)Oo%6iI^q^GpG{v)?a{T8F=W&FeEB-I}YS$A_rRfuHzd2UvRhklfm*a^*(eq;( zOD#8@%wsV#xEV50$*)LFal5YUm6!G+mo`Ne{?7J{oL;(mul&BWe+T}xom1YTZMl6BotumkZ>!mZ#kGubkGqJ?Mm%zftP4 zW-F0bC)AcVuRg{c#<8Tly@b9PoLa93h zH5^XNm9CX~dt%cajwd2T(U%WeWIa7$GQD(W9!r)|itM!HnXNg$m~7rYU%f|p^$fma zf?Sn#b^BJuwk+EnD6ZM|F#B2gv-}xtg4GUlHL@oa%9>~JBpjRg`}gmS>?x8^o~lpI^`6e`Q8s_+rqDWJcS(Wi)Y6oxmk(NKsi(+ZI%u(_ zCFd8@o{sbB3@-iCeA zC%v~;y961Q>}Z&hd}rTp%UyT%7>oNjj#31_upTB zJrrDUN^n!&%LI`_XZh{g#T9&gE&|^B4}-nC%RV$$U{dVOveHWt~yTIk)+=>(LNTw)Eu_?y)j(D(Wfh zEf$z*uqOS(KX!Rny_XG3TlX-f|NHbnTH~o>1+&0*hX-|w*0FT>p7t<)JSl8K>fDxt zH#3Wr6O?B3Pg2%UReYN9X)>1{1M?BxJNtf1G92mR$oTWZRpG^9`F-Em!}zAm(44qJ z#ewIDuENTHDHBdVUlF|0HDKo~p?R_zhJxM9Gmg2WG^uU=w08G=rU<=+ik`fj!tbr? z-_;88MlAlaZOYRtD^t#RSt}GIti05AI<8USpPvJnCBDg{6e>4gP&{+1?ksL zybC@vVZxs+DP}X;*DCYO+1j`E&#xm7QqI0P*K&Q8=OLrwH70W(7zXL`=JQ-Hn80^M S!-s)^fx*+&&t;ucLK6V4-C8{W literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_active.png b/kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_active.png new file mode 100644 index 0000000000000000000000000000000000000000..9b05d102d032cf0b8747299c9cb3b6eab04f5643 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0y~yVBi5^4mJh`hOp9@=L`%C(>+}rLo_C~PITlutRTP~ znvh+=31wy}XJ9Wa^qW^W(zO20uHJ`S8pTj@FWv#iFB_l&-t7`9D z6%}3yh8^BzyHqAHH>xa&Ejo96#|A#$?bn|3dv8+z+q_uKbBX9SKOZyWdk>D9dd)JC zy%hC-n~3S7s~pVpqms4v*Dcz)#p-r-cxkrmmd_TRegz>~Pmf3|NEPz_d7bIRz`(%Z M>FVdQ&MBb@0Ql-oyZ`_I literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_border.png b/kubejs/assets/tfg/textures/gui/artisan_table/extruder_mold_border.png new file mode 100644 index 0000000000000000000000000000000000000000..4b6d25301fb4f14b4087809e06eaea03fa986176 GIT binary patch literal 1367 zcmeAS@N?(olHy`uVBq!ia0y~yU;twdHU#}|3H)BKi*6camC>_*)V5Z(2tt(SkaTPug_!=TGeO@@%g!)F|3H1zL1GdU&@o}iA zdL=`kI}So2xMW^uxQ>vTcb?0^GfACw+SsL`0uXEH&kJ z(oqr8+H{krYOmd`w|aVUcdWvE#BIdd-oDMBdG+9@J7!0d3YYO!esZ{MQuXpu_?p{| zdDGv@oSZdX|NjiZ;CXeIj~x^L6Lo~)^rjitC!Sw_W{Ra#)-1R6@&DT@m0cPHnzrZv zFa7Ej-hU=#QpWb`Gt!g1RA*d2DCBi~;nZI56H#mX+!i0*qo~t9f04$SbGet_ehXL` zvT^6mms8H3nb^zr`$F3U=d|a~4Be|r&8APdnbY-h`V+?fZ>v`|O`W=B^%>PAnPrX~ zzqO^xLPA|vUoD)vvt>@5Vb6-J9&g)aKRFdE4}Ln$W@>u!fJWP$n>%-2=;g3a*tzKw z*V;`tMdsQ5=6zZ;lc`}%rqte|ROzizbG?~e9vyD~|KZ0+e~sy0!1QZXy+q##-<-~^STzw`%qc?H4 zxgS0|;lTWyz3r`sxb)ZOCf}bwp)_{-s;l)A&ZqAT)$6+Mw{+5u`v2@AT&yQ0 zZ{^?nbMmd&ERMM7(9oJc6%S-iAIPw7Q@LtWuI^H?d4Ih7$`bKbCr2ixs2rCMw=Q#R z&vGwJInlXio4-rkZFQyfZ-oz?ojCD2pXDLWlee>PyX?>Y?V{k+^D_In3SXt!jvIX%RO1bjz-ARok`=anYAes(yd_e#rj9 zJN5MQ>mL979RB$1k8j-T?r7BYG6M4^D7|r#w@;5zk zAj7!sNRh;`4E6XYTWgh|773iYIR|Qq#`?7ki_iYp7||2$px1T%UCFNree+(IR4rL_ zWJj#8;GS<8`~O-bqI`Pg>2i8nMEZ)mQnJ2qrGMFTbNN*2!#kuAX-JjlE`yEG1gaOT16S=p9ad%D4Nv z+L59|aIg%r}=C9r(0M5_|PZp%p_O*WTtWDvtEwf*ZYo&aqQn4``120x&EumN?S!&KdSpF zHYMrb(&HTpO!;=Ux;kdZo+N!@Km0IYUcK@Q$1N4P3=EB`;z|j^-d5f_fBZQfv#iPI z(fRnLF3h}2OFCVJ4o01RntIA)+g{Pt3~NQd^O>?Yb1W70(#*-JESFonzpl;DO;#sP zf$3!Ep%kIwZ)t9mB7ztN9dnwiFBv$Mr3G`9EV(f8(FeaHI$~3r{GXja?Rv}N=_8}3 z`!{Ru|8E<}p!8`$XD@qz*Wbsl%6H!DUmkz2zSh*YQ+TJ|r$4n`+cq8lIrT`C;?@sk zLeEbxdRU-gZ&P!=@!UG=ZtgAmrq>*oh?KJlMrr^1^*Fr8P$*SXhqM8C) zA4v4N-MruzwBcHj>E@2yZO8N!mgJxt?9Q`%dW0n9st!y(Lh#entNl zuN3jDJ1(nT%4S~ccvIASL1|*_a#5w-amrgY*1B=HT0Oqz`YS@YMQLu~YNgsr>m7aP#BMH2 zX_n`^WWD%I)`cGKce*_0XWiMNztF?|ir%H=QriW)?lk5GUeVg5Z|bD6$;8|>aP|qi zs~ihY1WoBw>L_v1RjQS`mik>)NPU}ZOuAC-s*PL= zPnfRhezdIlwM)wV?3REhrmL=SI4&{%Cie33hILUOXKkGBaX%CSU&S>84#LnpI9NyBMoB-|qMQ z&6-i#Yef6x@74Z&axu1K$)}TNzH5GcDgIr1|25X-{r&57wKw}N@9*C*$#=H4+3$aU z)7$6#wcq{iPRx@hN+-qlS^xhL@jA!s$BO03_tsg;uT#FB+%wU>zB=%=+s|W<{%~mj zZ#yaxyu*?!sas}$P3VtGMZqwabxA!FFJ^>XPAlzCEnHp0aKiFc&JCu?DGUq@44$rj JF6*2UngHvw?mqwk literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/gui/artisan_table/phenolic_board_border_4x.png b/kubejs/assets/tfg/textures/gui/artisan_table/phenolic_board_border_4x.png new file mode 100644 index 0000000000000000000000000000000000000000..f397102b7f52b9c750a4f134075dbf5a9f6c24c7 GIT binary patch literal 1197 zcmeAS@N?(olHy`uVBq!ia0y~yU;twdHU)ddYxn3=jNI2uC~dsfL6IV)Uo=9IB` z!rxHM?{Q$EjFyVj#}|yt*KxFLTT*%B-dy?it>%77*59h;Y)yY|ZIOL^{oilW=c6{c zU2Lnd(|`MKzG>IdMXT~(Z;cib%V(HS{Uy@$QpNGPkM7kGRJ$dyI8|Sg!wf?<9%szX}&12^(WA$&B%vSvXNiAct+uy0FNd(TW@<3mZBVs`i&F$F8gSpRM!Z z*;UrM-@laaRlKh~wAA(A&V4f6EIa;Qjy=?s(|P6Ugsr_3o=!EIzJ9G1gP`S%Lv;)b zrtHdnwR6&&;}0hv_ZDL5k+C%`%=lH}8D7gbr>geRk{0oDzU+Z&zf1W=tg!6qhKcU%5Ir2>zn6J+T}5M$iMlZmW^aId(zJ(&MmHTf~zE8}pTN=cc^c zp~SmUUnzIh#;f~wDDhq_pJ;aV248rJ_?GTP>yOU=mJv`KrDvQ_7y zP7{}Sms=)ltnZ44FH!92K9kh@pzF=7F!t*!POQ1cvF^mWjPios&MhmCsq9dieL<&d zFW)-BiIM9CVw65qpCnY|CXOx*mHa@TK^j+vPI;@JZ=v6oqQ`m{H( z-j%!KqLjPpqR34BP1A$tx$P2rnU&+WtlK11IVC1VsOOK=*=32jo7@Uq%UUPO2i}ZJ zUcW;r`%6`Uwb08fpO4ow4!3kR?_TaPJIlvQozG1n>X?7l>z7&G;i_h(rxv?Tke#>a zt1`3V6(`dPx!yl_O3k*uz%={mTkjWD4msDKZN1$)ufcoEuWaSGjS(Tq=l8U}*DkW; zKOZ)kGs9BpYFLeN@#iz=&aJB0v~zouD$ioYd*3{TCVbmq7P+`XhNme*@~+#Xr%sakgvaVU(ug~NBT_*Vu9<0RWwC&zui|2*EePxJPQ zdON3PkB$_xxbmd!#>VFR-&Vycy%E?s*=eD|RMfT@*K95P>v?Q2et!kg{iuj)_Z&?^_3ufptez?u) zD50E_ndB{eT&%*;N!x6PH_JkkjXJ^%$HgQYOimgtxaXD8X0UI=kxS=H--r2C1kO7? z?I#Dru@ukcwo#XO9)A78erhTw!y=BD?TycW*36VX_`iNxpk&a>OOwJk%WH&w5F(zx#jtUbi5Ny+8I<#hs@dT#NHp{A9`d%q`}>q5%wTiWT@b?=(CBo8RrzE@xw_~fkr!J6wZb+2Pgi-bRrA;6@FKzIe?Ewv71+}j z5R~|JRzPUSY4>aU|1&5|J-_gE>DT&?-vZbu+`&T?KX1KAfH~01z z)hgx5=bp1T?7euTl2216UDB6-g?VRP=Dn8kG zozvaV_etcA*6Hk-c^L~rJ2XG2U;17sx;Rc}OV(Vk)UN2=Ih8fb-;`m^lGgWD v8Y}N{KYDwt_WHtCp^PioZ7=Q-{=@n{Voqt(B8>wK3=9mOu6{1-oD!M<+#ehVwYMGO>M9nU||6Y3e*E&O~-jut$riyMq zTKoBEJ4aFWYQ9H~fpLGoo;#J4{r1k8Kkaq<*T?Vw!%#epk!zPqfVJGSOAl9TMOFQ| z^6~TQ@6U`_(}e8nyk_gA)#f3g ze@Z*g%kC>!5gZ~Ka*?k)gfY;uN5M!qYe~`OlJn6WIyU=0{MhqkvVOe)LuhT)pV;*R z6YZU9!(Kf8@$b{)`=>KIi{<3PPy6h>Brf;o%_P4Zm%Z+LC-tj;PTdP~W9_$hi-K0x zbu2yRtdMk~D#7Pibp5}Mtzl<#co|+Lrgn5SG_xA+x7BJsm{8Uqveqp-oL6W0nvJ|G zLi~-_m27rQe<^2q`w7eLtzMJaXG&fC`TYF!nWneZ%9aEw-41wcC8fIQtchF7?Cch{ z&K&Drft%l?7Ah(wKX{@v`(J56w4a`l%JM&MVpC597X?i;h-Q zx=&S9vZJ}XXXP>9B}(N9!6NLUH>XM|itaT1?pkOtF?N+;(8TDCz9OC}3VcdN%T8C_ zPWE(VQ`&Jt?;6L-6LTZWi<-OMWc5zyy3^^aZa(A0jI2BDAx~uQh#sv~H}5#H?mEZH z6aP2*_fBwOdwftSdDoinYXyTQ9;}#f;zstJ){rM`WtKauyM0X8P3np{yiUDbf1=@4 ziLP_vKPR})ODz+dnYCxOpSa{Iw--B3)N*_>i}IOXdIID;VaK>dU3-tUPwJZU@xtWY zQ%{6E=DhEgEv)GGZm&}Es>1lPdTHO;2J!bFa(q1zd{!vZUocYF_^VWD)LF^hCR5{A z6|Sv0btm+*`>!mm*x?Wwb`o5%dEJz5g<;m76aJne^%p7}BPwWfLa^(T*I zil-IUU3~oKB5QhoRmaLDWrAP3v}G^Po|60h`%JxWFN^-&dH!_n(#ze8 zIQPBx-u!*D+s25HtGSyuYVE3!Zdm9(FZky#+3(%IQ=VmtaEaVJ)}WyCw=9q$EzZ(8 zbWvR7vxV&LOVuuYubsKysL^~1Gs_ac1u5ERR(8uXZTRtV_MF;MzJ}=Q`k&8yoIk^+ znzLc@@2(bImIo#I1RF)r=OfF6Nz))5&5{{*#%Z z-+z3%#{1=zQGLz!Fky~@@3*U8bY1D>;Z-x4QFP?<`}-jbN<~VI=NTJ8n< z&(}6^l7`a%51W(K)t7s#U0HMPp3LlumyMIw9Z9@f@$u`AAItofaPrQWtN8Z8^-H%R zN_X%07M@%E^?m)ZeLJewiG-TWz8{|TyL#XI)9(4U`>Z#vs8H55En{A4Q}k12>1BJP zyoOx`DC$zf`?XuS)cQLS>(gzOeOAQ&tMiRO#&UIjjpZf*grr36HZtCuYt~S+zq+_oDE`%vBpNrWd+KEqbkV zIV9OQW@7FIovw9VXS{kJbmh!Eyy(TO6FOHp)}5G^p~|IxNhnru=CZ`QuRuBu?K+`z zjbq)3ZJ8y7YrD>5fi!fdiC>>}!sO}=&UGi4Ei}3g>#Y-=7`a|BX5#t3smU%pAU=>O?(4H2&0|Gy+vZ$5PGm)g@_qk92; z4=36jKJF%AHO;+p;}snxw+j=OZ3@!mM?L@m literal 0 HcmV?d00001 diff --git a/kubejs/data/tfg/loot_tables/blocks/artisan_table.json b/kubejs/data/tfg/loot_tables/blocks/artisan_table.json new file mode 100644 index 000000000..59792a68b --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/artisan_table.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:artisan_table" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/kubejs/server_scripts/tacz/recipes.misc.js b/kubejs/server_scripts/tacz/recipes.misc.js index c37803055..f0d7632f7 100644 --- a/kubejs/server_scripts/tacz/recipes.misc.js +++ b/kubejs/server_scripts/tacz/recipes.misc.js @@ -26,38 +26,6 @@ function registerTACZMiscRecipes(event) { ['tacz:target', 'minecraft:minecart'] ).id('tfg_tacz:target_minecart'); - - //Molds - event.shaped('tfg:small_casing_extruder_mold',[ - ' A ', - 'B ', - ' C' - ],{ - A: '#forge:tools/wire_cutters', - B: 'gtceu:empty_mold', - C: '#forge:tools/files' - }).id('tfg:small_casing_extruder_mold'); - - event.shaped('tfg:large_casing_extruder_mold',[ - ' ', - 'AB ', - ' C' - ],{ - A: '#forge:tools/wire_cutters', - B: 'gtceu:empty_mold', - C: '#forge:tools/files' - }).id('tfg:large_casing_extruder_mold'); - - event.shaped('tfg:shell_casing_extruder_mold',[ - ' C', - 'AB ', - ' ' - ],{ - A: '#forge:tools/wire_cutters', - B: 'gtceu:empty_mold', - C: '#forge:tools/files' - }).id('tfg:shell_casing_extruder_mold'); - //Mechanisms event.shaped('tfg:flintlock_mechanism', [ 'ABC', diff --git a/kubejs/server_scripts/tfg/machines/recipes.molds.js b/kubejs/server_scripts/tfg/machines/recipes.molds.js index 74bf13c2e..f6271a63a 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.molds.js +++ b/kubejs/server_scripts/tfg/machines/recipes.molds.js @@ -6,278 +6,57 @@ */ function registerTFGMoldRecipes(event) { - event.shaped('tfg:mining_hammer_head_extruder_mold', [ - 'Sfh', - ' ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:sword_head_extruder_mold', [ - 'Shf', - ' ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:pickaxe_head_extruder_mold', [ - 'S ', - 'hf ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:axe_head_extruder_mold', [ - 'S ', - ' fh', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:hoe_head_extruder_mold', [ - 'S ', - ' hf', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:scythe_head_extruder_mold', [ - 'S ', - ' ', - 'fh ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:file_head_extruder_mold', [ - 'S ', - ' ', - 'hf ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:hammer_head_extruder_mold', [ - 'Sf ', - ' h ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:saw_head_extruder_mold', [ - 'Sh ', - ' f ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:knife_head_extruder_mold', [ - 'S f', - ' ', - ' h' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:butchery_knife_head_extruder_mold', [ - 'S h', - ' ', - ' f' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:shovel_head_extruder_mold', [ - 'S ', - 'f ', - 'h ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:spade_head_extruder_mold', [ - 'S ', - 'f ', - ' h' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:propick_head_extruder_mold', [ - 'Sxf', - ' ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - x: '#forge:tools/wire_cutters' - }) - - event.shaped('tfg:javelin_head_extruder_mold', [ - 'S x', - 'f ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - x: '#forge:tools/wire_cutters' - }) - - event.shaped('tfg:chisel_head_extruder_mold', [ - 'S ', - 'xf ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - x: '#forge:tools/wire_cutters' - }) - - event.shaped('tfg:mace_head_extruder_mold', [ - 'S ', - ' xf', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - x: '#forge:tools/wire_cutters' - }) - - event.shaped('tfg:lamp_casting_mold', [ - 'Sh ', - ' ', - ' m' - ], { - S: 'gtceu:empty_mold', - h: '#forge:tools/hammers', - m: '#forge:tools/mallets' - }) - - event.shaped('tfg:trapdoor_casting_mold', [ - 'S h', - ' ', - ' m' - ], { - S: 'gtceu:empty_mold', - h: '#forge:tools/hammers', - m: '#forge:tools/mallets' - }) - - event.shaped('tfg:chain_casting_mold', [ - 'S ', - 'h ', - ' m' - ], { - S: 'gtceu:empty_mold', - h: '#forge:tools/hammers', - m: '#forge:tools/mallets' - }) - - event.shaped('tfg:bell_casting_mold', [ - 'S ', - ' h ', - ' m' - ], { - S: 'gtceu:empty_mold', - h: '#forge:tools/hammers', - m: '#forge:tools/mallets' - }) - - event.shaped('tfg:mattock_head_extruder_mold', [ - ' h', - 'fS ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:fish_hook_extruder_mold', [ - 'f ', - ' S ', - ' h' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - event.shaped('tfg:whisk_extruder_mold', [ - 'f h', - ' S ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) + /** @type {['huge'|'large'|'normal'|'small'|'tiny']}*/ + const pipe_sizes = [ + 'huge', + 'large', + 'normal', + 'small', + 'tiny' + ]; - event.shaped('tfg:screwdriver_tip_extruder_mold', [ - 'f ', - ' S ', - ' h ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) + let prev_size; + pipe_sizes.forEach((size) => { + if (size !== 'huge'){ + event.shaped(`gtceu:${size}_pipe_casting_mold`, [ + 'ABC' + ], { + A: '#forge:tools/hammers', + B: `gtceu:${prev_size}_pipe_casting_mold`, + C: '#forge:tools/mallets' + }).id(`tfg:shaped/${prev_size}_${size}_casting_mold`) + + event.shaped(`gtceu:${size}_pipe_extruder_mold`, [ + 'ABC' + ], { + A: '#forge:tools/hammers', + B: `gtceu:${prev_size}_pipe_extruder_mold`, + C: '#forge:tools/mallets' + }).id(`tfg:shaped/${prev_size}_${size}_extruder_mold`) + } + prev_size = size; + }); - event.shaped('tfg:wrench_tip_extruder_mold', [ - 'f ', - 'hS ', - ' ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) + pipe_sizes.reverse().forEach((size) => { + if (size !== 'tiny'){ + event.shaped(`gtceu:${size}_pipe_casting_mold`, [ + 'ABC' + ], { + A: '#forge:tools/mallets', + B: `gtceu:${prev_size}_pipe_casting_mold`, + C: '#forge:tools/hammers' + }).id(`tfg:shaped/${prev_size}_${size}_casting_mold`) - event.shaped('tfg:wire_cutter_head_extruder_mold', [ - 'hS ', - ' ', - ' f ' - ], { - S: 'gtceu:empty_mold', - f: '#forge:tools/files', - h: '#forge:tools/hammers' - }) - - let steelIngots = ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 4); - let steelDusts = ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 4); + event.shaped(`gtceu:${size}_pipe_extruder_mold`, [ + 'ABC' + ], { + A: '#forge:tools/mallets', + B: `gtceu:${prev_size}_pipe_extruder_mold`, + C: '#forge:tools/hammers' + }).id(`tfg:shaped/${prev_size}_${size}_extruder_mold`) + } + prev_size = size; + }); global.TFG_EXTRUDER_MOLDS.forEach(mold => { @@ -289,7 +68,7 @@ function registerTFGMoldRecipes(event) { .itemOutputs(mold) .duration(120) .EUt(GTValues.VA[GTValues.LV]) - }) + }); global.TFG_CASTING_MOLDS.forEach(mold => { @@ -301,23 +80,6 @@ function registerTFGMoldRecipes(event) { .itemOutputs(mold) .duration(120) .EUt(GTValues.VA[GTValues.LV]) - }) + }); - //TODO: Fix this code to respect full molds - // //craft mold to scrub nbt - // const molds = Ingredient.of('#tfc:fired_molds').itemIds; - - // molds.forEach(mold => { - // event.shapeless(Item.of(mold), [mold]) - // .id(`tfg:shapeless/mold_cleaning/${mold.replace(":", "/")}`); - // }); - - // //craft vessel to scrub nbt - // const vessels = Ingredient.of('#tfc:fired_vessels').itemIds; - - // vessels.forEach(vessel => { - // event.shapeless(Item.of(vessel), [vessel]) - // .id(`tfg:shapeless/vessel_cleaning/${vessel.replace(":", "/")}`); - // }); - -} +}; diff --git a/kubejs/server_scripts/tfg/primitive/recipes.artisan_table.js b/kubejs/server_scripts/tfg/primitive/recipes.artisan_table.js new file mode 100644 index 000000000..340244b36 --- /dev/null +++ b/kubejs/server_scripts/tfg/primitive/recipes.artisan_table.js @@ -0,0 +1,572 @@ +// priority: 0 +"use strict"; + +function registerTFGArtisanTableRecipes(event) { + + // Removals (`type` didnt want to work here). + event.remove({ id: /gtceu:shaped\/shape_.*/, input: 'gtceu:empty_mold'}); + event.remove({ id: /gtceu:shaped\/shape_.*/, input: /gtceu:.*_extruder_mold/}); + event.remove({ id: 'gtceu:shaped/basic_circuit_board'}); + event.remove({ id: 'gtceu:shaped/good_circuit_board'}); + + //Table Recipe + TFGHelpers.registerMaterialInfo('tfg:artisan_table', [GTMaterials.WroughtIron, 6, GTMaterials.Wood, 3, GTMaterials.Copper, 1/9]) + + event.shaped('tfg:artisan_table', [ + 'CBC', + 'AAA', + 'B B' + ], { + A: ChemicalHelper.get(TagPrefix.plateDouble, GTMaterials.WroughtIron, 1), + B: 'firmalife:treated_wood', + C: '#forge:screws/any_bronze' + }).id('tfg:shaped/artisan_table'); + + //#region Molds + + /** + * Mold pattern definitions. + * @param {string} name - Base id of the mold item. + * @param {boolean} genCast - Whether to generate a casting mold recipe. + * @param {boolean} genExtrude - Whether to generate an extruder mold recipe. + * @param {string[]} pattern - 6x6 pattern for the mold. 'X' for solid, ' ' for empty. + * @type {{name: string, genCast: boolean, genExtrude: boolean, pattern: string[]}[]} moldPatterns + */ + const moldPatterns = [ + { name: 'tfg:lamp', genCast: true, genExtrude: false, pattern: [ + "XX XX", + "X X", + "X XX X", + "X XX X", + "X XX X", + "X X" + ]}, + { name: 'tfg:trapdoor', genCast: true, genExtrude: false, pattern: [ + " ", + " XXXX ", + " ", + " ", + " XXXX ", + " " + ]}, + { name: 'tfg:chain', genCast: true, genExtrude: false, pattern: [ + "X X", + "X XX X", + "X X", + "XX XX", + "X X", + "X XX X" + ]}, + { name: 'tfg:bell', genCast: true, genExtrude: false, pattern: [ + "XX XX", + "X X", + "X X", + "X X", + " ", + " " + ]}, + { name: 'gtceu:plate', genCast: true, genExtrude: true, pattern: [ + "XXXXXX", + "X X", + "X X", + "X X", + "X X", + "XXXXXX" + ]}, + { name: 'gtceu:gear', genCast: true, genExtrude: true, pattern: [ + "XX XX", + "X X", + " XX ", + " XX ", + "X X", + "XX XX" + ]}, + { name: 'gtceu:bottle', genCast: true, genExtrude: true, pattern: [ + "X X", + "XX XX", + "XX XX", + "X X", + "X X", + "X X" + ]}, + { name: 'gtceu:ingot', genCast: true, genExtrude: true, pattern: [ + "XXXXXX", + "XX XX", + "XX XX", + "XX XX", + "XX XX", + "XXXXXX" + ]}, + { name: 'gtceu:ball', genCast: true, genExtrude: false, pattern: [ + "XXXXXX", + "XX XX", + "X X", + "X X", + "XX XX", + "XXXXXX" + ]}, + { name: 'gtceu:cylinder', genCast: true, genExtrude: false, pattern: [ + "XX XX", + "X X", + " ", + " ", + "X X", + "XX XX" + ]}, + { name: 'gtceu:block', genCast: true, genExtrude: true, pattern: [ + " ", + " ", + " ", + " ", + " ", + " " + ]}, + { name: 'gtceu:nugget', genCast: true, genExtrude: false, pattern: [ + "XXXXXX", + "XXXXXX", + "XX XXX", + "XX XXX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'gtceu:anvil', genCast: true, genExtrude: false, pattern: [ + " ", + " ", + "X X", + "XX XX", + "X X", + "XXXXXX" + ]}, + { name: 'gtceu:name', genCast: true, genExtrude: false, pattern: [ + "XXXXXX", + "X X X ", + " X X X", + "X X X ", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'gtceu:small_gear', genCast: true, genExtrude: true, pattern: [ + "XXX XX", + "XX X", + "X X ", + "XX X", + "XXX XX", + "XXXXXX" + ]}, + { name: 'gtceu:rotor', genCast: true, genExtrude: true, pattern: [ + " XXXX ", + "X XX X", + "XX XX", + "XX XX", + "X XX X", + " XXXX " + ]}, + { name: 'gtceu:pill', genCast: true, genExtrude: false, pattern: [ + "XXXXXX", + "XXXXXX", + "XX XX", + "X XX", + "X XXX", + "XXXXXX" + ]}, + { name: 'gtceu:huge_pipe', genCast: true, genExtrude: true, pattern: [ + " ", + " XXXX ", + " XXXX ", + " XXXX ", + " XXXX ", + " " + ]}, + + { name: 'gtceu:rod', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "XX XX", + "XX XX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'gtceu:bolt', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "XX X", + "XXX XX", + "XXX XX", + "XXXXXX" + ]}, + { name: 'gtceu:ring', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX XX", + "X XX X", + "X XX X", + "XX XX", + "XXXXXX" + ]}, + { name: 'gtceu:cell', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX X", + "X XX X", + "X XX X", + "X XX", + "XXXXXX" + ]}, + { name: 'gtceu:wire', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX XXX", + "XXXXXX", + "XXXXXX", + "XXX XX", + "XXXXXX" + ]}, + { name: 'gtceu:foil', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "XXXXXX", + " ", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:small_casing', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "X X X ", + "XXXXXX", + "X X X ", + "XXXXXX" + ]}, + { name: 'tfg:shell_casing', genCast: false, genExtrude: true, pattern: [ + " XXXX", + " XXXX", + "XXXXXX", + "XXXXXX", + "XXXX ", + "XXXX " + ]}, + { name: 'tfg:large_casing', genCast: false, genExtrude: true, pattern: [ + "XX XX", + "XX XX", + " XXXX", + " XXXX", + "XXXX ", + "XXXX " + ]}, + + //Tools + { name: 'tfg:mining_hammer_head', genCast: false, genExtrude: true, pattern: [ + " XXXXX", + " X", + " ", + " X", + " XXXXX", + "XXXXXX" + ]}, + { name: 'tfg:sword_head', genCast: false, genExtrude: true, pattern: [ + " XXXX", + " XXX", + "X XX", + "XX X", + "XXX X", + "XXXXX " + ]}, + { name: 'tfg:pickaxe_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "X X", + " XXXX ", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:shovel_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "X X", + "X X", + "X X", + "XX XX", + "XXXXXX" + ]}, + { name: 'tfg:axe_head', genCast: false, genExtrude: true, pattern: [ + "X XXXX", + " X", + " ", + " X", + "X XXXX", + "XXXXXX" + ]}, + { name: 'tfg:hoe_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + " ", + " XXXX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:scythe_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "X ", + " XX", + " XXXX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:file_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX XXX", + "XX XXX", + "XX XXX", + "XX XXX", + "XX XXX" + ]}, + { name: 'tfg:hammer_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + " ", + " ", + "XX XX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:saw_head', genCast: false, genExtrude: true, pattern: [ + " XXXX", + " XXX", + "X XX", + "X X", + "XX ", + "XXXX " + ]}, + { name: 'tfg:knife_head', genCast: false, genExtrude: true, pattern: [ + "XXX XX", + "XX XX", + "XX XX", + "XX XX", + "XX XX", + "XXXXXX" + ]}, + { name: 'tfg:butchery_knife_head', genCast: false, genExtrude: true, pattern: [ + "X XXXX", + "X XXXX", + "X XX", + "X X", + "X X X", + "X X" + ]}, + { name: 'tfg:spade_head', genCast: false, genExtrude: true, pattern: [ + "X X", + "X X", + "X X", + "X X", + "XX XX", + "XX XX" + ]}, + { name: 'tfg:propick_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + " X", + " XXXX ", + " XXXXX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:javelin_head', genCast: false, genExtrude: true, pattern: [ + " XXX", + " XX", + " X", + "X ", + "XX X", + "XXX XX" + ]}, + { name: 'tfg:chisel_head', genCast: false, genExtrude: true, pattern: [ + "XXX XX", + "XXX XX", + "XXX XX", + "XXX XX", + "XXX XX", + "XXXXXX" + ]}, + { name: 'tfg:mace_head', genCast: false, genExtrude: true, pattern: [ + "XX XX", + "X X", + "X X", + "X X", + "X X", + "XX XX" + ]}, + { name: 'tfg:mattock_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + " X", + " XX ", + "XXXXXX", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'tfg:fish_hook', genCast: false, genExtrude: true, pattern: [ + "XXX XX", + "XXXX X", + "X XX X", + "X XX X", + "XX XX", + "XXXXXX" + ]}, + { name: 'tfg:whisk', genCast: false, genExtrude: true, pattern: [ + " X X ", + "XX XX", + " XX ", + " XX ", + "XX XX", + " X X " + ]}, + { name: 'tfg:screwdriver_tip', genCast: false, genExtrude: true, pattern: [ + "XX X", + "XXX XX", + "XX X", + "XXX XX", + "XXX XX", + "XXX XX" + ]}, + { name: 'tfg:wrench_tip', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX XXX", + "XX XXX", + "XX XXX", + "XX XXX", + "X XX" + ]}, + { name: 'tfg:wire_cutter_head', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XX X", + "X X X", + "X XXX", + "X XXX", + "XXXXXX" + ]} + + /* + , + { name: 'tfg:', genCast: false, genExtrude: true, pattern: [ + "XXXXXX", + "XXXXXX", + "XXXXXX", + "XXXXXX", + "XXXXXX", + "XXXXXX" + ]} + */ + ]; + + /** Checks for duplicate patterns for the same mold type. */ + function patternsEqual(p1, p2) { + for (let i = 0; i < p1.length; i++) { + if (p1[i] !== p2[i]) return false; + }; + return true; + }; + /** Checks for duplicate mirrored patterns for the same mold type. */ + function patternsMirrorEqual(p1, p2) { + for (let i = 0; i < p1.length; i++) { + if (p1[i] !== p2[i].split('').reverse().join('')) return false; + }; + return true; + }; + // Error logging for duplicate patterns. + let patternsChecked = []; + for (let i = 0; i < moldPatterns.length; i++) { + for (let j = i + 1; j < moldPatterns.length; j++) { + + let a = moldPatterns[i]; + let b = moldPatterns[j]; + let shareCast = a.genCast && b.genCast; + let shareExtrude = a.genExtrude && b.genExtrude; + + if (shareCast || shareExtrude) { + if (patternsEqual(a.pattern, b.pattern) || patternsMirrorEqual(a.pattern, b.pattern)) { + patternsChecked.push({a: a.name, b: b.name}); + }; + }; + }; + }; + if (patternsChecked.length !== 0) { + throw new Error( + `Duplicate artisan table mold patterns detected between: ${patternsChecked.map(pair => `\n${pair.a} and ${pair.b}`).join(', ')}` + ); + }; + + // Create Artisan Table recipes for molds. + moldPatterns.forEach((mold) => { + if (mold.genCast){ + event.custom({ + "result": {"item": `${mold.name}_casting_mold`}, + "pattern": mold.pattern, + "artisanType": "tfg:casting_mold", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/${linuxUnfucker(mold.name)}_casting_mold`); + }; + if (mold.genExtrude){ + event.custom({ + "result": {"item": `${mold.name}_extruder_mold`}, + "pattern": mold.pattern, + "artisanType": "tfg:extruder_mold", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/${linuxUnfucker(mold.name)}_extruder_mold`); + }; + }); + + //#endregion + + //#region Circuits + + event.custom({ + "result": {"item": "gtceu:resin_printed_circuit_board"}, + "pattern": [ + "X XXXX", + " XX X", + "X X X", + "X XX X", + " XXX X", + "XXX X" + ], + "artisanType": "tfg:resin_board", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/resin_printed_circuit_board`); + + event.custom({ + "result": {"item": "gtceu:resin_printed_circuit_board", "count": 4}, + "pattern": [ + "X XXXX", + " XX X", + "X X X", + "X XX X", + " XXX X", + "XXX X" + ], + "artisanType": "tfg:resin_board_4x", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/resin_printed_circuit_board_4x`); + + event.custom({ + "result": {"item": "gtceu:phenolic_printed_circuit_board"}, + "pattern": [ + "X XX ", + " XXXX ", + "XX X ", + "XX XXX", + "XX XX ", + " XX " + ], + "artisanType": "tfg:phenolic_board", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/phenolic_printed_circuit_board`); + + event.custom({ + "result": {"item": "gtceu:phenolic_printed_circuit_board", "count": 4}, + "pattern": [ + "X XX ", + " XXXX ", + "XX X ", + "XX XXX", + "XX XX ", + " XX " + ], + "artisanType": "tfg:phenolic_board_4x", + "type": "tfg:artisan" + }).id(`tfg:artisan_table/phenolic_printed_circuit_board_4x`); + //#endregion + + +} diff --git a/kubejs/server_scripts/tfg/primitive/tags.primitive.js b/kubejs/server_scripts/tfg/primitive/tags.primitive.js index 092078b9c..54f10a270 100644 --- a/kubejs/server_scripts/tfg/primitive/tags.primitive.js +++ b/kubejs/server_scripts/tfg/primitive/tags.primitive.js @@ -72,6 +72,20 @@ function registerTFGPrimitiveItemTags(event) { event.add('forge:string', 'tfg:phantom_thread') event.add('forge:string', 'tfg:polycaprolactam_string') event.add('forge:string', 'firmalife:pineapple_yarn') + + // Artisan Table + event.add('tfg:artisan_table_inputs', 'gtceu:empty_mold') + event.add('tfg:artisan_table_inputs', 'gtceu:resin_circuit_board') + event.add('tfg:artisan_table_inputs', 'gtceu:copper_single_wire') + event.add('tfg:artisan_table_inputs', 'gtceu:copper_quadruple_wire') + event.add('tfg:artisan_table_inputs', 'gtceu:phenolic_circuit_board') + event.add('tfg:artisan_table_inputs', 'gtceu:silver_single_wire') + event.add('tfg:artisan_table_inputs', 'gtceu:silver_quadruple_wire') + event.add('tfg:artisan_table_tools', '#forge:tools/hammers') + event.add('tfg:artisan_table_tools', '#forge:tools/mallets') + event.add('tfg:artisan_table_tools', '#forge:tools/files') + event.add('tfg:artisan_table_tools', '#forge:tools/wire_cutters') + event.add('tfg:artisan_table_tools', '#forge:tools/screwdrivers') } function registerTFGPrimitiveBlockTags(event) { @@ -90,8 +104,7 @@ function registerTFGPrimitiveBlockTags(event) { function registerTFGPrimitiveFluidTags(event) { forEachMaterial(material => { let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY) - if (tfcProperty === null || !material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) - return; + if (tfcProperty === null || !material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) return; if (!ChemicalHelper.get(TagPrefix.gearSmall, material, 1).isEmpty()) { event.add('tfg:usable_in_small_gear_mold', material.getFluid().getFluidType().toString()) diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 925a225b1..3366ed27d 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -49,6 +49,7 @@ const registerTFGRecipes = (event) => { registerTFGClayRecipes(event) registerTFGEquipmentRecipes(event) registerTFGDyeRecipes(event) + registerTFGArtisanTableRecipes(event) registerTFGCasingRecipes(event) registerTFGEnderPearlRecipes(event) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 5392b40ab..ad5bc65a4 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -177,4 +177,5 @@ function registerTFGMiscellaneousRecipes(event) { .duration(5*20) .EUt(GTValues.VA[GTValues.LV]) .addMaterialInfo(true); + } diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 119a5b49b..a1c988e5f 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -46,6 +46,7 @@ const registerTFGItemTags = (event) => { event.add('tfg:empty_dna_syringes', 'tfg:clean_dna_syringe') event.add('tfc:sewing_needles', 'tfg:stainless_steel_needle') + //#endregion // Airplane Upgrades From d84e79abb097f47e33f7446d62654c94d96c164c Mon Sep 17 00:00:00 2001 From: Yan <115050813@qq.com> Date: Mon, 26 Jan 2026 10:39:04 +0800 Subject: [PATCH 41/66] Update zh_cn lang for patchouli book (#2861) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: update zh_cn translation for new drinkings * feat: update zh_cn lang for patchouli book --------- Co-authored-by: 闫茂源 --- .../field_guide/zh_cn/entries/beneath/piglins.json | 2 +- .../field_guide/zh_cn/entries/mechanics/bloomery.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/piglins.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/piglins.json index a29717042..de7c4663d 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/piglins.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/piglins.json @@ -27,7 +27,7 @@ { "type": "patchouli:text", "title": "堡垒遗迹", - "text": "掠夺一个 $(thing)堡垒遗迹$() 可能危险，但回报也很丰厚！你能获得如下物品：$(li)金、玫瑰金、生铁、黑青铜和银锭$(li)黑青铜武器、工具和护甲$(li)高岭土和石墨$(li)永久光源$(li)布料、皮革、种子和食物$(li)以及其他宝藏！" + "text": "掠夺一个 $(thing)堡垒遗迹$() 可能危险，但回报也很丰厚！你能获得如下物品：$(li)金、玫瑰金、生铁、黑青铜和银锭$(li)黑青铜武器、工具和护甲$(li)高岭土和石墨$(li)灯笼$(li)、布料、皮革、种子和食物$(li)以及其他宝藏！" }, { "type": "patchouli:spotlight", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json index 7d6c41d3c..9cda74328 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/bloomery.json @@ -6,7 +6,7 @@ "pages": [ { "type": "patchouli:text", - "text": "$(thing)锻铁炉$()是一种能将$(thing)铁矿$()烧炼成$(thing)生铁方坯$()的装置。生铁方坯可进一步锻造成$(thing)锻铁$()。$(l:the_world/ores_and_minerals#hematite)赤铁矿$()、$(l:the_world/ores_and_minerals#limonite)褐铁矿$()和$(l:the_world/ores_and_minerals#magnetite)磁铁矿$()均含铁。直接熔化这些矿石只会得到无用的$(thing)铸铁$()而非$(thing)锻铁$()。另外，所有含铁物品熔化时都只会变成铸铁。锻铁炉是把铸铁变为锻铁的唯一方法。锻铁炉接受任何含铁物品，包括铁矿石或铸铁锭。" + "text": "$(thing)锻铁炉$()是一种用于将$(thing)铁矿$()烧炼成$(thing)生铁方坯$()的装置，生铁方坯可被进一步加工成$(thing)锻铁$()。常见的铁矿包括$(l:tfg_ores/earth_vein_index#normal_hematite)赤铁矿$()、$(l:tfg_ores/earth_vein_index#normal_limonite)褐铁矿$()和$(l:tfg_ores/earth_vein_index#normal_magnetite)磁铁矿$()。这些矿石直接熔化只会得到$(thing)铸铁$()，而非$(thing)锻铁$()。实际上，所有含铁物品熔化后都只会变成铸铁。若要将它们转化为可用的锻铁，就需要使用锻铁炉。任何含铁物品都可用于锻铁炉，包括铁制工具和铸铁锭！" }, { "type": "patchouli:crafting", @@ -22,19 +22,19 @@ }, { "type": "patchouli:text", - "text": "锻铁炉最多可容纳 48 个 $(thing)输入项$()，每层烟囱最多放16件物品。可通过堆叠额外的石头来加高至多两层烟囱，每层额外的烟囱可以多容纳16件物品。$(br2)要向锻铁炉中加入物品，只需将物品从烟囱顶部投入烟囱中即可。如果烟囱中出现灰色物质就说明成功了。" + "text": "锻铁炉最多可容纳 48 个 $(thing)输入项$()，每层烟囱最多放16件物品。可通过堆叠额外的石头来加高至多两层烟囱，每层额外的烟囱可以多容纳16件物品。$(br2)向锻铁炉添加物品时，请攀至烟囱顶部并将物品投入其中。若观察到内部形成灰色的矿石堆，即表示投放成功。$(br2)你可以使用$(item)木炭$()或$(item)煤炭$()作为锻铁炉的燃料。" }, { "type": "patchouli:image", "images": [ "tfc:textures/gui/book/tutorial/bloomery_hole.png" ], - "text": "将物品添加到锻铁炉中。", + "text": "每生产一块$(thing)生铁方坯$()，锻铁炉需要消耗$(thing)1份燃料$()和$(thing)144mB铸铁$()。", "border": true }, { "type": "patchouli:text", - "text": "锻铁炉会将每$(thing)1份木炭$()和$(thing)144mB铸铁$()转化成一块$(thing)方坯$()。在投入所需的$(thing)木炭$()和$(thing)矿石$()后，点燃锻铁炉方块并等上 15 小时。锻铁炉熄灭后会留下许多方坯方块。用镐反复挖掘$(thing)方坯$()便能得到$(thing)生铁方坯$()。" + "text": "若你不想费心计算配比，我们推荐使用$(item)25份金属矿粉$()和$(item)22份燃料$()的组合。在投入所需的$(thing)燃料$()和$(thing)矿石$()后，点燃锻铁炉方块并等上 15 小时。锻铁炉熄灭后会留下许多方坯方块。用镐反复挖掘$(thing)方坯$()便能得到$(thing)生铁方坯$()。" }, { "type": "patchouli:multiblock", From 809bca72cf7aa9ea64d396b4bb001a2e9002f166 Mon Sep 17 00:00:00 2001 From: Redeix Date: Sun, 25 Jan 2026 20:52:47 -0600 Subject: [PATCH 42/66] fix render type and changelog --- CHANGELOG.md | 1 + kubejs/assets/tfg/models/block/artisan_table.json | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aee86aa42..98d84cca7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added much more music to the different dimensions @Pyritie - Vanadium magnetite is now usable as an iron ore for TFC purposes (#2834) @Pyritie - Added steam alloy smelter glass batch recipes (#2853) @Pyritie +- Added the Artisan Table to "knap" GT molds and circuits. @BlueBoat29 @Redeix ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie diff --git a/kubejs/assets/tfg/models/block/artisan_table.json b/kubejs/assets/tfg/models/block/artisan_table.json index 5219925d6..c1b27c983 100644 --- a/kubejs/assets/tfg/models/block/artisan_table.json +++ b/kubejs/assets/tfg/models/block/artisan_table.json @@ -2,6 +2,7 @@ "format_version": "1.9.0", "credit": "Made with Blockbench", "texture_size": [32, 32], + "render_type": "minecraft:cutout", "textures": { "0": "tfg:block/artisan_table", "particle": "#0" From 25dae7eadaa528af1c8455a910f9841386266c42 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 26 Jan 2026 03:55:21 +0000 Subject: [PATCH 43/66] langs and emi --- kubejs/assets/ad_astra/lang/es_es.json | 169 ++++++++++++++++++ .../category/properties/ae2_condenser.json | 2 +- .../properties/ae2_item_transformation.json | 2 +- .../properties/ae2_p2p_attunement.json | 2 +- .../emi/category/properties/afc_tree_tap.json | 2 +- .../category/properties/create_deploying.json | 2 +- .../category/properties/create_draining.json | 2 +- .../properties/create_item_application.json | 2 +- .../create_sandpaper_polishing.json | 2 +- .../properties/create_sequenced_assembly.json | 2 +- .../properties/create_spout_filling.json | 2 +- .../properties/createaddition_rolling.json | 2 +- .../properties/deafission_component_fr.json | 2 +- .../deafission_fission_component.json | 2 +- .../deafission_fission_reactor_coolant.json | 2 +- .../deafission_fission_reactor_fuel.json | 2 +- ...deafission_fission_reactor_processing.json | 2 +- .../diggerhelmet_helmet_repair.json | 2 +- .../domum_ornamentum_architects_cutter.json | 2 +- .../emi/category/properties/emi_info.json | 2 +- .../emi/category/properties/emi_tag.json | 2 +- .../exposure_photograph_printing.json | 2 +- .../exposure_photograph_stacking.json | 2 +- .../properties/firmalife_bowl_pot.json | 2 +- .../category/properties/firmalife_drying.json | 2 +- .../properties/firmalife_mixing_bowl.json | 2 +- .../category/properties/firmalife_oven.json | 2 +- .../properties/firmalife_smoking.json | 2 +- .../properties/firmalife_stomping.json | 2 +- .../category/properties/firmalife_vat.json | 2 +- .../properties/framedblocks_framing_saw.json | 2 +- .../properties/greate_automatic_packing.json | 2 +- .../properties/greate_automatic_shaped.json | 2 +- .../greate_automatic_shapeless.json | 2 +- .../properties/greate_block_cutting.json | 2 +- .../category/properties/greate_crushing.json | 2 +- .../properties/greate_fan_washing.json | 2 +- .../category/properties/greate_milling.json | 2 +- .../category/properties/greate_mixing.json | 2 +- .../category/properties/greate_packing.json | 2 +- .../category/properties/greate_pressing.json | 2 +- .../category/properties/greate_sawing.json | 2 +- .../properties/gtceu_air_scrubber.json | 2 +- .../properties/gtceu_alloy_blast_smelter.json | 2 +- .../properties/gtceu_alloy_smelter.json | 2 +- .../properties/gtceu_aqueous_accumulator.json | 2 +- .../properties/gtceu_arc_furnace.json | 2 +- .../gtceu_arc_furnace_recycling.json | 2 +- .../category/properties/gtceu_assembler.json | 2 +- .../properties/gtceu_assembly_line.json | 2 +- .../category/properties/gtceu_autoclave.json | 2 +- .../emi/category/properties/gtceu_bender.json | 2 +- .../category/properties/gtceu_bioreactor.json | 2 +- .../category/properties/gtceu_brewery.json | 2 +- .../emi/category/properties/gtceu_canner.json | 2 +- .../category/properties/gtceu_centrifuge.json | 2 +- .../category/properties/gtceu_chem_dyes.json | 2 +- .../properties/gtceu_chemical_bath.json | 2 +- .../properties/gtceu_chemical_reactor.json | 2 +- .../properties/gtceu_circuit_assembler.json | 2 +- .../gtceu_coal_liquefaction_tower.json | 2 +- .../category/properties/gtceu_coke_oven.json | 2 +- .../gtceu_combustion_generator.json | 2 +- .../category/properties/gtceu_compressor.json | 2 +- .../category/properties/gtceu_cracker.json | 2 +- .../emi/category/properties/gtceu_cutter.json | 2 +- .../properties/gtceu_distillation_tower.json | 2 +- .../category/properties/gtceu_distillery.json | 2 +- .../gtceu_electric_blast_furnace.json | 2 +- .../properties/gtceu_electrolyzer.json | 2 +- .../gtceu_electromagnetic_separator.json | 2 +- .../properties/gtceu_evaporation_tower.json | 2 +- .../category/properties/gtceu_extractor.json | 2 +- .../properties/gtceu_extractor_recycling.json | 2 +- .../category/properties/gtceu_extruder.json | 2 +- .../category/properties/gtceu_fermenter.json | 2 +- .../properties/gtceu_fission_reactor.json | 2 +- .../properties/gtceu_fluid_heater.json | 2 +- .../properties/gtceu_fluid_solidifier.json | 2 +- .../category/properties/gtceu_food_oven.json | 2 +- .../properties/gtceu_food_processor.json | 2 +- .../properties/gtceu_forge_hammer.json | 2 +- .../properties/gtceu_forming_press.json | 2 +- .../properties/gtceu_fusion_reactor.json | 2 +- .../properties/gtceu_gas_collector.json | 2 +- .../properties/gtceu_gas_pressurizer.json | 2 +- .../properties/gtceu_gas_turbine.json | 2 +- .../category/properties/gtceu_greenhouse.json | 2 +- .../properties/gtceu_heat_exchanger.json | 2 +- .../gtceu_hydroponics_facility.json | 2 +- .../gtceu_implosion_compressor.json | 2 +- .../properties/gtceu_ingot_molding.json | 2 +- .../properties/gtceu_large_boiler.json | 2 +- .../gtceu_large_chemical_reactor.json | 2 +- .../properties/gtceu_large_solar_panel.json | 2 +- .../gtceu_large_solar_panel_tier2.json | 2 +- .../gtceu_large_solar_panel_tier3.json | 2 +- .../properties/gtceu_laser_engraver.json | 2 +- .../emi/category/properties/gtceu_lathe.json | 2 +- .../category/properties/gtceu_macerator.json | 2 +- .../properties/gtceu_macerator_recycling.json | 2 +- .../emi/category/properties/gtceu_mixer.json | 2 +- .../properties/gtceu_moon_dust_harvester.json | 2 +- .../gtceu_nuclear_fuel_factory.json | 2 +- .../properties/gtceu_nuclear_turbine.json | 2 +- .../properties/gtceu_ore_bathing.json | 2 +- .../properties/gtceu_ore_crushing.json | 2 +- .../properties/gtceu_ore_forging.json | 2 +- .../category/properties/gtceu_ore_washer.json | 2 +- .../properties/gtceu_ostrum_harvester.json | 2 +- .../gtceu_ostrum_linear_accelerator.json | 2 +- .../emi/category/properties/gtceu_packer.json | 2 +- .../gtceu_pisciculture_fishery.json | 2 +- .../properties/gtceu_plasma_generator.json | 2 +- .../category/properties/gtceu_polarizer.json | 2 +- .../properties/gtceu_programmed_circuit.json | 2 +- .../properties/gtceu_pyrolyse_oven.json | 2 +- .../properties/gtceu_research_station.json | 2 +- .../properties/gtceu_rock_breaker.json | 2 +- .../category/properties/gtceu_scanner.json | 2 +- .../emi/category/properties/gtceu_sifter.json | 2 +- .../properties/gtceu_steam_bloomery.json | 2 +- .../properties/gtceu_steam_boiler.json | 2 +- .../properties/gtceu_steam_turbine.json | 2 +- .../properties/gtceu_thermal_centrifuge.json | 2 +- .../properties/gtceu_vacuum_freezer.json | 2 +- .../properties/gtceu_wire_coating.json | 2 +- .../category/properties/gtceu_wiremill.json | 2 +- .../properties/minecraft_smelting.json | 2 +- .../properties/minecraft_smithing.json | 2 +- .../properties/minecraft_stonecutting.json | 2 +- .../category/properties/rnr_block_mod.json | 2 +- .../emi/category/properties/rnr_mattock.json | 2 +- .../properties/tacz_attachment_query.json | 2 +- .../properties/taczammoquery_ammo_query.json | 2 +- .../emi/category/properties/tfc_alloying.json | 2 +- .../emi/category/properties/tfc_anvil.json | 2 +- .../properties/tfc_blast_furnace.json | 2 +- .../emi/category/properties/tfc_bloomery.json | 2 +- .../emi/category/properties/tfc_casting.json | 2 +- .../emi/category/properties/tfc_chisel.json | 2 +- .../category/properties/tfc_glassworking.json | 2 +- .../emi/category/properties/tfc_heating.json | 2 +- .../properties/tfc_instant_barrel.json | 2 +- .../properties/tfc_instant_fluid_barrel.json | 2 +- .../emi/category/properties/tfc_jam_pot.json | 2 +- .../emi/category/properties/tfc_loom.json | 2 +- .../emi/category/properties/tfc_quern.json | 2 +- .../emi/category/properties/tfc_scraping.json | 2 +- .../properties/tfc_sealed_barrel.json | 2 +- .../emi/category/properties/tfc_sewing.json | 2 +- .../category/properties/tfc_simple_pot.json | 2 +- .../emi/category/properties/tfc_soup_pot.json | 2 +- .../emi/category/properties/tfc_welding.json | 2 +- .../properties/tfg_artisan_table.json | 1 + .../category/properties/tfg_blaze_burner.json | 2 +- .../properties/tfg_block_interaction.json | 2 +- .../vintageimprovements_centrifugation.json | 2 +- .../vintageimprovements_coiling.json | 2 +- .../vintageimprovements_curving.json | 2 +- ...rovements_grinder_sandpaper_polishing.json | 2 +- .../vintageimprovements_hammering.json | 2 +- .../vintageimprovements_laser_cutting.json | 2 +- .../vintageimprovements_polishing.json | 2 +- .../vintageimprovements_pressurizing.json | 2 +- .../vintageimprovements_vacuumizing.json | 2 +- .../vintageimprovements_vibrating.json | 2 +- kubejs/assets/tfchotornot/lang/zh_cn.json | 4 +- kubejs/assets/tfg/lang/en_us.json | 11 +- kubejs/assets/tfg/lang/zh_cn.json | 10 +- 170 files changed, 354 insertions(+), 171 deletions(-) create mode 100644 kubejs/assets/ad_astra/lang/es_es.json create mode 100644 kubejs/assets/emi/category/properties/tfg_artisan_table.json diff --git a/kubejs/assets/ad_astra/lang/es_es.json b/kubejs/assets/ad_astra/lang/es_es.json new file mode 100644 index 000000000..5ec62777e --- /dev/null +++ b/kubejs/assets/ad_astra/lang/es_es.json @@ -0,0 +1,169 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.ad_astra.oxygen_distributor": "Distribuidor de aire respirable", + "block.ad_astra.infernal_spire_block": "Chapitel infernal", + "block.ad_astra.moon_sand": "Arena Lunar", + "block.ad_astra.moon_stone": "Anortosita en bruto", + "block.ad_astra.moon_cobblestone": "Roca de anortosita", + "block.ad_astra.moon_cobblestone_slab": "Losa de roca de anortosita", + "block.ad_astra.moon_cobblestone_stairs": "Escaleras de roca de anortosita", + "block.ad_astra.moon_pillar": "Pilar de anortosita", + "block.ad_astra.moon_stone_brick_slab": "Losa de ladrillos de anortosita", + "block.ad_astra.moon_stone_brick_stairs": "Escaleras de ladrillos de anortosita", + "block.ad_astra.moon_stone_brick_wall": "Muro de ladrillos de anortosita", + "block.ad_astra.moon_stone_bricks": "Ladrillos de anortosita", + "block.ad_astra.moon_stone_slab": "Losa de anortosita en bruto", + "block.ad_astra.moon_stone_stairs": "Escaleras de anortosita en bruto", + "block.ad_astra.chiseled_moon_stone_bricks": "Ladrillos de anortosita cincelados", + "block.ad_astra.chiseled_moon_stone_slab": "Losa de ladrillos de anortosita cincelados", + "block.ad_astra.chiseled_moon_stone_stairs": "Escaleras de ladrillos de anortosita cincelados", + "block.ad_astra.cracked_moon_stone_bricks": "Ladrillos de anortosita agrietados", + "block.ad_astra.polished_moon_stone": "Anortosita pulida", + "block.ad_astra.polished_moon_stone_slab": "Losa de anortosita pulida", + "block.ad_astra.polished_moon_stone_stairs": "Escaleras de anortosita pulida", + "block.ad_astra.sky_stone": "Meteorito", + "block.ad_astra.moon_deepslate": "Norita en bruto", + "block.ad_astra.cheese_block": "Bloque de queso lunar", + "block.ad_astra.moon_cheese_ore": "Mena de queso de anortosita", + "block.ad_astra.glacian_log": "Tallo glacial", + "block.ad_astra.stripped_glacian_log": "Tallo glacial sin corteza", + "block.ad_astra.glacian_leaves": "Lamella glacial", + "block.ad_astra.mars_sand": "Arena de argilita", + "block.ad_astra.mars_stone": "Argilita en bruto", + "block.ad_astra.mars_cobblestone": "Roca de argilita", + "block.ad_astra.mars_cobblestone_slab": "Losa de roca de argilita", + "block.ad_astra.mars_cobblestone_stairs": "Escaleras de roca de argilita", + "block.ad_astra.mars_pillar": "Pilar de argilita", + "block.ad_astra.mars_stone_brick_slab": "Losa de ladrillos de argilita", + "block.ad_astra.mars_stone_brick_stairs": "Escaleras de ladrillos de argilita", + "block.ad_astra.mars_stone_brick_wall": "Muro de ladrillos de argilita", + "block.ad_astra.mars_stone_bricks": "Ladrillos de argilita", + "block.ad_astra.mars_stone_slab": "Losa de argilita en bruto", + "block.ad_astra.mars_stone_stairs": "Escaleras de argilita en bruto", + "block.ad_astra.chiseled_mars_stone_bricks": "Ladrillos de argilita cincelados", + "block.ad_astra.chiseled_mars_stone_slab": "Losa de argilita cincelada", + "block.ad_astra.chiseled_mars_stone_stairs": "Escaleras de argilita cincelada", + "block.ad_astra.cracked_mars_stone_bricks": "Ladrillos de argilita agrietados", + "block.ad_astra.polished_mars_stone": "Argilita pulida", + "block.ad_astra.polished_mars_stone_slab": "Losa de argilita pulida", + "block.ad_astra.polished_mars_stone_stairs": "Escaleras de argilita pulida", + "block.ad_astra.conglomerate": "Roca de cubierta de meseta", + "block.ad_astra.polished_conglomerate": "Roca de cubierta de meseta pulida", + "block.ad_astra.venus_sand": "Arena de traquita", + "block.ad_astra.venus_stone": "Traquita en bruto", + "block.ad_astra.venus_cobblestone": "Roca de traquita", + "block.ad_astra.venus_cobblestone_slab": "Losa de roca de traquita", + "block.ad_astra.venus_cobblestone_stairs": "Escaleras de roca de traquita", + "block.ad_astra.venus_pillar": "Pilar de traquita", + "block.ad_astra.venus_stone_brick_slab": "Losa de ladrillos de traquita", + "block.ad_astra.venus_stone_brick_stairs": "Escaleras de ladrillos de traquita", + "block.ad_astra.venus_stone_brick_wall": "Muro de ladrillos de traquita", + "block.ad_astra.venus_stone_bricks": "Ladrillos de traquita", + "block.ad_astra.venus_stone_slab": "Losa de traquita en bruto", + "block.ad_astra.venus_stone_stairs": "Escaleras de traquita en bruto", + "block.ad_astra.chiseled_venus_stone_bricks": "Ladrillos de traquita cincelados", + "block.ad_astra.chiseled_venus_stone_slab": "Losa de traquita cincelada", + "block.ad_astra.chiseled_venus_stone_stairs": "Escaleras de traquita cinceladas", + "block.ad_astra.cracked_venus_stone_bricks": "Ladrillos de traquita agrietados", + "block.ad_astra.polished_venus_stone": "Traquita pulida", + "block.ad_astra.polished_venus_stone_slab": "Losa de traquita pulida", + "block.ad_astra.polished_venus_stone_stairs": "Escaleras de traquita pulidas", + "block.ad_astra.venus_sandstone": "Arenisca de traquita", + "block.ad_astra.venus_sandstone_bricks": "Ladrillos de arenisca de traquita", + "block.ad_astra.venus_sandstone_brick_slab": "Losa de ladrillos de arenisca de traquita", + "block.ad_astra.venus_sandstone_brick_stairs": "Escaleras de ladrillos de arenisca de traquita", + "block.ad_astra.cracked_venus_sandstone_bricks": "Ladrillos de arenisca de traquita agrietados", + "block.ad_astra.mercury_stone": "Komatita en bruto", + "block.ad_astra.mercury_cobblestone": "Roca de komatita", + "block.ad_astra.mercury_cobblestone_slab": "Losa de roca de komatita", + "block.ad_astra.mercury_cobblestone_stairs": "Escaleras de roca de komatita", + "block.ad_astra.mercury_pillar": "Pilar de komatita", + "block.ad_astra.mercury_stone_brick_slab": "Losa de ladrillos de komatita", + "block.ad_astra.mercury_stone_brick_stairs": "Escaleras de ladrillos de komatita", + "block.ad_astra.mercury_stone_brick_wall": "Muro de ladrillos de komatita", + "block.ad_astra.mercury_stone_bricks": "Ladrillos de komatita", + "block.ad_astra.mercury_stone_slab": "Losa de komatita en bruto", + "block.ad_astra.mercury_stone_stairs": "Escaleras de komatita en bruto", + "block.ad_astra.chiseled_mercury_stone_bricks": "Ladrillos de komatita cincelados", + "block.ad_astra.chiseled_mercury_stone_slab": "Losa de komatita cincelados", + "block.ad_astra.chiseled_mercury_stone_stairs": "Escaleras de komatita cinceladas", + "block.ad_astra.cracked_mercury_stone_bricks": "Ladrillos de komatita agrietados", + "block.ad_astra.polished_mercury_stone": "Komatita pulida", + "block.ad_astra.polished_mercury_stone_slab": "Losa de komatita pulida", + "block.ad_astra.polished_mercury_stone_stairs": "Escaleras de komatita pulidas", + "block.ad_astra.glacio_stone": "Fonolita en bruto", + "block.ad_astra.glacio_cobblestone": "Roca de fonolita", + "block.ad_astra.glacio_cobblestone_slab": "Losa de roca de fonolita", + "block.ad_astra.glacio_cobblestone_stairs": "Escaleras de roca de fonolita", + "block.ad_astra.glacio_pillar": "Pilar de fonolita", + "block.ad_astra.glacio_stone_brick_slab": "Losa de ladrillos de fonolita", + "block.ad_astra.glacio_stone_brick_stairs": "Escaleras de ladrillos de fonolita", + "block.ad_astra.glacio_stone_brick_wall": "Muro de ladrillos de fonolita", + "block.ad_astra.glacio_stone_bricks": "Ladrillos de fonolita", + "block.ad_astra.glacio_stone_slab": "Losa de fonolita en bruto", + "block.ad_astra.glacio_stone_stairs": "Escaleras de fonolita en bruto", + "block.ad_astra.chiseled_glacio_stone_bricks": "Ladrillos de fonolita cincelados", + "block.ad_astra.chiseled_glacio_stone_slab": "Losa de fonolita cincelada", + "block.ad_astra.chiseled_glacio_stone_stairs": "Escaleras de fonolita cinceladas", + "block.ad_astra.cracked_glacio_stone_bricks": "Ladrillos de fonolita agrietados", + "block.ad_astra.polished_glacio_stone": "Fonolita pulida", + "block.ad_astra.polished_glacio_stone_slab": "Losa de fonolita pulida", + "block.ad_astra.polished_glacio_stone_stairs": "Escaleras de fonolita pulida", + "block.ad_astra.glacio_globe": "Globo de Europa", + "entity.ad_astra.corrupted_lunarian": "Zombi lunar", + "entity.ad_astra.martian_raptor": "Ave de presa esquelética", + "entity.ad_astra.tier_1_rocket": "Cohete de R-Aluminacero", + "entity.ad_astra.tier_2_rocket": "Cohete de titanio ASM 4914", + "entity.ad_astra.tier_3_rocket": "Cohete de acero de tungsteno 45-Ti", + "entity.ad_astra.tier_1_rover": "Astromóvil", + "fluid_type.ad_astra.oxygen": "Aire respirable", + "item.ad_astra.steel_cable": "Cable RF básico", + "item.ad_astra.desh_cable": "Cable RF avanzado", + "item.ad_astra.tier_1_rocket": "Cohete de R-Aluminacero", + "item.ad_astra.tier_2_rocket": "Cohete de titanio ASM 4914", + "item.ad_astra.tier_3_rocket": "Cohete de acero de tungsteno 45-Ti", + "item.ad_astra.oxygen_bucket": "Cubo con aire respirable", + "item.ad_astra.tier_1_rover": "Astromóvil", + "item.ad_astra.photovoltaic_etrium_cell": "Celda fotovoltáica avanzada", + "item.ad_astra.photovoltaic_vesnium_cell": "Celda fotovoltáica de energium", + "item.ad_astra.ostrum_tank": "Ostrum Booster Tank", + "item.ad_astra.steel_engine": "Motor de cohete de acero", + "item.ad_astra.desh_engine": "Motor de cohete de desh", + "item.ad_astra.ostrum_engine": "Motor de cohete de ostrum", + "item.ad_astra.netherite_space_helmet": "§bCasco espacial de acero de tungsteno", + "item.ad_astra.netherite_space_suit": "§bTraje espacial de acero de tungsteno", + "item.ad_astra.netherite_space_pants": "§bPantalones espaciales de acero de tungsteno", + "item.ad_astra.netherite_space_boots": "§bBotas espaciales de acero de tungsteno", + "item.ad_astra.cheese": "Queso lunar", + "dimension.ad_astra.glacio": "Europa", + "dimension.ad_astra.glacio_orbit": "Órbita de Europa", + "painting.ad_astra.glacio.title": "Europa", + "planet.ad_astra.glacio": "Europa", + "planet.ad_astra.glacio_orbit": "Órbita de Europa", + "tagprefix.moon_stone": "Mena de %s de anortosita", + "tagprefix.moon_deepslate": "Mena de %s de norita", + "tagprefix.mars_stone": "Mena de %s de argilita", + "tagprefix.venus_stone": "Mena de %s de traquita", + "tagprefix.mercury_stone": "Mena de %s de komatita", + "tagprefix.glacio_stone": "Mena de %s de fonolita", + "info.ad_astra.solar_panel": "Genera energía solar durante el día. La energía generada es dependiente del planeta.", + "tooltip.ad_astra.energy": "%s FE / %s FE", + "tooltip.ad_astra.energy_generation_per_tick": "Genera %s FE por tick", + "tooltip.ad_astra.energy_in": "Entrada: %s FE/t", + "tooltip.ad_astra.energy_out": "Salida: %s FE/t", + "tooltip.ad_astra.energy_per_tick": "%s FE/t", + "tooltip.ad_astra.energy_transfer_tick": "Transferencia: %s FE/t", + "tooltip.ad_astra.energy_use_per_tick": "Usa %s FE por tick", + "tooltip.ad_astra.max_energy_in": "Entrada máxima: %s FE/t", + "tooltip.ad_astra.max_energy_out": "Salida máxima: %s FE/t", + "tooltip.ad_astra.max_generation": "Máximo: %s FE/t", + "tooltip.ad_astra.max_fluid_in": "Entrada máxima: %s mB/t", + "tooltip.ad_astra.max_fluid_out": "Salida máxima: %s mB/t", + "tooltip.ad_astra.fluid": "%s mB / %s mB %s", + "tooltip.ad_astra.fluid_generation_per_iteration": "Genera %s mB por iteración", + "tooltip.ad_astra.fluid_in": "Entrada: %s mB/t", + "tooltip.ad_astra.fluid_out": "Salida: %s mB/t", + "tooltip.ad_astra.fluid_per_tick": "%s mB/t", + "tooltip.ad_astra.fluid_transfer_tick": "Transferencia: %s mB/t", + "tooltip.ad_astra.fluid_use_per_iteration": "Usa %s mB por iteración" +} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_condenser.json b/kubejs/assets/emi/category/properties/ae2_condenser.json index e5989a692..6b95888a8 100644 --- a/kubejs/assets/emi/category/properties/ae2_condenser.json +++ b/kubejs/assets/emi/category/properties/ae2_condenser.json @@ -1 +1 @@ -{"ae2:condenser":{"order":158}} \ No newline at end of file +{"ae2:condenser":{"order":159}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_item_transformation.json b/kubejs/assets/emi/category/properties/ae2_item_transformation.json index c3db93797..b43191b1e 100644 --- a/kubejs/assets/emi/category/properties/ae2_item_transformation.json +++ b/kubejs/assets/emi/category/properties/ae2_item_transformation.json @@ -1 +1 @@ -{"ae2:item_transformation":{"order":49}} \ No newline at end of file +{"ae2:item_transformation":{"order":50}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_p2p_attunement.json b/kubejs/assets/emi/category/properties/ae2_p2p_attunement.json index bd9501a4b..067e17ad4 100644 --- a/kubejs/assets/emi/category/properties/ae2_p2p_attunement.json +++ b/kubejs/assets/emi/category/properties/ae2_p2p_attunement.json @@ -1 +1 @@ -{"ae2:p2p_attunement":{"order":170}} \ No newline at end of file +{"ae2:p2p_attunement":{"order":171}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/afc_tree_tap.json b/kubejs/assets/emi/category/properties/afc_tree_tap.json index b74daf269..06826601c 100644 --- a/kubejs/assets/emi/category/properties/afc_tree_tap.json +++ b/kubejs/assets/emi/category/properties/afc_tree_tap.json @@ -1 +1 @@ -{"afc:tree_tap":{"order":29}} \ No newline at end of file +{"afc:tree_tap":{"order":30}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_deploying.json b/kubejs/assets/emi/category/properties/create_deploying.json index b87208177..dad06c61b 100644 --- a/kubejs/assets/emi/category/properties/create_deploying.json +++ b/kubejs/assets/emi/category/properties/create_deploying.json @@ -1 +1 @@ -{"create:deploying":{"order":52}} \ No newline at end of file +{"create:deploying":{"order":53}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_draining.json b/kubejs/assets/emi/category/properties/create_draining.json index ee5f9237c..89073cb93 100644 --- a/kubejs/assets/emi/category/properties/create_draining.json +++ b/kubejs/assets/emi/category/properties/create_draining.json @@ -1 +1 @@ -{"create:draining":{"order":173}} \ No newline at end of file +{"create:draining":{"order":174}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_item_application.json b/kubejs/assets/emi/category/properties/create_item_application.json index bbbc8bb09..b818d965b 100644 --- a/kubejs/assets/emi/category/properties/create_item_application.json +++ b/kubejs/assets/emi/category/properties/create_item_application.json @@ -1 +1 @@ -{"create:item_application":{"order":53}} \ No newline at end of file +{"create:item_application":{"order":54}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_sandpaper_polishing.json b/kubejs/assets/emi/category/properties/create_sandpaper_polishing.json index 345f16be3..ae6ea0d54 100644 --- a/kubejs/assets/emi/category/properties/create_sandpaper_polishing.json +++ b/kubejs/assets/emi/category/properties/create_sandpaper_polishing.json @@ -1 +1 @@ -{"create:sandpaper_polishing":{"order":50}} \ No newline at end of file +{"create:sandpaper_polishing":{"order":51}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_sequenced_assembly.json b/kubejs/assets/emi/category/properties/create_sequenced_assembly.json index 2dc37de33..acf9aafff 100644 --- a/kubejs/assets/emi/category/properties/create_sequenced_assembly.json +++ b/kubejs/assets/emi/category/properties/create_sequenced_assembly.json @@ -1 +1 @@ -{"create:sequenced_assembly":{"order":55}} \ No newline at end of file +{"create:sequenced_assembly":{"order":56}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_spout_filling.json b/kubejs/assets/emi/category/properties/create_spout_filling.json index dbc8fd535..267530a67 100644 --- a/kubejs/assets/emi/category/properties/create_spout_filling.json +++ b/kubejs/assets/emi/category/properties/create_spout_filling.json @@ -1 +1 @@ -{"create:spout_filling":{"order":174}} \ No newline at end of file +{"create:spout_filling":{"order":175}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/createaddition_rolling.json b/kubejs/assets/emi/category/properties/createaddition_rolling.json index 3524eee33..ff2e73280 100644 --- a/kubejs/assets/emi/category/properties/createaddition_rolling.json +++ b/kubejs/assets/emi/category/properties/createaddition_rolling.json @@ -1 +1 @@ -{"createaddition:rolling":{"order":81}} \ No newline at end of file +{"createaddition:rolling":{"order":82}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_component_fr.json b/kubejs/assets/emi/category/properties/deafission_component_fr.json index 23ab63472..875234609 100644 --- a/kubejs/assets/emi/category/properties/deafission_component_fr.json +++ b/kubejs/assets/emi/category/properties/deafission_component_fr.json @@ -1 +1 @@ -{"deafission:component_fr":{"order":71}} \ No newline at end of file +{"deafission:component_fr":{"order":72}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_fission_component.json b/kubejs/assets/emi/category/properties/deafission_fission_component.json index 41832a459..5784c5d53 100644 --- a/kubejs/assets/emi/category/properties/deafission_fission_component.json +++ b/kubejs/assets/emi/category/properties/deafission_fission_component.json @@ -1 +1 @@ -{"deafission:fission_component":{"order":70}} \ No newline at end of file +{"deafission:fission_component":{"order":71}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant.json b/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant.json index 5f41b7113..6c6afed67 100644 --- a/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant.json +++ b/kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant.json @@ -1 +1 @@ -{"deafission:fission_reactor_coolant":{"order":67}} \ No newline at end of file +{"deafission:fission_reactor_coolant":{"order":68}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_fission_reactor_fuel.json b/kubejs/assets/emi/category/properties/deafission_fission_reactor_fuel.json index adc216b76..504f42e25 100644 --- a/kubejs/assets/emi/category/properties/deafission_fission_reactor_fuel.json +++ b/kubejs/assets/emi/category/properties/deafission_fission_reactor_fuel.json @@ -1 +1 @@ -{"deafission:fission_reactor_fuel":{"order":69}} \ No newline at end of file +{"deafission:fission_reactor_fuel":{"order":70}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/deafission_fission_reactor_processing.json b/kubejs/assets/emi/category/properties/deafission_fission_reactor_processing.json index 87bf66379..1d7899a11 100644 --- a/kubejs/assets/emi/category/properties/deafission_fission_reactor_processing.json +++ b/kubejs/assets/emi/category/properties/deafission_fission_reactor_processing.json @@ -1 +1 @@ -{"deafission:fission_reactor_processing":{"order":68}} \ No newline at end of file +{"deafission:fission_reactor_processing":{"order":69}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/diggerhelmet_helmet_repair.json b/kubejs/assets/emi/category/properties/diggerhelmet_helmet_repair.json index 7715f2c79..3c15a19a7 100644 --- a/kubejs/assets/emi/category/properties/diggerhelmet_helmet_repair.json +++ b/kubejs/assets/emi/category/properties/diggerhelmet_helmet_repair.json @@ -1 +1 @@ -{"diggerhelmet:helmet_repair":{"order":165}} \ No newline at end of file +{"diggerhelmet:helmet_repair":{"order":166}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json index b8c07b028..c2935cecb 100644 --- a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json +++ b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json @@ -1 +1 @@ -{"domum_ornamentum:architects_cutter":{"order":169}} \ No newline at end of file +{"domum_ornamentum:architects_cutter":{"order":170}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_info.json b/kubejs/assets/emi/category/properties/emi_info.json index de5b44335..5854418dc 100644 --- a/kubejs/assets/emi/category/properties/emi_info.json +++ b/kubejs/assets/emi/category/properties/emi_info.json @@ -1 +1 @@ -{"emi:info":{"order":179}} \ No newline at end of file +{"emi:info":{"order":180}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_tag.json b/kubejs/assets/emi/category/properties/emi_tag.json index 8913e2dd2..eda00a319 100644 --- a/kubejs/assets/emi/category/properties/emi_tag.json +++ b/kubejs/assets/emi/category/properties/emi_tag.json @@ -1 +1 @@ -{"emi:tag":{"order":180}} \ No newline at end of file +{"emi:tag":{"order":181}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_printing.json b/kubejs/assets/emi/category/properties/exposure_photograph_printing.json index d08557db7..707d2dbc2 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_printing.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_printing.json @@ -1 +1 @@ -{"exposure:photograph_printing":{"order":163}} \ No newline at end of file +{"exposure:photograph_printing":{"order":164}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json index c79168c91..25cf51b96 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json @@ -1 +1 @@ -{"exposure:photograph_stacking":{"order":164}} \ No newline at end of file +{"exposure:photograph_stacking":{"order":165}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json b/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json index 5c6d431f3..0b2540eca 100644 --- a/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json +++ b/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json @@ -1 +1 @@ -{"firmalife:bowl_pot":{"order":43}} \ No newline at end of file +{"firmalife:bowl_pot":{"order":44}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_drying.json b/kubejs/assets/emi/category/properties/firmalife_drying.json index 9e393a878..bf367d13c 100644 --- a/kubejs/assets/emi/category/properties/firmalife_drying.json +++ b/kubejs/assets/emi/category/properties/firmalife_drying.json @@ -1 +1 @@ -{"firmalife:drying":{"order":35}} \ No newline at end of file +{"firmalife:drying":{"order":36}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json b/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json index f8d8e7108..bee11e631 100644 --- a/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json +++ b/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json @@ -1 +1 @@ -{"firmalife:mixing_bowl":{"order":36}} \ No newline at end of file +{"firmalife:mixing_bowl":{"order":37}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_oven.json b/kubejs/assets/emi/category/properties/firmalife_oven.json index 3aff9e548..41eef1719 100644 --- a/kubejs/assets/emi/category/properties/firmalife_oven.json +++ b/kubejs/assets/emi/category/properties/firmalife_oven.json @@ -1 +1 @@ -{"firmalife:oven":{"order":37}} \ No newline at end of file +{"firmalife:oven":{"order":38}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_smoking.json b/kubejs/assets/emi/category/properties/firmalife_smoking.json index d2d5eeaa1..dfda139c9 100644 --- a/kubejs/assets/emi/category/properties/firmalife_smoking.json +++ b/kubejs/assets/emi/category/properties/firmalife_smoking.json @@ -1 +1 @@ -{"firmalife:smoking":{"order":39}} \ No newline at end of file +{"firmalife:smoking":{"order":40}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_stomping.json b/kubejs/assets/emi/category/properties/firmalife_stomping.json index 52133f4ce..dfdd42851 100644 --- a/kubejs/assets/emi/category/properties/firmalife_stomping.json +++ b/kubejs/assets/emi/category/properties/firmalife_stomping.json @@ -1 +1 @@ -{"firmalife:stomping":{"order":45}} \ No newline at end of file +{"firmalife:stomping":{"order":46}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_vat.json b/kubejs/assets/emi/category/properties/firmalife_vat.json index 1032b5898..5f18c652d 100644 --- a/kubejs/assets/emi/category/properties/firmalife_vat.json +++ b/kubejs/assets/emi/category/properties/firmalife_vat.json @@ -1 +1 @@ -{"firmalife:vat":{"order":44}} \ No newline at end of file +{"firmalife:vat":{"order":45}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json index a95aa8971..38da3b56b 100644 --- a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json +++ b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json @@ -1 +1 @@ -{"framedblocks:framing_saw":{"order":168}} \ No newline at end of file +{"framedblocks:framing_saw":{"order":169}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_packing.json b/kubejs/assets/emi/category/properties/greate_automatic_packing.json index f73592900..698a21706 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_packing.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_packing.json @@ -1 +1 @@ -{"greate:automatic_packing":{"order":177}} \ No newline at end of file +{"greate:automatic_packing":{"order":178}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_shaped.json b/kubejs/assets/emi/category/properties/greate_automatic_shaped.json index a6906d2a3..b422abba8 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_shaped.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_shaped.json @@ -1 +1 @@ -{"greate:automatic_shaped":{"order":175}} \ No newline at end of file +{"greate:automatic_shaped":{"order":176}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json b/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json index 0e8bd0689..442c0e107 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json @@ -1 +1 @@ -{"greate:automatic_shapeless":{"order":176}} \ No newline at end of file +{"greate:automatic_shapeless":{"order":177}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_block_cutting.json b/kubejs/assets/emi/category/properties/greate_block_cutting.json index 32291d555..2e41c54b1 100644 --- a/kubejs/assets/emi/category/properties/greate_block_cutting.json +++ b/kubejs/assets/emi/category/properties/greate_block_cutting.json @@ -1 +1 @@ -{"greate:block_cutting":{"order":167}} \ No newline at end of file +{"greate:block_cutting":{"order":168}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_crushing.json b/kubejs/assets/emi/category/properties/greate_crushing.json index 3e8026cb5..640462ec6 100644 --- a/kubejs/assets/emi/category/properties/greate_crushing.json +++ b/kubejs/assets/emi/category/properties/greate_crushing.json @@ -1 +1 @@ -{"greate:crushing":{"order":119}} \ No newline at end of file +{"greate:crushing":{"order":120}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_fan_washing.json b/kubejs/assets/emi/category/properties/greate_fan_washing.json index 1215ae3dc..7944b77b7 100644 --- a/kubejs/assets/emi/category/properties/greate_fan_washing.json +++ b/kubejs/assets/emi/category/properties/greate_fan_washing.json @@ -1 +1 @@ -{"greate:fan_washing":{"order":125}} \ No newline at end of file +{"greate:fan_washing":{"order":126}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_milling.json b/kubejs/assets/emi/category/properties/greate_milling.json index 01f14ecb5..954c52b28 100644 --- a/kubejs/assets/emi/category/properties/greate_milling.json +++ b/kubejs/assets/emi/category/properties/greate_milling.json @@ -1 +1 @@ -{"greate:milling":{"order":118}} \ No newline at end of file +{"greate:milling":{"order":119}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_mixing.json b/kubejs/assets/emi/category/properties/greate_mixing.json index 67983151f..3c5c093c7 100644 --- a/kubejs/assets/emi/category/properties/greate_mixing.json +++ b/kubejs/assets/emi/category/properties/greate_mixing.json @@ -1 +1 @@ -{"greate:mixing":{"order":123}} \ No newline at end of file +{"greate:mixing":{"order":124}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_packing.json b/kubejs/assets/emi/category/properties/greate_packing.json index 54da5b3e9..e8e4b2d6d 100644 --- a/kubejs/assets/emi/category/properties/greate_packing.json +++ b/kubejs/assets/emi/category/properties/greate_packing.json @@ -1 +1 @@ -{"greate:packing":{"order":21}} \ No newline at end of file +{"greate:packing":{"order":22}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_pressing.json b/kubejs/assets/emi/category/properties/greate_pressing.json index 915a21b25..6ec0e927b 100644 --- a/kubejs/assets/emi/category/properties/greate_pressing.json +++ b/kubejs/assets/emi/category/properties/greate_pressing.json @@ -1 +1 @@ -{"greate:pressing":{"order":108}} \ No newline at end of file +{"greate:pressing":{"order":109}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_sawing.json b/kubejs/assets/emi/category/properties/greate_sawing.json index b14496925..9fa83720a 100644 --- a/kubejs/assets/emi/category/properties/greate_sawing.json +++ b/kubejs/assets/emi/category/properties/greate_sawing.json @@ -1 +1 @@ -{"greate:sawing":{"order":95}} \ No newline at end of file +{"greate:sawing":{"order":96}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json b/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json index f41aab06a..6699a164c 100644 --- a/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json +++ b/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json @@ -1 +1 @@ -{"gtceu:air_scrubber":{"order":74}} \ No newline at end of file +{"gtceu:air_scrubber":{"order":75}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json b/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json index f8fc50a7d..ef4356bb7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json +++ b/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json @@ -1 +1 @@ -{"gtceu:alloy_blast_smelter":{"order":135}} \ No newline at end of file +{"gtceu:alloy_blast_smelter":{"order":136}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json b/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json index 176573172..f6e4b0423 100644 --- a/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json +++ b/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json @@ -1 +1 @@ -{"gtceu:alloy_smelter":{"order":75}} \ No newline at end of file +{"gtceu:alloy_smelter":{"order":76}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json b/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json index f14c7de77..92c064469 100644 --- a/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json +++ b/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json @@ -1 +1 @@ -{"gtceu:aqueous_accumulator":{"order":77}} \ No newline at end of file +{"gtceu:aqueous_accumulator":{"order":78}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json b/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json index 169b35cfb..86d984b45 100644 --- a/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json +++ b/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json @@ -1 +1 @@ -{"gtceu:arc_furnace":{"order":78}} \ No newline at end of file +{"gtceu:arc_furnace":{"order":79}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json b/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json index c3807af7f..6186ec92e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json @@ -1 +1 @@ -{"gtceu:arc_furnace_recycling":{"order":159}} \ No newline at end of file +{"gtceu:arc_furnace_recycling":{"order":160}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_assembler.json b/kubejs/assets/emi/category/properties/gtceu_assembler.json index e547ae894..8edabc0e4 100644 --- a/kubejs/assets/emi/category/properties/gtceu_assembler.json +++ b/kubejs/assets/emi/category/properties/gtceu_assembler.json @@ -1 +1 @@ -{"gtceu:assembler":{"order":79}} \ No newline at end of file +{"gtceu:assembler":{"order":80}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_assembly_line.json b/kubejs/assets/emi/category/properties/gtceu_assembly_line.json index dbce179a4..fd55fae87 100644 --- a/kubejs/assets/emi/category/properties/gtceu_assembly_line.json +++ b/kubejs/assets/emi/category/properties/gtceu_assembly_line.json @@ -1 +1 @@ -{"gtceu:assembly_line":{"order":136}} \ No newline at end of file +{"gtceu:assembly_line":{"order":137}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_autoclave.json b/kubejs/assets/emi/category/properties/gtceu_autoclave.json index 37a92f362..a53a009d1 100644 --- a/kubejs/assets/emi/category/properties/gtceu_autoclave.json +++ b/kubejs/assets/emi/category/properties/gtceu_autoclave.json @@ -1 +1 @@ -{"gtceu:autoclave":{"order":80}} \ No newline at end of file +{"gtceu:autoclave":{"order":81}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_bender.json b/kubejs/assets/emi/category/properties/gtceu_bender.json index ac1b79c9b..72563097a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_bender.json +++ b/kubejs/assets/emi/category/properties/gtceu_bender.json @@ -1 +1 @@ -{"gtceu:bender":{"order":83}} \ No newline at end of file +{"gtceu:bender":{"order":84}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_bioreactor.json b/kubejs/assets/emi/category/properties/gtceu_bioreactor.json index df5863ec1..5954ef3db 100644 --- a/kubejs/assets/emi/category/properties/gtceu_bioreactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_bioreactor.json @@ -1 +1 @@ -{"gtceu:bioreactor":{"order":137}} \ No newline at end of file +{"gtceu:bioreactor":{"order":138}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_brewery.json b/kubejs/assets/emi/category/properties/gtceu_brewery.json index 8cc06a1e4..422d93589 100644 --- a/kubejs/assets/emi/category/properties/gtceu_brewery.json +++ b/kubejs/assets/emi/category/properties/gtceu_brewery.json @@ -1 +1 @@ -{"gtceu:brewery":{"order":84}} \ No newline at end of file +{"gtceu:brewery":{"order":85}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_canner.json b/kubejs/assets/emi/category/properties/gtceu_canner.json index 9ac566d07..526901f9c 100644 --- a/kubejs/assets/emi/category/properties/gtceu_canner.json +++ b/kubejs/assets/emi/category/properties/gtceu_canner.json @@ -1 +1 @@ -{"gtceu:canner":{"order":85}} \ No newline at end of file +{"gtceu:canner":{"order":86}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_centrifuge.json b/kubejs/assets/emi/category/properties/gtceu_centrifuge.json index 849e253b1..d8004471f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_centrifuge.json +++ b/kubejs/assets/emi/category/properties/gtceu_centrifuge.json @@ -1 +1 @@ -{"gtceu:centrifuge":{"order":87}} \ No newline at end of file +{"gtceu:centrifuge":{"order":88}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json b/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json index 0ac44f86d..ff35d2403 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json +++ b/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json @@ -1 +1 @@ -{"gtceu:chem_dyes":{"order":89}} \ No newline at end of file +{"gtceu:chem_dyes":{"order":90}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json b/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json index 14bbcd091..77fb65f40 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json +++ b/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json @@ -1 +1 @@ -{"gtceu:chemical_bath":{"order":88}} \ No newline at end of file +{"gtceu:chemical_bath":{"order":89}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json b/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json index 0b579ef62..6dea103e0 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json @@ -1 +1 @@ -{"gtceu:chemical_reactor":{"order":91}} \ No newline at end of file +{"gtceu:chemical_reactor":{"order":92}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json b/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json index 3c50acf2a..45bdc0ff5 100644 --- a/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json +++ b/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json @@ -1 +1 @@ -{"gtceu:circuit_assembler":{"order":93}} \ No newline at end of file +{"gtceu:circuit_assembler":{"order":94}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_coal_liquefaction_tower.json b/kubejs/assets/emi/category/properties/gtceu_coal_liquefaction_tower.json index 7c3d1662f..13f13109d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_coal_liquefaction_tower.json +++ b/kubejs/assets/emi/category/properties/gtceu_coal_liquefaction_tower.json @@ -1 +1 @@ -{"gtceu:coal_liquefaction_tower":{"order":138}} \ No newline at end of file +{"gtceu:coal_liquefaction_tower":{"order":139}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_coke_oven.json b/kubejs/assets/emi/category/properties/gtceu_coke_oven.json index 7c5fb7c74..6e875cd64 100644 --- a/kubejs/assets/emi/category/properties/gtceu_coke_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_coke_oven.json @@ -1 +1 @@ -{"gtceu:coke_oven":{"order":59}} \ No newline at end of file +{"gtceu:coke_oven":{"order":60}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json b/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json index 23a9fd588..cdfa90630 100644 --- a/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json +++ b/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json @@ -1 +1 @@ -{"gtceu:combustion_generator":{"order":61}} \ No newline at end of file +{"gtceu:combustion_generator":{"order":62}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_compressor.json b/kubejs/assets/emi/category/properties/gtceu_compressor.json index b4608cf12..52e2dbf69 100644 --- a/kubejs/assets/emi/category/properties/gtceu_compressor.json +++ b/kubejs/assets/emi/category/properties/gtceu_compressor.json @@ -1 +1 @@ -{"gtceu:compressor":{"order":94}} \ No newline at end of file +{"gtceu:compressor":{"order":95}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_cracker.json b/kubejs/assets/emi/category/properties/gtceu_cracker.json index f2f6ef99b..886e4779b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_cracker.json +++ b/kubejs/assets/emi/category/properties/gtceu_cracker.json @@ -1 +1 @@ -{"gtceu:cracker":{"order":139}} \ No newline at end of file +{"gtceu:cracker":{"order":140}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_cutter.json b/kubejs/assets/emi/category/properties/gtceu_cutter.json index 1af20f965..f265e3581 100644 --- a/kubejs/assets/emi/category/properties/gtceu_cutter.json +++ b/kubejs/assets/emi/category/properties/gtceu_cutter.json @@ -1 +1 @@ -{"gtceu:cutter":{"order":96}} \ No newline at end of file +{"gtceu:cutter":{"order":97}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json b/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json index 72a980557..dbb857434 100644 --- a/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json +++ b/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json @@ -1 +1 @@ -{"gtceu:distillation_tower":{"order":98}} \ No newline at end of file +{"gtceu:distillation_tower":{"order":99}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_distillery.json b/kubejs/assets/emi/category/properties/gtceu_distillery.json index 88cdd2fe7..abe5bff62 100644 --- a/kubejs/assets/emi/category/properties/gtceu_distillery.json +++ b/kubejs/assets/emi/category/properties/gtceu_distillery.json @@ -1 +1 @@ -{"gtceu:distillery":{"order":97}} \ No newline at end of file +{"gtceu:distillery":{"order":98}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json b/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json index a06f87714..20666032f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json +++ b/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json @@ -1 +1 @@ -{"gtceu:electric_blast_furnace":{"order":140}} \ No newline at end of file +{"gtceu:electric_blast_furnace":{"order":141}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json b/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json index 64bd5759c..3d59509ee 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json +++ b/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json @@ -1 +1 @@ -{"gtceu:electrolyzer":{"order":99}} \ No newline at end of file +{"gtceu:electrolyzer":{"order":100}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json b/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json index 5f99ad041..55b6d8105 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json +++ b/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json @@ -1 +1 @@ -{"gtceu:electromagnetic_separator":{"order":100}} \ No newline at end of file +{"gtceu:electromagnetic_separator":{"order":101}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_evaporation_tower.json b/kubejs/assets/emi/category/properties/gtceu_evaporation_tower.json index 6384d23bf..75b000ec2 100644 --- a/kubejs/assets/emi/category/properties/gtceu_evaporation_tower.json +++ b/kubejs/assets/emi/category/properties/gtceu_evaporation_tower.json @@ -1 +1 @@ -{"gtceu:evaporation_tower":{"order":141}} \ No newline at end of file +{"gtceu:evaporation_tower":{"order":142}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extractor.json b/kubejs/assets/emi/category/properties/gtceu_extractor.json index a31e5a37e..a098ce001 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extractor.json +++ b/kubejs/assets/emi/category/properties/gtceu_extractor.json @@ -1 +1 @@ -{"gtceu:extractor":{"order":102}} \ No newline at end of file +{"gtceu:extractor":{"order":103}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json b/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json index 6e0143e12..99ab62d51 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json @@ -1 +1 @@ -{"gtceu:extractor_recycling":{"order":161}} \ No newline at end of file +{"gtceu:extractor_recycling":{"order":162}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extruder.json b/kubejs/assets/emi/category/properties/gtceu_extruder.json index 4d76a1d27..f191dc87e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extruder.json +++ b/kubejs/assets/emi/category/properties/gtceu_extruder.json @@ -1 +1 @@ -{"gtceu:extruder":{"order":104}} \ No newline at end of file +{"gtceu:extruder":{"order":105}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fermenter.json b/kubejs/assets/emi/category/properties/gtceu_fermenter.json index 222919a16..d5c266326 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fermenter.json +++ b/kubejs/assets/emi/category/properties/gtceu_fermenter.json @@ -1 +1 @@ -{"gtceu:fermenter":{"order":105}} \ No newline at end of file +{"gtceu:fermenter":{"order":106}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json b/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json index fad7a9f11..6e14a9976 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json @@ -1 +1 @@ -{"gtceu:fission_reactor":{"order":142}} \ No newline at end of file +{"gtceu:fission_reactor":{"order":143}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json b/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json index 511826e95..ea2cd6df9 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json +++ b/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json @@ -1 +1 @@ -{"gtceu:fluid_heater":{"order":106}} \ No newline at end of file +{"gtceu:fluid_heater":{"order":107}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json b/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json index c27aac3b2..4f6b62384 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json +++ b/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json @@ -1 +1 @@ -{"gtceu:fluid_solidifier":{"order":107}} \ No newline at end of file +{"gtceu:fluid_solidifier":{"order":108}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_food_oven.json b/kubejs/assets/emi/category/properties/gtceu_food_oven.json index 8eb36875b..e34fe713b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_food_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_food_oven.json @@ -1 +1 @@ -{"gtceu:food_oven":{"order":38}} \ No newline at end of file +{"gtceu:food_oven":{"order":39}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_food_processor.json b/kubejs/assets/emi/category/properties/gtceu_food_processor.json index 951432e03..619dd2ff7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_food_processor.json +++ b/kubejs/assets/emi/category/properties/gtceu_food_processor.json @@ -1 +1 @@ -{"gtceu:food_processor":{"order":46}} \ No newline at end of file +{"gtceu:food_processor":{"order":47}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json b/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json index 5c7caff41..05db31d07 100644 --- a/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json +++ b/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json @@ -1 +1 @@ -{"gtceu:forge_hammer":{"order":109}} \ No newline at end of file +{"gtceu:forge_hammer":{"order":110}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_forming_press.json b/kubejs/assets/emi/category/properties/gtceu_forming_press.json index ac1ab08a5..213ce1954 100644 --- a/kubejs/assets/emi/category/properties/gtceu_forming_press.json +++ b/kubejs/assets/emi/category/properties/gtceu_forming_press.json @@ -1 +1 @@ -{"gtceu:forming_press":{"order":111}} \ No newline at end of file +{"gtceu:forming_press":{"order":112}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json index 696302445..3f4912970 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json @@ -1 +1 @@ -{"gtceu:fusion_reactor":{"order":143}} \ No newline at end of file +{"gtceu:fusion_reactor":{"order":144}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_gas_collector.json b/kubejs/assets/emi/category/properties/gtceu_gas_collector.json index 0855a78a8..c7c01db93 100644 --- a/kubejs/assets/emi/category/properties/gtceu_gas_collector.json +++ b/kubejs/assets/emi/category/properties/gtceu_gas_collector.json @@ -1 +1 @@ -{"gtceu:gas_collector":{"order":112}} \ No newline at end of file +{"gtceu:gas_collector":{"order":113}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_gas_pressurizer.json b/kubejs/assets/emi/category/properties/gtceu_gas_pressurizer.json index c55dcefef..7231cc1c7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_gas_pressurizer.json +++ b/kubejs/assets/emi/category/properties/gtceu_gas_pressurizer.json @@ -1 +1 @@ -{"gtceu:gas_pressurizer":{"order":113}} \ No newline at end of file +{"gtceu:gas_pressurizer":{"order":114}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json b/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json index ae2caa47f..1e6ab6dee 100644 --- a/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json +++ b/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json @@ -1 +1 @@ -{"gtceu:gas_turbine":{"order":62}} \ No newline at end of file +{"gtceu:gas_turbine":{"order":63}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json index 20d1e3946..efa9331fc 100644 --- a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json +++ b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json @@ -1 +1 @@ -{"gtceu:greenhouse":{"order":144}} \ No newline at end of file +{"gtceu:greenhouse":{"order":145}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json b/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json index 11bb3eba1..462decfd8 100644 --- a/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json +++ b/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json @@ -1 +1 @@ -{"gtceu:heat_exchanger":{"order":145}} \ No newline at end of file +{"gtceu:heat_exchanger":{"order":146}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_hydroponics_facility.json b/kubejs/assets/emi/category/properties/gtceu_hydroponics_facility.json index 3c4d85d63..baafe3f50 100644 --- a/kubejs/assets/emi/category/properties/gtceu_hydroponics_facility.json +++ b/kubejs/assets/emi/category/properties/gtceu_hydroponics_facility.json @@ -1 +1 @@ -{"gtceu:hydroponics_facility":{"order":146}} \ No newline at end of file +{"gtceu:hydroponics_facility":{"order":147}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json index 5aca7e4c1..0a8de3528 100644 --- a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json +++ b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json @@ -1 +1 @@ -{"gtceu:implosion_compressor":{"order":147}} \ No newline at end of file +{"gtceu:implosion_compressor":{"order":148}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json b/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json index 971a52dbe..d02888088 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json +++ b/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json @@ -1 +1 @@ -{"gtceu:ingot_molding":{"order":76}} \ No newline at end of file +{"gtceu:ingot_molding":{"order":77}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_boiler.json b/kubejs/assets/emi/category/properties/gtceu_large_boiler.json index 767c4742a..311888a6b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_boiler.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_boiler.json @@ -1 +1 @@ -{"gtceu:large_boiler":{"order":57}} \ No newline at end of file +{"gtceu:large_boiler":{"order":58}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json b/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json index 8d9aefd8f..47a56c517 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json @@ -1 +1 @@ -{"gtceu:large_chemical_reactor":{"order":92}} \ No newline at end of file +{"gtceu:large_chemical_reactor":{"order":93}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel.json b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel.json index 2ee7e3233..75fe09b10 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel.json @@ -1 +1 @@ -{"gtceu:large_solar_panel":{"order":63}} \ No newline at end of file +{"gtceu:large_solar_panel":{"order":64}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier2.json b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier2.json index 348ef5499..c4f897724 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier2.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier2.json @@ -1 +1 @@ -{"gtceu:large_solar_panel_tier2":{"order":64}} \ No newline at end of file +{"gtceu:large_solar_panel_tier2":{"order":65}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier3.json b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier3.json index 579c5fe10..ed2df2f6e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier3.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_solar_panel_tier3.json @@ -1 +1 @@ -{"gtceu:large_solar_panel_tier3":{"order":65}} \ No newline at end of file +{"gtceu:large_solar_panel_tier3":{"order":66}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json b/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json index 9f146f15f..4a437912f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json +++ b/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json @@ -1 +1 @@ -{"gtceu:laser_engraver":{"order":115}} \ No newline at end of file +{"gtceu:laser_engraver":{"order":116}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_lathe.json b/kubejs/assets/emi/category/properties/gtceu_lathe.json index 7659c2ad4..c980bccd7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_lathe.json +++ b/kubejs/assets/emi/category/properties/gtceu_lathe.json @@ -1 +1 @@ -{"gtceu:lathe":{"order":117}} \ No newline at end of file +{"gtceu:lathe":{"order":118}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_macerator.json b/kubejs/assets/emi/category/properties/gtceu_macerator.json index 35d939495..196bf9eff 100644 --- a/kubejs/assets/emi/category/properties/gtceu_macerator.json +++ b/kubejs/assets/emi/category/properties/gtceu_macerator.json @@ -1 +1 @@ -{"gtceu:macerator":{"order":120}} \ No newline at end of file +{"gtceu:macerator":{"order":121}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json b/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json index 8f6be3973..d347311b6 100644 --- a/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json @@ -1 +1 @@ -{"gtceu:macerator_recycling":{"order":160}} \ No newline at end of file +{"gtceu:macerator_recycling":{"order":161}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_mixer.json b/kubejs/assets/emi/category/properties/gtceu_mixer.json index ca10c1c19..414afa0ea 100644 --- a/kubejs/assets/emi/category/properties/gtceu_mixer.json +++ b/kubejs/assets/emi/category/properties/gtceu_mixer.json @@ -1 +1 @@ -{"gtceu:mixer":{"order":122}} \ No newline at end of file +{"gtceu:mixer":{"order":123}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json b/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json index 7adafaf6b..83720c659 100644 --- a/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json +++ b/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json @@ -1 +1 @@ -{"gtceu:moon_dust_harvester":{"order":148}} \ No newline at end of file +{"gtceu:moon_dust_harvester":{"order":149}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json b/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json index 386165365..345240e54 100644 --- a/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json +++ b/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json @@ -1 +1 @@ -{"gtceu:nuclear_fuel_factory":{"order":149}} \ No newline at end of file +{"gtceu:nuclear_fuel_factory":{"order":150}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_nuclear_turbine.json b/kubejs/assets/emi/category/properties/gtceu_nuclear_turbine.json index 95573260b..803a8afce 100644 --- a/kubejs/assets/emi/category/properties/gtceu_nuclear_turbine.json +++ b/kubejs/assets/emi/category/properties/gtceu_nuclear_turbine.json @@ -1 +1 @@ -{"gtceu:nuclear_turbine":{"order":66}} \ No newline at end of file +{"gtceu:nuclear_turbine":{"order":67}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json index da316554a..df113f580 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json @@ -1 +1 @@ -{"gtceu:ore_bathing":{"order":90}} \ No newline at end of file +{"gtceu:ore_bathing":{"order":91}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json index e3e09a0f7..d95deb28b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json @@ -1 +1 @@ -{"gtceu:ore_crushing":{"order":121}} \ No newline at end of file +{"gtceu:ore_crushing":{"order":122}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json index 2be9b523a..e3a94606a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json @@ -1 +1 @@ -{"gtceu:ore_forging":{"order":110}} \ No newline at end of file +{"gtceu:ore_forging":{"order":111}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json index 99fc46d2e..405a50946 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json @@ -1 +1 @@ -{"gtceu:ore_washer":{"order":124}} \ No newline at end of file +{"gtceu:ore_washer":{"order":125}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json b/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json index c9fdc1274..602826a05 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json +++ b/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json @@ -1 +1 @@ -{"gtceu:ostrum_harvester":{"order":150}} \ No newline at end of file +{"gtceu:ostrum_harvester":{"order":151}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ostrum_linear_accelerator.json b/kubejs/assets/emi/category/properties/gtceu_ostrum_linear_accelerator.json index e609def97..5ac587256 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ostrum_linear_accelerator.json +++ b/kubejs/assets/emi/category/properties/gtceu_ostrum_linear_accelerator.json @@ -1 +1 @@ -{"gtceu:ostrum_linear_accelerator":{"order":151}} \ No newline at end of file +{"gtceu:ostrum_linear_accelerator":{"order":152}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_packer.json b/kubejs/assets/emi/category/properties/gtceu_packer.json index 2f428dab9..7b19510f3 100644 --- a/kubejs/assets/emi/category/properties/gtceu_packer.json +++ b/kubejs/assets/emi/category/properties/gtceu_packer.json @@ -1 +1 @@ -{"gtceu:packer":{"order":126}} \ No newline at end of file +{"gtceu:packer":{"order":127}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_pisciculture_fishery.json b/kubejs/assets/emi/category/properties/gtceu_pisciculture_fishery.json index 2f137300b..a0bd0d75a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_pisciculture_fishery.json +++ b/kubejs/assets/emi/category/properties/gtceu_pisciculture_fishery.json @@ -1 +1 @@ -{"gtceu:pisciculture_fishery":{"order":152}} \ No newline at end of file +{"gtceu:pisciculture_fishery":{"order":153}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json b/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json index 66f62c6f5..902dc1974 100644 --- a/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json +++ b/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json @@ -1 +1 @@ -{"gtceu:plasma_generator":{"order":72}} \ No newline at end of file +{"gtceu:plasma_generator":{"order":73}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_polarizer.json b/kubejs/assets/emi/category/properties/gtceu_polarizer.json index f77e2a7b1..77f51e722 100644 --- a/kubejs/assets/emi/category/properties/gtceu_polarizer.json +++ b/kubejs/assets/emi/category/properties/gtceu_polarizer.json @@ -1 +1 @@ -{"gtceu:polarizer":{"order":127}} \ No newline at end of file +{"gtceu:polarizer":{"order":128}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json index 1ca470d2f..2ddd1eaf6 100644 --- a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json +++ b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json @@ -1 +1 @@ -{"gtceu:programmed_circuit":{"order":178}} \ No newline at end of file +{"gtceu:programmed_circuit":{"order":179}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json index 3ee2775ce..d2931e90f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json @@ -1 +1 @@ -{"gtceu:pyrolyse_oven":{"order":153}} \ No newline at end of file +{"gtceu:pyrolyse_oven":{"order":154}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_research_station.json b/kubejs/assets/emi/category/properties/gtceu_research_station.json index 2e9c56869..7a62851bb 100644 --- a/kubejs/assets/emi/category/properties/gtceu_research_station.json +++ b/kubejs/assets/emi/category/properties/gtceu_research_station.json @@ -1 +1 @@ -{"gtceu:research_station":{"order":154}} \ No newline at end of file +{"gtceu:research_station":{"order":155}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json b/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json index d43366b28..8fc971e87 100644 --- a/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json +++ b/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json @@ -1 +1 @@ -{"gtceu:rock_breaker":{"order":128}} \ No newline at end of file +{"gtceu:rock_breaker":{"order":129}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_scanner.json b/kubejs/assets/emi/category/properties/gtceu_scanner.json index bc3c9eb07..f499fd75f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_scanner.json +++ b/kubejs/assets/emi/category/properties/gtceu_scanner.json @@ -1 +1 @@ -{"gtceu:scanner":{"order":129}} \ No newline at end of file +{"gtceu:scanner":{"order":130}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_sifter.json b/kubejs/assets/emi/category/properties/gtceu_sifter.json index 91729a678..08590a5a8 100644 --- a/kubejs/assets/emi/category/properties/gtceu_sifter.json +++ b/kubejs/assets/emi/category/properties/gtceu_sifter.json @@ -1 +1 @@ -{"gtceu:sifter":{"order":131}} \ No newline at end of file +{"gtceu:sifter":{"order":132}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json index cbf79f09e..4beba1a99 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json @@ -1 +1 @@ -{"gtceu:steam_bloomery":{"order":155}} \ No newline at end of file +{"gtceu:steam_bloomery":{"order":156}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json b/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json index aa5444e77..1344362df 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json @@ -1 +1 @@ -{"gtceu:steam_boiler":{"order":56}} \ No newline at end of file +{"gtceu:steam_boiler":{"order":57}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json b/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json index c04030c4c..2d062a1d3 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json @@ -1 +1 @@ -{"gtceu:steam_turbine":{"order":58}} \ No newline at end of file +{"gtceu:steam_turbine":{"order":59}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json b/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json index e2c701368..0bc83bd94 100644 --- a/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json +++ b/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json @@ -1 +1 @@ -{"gtceu:thermal_centrifuge":{"order":132}} \ No newline at end of file +{"gtceu:thermal_centrifuge":{"order":133}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json index c35543341..5edc94182 100644 --- a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json +++ b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json @@ -1 +1 @@ -{"gtceu:vacuum_freezer":{"order":156}} \ No newline at end of file +{"gtceu:vacuum_freezer":{"order":157}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json index 0bcd70b8e..a127850c7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json +++ b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json @@ -1 +1 @@ -{"gtceu:wire_coating":{"order":157}} \ No newline at end of file +{"gtceu:wire_coating":{"order":158}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_wiremill.json b/kubejs/assets/emi/category/properties/gtceu_wiremill.json index d6768e6e3..d33e56613 100644 --- a/kubejs/assets/emi/category/properties/gtceu_wiremill.json +++ b/kubejs/assets/emi/category/properties/gtceu_wiremill.json @@ -1 +1 @@ -{"gtceu:wiremill":{"order":134}} \ No newline at end of file +{"gtceu:wiremill":{"order":135}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_smelting.json b/kubejs/assets/emi/category/properties/minecraft_smelting.json index 40e3a7239..e0a9398cb 100644 --- a/kubejs/assets/emi/category/properties/minecraft_smelting.json +++ b/kubejs/assets/emi/category/properties/minecraft_smelting.json @@ -1 +1 @@ -{"minecraft:smelting":{"order":73}} \ No newline at end of file +{"minecraft:smelting":{"order":74}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_smithing.json b/kubejs/assets/emi/category/properties/minecraft_smithing.json index 0884f8637..3ef51601a 100644 --- a/kubejs/assets/emi/category/properties/minecraft_smithing.json +++ b/kubejs/assets/emi/category/properties/minecraft_smithing.json @@ -1 +1 @@ -{"minecraft:smithing":{"order":162}} \ No newline at end of file +{"minecraft:smithing":{"order":163}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json index 8e40f1250..adbf423f4 100644 --- a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json +++ b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json @@ -1 +1 @@ -{"minecraft:stonecutting":{"order":166}} \ No newline at end of file +{"minecraft:stonecutting":{"order":167}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/rnr_block_mod.json b/kubejs/assets/emi/category/properties/rnr_block_mod.json index 8ab0b1d64..d24ca9768 100644 --- a/kubejs/assets/emi/category/properties/rnr_block_mod.json +++ b/kubejs/assets/emi/category/properties/rnr_block_mod.json @@ -1 +1 @@ -{"rnr:block_mod":{"order":47}} \ No newline at end of file +{"rnr:block_mod":{"order":48}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/rnr_mattock.json b/kubejs/assets/emi/category/properties/rnr_mattock.json index ef212895f..4964f4dc6 100644 --- a/kubejs/assets/emi/category/properties/rnr_mattock.json +++ b/kubejs/assets/emi/category/properties/rnr_mattock.json @@ -1 +1 @@ -{"rnr:mattock":{"order":48}} \ No newline at end of file +{"rnr:mattock":{"order":49}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tacz_attachment_query.json b/kubejs/assets/emi/category/properties/tacz_attachment_query.json index 5a657c070..5120abdce 100644 --- a/kubejs/assets/emi/category/properties/tacz_attachment_query.json +++ b/kubejs/assets/emi/category/properties/tacz_attachment_query.json @@ -1 +1 @@ -{"tacz:attachment_query":{"order":171}} \ No newline at end of file +{"tacz:attachment_query":{"order":172}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json b/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json index df66f83aa..d1d6603bc 100644 --- a/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json +++ b/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json @@ -1 +1 @@ -{"taczammoquery:ammo_query":{"order":172}} \ No newline at end of file +{"taczammoquery:ammo_query":{"order":173}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_alloying.json b/kubejs/assets/emi/category/properties/tfc_alloying.json index 73194c877..7befe3371 100644 --- a/kubejs/assets/emi/category/properties/tfc_alloying.json +++ b/kubejs/assets/emi/category/properties/tfc_alloying.json @@ -1 +1 @@ -{"tfc:alloying":{"order":28}} \ No newline at end of file +{"tfc:alloying":{"order":29}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_anvil.json b/kubejs/assets/emi/category/properties/tfc_anvil.json index 41ead7698..dbbd48fb3 100644 --- a/kubejs/assets/emi/category/properties/tfc_anvil.json +++ b/kubejs/assets/emi/category/properties/tfc_anvil.json @@ -1 +1 @@ -{"tfc:anvil":{"order":19}} \ No newline at end of file +{"tfc:anvil":{"order":20}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_blast_furnace.json b/kubejs/assets/emi/category/properties/tfc_blast_furnace.json index bcf2aeb66..d5bfd0031 100644 --- a/kubejs/assets/emi/category/properties/tfc_blast_furnace.json +++ b/kubejs/assets/emi/category/properties/tfc_blast_furnace.json @@ -1 +1 @@ -{"tfc:blast_furnace":{"order":27}} \ No newline at end of file +{"tfc:blast_furnace":{"order":28}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_bloomery.json b/kubejs/assets/emi/category/properties/tfc_bloomery.json index 64e2b0fc5..ca4669630 100644 --- a/kubejs/assets/emi/category/properties/tfc_bloomery.json +++ b/kubejs/assets/emi/category/properties/tfc_bloomery.json @@ -1 +1 @@ -{"tfc:bloomery":{"order":26}} \ No newline at end of file +{"tfc:bloomery":{"order":27}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_casting.json b/kubejs/assets/emi/category/properties/tfc_casting.json index 7ab19f53a..429cc3c55 100644 --- a/kubejs/assets/emi/category/properties/tfc_casting.json +++ b/kubejs/assets/emi/category/properties/tfc_casting.json @@ -1 +1 @@ -{"tfc:casting":{"order":18}} \ No newline at end of file +{"tfc:casting":{"order":19}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_chisel.json b/kubejs/assets/emi/category/properties/tfc_chisel.json index e1060b283..ca7e4f652 100644 --- a/kubejs/assets/emi/category/properties/tfc_chisel.json +++ b/kubejs/assets/emi/category/properties/tfc_chisel.json @@ -1 +1 @@ -{"tfc:chisel":{"order":33}} \ No newline at end of file +{"tfc:chisel":{"order":34}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_glassworking.json b/kubejs/assets/emi/category/properties/tfc_glassworking.json index 6e0a43dc4..eb9ecc48c 100644 --- a/kubejs/assets/emi/category/properties/tfc_glassworking.json +++ b/kubejs/assets/emi/category/properties/tfc_glassworking.json @@ -1 +1 @@ -{"tfc:glassworking":{"order":32}} \ No newline at end of file +{"tfc:glassworking":{"order":33}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_heating.json b/kubejs/assets/emi/category/properties/tfc_heating.json index 1d8ff6480..e96e69649 100644 --- a/kubejs/assets/emi/category/properties/tfc_heating.json +++ b/kubejs/assets/emi/category/properties/tfc_heating.json @@ -1 +1 @@ -{"tfc:heating":{"order":16}} \ No newline at end of file +{"tfc:heating":{"order":17}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_instant_barrel.json b/kubejs/assets/emi/category/properties/tfc_instant_barrel.json index d877178e4..bc8c355ee 100644 --- a/kubejs/assets/emi/category/properties/tfc_instant_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_instant_barrel.json @@ -1 +1 @@ -{"tfc:instant_barrel":{"order":23}} \ No newline at end of file +{"tfc:instant_barrel":{"order":24}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json b/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json index e7477e0f5..94fc2b3a4 100644 --- a/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json @@ -1 +1 @@ -{"tfc:instant_fluid_barrel":{"order":24}} \ No newline at end of file +{"tfc:instant_fluid_barrel":{"order":25}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_jam_pot.json b/kubejs/assets/emi/category/properties/tfc_jam_pot.json index 0aef4616a..681c4b0ca 100644 --- a/kubejs/assets/emi/category/properties/tfc_jam_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_jam_pot.json @@ -1 +1 @@ -{"tfc:jam_pot":{"order":42}} \ No newline at end of file +{"tfc:jam_pot":{"order":43}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_loom.json b/kubejs/assets/emi/category/properties/tfc_loom.json index e75a691b5..9cc1fda8b 100644 --- a/kubejs/assets/emi/category/properties/tfc_loom.json +++ b/kubejs/assets/emi/category/properties/tfc_loom.json @@ -1 +1 @@ -{"tfc:loom":{"order":31}} \ No newline at end of file +{"tfc:loom":{"order":32}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_quern.json b/kubejs/assets/emi/category/properties/tfc_quern.json index 236da9c3b..f63c00555 100644 --- a/kubejs/assets/emi/category/properties/tfc_quern.json +++ b/kubejs/assets/emi/category/properties/tfc_quern.json @@ -1 +1 @@ -{"tfc:quern":{"order":17}} \ No newline at end of file +{"tfc:quern":{"order":18}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_scraping.json b/kubejs/assets/emi/category/properties/tfc_scraping.json index e14d944ca..c4288360f 100644 --- a/kubejs/assets/emi/category/properties/tfc_scraping.json +++ b/kubejs/assets/emi/category/properties/tfc_scraping.json @@ -1 +1 @@ -{"tfc:scraping":{"order":30}} \ No newline at end of file +{"tfc:scraping":{"order":31}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json b/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json index e03845208..cc7562727 100644 --- a/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json @@ -1 +1 @@ -{"tfc:sealed_barrel":{"order":25}} \ No newline at end of file +{"tfc:sealed_barrel":{"order":26}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_sewing.json b/kubejs/assets/emi/category/properties/tfc_sewing.json index 75fbf2ebf..c29ae1052 100644 --- a/kubejs/assets/emi/category/properties/tfc_sewing.json +++ b/kubejs/assets/emi/category/properties/tfc_sewing.json @@ -1 +1 @@ -{"tfc:sewing":{"order":34}} \ No newline at end of file +{"tfc:sewing":{"order":35}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_simple_pot.json b/kubejs/assets/emi/category/properties/tfc_simple_pot.json index 1fb8c60ce..479fb4384 100644 --- a/kubejs/assets/emi/category/properties/tfc_simple_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_simple_pot.json @@ -1 +1 @@ -{"tfc:simple_pot":{"order":40}} \ No newline at end of file +{"tfc:simple_pot":{"order":41}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_soup_pot.json b/kubejs/assets/emi/category/properties/tfc_soup_pot.json index 2692e0a12..11e15e272 100644 --- a/kubejs/assets/emi/category/properties/tfc_soup_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_soup_pot.json @@ -1 +1 @@ -{"tfc:soup_pot":{"order":41}} \ No newline at end of file +{"tfc:soup_pot":{"order":42}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_welding.json b/kubejs/assets/emi/category/properties/tfc_welding.json index 0d3fa1c3a..f8f98981d 100644 --- a/kubejs/assets/emi/category/properties/tfc_welding.json +++ b/kubejs/assets/emi/category/properties/tfc_welding.json @@ -1 +1 @@ -{"tfc:welding":{"order":20}} \ No newline at end of file +{"tfc:welding":{"order":21}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfg_artisan_table.json b/kubejs/assets/emi/category/properties/tfg_artisan_table.json new file mode 100644 index 000000000..1288ac4a4 --- /dev/null +++ b/kubejs/assets/emi/category/properties/tfg_artisan_table.json @@ -0,0 +1 @@ +{"tfg:artisan_table":{"order":16}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfg_blaze_burner.json b/kubejs/assets/emi/category/properties/tfg_blaze_burner.json index f5b18fcd8..697bd742c 100644 --- a/kubejs/assets/emi/category/properties/tfg_blaze_burner.json +++ b/kubejs/assets/emi/category/properties/tfg_blaze_burner.json @@ -1 +1 @@ -{"tfg:blaze_burner":{"order":60}} \ No newline at end of file +{"tfg:blaze_burner":{"order":61}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfg_block_interaction.json b/kubejs/assets/emi/category/properties/tfg_block_interaction.json index fa4725535..e4355d70b 100644 --- a/kubejs/assets/emi/category/properties/tfg_block_interaction.json +++ b/kubejs/assets/emi/category/properties/tfg_block_interaction.json @@ -1 +1 @@ -{"tfg:block_interaction":{"order":54}} \ No newline at end of file +{"tfg:block_interaction":{"order":55}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json b/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json index 05eea7f7b..ee3e03c79 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json @@ -1 +1 @@ -{"vintageimprovements:centrifugation":{"order":86}} \ No newline at end of file +{"vintageimprovements:centrifugation":{"order":87}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json b/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json index 185fc7f00..9cb992072 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json @@ -1 +1 @@ -{"vintageimprovements:coiling":{"order":133}} \ No newline at end of file +{"vintageimprovements:coiling":{"order":134}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_curving.json b/kubejs/assets/emi/category/properties/vintageimprovements_curving.json index d08896541..ecaad064d 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_curving.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_curving.json @@ -1 +1 @@ -{"vintageimprovements:curving":{"order":103}} \ No newline at end of file +{"vintageimprovements:curving":{"order":104}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_grinder_sandpaper_polishing.json b/kubejs/assets/emi/category/properties/vintageimprovements_grinder_sandpaper_polishing.json index ad40e3992..128e27e83 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_grinder_sandpaper_polishing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_grinder_sandpaper_polishing.json @@ -1 +1 @@ -{"vintageimprovements:grinder_sandpaper_polishing":{"order":51}} \ No newline at end of file +{"vintageimprovements:grinder_sandpaper_polishing":{"order":52}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json b/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json index 648a027a6..cadc583f1 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json @@ -1 +1 @@ -{"vintageimprovements:hammering":{"order":22}} \ No newline at end of file +{"vintageimprovements:hammering":{"order":23}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json b/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json index c014d6a25..aa0b4f013 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json @@ -1 +1 @@ -{"vintageimprovements:laser_cutting":{"order":114}} \ No newline at end of file +{"vintageimprovements:laser_cutting":{"order":115}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_polishing.json b/kubejs/assets/emi/category/properties/vintageimprovements_polishing.json index 760cee391..fde04d7d1 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_polishing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_polishing.json @@ -1 +1 @@ -{"vintageimprovements:polishing":{"order":116}} \ No newline at end of file +{"vintageimprovements:polishing":{"order":117}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json b/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json index f6bb70239..40a51fa64 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json @@ -1 +1 @@ -{"vintageimprovements:pressurizing":{"order":82}} \ No newline at end of file +{"vintageimprovements:pressurizing":{"order":83}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json b/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json index 8e01ce0e6..9d955f31a 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json @@ -1 +1 @@ -{"vintageimprovements:vacuumizing":{"order":101}} \ No newline at end of file +{"vintageimprovements:vacuumizing":{"order":102}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json b/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json index 9cc5cbe70..05cc197f3 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json @@ -1 +1 @@ -{"vintageimprovements:vibrating":{"order":130}} \ No newline at end of file +{"vintageimprovements:vibrating":{"order":131}} \ No newline at end of file diff --git a/kubejs/assets/tfchotornot/lang/zh_cn.json b/kubejs/assets/tfchotornot/lang/zh_cn.json index b88627358..2be883ffd 100644 --- a/kubejs/assets/tfchotornot/lang/zh_cn.json +++ b/kubejs/assets/tfchotornot/lang/zh_cn.json @@ -3,8 +3,8 @@ "tfchotornot.creative_tab.tfchotornot": "群峦传说：冷热自知", "tooltip.tfchotornot.insulating_items": "佩戴于副手可避免负面效果", "tooltip.tfchotornot.toohot": "太烫了，无法接触!", - "tooltip.tfchotornot.toocold": "太冷了，不能处理!", - "tooltip.tfchotornot.toolight": "太亮了，不能处理!", + "tooltip.tfchotornot.toocold": "太冷了，无法接触!", + "tooltip.tfchotornot.toolight": "太轻了，无法接触!", "message.tfchotornot.item_getting_hot": "注意！副手物品过热！", "item.tfchotornot.mittens": "手套", "item.tfchotornot.burlap_potholder": "粗麻布隔热垫", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index c7ae766bd..c0d3908ba 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1202,6 +1202,7 @@ "item.tfg.fish_roe": "%s Roe", "item.tfg.rotten_voiding_cover": "Rotten Voiding Cover", "item.tfg.flora_pellets": "Flora Pellets", + "item.tfg.magnesia_refractory_brick_ingot": "Resin-Bonded Magnesia Refractory Brick", "material.tfg.latex": "Latex", "material.tfg.vulcanized_latex": "Vulcanized Latex", "material.tfg.fluix": "Fluix", @@ -1377,6 +1378,13 @@ "material.tfg.chloroplasts": "Chloroplasts", "material.tfg.nitrate_rich_water": "Nitrate Rich Water", "material.tfg.nitrate_rich_semiheavy_ammoniacal_water": "Nitrate Rich Semiheavy Ammoniacal Water", + "material.tfg.weak_red_steel": "Weak Red Steel", + "material.tfg.weak_blue_steel": "Weak Blue Steel", + "material.tfg.refractory_clay": "Refractory Clay", + "material.tfg.bakelite": "Bakelite", + "material.tfg.phenolic_resin": "Phenolic Resin", + "material.tfg.magnesium_hydroxide": "Magnesium Hydroxide", + "material.tfg.magnesia_refractory_brick": "Resin-Bonded Magnesia Refractory Brick", "ore_vein.tfg.deep_sheldonite": "Cooperite & Bornite", "ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet", "ore_vein.tfg.deep_garnet_opal": "Opal & Garnet", @@ -1700,6 +1708,7 @@ "tfg.tooltip.hotornot_hot_equipment": "§7Provides protection from all §6hot§7 items, fluids, and pipes.§r", "tfg.tooltip.hotornot_cold_equipment": "§7Provides protection from all §bcold§7 items, fluids, and pipes.§r", "tfg.tooltip.hotornot_floating_equipment": "§7Provides protection from all §elighter-than-air§7 gases.§r", + "tfg.tooltip.polycaprolactam": "Also known as Nylon", "tfg.tooltip.machine.one_energy_hatch": "Accepts exactly §6One§r Energy Hatch.", "tfg.tooltip.machine.two_energy_hatches": "Accepts up to §6Two§r Energy Hatches.", "tfg.tooltip.machine.subtick": "This machine supports §2Subticking§r!", @@ -4021,7 +4030,7 @@ "quests.steam_age.resin_boards.desc": "Did you know tree taps can drip directly into GregTech pipes and drums? Now you do!", "quests.steam_age.circuit_boards.title": "Electronics #2: Circuit Boards", "quests.steam_age.circuit_boards.subtitle": "The easier component for circuits", - "quests.steam_age.circuit_boards.desc": "Some delicate craftsmanship in an &3Artisan Table&r will allow you to combine those Resin Circuit Boards with some Copper Wires to create your first &aCircuit&r!\n\nThe Artisan Table works on the same principal as Knapping, but this time with additional item and tool inputs.", + "quests.steam_age.circuit_boards.desc": "Some delicate craftsmanship in an &3Artisan Table&r will allow you to combine those Resin Circuit Boards with some Copper Wires to create your first &aCircuit Boards&r!\n\nThe Artisan Table works on the same principal as Knapping, but this time with additional item and tool inputs.", "quests.steam_age.vacuum_chamber.title": "Vacuum Chamber", "quests.steam_age.vacuum_chamber.subtitle": "Putting the Vacuum in Vacuum Tubes", "quests.steam_age.vacuum_chamber.desc": "This machine is the final step in making your first Vacuum Tubes. Place it above a Basin and give it some power, and make sure the machine is set to Vacuumizing mode.\n\nThis machine can also help liquefy glue and rubber while being heated by either a Charcoal Forge or a Blaze Burner.", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index 2464e8c53..c40e74d68 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -810,6 +810,8 @@ "block.tfg.impure_moderate_core": "不纯慢化堆芯", "block.tfg.moderate_core_frame": "慢化堆芯框架", "block.tfg.impure_moderate_core_frame": "不纯慢化堆芯框架", + "tfg.block_entity.artisan_table": "工匠台", + "block.tfg.artisan_table": "工匠台", "fluid.tfg.heavy_ammoniacal_water": "重氨水", "fluid.tfg.semiheavy_ammoniacal_water": "半重氨水", "fluid.tfg.sulfur_fumes": "浓硫酸烟雾", @@ -1782,7 +1784,7 @@ "tfg.tooltip.hotornot_container": "§a可安全容纳§6高温§a、§b低温§a以及§e比空气轻§a的物品与流体。§r", "tfg.tooltip.hotornot_hot_equipment": "§7提供对所有§6高温§7物品、流体和管道的防护。§r", "tfg.tooltip.hotornot_cold_equipment": "§7提供对所有§b低温§7物品、流体和管道的防护。§r", - "tfg.tooltip.hotornot_floating_equipment": "§7提供对所有§e比空气轻§7d的气体的防护。§r", + "tfg.tooltip.hotornot_floating_equipment": "§7提供对所有§e比空气轻§7的气体的防护。§r", "tfg.tooltip.machine.one_energy_hatch": "只允许有且仅有§61个§f能源仓。", "tfg.tooltip.machine.two_energy_hatches": "允许有最多§62个§r能源仓。", "tfg.tooltip.machine.subtick": "这台机器支持§2子刻机制§r！", @@ -1831,6 +1833,8 @@ "tfg.tooltip.component.nuclear_turbine_2": "每个高于 §5EV§r 阶段的转子支架 §7可提升§r 10% 效率，并使 EU/t 产出翻倍。", "tfg.tooltip.component.smr_generator_1": "§e基础产出：§r 4096 EU/t", "tfg.tooltip.component.smr_generator_2": "专为利用超临界二氧化碳与小模块化反应堆发电而设计。\n使用润滑剂与加速剂可提升其效率，并管理反应堆的冷却回路。", + "tfg.tooltip.show_recipes": "显示配方", + "emi.category.tfg.artisan_table": "工匠台", "tfg.gui.refrigerator.unify_dates.enabled": "过期日期统一：§a开", "tfg.gui.refrigerator.unify_dates.disabled": "过期日期统一：§a关", "tfg.machine.food_refrigerator_power_usage": "§7工作时消耗§r %s EU/t §7以保持食物新鲜。§r", @@ -2230,7 +2234,7 @@ "quests.create_logistics.rose_quartz_lens.desc": "无论你以何种方式获得了所需材料，你都需要一台&3车床&r来实际制造透镜。一台&7基础&3车床&r足以用一颗&d精美玫瑰石英&r宝石制作透镜，但如果你想仅用一块板来制作透镜，你将需要更好的设备，即一台&b高级&3车床&r。\n\n一旦制作完成，该透镜可以用于在&7基础&3激光刻录机&r中刻录&d双重红合金板&r来制造我们需要的&d发射器&r单元，并且在此过程中不会被消耗。", "quests.create_logistics.stock_link.title": "仓储链接站", "quests.create_logistics.stock_link.subtitle": "家里有存储总线了", - "quests.create_logistics.stock_link.desc": "你可以制造的第一个&2高级物流&r机器是&3仓储链接站&r，它可用于创建&d物流网络&r。当放置到&3打包机&r的任意一面时，仓储链接站将&a使打包机所连接的库存对网络可见&r！就其本身而言，仓储链接站并不是超级有用，但它是所有其他即将到来的机器的核心组件……\n\n记得先手持仓储链接站右键点击已放置的仓储链接站，将两者绑定以共享同一网络。要取消此操作，你可以简单地单独合成来仓储链接站清除其调谐。", + "quests.create_logistics.stock_link.desc": "你可以制造的第一个&2高级物流&r机器是&3仓储链接站&r，它可用于创建&d物流网络&r。当放置到&3打包机&r的任意一面时，仓储链接站将&a使打包机所连接的库存对网络可见&r！就其本身而言，仓储链接站并不是超级有用，但它是所有其他即将到来的机器的核心组件……\n\n记得先手持仓储链接站右键点击已放置的仓储链接站，将两者绑定以共享同一网络。要取消此操作，你可以简单地单独合成仓储链接站来清除其调谐。", "quests.create_logistics.stock_ticker.title": "仓储发报机", "quests.create_logistics.stock_ticker.subtitle": "服务员！服务员！再来点粉质壤土缠根泥土！", "quests.create_logistics.stock_ticker.desc.1": "如果你已经使用&3仓储链接站&r向&d物流网络&r提供了各种物品，下一步就是制作一个可以远程调用所述物品的东西……这就是&3仓储发报机&r的用武之地。与仓储发报机非常相似，你首先需要右击一个现有的链接，将仓储发报机绑定到该网络。然后你需要在仓储发报机旁边放置一个&3烈焰人燃烧室&r或任何坐在&3坐垫&r上的生物，让他们充当&3仓库管理员&r。", @@ -4102,7 +4106,7 @@ "quests.steam_age.resin_boards.desc": "没想到吧？树液采集器可直接将液体滴入格雷科技管道与桶！现在你掌握这个技巧了！", "quests.steam_age.circuit_boards.title": "电子学 #2：电路基板", "quests.steam_age.circuit_boards.subtitle": "更简易的电路元件", - "quests.steam_age.circuit_boards.desc": "将覆膜电路基板与铜导线组合，你就有了第一个&a电路&r的基础！", + "quests.steam_age.circuit_boards.desc": "通过在&3工匠台&r上进行一些精细操作，你可以将这些覆膜电路基板与铜导线组合，制造出你的第一块&a电路板&r！\n\n工匠台的工作原理与敲制类似，但此次需要额外放入物品和工具。", "quests.steam_age.vacuum_chamber.title": "真空腔室", "quests.steam_age.vacuum_chamber.subtitle": "为真空管赋予真空特性", "quests.steam_age.vacuum_chamber.desc": "这台机器是制作首批真空管的最终步骤。将其置于工作盆上方并接通应力，同时确保机器设置为真空模式。\n\n该设备在受木炭炉或烈焰人燃烧室加热时，还可用于液化胶水与橡胶。", From 8e2fa9164dbfe6b04cf639d215b66348f2f0c506 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 26 Jan 2026 13:31:50 +0000 Subject: [PATCH 44/66] add another page to the medicine quest --- config/ftbquests/quests/chapters/questsstoneage.snbt | 2 ++ kubejs/assets/gtceu/lang/en_us.json | 2 ++ kubejs/assets/tfg/lang/en_us.json | 1 + 3 files changed, 5 insertions(+) diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index b429838d3..fbce49270 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -2295,6 +2295,8 @@ "{quests.stone_age.medical_conditions.desc.1}" "{@pagebreak}" "{quests.stone_age.medical_conditions.desc.2}" + "{@pagebreak}" + "{quests.stone_age.medical_conditions.desc.3}" ] icon: "createdeco:decal_skull" id: "00117AD40FACB89D" diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 4f656545c..c07bbc0e6 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -190,6 +190,8 @@ "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Moon and Ostrum Harvesters:§r", "tooltip.moldraw.shift_view_molecule": "§7§oHold (Shift) for Molecular Structure§r", "tooltip.moldraw.shift_view_alloy": "§7§oHold (Shift) for Alloy Composition§r", + "gtceu.medical_condition.antidote.description.effect_removed": "Removes %s%% of the above conditions' effects", + "gtceu.medical_condition.antidote.description.effect_removed.all": "Removes all of the above conditions' effects", "gtceu.greenhouse": "Electric Greenhouse", "gtceu.steam_bloomery": "Steam Bloomery", "gtceu.food_oven": "Food Oven", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index c0d3908ba..60c4590a7 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -4268,6 +4268,7 @@ "quests.stone_age.medical_conditions.subtitle": "Don't eat the Asbestos", "quests.stone_age.medical_conditions.desc.1": "Be careful what you pick up! Not all ores or dusts are safe to touch, and some will cause a buildup of a &6Medical Condition&r.\n\nEverything &cHazardous&r is written on its tooltip, so if you suddenly notice a debuff appearing, get that item out of your inventory! Putting it inside a container like a small vessel or backpack is safe.\n\nMost of these effects will slowly go away on their own, but if you let them build up long enough, you'll start getting a host of other nasty effects, up to and including &cdeath&r.", "quests.stone_age.medical_conditions.desc.2": "You will eventually need to work with some of these materials, so you have ways to deal with them.\n\nThe best way is to avoid getting any conditions in the first place - a Face Mask and Rubber Gloves will prevent inhalation and contact hazards respectively.\n\nThe second-best way is a cure: check out some of the &aPills, Tablets, and Salvos&r you can craft - they all help cure certain effects (and provide helpful buffs!), though the stronger cures have more annoying side-effects.", + "quests.stone_age.medical_conditions.desc.3": "Be careful around anything &cCarcinogenic&r or &cRadioactive&r - these conditions are &epermanent&r until you're able to craft Paracetamol in &7LV&r.", "quests.stone_age.medical_conditions.task": "I'm my own doctor", "quests.stone_age.copper_for_anvil.title": "Copper for the Anvil", "quests.stone_age.copper_for_anvil.subtitle": "You better get used to getting 14 ingots of something.", From 91fa880e82960367a47e35ab7186ce45690d3fb9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 26 Jan 2026 13:38:24 +0000 Subject: [PATCH 45/66] cl --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98d84cca7..a31ec81bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,16 +4,18 @@ ### Breaking changes - The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie ### Changes +- Added the Artisan Table to "knap" circuit boards and GT extruder and casting molds, replacing their crafting table recipes. @BlueBoat29 @Redeix - Added much more music to the different dimensions @Pyritie - Vanadium magnetite is now usable as an iron ore for TFC purposes (#2834) @Pyritie - Added steam alloy smelter glass batch recipes (#2853) @Pyritie -- Added the Artisan Table to "knap" GT molds and circuits. @BlueBoat29 @Redeix +- Paracetamol now cures a small amount of the Radioactive condition, and RadAway now cures everything completely @Pyritie ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie - Fixed rosin leaves and saplings having tags the wrong way around (#2840) @TanJeeSchuan - Fixed missing borax to flux recipe @Pyritie ### Translation updates +- Chinese (simplified) @jmecn ## [0.11.18] - 23-01-2026 ### Important notes From efb19e95675b670a8fddd50605df1f85883a217f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jan 2026 23:19:23 +0000 Subject: [PATCH 46/66] Bump actions/checkout from 6.0.1 to 6.0.2 in the dependencies group (#2871) Bumps the dependencies group with 1 update: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 6.0.1 to 6.0.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6.0.1...v6.0.2) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 6.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b2db7eee..1ff05d7ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: steps: - name: 📦 Checkout - uses: actions/checkout@v6.0.1 + uses: actions/checkout@v6.0.2 with: fetch-depth: 0 @@ -229,7 +229,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6.0.1 + uses: actions/checkout@v6.0.2 with: fetch-depth: 0 @@ -313,7 +313,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v6.0.1 + uses: actions/checkout@v6.0.2 - name: 🔄 Replace strings shell: bash @@ -460,7 +460,7 @@ jobs: steps: - name: 📦 Checkout - uses: actions/checkout@v6.0.1 + uses: actions/checkout@v6.0.2 - name: 📦 Download artifact uses: actions/download-artifact@v7.0.0 From 119040862373c8b2d9e3c9fa952b547ad36497aa Mon Sep 17 00:00:00 2001 From: Paradalope <68783833+Paradalope@users.noreply.github.com> Date: Mon, 26 Jan 2026 18:05:48 -0600 Subject: [PATCH 47/66] Update data.equipment.js (#2872) name of the branch, adds the resistances for the lavaproof blue steel boots (not the diving boots), which were previously missing. --- kubejs/server_scripts/tfg/equipment/data.equipment.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kubejs/server_scripts/tfg/equipment/data.equipment.js b/kubejs/server_scripts/tfg/equipment/data.equipment.js index 4263d344b..636982684 100644 --- a/kubejs/server_scripts/tfg/equipment/data.equipment.js +++ b/kubejs/server_scripts/tfg/equipment/data.equipment.js @@ -69,6 +69,12 @@ function registerTFGEquipmentData(event) { 13, 13, 15 + ) + event.itemDamageResistance( + 'minecraft:netherite_boots', + 13, + 13, + 15 ) event.itemDamageResistance( 'create:netherite_diving_boots', From f324e7e6daf6c8c8696018900653a38cceaaa802 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 27 Jan 2026 00:10:22 +0000 Subject: [PATCH 48/66] New content for ULV + LV (#2873) * require black steel plates before the forge hammer, add some blue steel things post-deployer that require a colored steel anvil, start refractory clay dust * first draft of bakelite, new phenolic boards, new cupro coils * add another page to the medicine quest * cl * backup of lv quests * quest stuff and some recipe tweaks * tweak --------- Co-authored-by: Redeix --- CHANGELOG.md | 4 +- .../quests/chapters/create_logistics.snbt | 17 +- .../quests/chapters/ev__extreme_voltage.snbt | 1 - .../quests/chapters/gregtech_energy.snbt | 8 +- .../quests/chapters/lv__low_voltage.snbt | 785 ++++++++++++------ .../quests/chapters/questsmetallurgy.snbt | 5 + .../quests/chapters/questssteam_age.snbt | 157 ++-- .../quests/chapters/questsstoneage.snbt | 2 + .../quests/chapters/tips__tools.snbt | 24 +- kubejs/assets/gtceu/lang/en_us.json | 2 + kubejs/assets/tfg/alloys/weak_blue_steel.json | 3 + kubejs/assets/tfg/alloys/weak_red_steel.json | 3 + kubejs/assets/tfg/lang/en_us.json | 96 ++- kubejs/client_scripts/tooltips.js | 3 + .../create_additions/recipes.js | 6 +- kubejs/server_scripts/greate/recipes.js | 4 +- .../server_scripts/greate/recipes.removes.js | 43 + .../gregtech/recipes.machines.js | 52 +- .../gregtech/recipes.removes.js | 10 + kubejs/server_scripts/gregtech/tags.js | 4 +- kubejs/server_scripts/tfc/recipes.js | 4 +- kubejs/server_scripts/tfc/recipes.removes.js | 7 + kubejs/server_scripts/tfcbetterbf/recipes.js | 28 +- .../tfg/machines/recipes.bakelite.js | 70 ++ .../tfg/machines/recipes.coils.js | 77 ++ .../tfg/machines/recipes.multiblocks.js | 4 +- .../tfg/ores_and_materials/recipes.alloys.js | 29 + .../recipes.material_tools.js | 2 +- .../tfg/primitive/recipes.clay.js | 23 +- .../primitive/recipes.glue_and_chipboard.js | 15 - kubejs/server_scripts/tfg/recipes.js | 2 + .../vintage_improvements/recipes.js | 6 +- kubejs/startup_scripts/gtceu/constants.js | 2 + .../gtceu/material_modification.js | 6 +- kubejs/startup_scripts/tfg/items.js | 3 - kubejs/startup_scripts/tfg/materials.js | 42 + .../tfg/primitive/items.primitive.js | 1 - .../tfg/primitive/materials.primitive.js | 32 +- kubejs/startup_scripts/tfg/tag_prefixes.js | 3 + 39 files changed, 1092 insertions(+), 493 deletions(-) create mode 100644 kubejs/assets/tfg/alloys/weak_blue_steel.json create mode 100644 kubejs/assets/tfg/alloys/weak_red_steel.json create mode 100644 kubejs/server_scripts/tfg/machines/recipes.bakelite.js create mode 100644 kubejs/server_scripts/tfg/machines/recipes.coils.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 98d84cca7..a31ec81bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,16 +4,18 @@ ### Breaking changes - The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie ### Changes +- Added the Artisan Table to "knap" circuit boards and GT extruder and casting molds, replacing their crafting table recipes. @BlueBoat29 @Redeix - Added much more music to the different dimensions @Pyritie - Vanadium magnetite is now usable as an iron ore for TFC purposes (#2834) @Pyritie - Added steam alloy smelter glass batch recipes (#2853) @Pyritie -- Added the Artisan Table to "knap" GT molds and circuits. @BlueBoat29 @Redeix +- Paracetamol now cures a small amount of the Radioactive condition, and RadAway now cures everything completely @Pyritie ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie - Fixed rosin leaves and saplings having tags the wrong way around (#2840) @TanJeeSchuan - Fixed missing borax to flux recipe @Pyritie ### Translation updates +- Chinese (simplified) @jmecn ## [0.11.18] - 23-01-2026 ### Important notes diff --git a/config/ftbquests/quests/chapters/create_logistics.snbt b/config/ftbquests/quests/chapters/create_logistics.snbt index 9d7f8c168..914590ae0 100644 --- a/config/ftbquests/quests/chapters/create_logistics.snbt +++ b/config/ftbquests/quests/chapters/create_logistics.snbt @@ -131,6 +131,8 @@ dependencies: [ "572A8983FA12152A" "3AF956758FA289A8" + "07E7678095258EDB" + "383A14A5C65B3ADF" ] dependency_requirement: "one_completed" description: ["{quests.create_logistics.rose_quartz_lens.desc}"] @@ -209,8 +211,9 @@ { dependencies: [ "7C4807A247AF36A1" - "648BCF486E16CCB2" + "713C8D6A20BF3A0E" ] + dependency_requirement: "one_completed" description: ["{quests.create_logistics.stock_link.desc}"] id: "76490E046A44BCC3" size: 2.0d @@ -225,7 +228,11 @@ y: -1.0d } { - dependencies: ["76490E046A44BCC3"] + dependencies: [ + "76490E046A44BCC3" + "50FE830DA6F403B2" + ] + dependency_requirement: "one_completed" description: [ "{quests.create_logistics.stock_ticker.desc.1}" "{@pagebreak}" @@ -245,7 +252,11 @@ y: -2.5d } { - dependencies: ["76490E046A44BCC3"] + dependencies: [ + "76490E046A44BCC3" + "50FE830DA6F403B2" + ] + dependency_requirement: "one_completed" description: ["{quests.create_logistics.redstone_requester.desc}"] id: "3F44CFF8A6018F3E" subtitle: "{quests.create_logistics.redstone_requester.subtitle}" diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 40fd2428b..a736b2b47 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -92,7 +92,6 @@ { dependencies: [ "601088B7920140B2" - "3FBDC8552F7D8008" "3B18DE7395776B41" ] description: ["{quests.extreme_voltage.t2_rocket.desc}"] diff --git a/config/ftbquests/quests/chapters/gregtech_energy.snbt b/config/ftbquests/quests/chapters/gregtech_energy.snbt index a962839dd..e52987dc3 100644 --- a/config/ftbquests/quests/chapters/gregtech_energy.snbt +++ b/config/ftbquests/quests/chapters/gregtech_energy.snbt @@ -118,10 +118,7 @@ y: -7.0d } { - dependencies: [ - "06B2E38F7DCF2678" - "22510C5F2386B453" - ] + dependencies: ["06B2E38F7DCF2678"] dependency_requirement: "one_completed" description: ["{quests.gregtech_energy.produce_energy.desc}"] icon: "gtceu:lv_field_generator" @@ -1083,12 +1080,15 @@ "4C620105AAC49381" "0C718329245D9619" ] + description: ["{quests.low_voltage.lv_biodiesel.desc}"] id: "139C7DF629329753" + subtitle: "{quests.low_voltage.lv_biodiesel.subtitle}" tasks: [{ id: "7BA9FDD1F45B53F6" item: "gtceu:bio_diesel_bucket" type: "item" }] + title: "{quests.low_voltage.lv_biodiesel.title}" x: -9.0d y: -7.0d } diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 60e1d570a..42831456c 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -10,20 +10,55 @@ { id: "0EA7766FE6845121" linked_quest: "0FFBB6177DEB0A23" - x: -8.0d - y: 11.5d + x: -14.5d + y: 15.0d } { id: "46612C429BCA8A18" linked_quest: "6BAC3BE1D4FE0F6B" - x: 7.5d - y: 4.0d + x: 2.5d + y: 10.0d } { id: "5E5AD44B50E0B15B" linked_quest: "31A6A236B6710B95" - x: 7.5d - y: 5.0d + x: 4.5d + y: 12.0d + } + { + id: "5BC9534E2B4A16A2" + linked_quest: "2262F1FD4EAB777F" + shape: "octagon" + size: 1.5d + x: -2.5d + y: 14.0d + } + { + id: "3E4C0AAC278DC9F1" + linked_quest: "341E2F290344BEEE" + shape: "octagon" + size: 1.5d + x: -10.5d + y: 4.0d + } + { + id: "00B51E50BEBF7E1D" + linked_quest: "3F44CFF8A6018F3E" + x: -8.5d + y: 6.0d + } + { + id: "34F6462681BB5D77" + linked_quest: "7C4807A247AF36A1" + x: -8.5d + y: 2.0d + } + { + id: "343F16805E04BFBE" + linked_quest: "2D2CB8104E40E808" + shape: "heart" + x: 7.0d + y: 6.0d } ] quests: [ @@ -42,7 +77,7 @@ }] title: "{quests.low_voltage.lv_fluid_regulator.title}" x: 6.0d - y: -1.5d + y: -8.5d } { dependencies: ["38993B4697B0E16C"] @@ -62,7 +97,7 @@ }] title: "{quests.low_voltage.lv_robot_arm.title}" x: 6.0d - y: -4.5d + y: -11.5d } { dependencies: ["7EED0084BA59FED1"] @@ -78,7 +113,7 @@ }] title: "{quests.low_voltage.lv_conveyor.title}" x: 4.5d - y: -3.0d + y: -10.0d } { dependencies: ["7EED0084BA59FED1"] @@ -94,7 +129,7 @@ }] title: "{quests.low_voltage.lv_pump.title}" x: 4.5d - y: -1.5d + y: -8.5d } { dependencies: ["7EED0084BA59FED1"] @@ -110,18 +145,13 @@ }] title: "{quests.low_voltage.lv_piston.title}" x: 4.5d - y: -4.5d + y: -11.5d } { dependencies: ["7FA1525D681C4B4A"] - description: [ - "{quests.low_voltage.lv_steam_turbine.desc.1}" - "{@pagebreak}" - "{quests.low_voltage.lv_steam_turbine.desc.2}" - ] + description: ["{quests.low_voltage.lv_steam_turbine.desc}"] id: "6E186F9C57155BFA" optional: true - shape: "hexagon" size: 1.0d subtitle: "{quests.low_voltage.lv_steam_turbine.subtitle}" tasks: [{ @@ -130,8 +160,8 @@ type: "item" }] title: "{quests.low_voltage.lv_steam_turbine.title}" - x: 7.5d - y: 9.5d + x: 1.0d + y: -6.0d } { dependencies: ["7FA1525D681C4B4A"] @@ -148,16 +178,20 @@ type: "item" }] title: "{quests.low_voltage.lv_amp_explanation.title}" - x: 5.5d - y: 10.5d + x: 2.0d + y: -8.0d } { - dependencies: ["45B71324028F6E68"] + dependencies: [ + "45B71324028F6E68" + "39F6BCF4B8DFC7D4" + ] + dependency_requirement: "one_completed" description: ["{quests.low_voltage.aluminium_ingot.desc}"] hide_dependency_lines: false id: "7567E885B7166603" shape: "octagon" - size: 1.5d + size: 2.0d subtitle: "{quests.low_voltage.aluminium_ingot.subtitle}" tasks: [{ id: "161B5813936E5E42" @@ -165,21 +199,19 @@ type: "item" }] title: "{quests.low_voltage.aluminium_ingot.title}" - x: -10.0d - y: 11.5d + x: -12.5d + y: 14.0d } { dependencies: [ - "49896161B31DB7B4" - "5B891BA4897FD73C" "1912758422EEB006" + "5B891BA4897FD73C" + "49896161B31DB7B4" ] dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_battery_preparation.desc}"] - hide_dependency_lines: true icon: "gtceu:battery_alloy_ingot" id: "6D9D54FAB21EC086" - size: 1.0d subtitle: "{quests.low_voltage.lv_battery_preparation.subtitle}" tasks: [ { @@ -195,8 +227,8 @@ } ] title: "{quests.low_voltage.lv_battery_preparation.title}" - x: 7.5d - y: -0.5d + x: 5.0d + y: 4.0d } { dependencies: [ @@ -223,14 +255,10 @@ }] title: "{quests.low_voltage.cover_behaviour.title}" x: 6.0d - y: -3.0d + y: -10.0d } { - dependencies: [ - "32EA7E81885C8E87" - "10ECB471A77F5136" - "07E7678095258EDB" - ] + dependencies: ["47B899144B865516"] dependency_requirement: "one_completed" description: [ "{quests.low_voltage.machine_auto_output_behaviour.desc.1}" @@ -239,7 +267,7 @@ ] icon: "minecraft:hopper" id: "64E1E87B8AF72968" - shape: "square" + shape: "circle" size: 1.0d subtitle: "{quests.low_voltage.machine_auto_output_behaviour.subtitle}" tasks: [{ @@ -248,11 +276,11 @@ type: "checkmark" }] title: "{quests.low_voltage.machine_auto_output_behaviour.title}" - x: -5.0d - y: -0.5d + x: -2.5d + y: 2.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: [ "{quests.low_voltage.lv_wiremill.desc.1}" "{@pagebreak}" @@ -277,11 +305,11 @@ type: "item" }] title: "{quests.low_voltage.lv_wiremill.title}" - x: -3.0d - y: 0.5d + x: -1.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_bender.desc}"] id: "10ECB471A77F5136" size: 1.0d @@ -302,11 +330,11 @@ type: "item" }] title: "{quests.low_voltage.lv_bender.title}" - x: -5.0d - y: 1.5d + x: -3.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: [ "{quests.low_voltage.lv_lathe.desc.1}" "{@pagebreak}" @@ -328,11 +356,11 @@ type: "item" }] title: "{quests.low_voltage.lv_lathe.title}" - x: -4.0d - y: 1.0d + x: -5.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_polariser.desc}"] id: "29379C91D6E00436" size: 1.0d @@ -343,8 +371,8 @@ type: "item" }] title: "{quests.low_voltage.lv_polariser.title}" - x: -1.0d - y: -0.5d + x: 3.0d + y: -1.0d } { dependencies: [ @@ -370,8 +398,8 @@ type: "item" }] title: "{quests.low_voltage.lbb.title}" - x: 9.0d - y: 9.5d + x: 0.0d + y: -5.5d } { dependencies: ["1E9BE8D3F8A602DC"] @@ -391,18 +419,19 @@ type: "item" }] title: "{quests.low_voltage.lv_superconductor.title}" - x: -12.0d - y: 7.5d + x: -14.5d + y: 10.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: [ "{quests.low_voltage.lv_chemical_bath.desc.1}" "{@pagebreak}" "{quests.low_voltage.lv_chemical_bath.desc.2}" ] - hide_dependency_lines: true id: "330BDB559A7BAB35" + optional: true + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.lv_chemical_bath.subtitle}" tasks: [{ @@ -411,8 +440,8 @@ type: "item" }] title: "{quests.low_voltage.lv_chemical_bath.title}" - x: -4.0d - y: 13.5d + x: 2.5d + y: 3.0d } { dependencies: ["64E1E87B8AF72968"] @@ -429,7 +458,7 @@ } } id: "59F0060B55307311" - shape: "square" + shape: "circle" size: 1.0d subtitle: "{quests.low_voltage.programmed_circuits.subtitle}" tasks: [{ @@ -438,11 +467,11 @@ type: "checkmark" }] title: "{quests.low_voltage.programmed_circuits.title}" - x: -6.5d - y: -0.5d + x: -4.5d + y: 2.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["63CD0236B337EAAD"] description: ["{quests.low_voltage.lv_canner.desc}"] id: "37307A46E70011D3" size: 1.0d @@ -453,8 +482,8 @@ type: "item" }] title: "{quests.low_voltage.lv_canner.title}" - x: 5.0d - y: 1.5d + x: 2.5d + y: 6.0d } { dependencies: [ @@ -482,8 +511,8 @@ type: "item" }] title: "{quests.low_voltage.lv_battery.title}" - x: 7.5d - y: 1.0d + x: 5.0d + y: 6.0d } { dependencies: ["3E6DC423FE4A99F7"] @@ -512,11 +541,14 @@ type: "item" }] title: "{quests.low_voltage.lv_battery_buffer_4x.title}" - x: 7.5d - y: 2.5d + x: 5.0d + y: 8.0d } { - dependencies: ["1646BF9194100E57"] + dependencies: [ + "1646BF9194100E57" + "2FC7B1E867E4194E" + ] description: [ "{quests.low_voltage.lv_ebf.desc.1}" "{@pagebreak}" @@ -541,14 +573,22 @@ type: "item" }] title: "{quests.low_voltage.lv_ebf.title}" - x: -10.0d - y: 7.5d + x: -12.5d + y: 10.0d } { - dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.other_machines.desc}"] hide_dependency_lines: false - icon: "gtceu:crushed_sulfur_ore" + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:crushed_sphalerite_ore" + } id: "701BCADAE5CF6CA5" shape: "circle" size: 1.0d @@ -559,8 +599,8 @@ type: "checkmark" }] title: "{quests.low_voltage.other_machines.title}" - x: 5.5d - y: 4.5d + x: 2.5d + y: 12.0d } { description: ["{quests.low_voltage.lv_age_progression.desc}"] @@ -576,7 +616,7 @@ }] title: "{quests.low_voltage.lv_age_progression.title}" x: 0.0d - y: -3.0d + y: -12.5d } { dependencies: [ @@ -586,7 +626,8 @@ dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_fluid_solidifier.desc}"] id: "581CDF545E1EA1FD" - size: 1.0d + shape: "octagon" + size: 1.5d subtitle: "{quests.low_voltage.lv_fluid_solidifier.subtitle}" tasks: [{ id: "20B1CA4DB2750E84" @@ -594,8 +635,8 @@ type: "item" }] title: "{quests.low_voltage.lv_fluid_solidifier.title}" - x: -8.0d - y: 3.5d + x: -4.5d + y: 6.0d } { dependencies: [ @@ -621,13 +662,13 @@ type: "item" }] title: "{quests.low_voltage.lv_ore_prospector.title}" - x: 9.0d - y: 1.0d + x: 7.0d + y: 7.0d } { dependencies: [ "6042514C8FC54334" - "5B2696206205CB2E" + "02E5D186ABF719F0" ] description: ["{quests.low_voltage.cupronickel_coil.desc}"] icon: { @@ -647,11 +688,10 @@ type: "item" }] title: "{quests.low_voltage.cupronickel_coil.title}" - x: -8.0d - y: 7.5d + x: -10.5d + y: 10.0d } { - dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.lv_gas_collector.desc}"] id: "15928F50AE80A5CF" shape: "square" @@ -663,11 +703,11 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_collector.title}" - x: -4.0d - y: 9.5d + x: -8.5d + y: 12.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: [ "{quests.low_voltage.lv_chemical_reactor.desc.1}" "{@pagebreak}" @@ -697,17 +737,19 @@ } ] title: "{quests.low_voltage.lv_chemical_reactor.title}" - x: -6.0d - y: 3.5d + x: -2.5d + y: 6.0d } { - dependencies: ["10ECB471A77F5136"] + dependencies: ["63CD0236B337EAAD"] description: [ "{quests.low_voltage.universal_cell.desc.1}" "{@pagebreak}" "{quests.low_voltage.universal_cell.desc.2}" ] id: "292938760AB9A12B" + optional: true + shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.universal_cell.subtitle}" tasks: [{ @@ -723,16 +765,14 @@ type: "item" }] title: "{quests.low_voltage.universal_cell.title}" - x: -6.5d - y: 1.5d + x: 1.0d + y: 8.0d } { dependencies: ["581CDF545E1EA1FD"] description: ["{quests.low_voltage.mold_rotor.desc}"] icon: "gtceu:rotor_casting_mold" id: "115C4226F6473F0C" - optional: true - shape: "heart" size: 1.0d subtitle: "{quests.low_voltage.mold_rotor.subtitle}" tasks: [ @@ -748,29 +788,35 @@ } ] title: "{quests.low_voltage.mold_rotor.title}" - x: -9.5d - y: 3.5d + x: -6.5d + y: 7.0d } { - dependencies: ["5B891BA4897FD73C"] + dependencies: ["5B2696206205CB2E"] dependency_requirement: "one_completed" description: ["{quests.low_voltage.soldering_alloy.desc}"] - icon: "gtceu:soldering_alloy_dust" + icon: "gtceu:soldering_alloy_bucket" id: "713C8D6A20BF3A0E" shape: "square" size: 1.0d subtitle: "{quests.low_voltage.soldering_alloy.subtitle}" - tasks: [{ - id: "67F9F84D66E32728" - item: "gtceu:soldering_alloy_dust" - type: "item" - }] + tasks: [ + { + id: "5F6344C5B4DCE4C8" + item: "gtceu:soldering_alloy_bucket" + optional_task: true + type: "item" + } + { + id: "1095906933C39F9A" + type: "checkmark" + } + ] title: "{quests.low_voltage.soldering_alloy.title}" - x: 4.0d - y: 11.5d + x: -6.5d + y: 4.0d } { - dependencies: ["22510C5F2386B453"] description: [ "{quests.low_voltage.lv_electroliser.desc.1}" "{@pagebreak}" @@ -788,11 +834,11 @@ type: "item" }] title: "{quests.low_voltage.lv_electroliser.title}" - x: -6.0d - y: 7.5d + x: -2.5d + y: 12.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_cutter.desc}"] id: "3A8D7FC6F316C38C" size: 1.0d @@ -813,11 +859,11 @@ type: "item" }] title: "{quests.low_voltage.lv_cutter.title}" - x: -2.0d - y: 0.0d + x: 1.0d + y: -1.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["63CD0236B337EAAD"] description: [ "{quests.low_voltage.lv_centrifuge.desc.1}" "{@pagebreak}" @@ -834,8 +880,8 @@ type: "item" }] title: "{quests.low_voltage.lv_centrifuge.title}" - x: -2.0d - y: 9.5d + x: -2.5d + y: 10.0d } { dependencies: ["37307A46E70011D3"] @@ -852,11 +898,11 @@ type: "item" }] title: "{quests.low_voltage.lv_sprayer.title}" - x: 5.0d - y: 0.0d + x: 2.5d + y: 8.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: [ "{quests.low_voltage.lv_assembler.desc.1}" "{@pagebreak}" @@ -873,10 +919,10 @@ }] title: "{quests.low_voltage.lv_assembler.title}" x: 0.0d - y: 9.5d + y: 6.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: [ "{quests.low_voltage.lv_extractor.desc.1}" "{@pagebreak}" @@ -891,8 +937,8 @@ type: "item" }] title: "{quests.low_voltage.lv_extractor.title}" - x: -6.0d - y: 5.5d + x: -4.5d + y: 4.0d } { dependencies: ["0DBC148D92A9F69F"] @@ -912,7 +958,7 @@ }] title: "{quests.low_voltage.lv_circuit_assembler.title}" x: 0.0d - y: 16.5d + y: 19.5d } { dependencies: ["1A77CA35F054F988"] @@ -930,8 +976,8 @@ type: "item" }] title: "{quests.low_voltage.lv_arc_furnace.title}" - x: -6.0d - y: 11.5d + x: -4.5d + y: 13.0d } { dependencies: [ @@ -973,8 +1019,8 @@ } ] title: "{quests.low_voltage.lv_oxygen.title}" - x: -6.0d - y: 9.5d + x: -4.5d + y: 12.0d } { dependencies: ["5263F866638D875C"] @@ -1004,11 +1050,11 @@ } ] title: "{quests.low_voltage.lv_glue.title}" - x: -2.0d - y: 11.5d + x: -4.5d + y: 10.0d } { - dependencies: ["5B891BA4897FD73C"] + dependencies: ["701BCADAE5CF6CA5"] dependency_requirement: "one_completed" description: ["{quests.low_voltage.gallium_arsenide.desc}"] id: "4073577B7EF9B593" @@ -1020,14 +1066,13 @@ type: "item" }] title: "{quests.low_voltage.gallium_arsenide.title}" - x: 2.0d - y: 11.5d + x: 2.5d + y: 14.0d } { dependencies: [ - "0EAC071414AEC07E" - "330BDB559A7BAB35" - "63CD0236B337EAAD" + "1C5F5EDAEE355130" + "628C72BC441DAAB5" ] description: [ "{quests.low_voltage.t2_circuit_board.desc.1}" @@ -1042,8 +1087,8 @@ item: "gtceu:phenolic_printed_circuit_board" type: "item" }] - x: -2.0d - y: 13.5d + x: -3.5d + y: 16.0d } { dependencies: [ @@ -1061,7 +1106,7 @@ }] title: "{quests.low_voltage.lv_diode.title}" x: 0.0d - y: 11.5d + y: 14.0d } { dependencies: [ @@ -1070,8 +1115,8 @@ ] description: ["{quests.low_voltage.1_mv_circuit.desc}"] id: "0DBC148D92A9F69F" - shape: "gear" - size: 1.5d + shape: "octagon" + size: 2.0d subtitle: "{quests.low_voltage.1_mv_circuit.subtitle}" tasks: [{ id: "70313E1917121E14" @@ -1080,7 +1125,7 @@ }] title: "{quests.low_voltage.1_mv_circuit.title}" x: 0.0d - y: 13.5d + y: 16.0d } { dependencies: ["1E9BE8D3F8A602DC"] @@ -1094,19 +1139,20 @@ type: "item" }] title: "{quests.low_voltage.aluminium_dust.title}" - x: -10.0d - y: 9.5d + x: -12.5d + y: 12.0d } { - dependencies: ["1E9BE8D3F8A602DC"] description: ["{quests.low_voltage.multiblock_tech.desc}"] hide_text_until_complete: false icon: "gtceu:heatproof_machine_casing" id: "2FC7B1E867E4194E" + shape: "circle" size: 1.0d subtitle: "{quests.low_voltage.multiblock_tech.subtitle}" tasks: [ { + disable_toast: true id: "1B5378C55DC4AE73" item: { Count: 1 @@ -1119,23 +1165,13 @@ type: "item" } { - id: "3201D38691813B6D" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:ulv_output_bus)item(gtceu:lv_output_bus))" - } - } - title: "{quests.low_voltage.multiblock_tech.task.2}" - type: "item" - } - { + disable_toast: true id: "1F39902E1FB41053" item: "gtceu:maintenance_hatch" type: "item" } { + disable_toast: true id: "705D4CC1AA36EF10" item: "gtceu:lv_muffler_hatch" type: "item" @@ -1147,6 +1183,7 @@ type: "item" } { + disable_toast: true id: "7E3D72FA8499654D" item: { Count: 1 @@ -1160,49 +1197,29 @@ } { count: 2L + disable_toast: true id: "64F174F0EDAED10E" item: "gtceu:lv_energy_input_hatch" type: "item" } + { + disable_toast: true + id: "226789AAB78CDC09" + item: "gtceu:lv_output_bus" + type: "item" + } ] title: "{quests.low_voltage.multiblock_tech.title}" - x: -10.0d - y: 5.5d + x: -12.5d + y: 8.0d } { - dependencies: ["22510C5F2386B453"] - description: [ - "{quests.low_voltage.lv_rock_crusher.desc.1}" - "{@pagebreak}" - "{quests.low_voltage.lv_rock_crusher.desc.2}" + dependencies: [ + "2E36E5755B2F551C" + "4B4F052F00435AFE" + "2D2CB8104E40E808" ] - icon: "gtceu:lv_rock_crusher" - id: "1F2359106FC95603" - optional: true - shape: "heart" - size: 1.0d - subtitle: "{quests.low_voltage.lv_rock_crusher.subtitle}" - tasks: [{ - id: "37396BE76A4F64C5" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - display: { - Name: "{\"text\":\"Any Rock Crusher\"}" - } - "ftbfiltersystem:filter": "or(item(gtceu:lv_rock_crusher)item(gtceu:mv_rock_crusher)item(gtceu:hv_rock_crusher)item(gtceu:ev_rock_crusher)item(gtceu:iv_rock_crusher)item(gtceu:luv_rock_crusher)item(gtceu:zpm_rock_crusher)item(gtceu:uv_rock_crusher))" - } - } - title: "{quests.low_voltage.lv_rock_crusher.task}" - type: "item" - }] - title: "{quests.low_voltage.lv_rock_crusher.title}" - x: 3.5d - y: 0.5d - } - { - dependencies: ["3E6DC423FE4A99F7"] + dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_turbo_charge.desc}"] icon: "gtceu:lv_charger_4x" id: "2DB259568F347C0E" @@ -1227,42 +1244,30 @@ }] title: "{quests.low_voltage.lv_turbo_charge.title}" x: 9.0d - y: -0.5d + y: 6.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["12565AB92A2BF976"] description: ["{quests.low_voltage.lv_mixer.desc}"] id: "5B891BA4897FD73C" subtitle: "{quests.low_voltage.lv_mixer.subtitle}" tasks: [{ - id: "337A6B670842F80A" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - display: { - Name: "{\"text\":\"LV Mixer\"}" - } - "ftbfiltersystem:filter": "or(item(greate:steel_mechanical_mixer)item(gtceu:lv_mixer))" - } - } - title: "{quests.low_voltage.lv_mixer.task}" + id: "7595657F7017B1F6" + item: "gtceu:lv_mixer" type: "item" }] title: "{quests.low_voltage.lv_mixer.title}" - x: 2.0d - y: 9.5d + x: 5.0d + y: -1.0d } { - dependencies: ["12565AB92A2BF976"] + dependencies: ["648BCF486E16CCB2"] description: [ "{quests.low_voltage.lv_machine_hull.desc.1}" "{@pagebreak}" "{quests.low_voltage.lv_machine_hull.desc.2}" ] id: "22510C5F2386B453" - shape: "gear" - size: 2.5d subtitle: "{quests.low_voltage.lv_machine_hull.subtitle}" tasks: [{ id: "499CACFF0350B3CA" @@ -1271,7 +1276,7 @@ }] title: "{quests.low_voltage.lv_machine_hull.title}" x: 0.0d - y: 4.5d + y: -10.0d } { dependencies: ["15928F50AE80A5CF"] @@ -1301,11 +1306,11 @@ } ] title: "{quests.low_voltage.lv_nitrogen.title}" - x: -4.0d - y: 11.5d + x: -10.5d + y: 12.0d } { - dependencies: ["648BCF486E16CCB2"] + dependencies: ["22510C5F2386B453"] description: ["{quests.low_voltage.lv_motor.desc}"] icon: "gtceu:lv_electric_motor" id: "7EED0084BA59FED1" @@ -1320,7 +1325,7 @@ }] title: "{quests.low_voltage.lv_motor.title}" x: 3.0d - y: -3.0d + y: -10.0d } { dependencies: ["581CDF545E1EA1FD"] @@ -1342,14 +1347,16 @@ } ] title: "{quests.low_voltage.mold_plate.title}" - x: -9.5d - y: 2.5d + x: -6.5d + y: 6.0d } { dependencies: ["3E6DC423FE4A99F7"] + description: ["{quests.low_voltage.night_vision_goggles.desc}"] id: "4B4F052F00435AFE" optional: true shape: "heart" + subtitle: "{quests.low_voltage.night_vision_goggles.subtitle}" tasks: [{ id: "00E6EDB1E4C1482F" item: { @@ -1359,15 +1366,15 @@ } type: "item" }] - x: 9.0d - y: 2.5d + x: 7.0d + y: 5.0d } { dependencies: ["7FA1525D681C4B4A"] description: ["{quests.steam_age.alternator.desc.1}"] + icon: "createaddition:alternator" id: "2DC24661CAD557B0" optional: true - shape: "hexagon" subtitle: "{quests.steam_age.alternator.subtitle}" tasks: [ { @@ -1391,11 +1398,14 @@ } ] title: "{quests.steam_age.alternator.title}" - x: 7.5d - y: 8.0d + x: -1.0d + y: -6.0d } { - dependencies: ["7567E885B7166603"] + dependencies: [ + "7567E885B7166603" + "1C5F5EDAEE355130" + ] description: [ "{quests.low_voltage.mv_hull.desc1}" "{@pagebreak}" @@ -1411,22 +1421,51 @@ type: "item" }] title: "{quests.low_voltage.mv_hull.title}" - x: -10.0d - y: 15.0d + x: -12.5d + y: 17.5d } { - dependencies: ["648BCF486E16CCB2"] + dependencies: [ + "170B544373A16112" + "2DC24661CAD557B0" + "1AD51E2B66EA7F67" + "6E186F9C57155BFA" + ] + dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_machine_casing.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:red_steel_wire_cutter" + tag: { + Damage: 0 + DisallowContainerItem: 0b + GT.Behaviours: { } + GT.Tool: { + DefaultEnchantments: [ ] + HarvestLevel: 3 + MaxDamage: 15359 + ToolSpeed: 11.0f + } + HideFlags: 2 + } + } id: "12565AB92A2BF976" + shape: "circle" + size: 1.5d subtitle: "{quests.low_voltage.lv_machine_casing.subtitle}" tasks: [{ - id: "7459A24E5EBE148D" - item: "gtceu:lv_machine_casing" - type: "item" + id: "373E2FE9A8AB14B3" + type: "checkmark" }] title: "{quests.low_voltage.lv_machine_casing.title}" x: 0.0d - y: 1.0d + y: -3.5d } { dependencies: ["0DBC148D92A9F69F"] @@ -1451,11 +1490,11 @@ type: "item" }] title: "{quests.low_voltage.lv_greenhouse.title}" - x: 2.25d - y: 13.5d + x: 2.5d + y: 16.0d } { - dependencies: ["22510C5F2386B453"] + dependencies: ["47B899144B865516"] description: ["{quests.low_voltage.lv_aqueous_accumulator.desc}"] icon: "tfg:lv_aqueous_accumulator" id: "47E6F8AC20D51814" @@ -1475,8 +1514,8 @@ type: "item" }] title: "{quests.low_voltage.lv_aqueous_accumulator.title}" - x: 2.0d - y: 0.0d + x: 2.5d + y: 2.0d } { dependencies: [ @@ -1488,7 +1527,6 @@ description: ["{quests.low_voltage.lv_combuston_gen.desc}"] id: "170B544373A16112" optional: true - shape: "hexagon" subtitle: "{quests.low_voltage.lv_combuston_gen.subtitle}" tasks: [{ id: "2B36CA88F25D5449" @@ -1496,8 +1534,8 @@ type: "item" }] title: "{quests.low_voltage.lv_combuston_gen.title}" - x: 7.5d - y: 11.0d + x: -3.0d + y: -6.0d } { dependencies: ["22510C5F2386B453"] @@ -1516,8 +1554,8 @@ type: "checkmark" }] title: "{quests.low_voltage.link_chapter.title}" - x: 5.5d - y: 8.5d + x: 0.0d + y: -8.0d } { dependencies: ["5F3063C539C9CBBF"] @@ -1539,8 +1577,8 @@ type: "item" }] title: "{quests.low_voltage.lv_seeds.title}" - x: 11.0d - y: 11.0d + x: -6.5d + y: -6.5d } { dependencies: ["55213ACBF5F5D398"] @@ -1555,8 +1593,8 @@ type: "item" }] title: "{quests.low_voltage.lv_seed_oil.title}" - x: 10.0d - y: 11.0d + x: -5.5d + y: -6.5d } { dependencies: ["1D979CB5862BD480"] @@ -1571,12 +1609,10 @@ type: "item" }] title: "{quests.low_voltage.lv_biodiesel.title}" - x: 9.0d - y: 11.0d + x: -4.5d + y: -6.5d } { - dependencies: ["1912758422EEB006"] - dependency_requirement: "one_completed" description: ["{quests.low_voltage.cupronickel_ingot.desc}"] id: "6042514C8FC54334" shape: "diamond" @@ -1587,8 +1623,8 @@ type: "item" }] title: "{quests.low_voltage.cupronickel_ingot.title}" - x: -8.0d - y: 9.5d + x: -10.5d + y: 8.0d } { dependencies: ["7567E885B7166603"] @@ -1617,14 +1653,10 @@ } ] title: "{quests.low_voltage.aluminium_greate.title}" - x: -12.0d - y: 11.5d + x: -14.5d + y: 14.0d } { - dependencies: [ - "5263F866638D875C" - "3D98819A799D2E64" - ] dependency_requirement: "one_completed" description: ["{quests.low_voltage.oil.desc}"] hide_dependency_lines: true @@ -1639,8 +1671,8 @@ type: "checkmark" }] title: "{quests.low_voltage.oil.title}" - x: 10.0d - y: 12.0d + x: -5.5d + y: -5.5d } { dependencies: [ @@ -1650,7 +1682,6 @@ description: ["{quests.low_voltage.lv_gas_turbine.desc}"] id: "1AD51E2B66EA7F67" optional: true - shape: "hexagon" subtitle: "{quests.low_voltage.lv_gas_turbine.subtitle}" tasks: [{ id: "295425BB3FED8220" @@ -1658,8 +1689,8 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_turbine.title}" - x: 7.5d - y: 6.5d + x: 3.0d + y: -6.0d } { dependencies: ["2CEE3C0972650C81"] @@ -1690,8 +1721,8 @@ } ] title: "{quests.low_voltage.lv_naphtha_light.title}" - x: 9.0d - y: 12.0d + x: -4.5d + y: -5.5d } { dependencies: ["5F3063C539C9CBBF"] @@ -1707,8 +1738,8 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_syngas.title}" - x: 9.0d - y: 6.5d + x: 4.5d + y: -6.0d } { dependencies: [ @@ -1725,8 +1756,8 @@ type: "item" }] title: "{quests.low_voltage.glowstone.title}" - x: -8.0d - y: 5.5d + x: -6.5d + y: 5.0d } { dependencies: ["22510C5F2386B453"] @@ -1747,8 +1778,222 @@ type: "checkmark" }] title: "{quests.low_voltage.lost.title}" - x: 1.5d - y: 5.0d + x: -2.0d + y: -10.0d + } + { + dependencies: [ + "32EA7E81885C8E87" + "3A8D7FC6F316C38C" + "10ECB471A77F5136" + "5B891BA4897FD73C" + "07E7678095258EDB" + "29379C91D6E00436" + ] + dependency_requirement: "one_completed" + description: ["{quests.low_voltage.next_machines.desc}"] + icon: { + Count: 1 + id: "gtceu:lv_blue_steel_wrench" + tag: { + Charge: 2147483647L + Damage: 0 + DisallowContainerItem: 0b + GT.Behaviours: { + Mode: 2b + } + GT.Tool: { + DefaultEnchantments: [ ] + HarvestLevel: 3 + MaxDamage: 6143 + ToolSpeed: 34.0f + } + HideFlags: 2 + MaxCharge: 2147483647L + } + } + id: "47B899144B865516" + shape: "circle" + size: 1.5d + subtitle: "{quests.low_voltage.next_machines.subtitle}" + tasks: [{ + id: "4E3F61B3665C360D" + type: "checkmark" + }] + title: "{quests.low_voltage.next_machines.title}" + x: 0.0d + y: 2.0d + } + { + dependencies: ["3D98819A799D2E64"] + description: ["{quests.low_voltage.lv_distillery.desc}"] + id: "26C843A618A39A44" + subtitle: "{quests.low_voltage.lv_distillery.subtitle}" + tasks: [{ + id: "7A2467AC143CE86C" + item: "gtceu:lv_distillery" + type: "item" + }] + x: -4.5d + y: 8.0d + } + { + dependencies: ["26C843A618A39A44"] + description: [ + "{quests.low_voltage.phenolic_resin.desc.1}" + "{@pagebreak}" + "{quests.low_voltage.phenolic_resin.desc.2}" + ] + icon: "tfg:phenolic_resin_bucket" + id: "671F90ADCDF476A8" + subtitle: "{quests.low_voltage.phenolic_resin.subtitle}" + tasks: [ + { + id: "173ED252A38EC942" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(nbt(fuzzy:{fluid:{FluidName:\"tfg:phenolic_resin\"}})nbt(fuzzy:{Fluid:{FluidName:\"tfg:phenolic_resin\"}})item(tfg:phenolic_resin_bucket))" + } + } + optional_task: true + title: "{material.tfg.phenolic_resin}" + type: "item" + } + { + id: "7427C1BCD5B921B6" + type: "checkmark" + } + ] + title: "{material.tfg.phenolic_resin}" + x: -6.5d + y: 10.0d + } + { + dependencies: ["671F90ADCDF476A8"] + description: [ + "{quests.low_voltage.bakelite.desc.1}" + "{@pagebreak}" + "{quests.low_voltage.bakelite.desc.2}" + ] + id: "1C5F5EDAEE355130" + shape: "octagon" + size: 1.5d + subtitle: "{quests.low_voltage.bakelite.subtitle}" + tasks: [{ + id: "0938AC37E76A29D7" + item: "tfg:bakelite_plate" + type: "item" + }] + title: "{material.tfg.bakelite}" + x: -6.5d + y: 16.0d + } + { + description: ["{quests.low_voltage.lv_forming_press.desc}"] + icon: "gtceu:lv_forming_press" + id: "628C72BC441DAAB5" + subtitle: "{quests.low_voltage.lv_forming_press.subtitle}" + tasks: [{ + id: "60128F9B939ED982" + item: "gtceu:lv_forming_press" + type: "item" + }] + x: -3.5d + y: 18.0d + } + { + dependencies: [ + "671F90ADCDF476A8" + "6FFD4990FF07078A" + "698DCAB4F014EB3B" + ] + dependency_requirement: "one_completed" + description: ["{quests.low_voltage.refractory_brick.desc}"] + id: "02E5D186ABF719F0" + subtitle: "{quests.low_voltage.refractory_brick.subtitle}" + tasks: [{ + id: "5E377C9A0AD52487" + item: "tfg:magnesia_refractory_brick_ingot" + type: "item" + }] + x: -8.5d + y: 10.0d + } + { + description: ["{quests.low_voltage.magnesia.desc}"] + id: "698DCAB4F014EB3B" + shape: "diamond" + subtitle: "{quests.low_voltage.magnesia.subtitle}" + tasks: [{ + id: "57C83D16611E601A" + item: "gtceu:magnesia_dust" + type: "item" + }] + x: -8.5d + y: 8.0d + } + { + dependencies: ["47B899144B865516"] + description: ["{quests.low_voltage.food_machines.desc}"] + icon: "tfg:lv_food_processor" + id: "3B6A7B1E9114C2A9" + optional: true + shape: "heart" + subtitle: "{quests.low_voltage.food_machines.subtitle}" + tasks: [ + { + id: "12EE86BCBC04FCCE" + item: "tfg:lv_food_processor" + type: "item" + } + { + id: "4A3187B73528B908" + item: "tfg:lv_food_oven" + type: "item" + } + { + id: "2D6C7761076670A5" + item: "tfg:rotten_voiding_cover" + optional_task: true + type: "item" + } + ] + title: "{quests.low_voltage.food_machines.title}" + x: 2.5d + y: 4.0d + } + { + dependencies: [ + "713C8D6A20BF3A0E" + "7C4807A247AF36A1" + ] + dependency_requirement: "one_completed" + description: ["{quests.create_logistics.stock_link.desc}"] + disable_toast: true + id: "50FE830DA6F403B2" + subtitle: "{quests.create_logistics.stock_link.subtitle}" + tasks: [{ + id: "7B71B5DBEFD84C1F" + item: "create:stock_link" + type: "item" + }] + title: "{quests.create_logistics.stock_link.title}" + x: -8.5d + y: 4.0d + } + { + description: ["{quests.low_voltage.lv_laser_engraver.desc}"] + id: "383A14A5C65B3ADF" + subtitle: "{quests.low_voltage.lv_laser_engraver.subtitle}" + tasks: [{ + id: "4CB619C294C16642" + item: "gtceu:lv_laser_engraver" + type: "item" + }] + x: -10.5d + y: 2.0d } ] subtitle: ["{quests.low_voltage.subtitle}"] diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index 132a73332..61a20311b 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -415,6 +415,7 @@ description: ["{quests.metal_age.anvil_recycling.desc}"] icon: "tfc:firepit" id: "3B2550394C94CEC9" + shape: "circle" size: 1.0d subtitle: "{quests.metal_age.anvil_recycling.subtitle}" tasks: [{ @@ -646,6 +647,7 @@ } } id: "5792DDAA82895E67" + shape: "circle" subtitle: "{quests.metal_age.red_blu.subtitle}" tasks: [{ id: "63890641DCD6659F" @@ -719,6 +721,7 @@ description: ["{quests.metal_age.wrought_iron_goodies.desc}"] icon: "create:chute" id: "20C2CE92459BE14A" + shape: "circle" subtitle: "{quests.metal_age.wrought_iron_goodies.subtitle}" tasks: [{ id: "60605AA92B6947D8" @@ -734,6 +737,7 @@ description: ["{quests.metal_age.fire_clay_ingredients.desc}"] icon: "minecraft:cartography_table" id: "5A936E9BCF30AA3D" + shape: "circle" subtitle: "{quests.metal_age.fire_clay_ingredients.subtitle}" tasks: [{ id: "39CA01175999A291" @@ -816,6 +820,7 @@ description: ["{quests.metal_age.steel_goodies.desc}"] icon: "greate:steel_mechanical_pump" id: "0C9B7745D812555A" + shape: "circle" subtitle: "{quests.metal_age.steel_goodies.subtitle}" tasks: [{ id: "3EB7C3AE88950E4B" diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 433379c42..753639ff5 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -19,20 +19,22 @@ { id: "39027CF4DC307D33" linked_quest: "5E186CD5E83BFDF0" - x: -28.5d + x: -27.0d y: 2.0d } { id: "0CE64B9914191C56" linked_quest: "6FFD4990FF07078A" shape: "diamond" - x: -9.5d + x: -9.0d y: 11.5d } { id: "23A27702FF816291" linked_quest: "6903C72A254A7B08" - x: -12.5d + shape: "octagon" + size: 2.0d + x: -11.5d y: 8.0d } { @@ -40,27 +42,27 @@ linked_quest: "48A8E3210B2BAE1C" shape: "octagon" size: 2.0d - x: -28.5d + x: -27.0d y: 0.0d } { id: "7C03FE015586C652" linked_quest: "55213ACBF5F5D398" shape: "heart" - x: -12.0d + x: -10.5d y: 16.0d } { id: "65E0B13E245D2E5F" linked_quest: "379F434116632A89" - x: -26.0d + x: -24.5d y: 1.0d } { id: "68F5E521F2DB0A86" linked_quest: "0404FBCC34011053" shape: "heart" - x: -13.0d + x: -11.5d y: 16.0d } { @@ -77,6 +79,14 @@ x: -22.5d y: 4.0d } + { + id: "6C8C3BBD2BA9853B" + linked_quest: "56CA2EB7812529C5" + shape: "gear" + size: 1.5d + x: -13.0d + y: 13.5d + } ] quests: [ { @@ -84,7 +94,11 @@ "7B045998769930F0" "55FDF06AC0C01D0B" ] - description: ["{quests.steam_age.basic_millstone.desc}"] + description: [ + "{quests.steam_age.basic_millstone.desc.1}" + "{@pagebreak}" + "{quests.steam_age.basic_millstone.desc.2}" + ] id: "48C1E980F7D64317" size: 1.0d subtitle: "{quests.steam_age.basic_millstone.subtitle}" @@ -94,7 +108,7 @@ type: "item" }] title: "{quests.steam_age.basic_millstone.title}" - x: -20.5d + x: -19.0d y: 0.0d } { @@ -112,7 +126,7 @@ type: "item" }] title: "{quests.steam_age.horse_crank.title}" - x: -24.5d + x: -23.0d y: -2.0d } { @@ -131,7 +145,7 @@ type: "item" }] title: "{quests.steam_age.helve_hammer.title}" - x: -20.5d + x: -19.0d y: -4.0d } { @@ -159,7 +173,7 @@ } ] title: "{quests.steam_age.basic_greate.title}" - x: -20.5d + x: -19.0d y: -2.0d } { @@ -173,7 +187,7 @@ type: "item" }] title: "{quests.steam_age.water_wheel.title}" - x: -14.5d + x: -13.0d y: 0.0d } { @@ -195,7 +209,7 @@ } ] title: "{quests.steam_age.windmill.title}" - x: -14.5d + x: -13.0d y: -4.0d } { @@ -210,7 +224,7 @@ type: "item" }] title: "{quests.steam_age.metal_casing.title}" - x: -9.5d + x: -8.0d y: -2.0d } { @@ -227,7 +241,7 @@ type: "item" }] title: "{quests.steam_age.steel_encased_fan.title}" - x: -5.5d + x: -4.0d y: 4.0d } { @@ -247,7 +261,7 @@ type: "item" }] title: "{quests.steam_age.steel_pump.title}" - x: -3.5d + x: -2.0d y: 2.0d } { @@ -297,7 +311,7 @@ } ] title: "{quests.steam_age.steam_engine.title}" - x: -5.5d + x: -4.0d y: -2.0d } { @@ -316,7 +330,7 @@ type: "item" }] title: "{quests.steam_age.mechanical_saw.title}" - x: -9.5d + x: -8.0d y: 0.0d } { @@ -330,7 +344,7 @@ type: "item" }] title: "{quests.steam_age.mechanical_harvester.title}" - x: -9.5d + x: -8.0d y: -4.0d } { @@ -358,7 +372,7 @@ } ] title: "{quests.steam_age.chute.title}" - x: -12.0d + x: -10.5d y: 0.0d } { @@ -376,7 +390,7 @@ type: "item" }] title: "{quests.steam_age.mold_table.title}" - x: -3.5d + x: -2.0d y: 4.0d } { @@ -406,7 +420,7 @@ } ] title: "{quests.steam_age.steel_greate.title}" - x: -5.5d + x: -4.0d y: 2.0d } { @@ -424,7 +438,7 @@ type: "item" }] title: "{quests.steam_age.steel_millstone.title}" - x: -7.5d + x: -6.0d y: 2.0d } { @@ -523,8 +537,8 @@ } ] title: "{quests.steam_age.miner.title}" - x: -10.0d - y: 17.0d + x: -9.0d + y: 18.0d } { dependencies: [ @@ -681,7 +695,7 @@ type: "item" }] title: "{quests.steam_age.item_pipes.title}" - x: -12.0d + x: -10.5d y: 2.0d } { @@ -708,7 +722,7 @@ } ] title: "{quests.steam_age.circuit_boards.title}" - x: -10.0d + x: -9.0d y: 10.0d } { @@ -777,8 +791,8 @@ type: "item" }] title: "{quests.steam_age.vacuum_tubes.title}" - x: -8.0d - y: 14.0d + x: -7.0d + y: 15.0d } { dependencies: ["7DB7AB5349218605"] @@ -828,7 +842,7 @@ type: "item" }] title: "{quests.steam_age.resistors.title}" - x: -5.0d + x: -4.0d y: 11.5d } { @@ -844,8 +858,8 @@ type: "item" }] title: "{quests.steam_age.coiling_machine.title}" - x: -5.0d - y: 16.0d + x: -4.0d + y: 17.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -860,8 +874,8 @@ type: "item" }] title: "{quests.steam_age.steel_mixer.title}" - x: -5.0d - y: 14.5d + x: -4.0d + y: 15.5d } { dependencies: ["2C35D4E01AEC02AA"] @@ -875,8 +889,8 @@ type: "item" }] title: "{quests.steam_age.lathe.title}" - x: -6.0d - y: 17.0d + x: -5.0d + y: 18.0d } { dependencies: [ @@ -913,8 +927,8 @@ type: "item" }] title: "{quests.steam_age.vibrating_table.title}" - x: -8.0d - y: 17.0d + x: -7.0d + y: 18.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -933,8 +947,8 @@ type: "item" }] title: "{quests.steam_age.rolling_mill.title}" - x: -5.0d - y: 13.0d + x: -4.0d + y: 14.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -948,8 +962,8 @@ type: "item" }] title: "{quests.steam_age.steel_saw.title}" - x: -7.0d - y: 17.0d + x: -6.0d + y: 18.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -963,8 +977,8 @@ type: "item" }] title: "{quests.steam_age.curving_press.title}" - x: -9.0d - y: 17.0d + x: -8.0d + y: 18.0d } { dependencies: [ @@ -1124,7 +1138,7 @@ } ] title: "{quests.steam_age.fluid_pipes.title}" - x: -3.5d + x: -2.0d y: 0.0d } { @@ -1150,7 +1164,7 @@ type: "item" }] title: "{quests.steam_age.fluid_drums.title}" - x: -1.5d + x: 0.0d y: 2.0d } { @@ -1179,8 +1193,8 @@ type: "item" }] title: "{quests.steam_age.potin.title}" - x: -3.5d - y: 14.5d + x: -2.5d + y: 15.5d } { dependencies: ["6F1BC99BE641B671"] @@ -1207,7 +1221,7 @@ } ] title: "{quests.steam_age.create_tools.title}" - x: -22.5d + x: -21.0d y: -4.0d } { @@ -1240,7 +1254,10 @@ y: 16.0d } { - dependencies: ["6AA07588374B59AB"] + dependencies: [ + "6AA07588374B59AB" + "56CA2EB7812529C5" + ] description: ["{quests.steam_age.vacuum_chamber.desc}"] id: "5F3063C539C9CBBF" subtitle: "{quests.steam_age.vacuum_chamber.subtitle}" @@ -1250,7 +1267,7 @@ type: "item" }] title: "{quests.steam_age.vacuum_chamber.title}" - x: -12.5d + x: -11.5d y: 15.0d } { @@ -1321,7 +1338,7 @@ } ] title: "{quests.steam_age.poor_paths.title}" - x: -26.0d + x: -24.5d y: -3.5d } { @@ -1373,7 +1390,7 @@ } ] title: "{quests.steam_age.normal_paths.title}" - x: -26.5d + x: -25.0d y: -2.0d } { @@ -1431,7 +1448,7 @@ } ] title: "{quests.steam_age.good_paths.title}" - x: -26.0d + x: -24.5d y: -0.5d } { @@ -1453,7 +1470,7 @@ type: "item" }] title: "{quests.steam_age.lv_circuit.title}" - x: -8.0d + x: -7.0d y: 8.0d } { @@ -1468,7 +1485,7 @@ type: "item" }] title: "{quests.steam_age.paper.title}" - x: -3.5d + x: -2.5d y: 11.5d } { @@ -1491,7 +1508,7 @@ type: "item" }] title: "{quests.metal_age.bronze_goodies.title}" - x: -22.5d + x: -21.0d y: -2.0d } { @@ -1515,7 +1532,7 @@ type: "item" }] title: "{quests.metal_age.wrought_iron_goodies.title}" - x: -12.0d + x: -10.5d y: -2.0d } { @@ -1539,7 +1556,7 @@ type: "item" }] title: "{quests.metal_age.steel_goodies.title}" - x: -5.5d + x: -4.0d y: 0.0d } { @@ -1621,7 +1638,7 @@ type: "item" }] title: "{quests.steam_age.rotation_speed_controller.title}" - x: -7.5d + x: -6.0d y: 0.0d } { @@ -1638,7 +1655,7 @@ type: "item" }] title: "{quests.steam_age.resin_boards.title}" - x: -11.5d + x: -10.5d y: 11.5d } { @@ -1672,7 +1689,7 @@ } ] title: "{quests.metal_age.coke_oven.title}" - x: -14.5d + x: -13.0d y: -2.0d } { @@ -1707,7 +1724,7 @@ type: "item" }] title: "{quests.steam_age.basic_mech_press.title}" - x: -18.5d + x: -17.0d y: -2.0d } { @@ -1730,7 +1747,7 @@ type: "item" }] title: "{quests.steam_age.steel_mech_press.title}" - x: -7.5d + x: -6.0d y: 4.0d } { @@ -1745,7 +1762,7 @@ type: "checkmark" }] title: "{quests.steam_age.fuel_sources.title}" - x: -7.5d + x: -6.0d y: -2.0d } { @@ -1759,7 +1776,7 @@ type: "item" }] title: "{quests.steam_age.large_water_wheel.title}" - x: -3.5d + x: -2.0d y: -2.0d } { @@ -1781,8 +1798,8 @@ type: "item" }] title: "{quests.steam_age.supers.title}" - x: -10.5d - y: 13.5d + x: -6.0d + y: 13.0d } { dependencies: ["0D0D461AE3A3F7BF"] @@ -1811,7 +1828,7 @@ } ] title: "{quests.steam_age.multiblock_tank.title}" - x: -16.5d + x: -15.0d y: -2.0d } { diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index b429838d3..02786704d 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -1674,6 +1674,7 @@ } } id: "1562419608EB333D" + shape: "circle" size: 1.5d subtitle: "{quests.stone_age.hydration.subtitle}" tasks: [{ @@ -1847,6 +1848,7 @@ description: ["{quests.stone_age.water_bucket.desc}"] icon: "minecraft:water_bucket" id: "1F9321F1743A0B79" + shape: "circle" subtitle: "{quests.stone_age.water_bucket.subtitle}" tasks: [{ id: "64BE95016DF461FD" diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 9f57ea394..897535008 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -790,7 +790,10 @@ y: 15.0d } { - dependencies: ["02FDECC931B5E8EF"] + dependencies: [ + "02FDECC931B5E8EF" + "3E6DC423FE4A99F7" + ] description: [ "{quests.tfg_tips.gt_power_tools.desc.1}" "{@pagebreak}" @@ -823,20 +826,13 @@ } } id: "2D2CB8104E40E808" + optional: true subtitle: "{quests.tfg_tips.gt_power_tools.subtitle}" - tasks: [ - { - id: "5DA224C235E227E3" - title: "GT Tool" - type: "checkmark" - } - { - id: "5B0BF3A94CA0D8A9" - item: "gtceu:lv_charger_4x" - optional_task: true - type: "item" - } - ] + tasks: [{ + id: "5DA224C235E227E3" + title: "GT Tool" + type: "checkmark" + }] title: "{quests.tfg_tips.gt_power_tools.title}" x: 10.5d y: 11.5d diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 4f656545c..c07bbc0e6 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -190,6 +190,8 @@ "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Moon and Ostrum Harvesters:§r", "tooltip.moldraw.shift_view_molecule": "§7§oHold (Shift) for Molecular Structure§r", "tooltip.moldraw.shift_view_alloy": "§7§oHold (Shift) for Alloy Composition§r", + "gtceu.medical_condition.antidote.description.effect_removed": "Removes %s%% of the above conditions' effects", + "gtceu.medical_condition.antidote.description.effect_removed.all": "Removes all of the above conditions' effects", "gtceu.greenhouse": "Electric Greenhouse", "gtceu.steam_bloomery": "Steam Bloomery", "gtceu.food_oven": "Food Oven", diff --git a/kubejs/assets/tfg/alloys/weak_blue_steel.json b/kubejs/assets/tfg/alloys/weak_blue_steel.json new file mode 100644 index 000000000..873cd3288 --- /dev/null +++ b/kubejs/assets/tfg/alloys/weak_blue_steel.json @@ -0,0 +1,3 @@ +{ + "derive": true +} \ No newline at end of file diff --git a/kubejs/assets/tfg/alloys/weak_red_steel.json b/kubejs/assets/tfg/alloys/weak_red_steel.json new file mode 100644 index 000000000..873cd3288 --- /dev/null +++ b/kubejs/assets/tfg/alloys/weak_red_steel.json @@ -0,0 +1,3 @@ +{ + "derive": true +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index c0d3908ba..518b158ad 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -2898,10 +2898,10 @@ "quests.low_voltage.lv_machine_hull.title": "Your second machine hull", "quests.low_voltage.lv_machine_hull.subtitle": "It's time to get into electricity", "quests.low_voltage.lv_machine_hull.desc.1": "You're getting real close to your &6first LV Machine&r and the beginning of the electric age! If you haven't made any &4Red Steel&r yet, you'll now have to, but in return you will get &6new ways&r to improve your production.\n\nThis is the GregTech philosophy: &6the further you progress, the better the new recipes become&r.\n\nTry to make at least 3 or 4 casings to begin.", - "quests.low_voltage.lv_machine_hull.desc.2": "For some players, reaching a new tier is marked by crafting the first &6circuit&r, for others it's the &6machine hull&r or the &6energy hatch&r. You can use whatever works best for you, but for the sake of organization, these quests will use the machine hull.\n\nLost on where to start? We recommend looking for machines that will make everything else cheaper, starting with the thing you hate the most.", - "quests.low_voltage.lv_machine_casing.title": "LV Machine Casing for Create?", + "quests.low_voltage.lv_machine_hull.desc.2": "For some players, reaching a new tier is marked by crafting the first &6circuit&r, for others it's the &6machine hull&r or the &6energy hatch&r. You can use whatever works best for you, but for the sake of organization, these quests will use the machine hull.\n\nAs a quick reminder, &cmachines explode when exposed to rain or water&r on any of the blocks they're adjacent to, unless the machine specifically says otherwise.", + "quests.low_voltage.lv_machine_casing.title": "Your next machines", "quests.low_voltage.lv_machine_casing.subtitle": "More options!", - "quests.low_voltage.lv_machine_casing.desc": "To make getting into LV less intimidating, &5TFG&r gives you the option to use &6Create&r machines in place of some &6GregTech&r machines.\n\nWe introduced them &6last chapter&r, but just know that if there is an alternative to a GregTech machine, you will have the choice within the quest.", + "quests.low_voltage.lv_machine_casing.desc": "Now that you've got some electricity going, it's time to use it! We recommend starting by making machines that will make it easier and cheaper to make even more machines.\n\nTo make getting into LV less intimidating, &5TFG&r gives you the option to use &6Create&r machines in place of some &6GregTech&r machines.\n\nWe introduced them &6last chapter&r, but just know that if there is an alternative to a GregTech machine, you will have the choice within the quest.", "quests.low_voltage.lv_motor.title": "The First of Many Motors", "quests.low_voltage.lv_motor.subtitle": "Low Voltage beckons...", "quests.low_voltage.lv_motor.desc": "Remember that &2EMI is your friend&r if recipes are getting overwhelming. You can click the button with four stacked squares on the bottom right of any recipe, and EMI will show you a tree of all the crafting ingredients, and you can even have it add a \"shopping list\" to your favourites!\n\nGetting back on topic, set yourself up for &7LV&r by crafting six &aLV Electric Motors&r! This may seem like a lot, but that's the bare minimum required to get to the good stuff in &7LV&r.", @@ -2917,19 +2917,18 @@ "quests.low_voltage.lost.task": "I know what to do now!", "quests.low_voltage.lv_steam_turbine.title": "The Steam Turbine", "quests.low_voltage.lv_steam_turbine.subtitle": "You must construct additional turbines", - "quests.low_voltage.lv_steam_turbine.desc.1": "The &3Steam Turbine&r is one of the only generators you can realistically use in &7LV&r. &2Later, you'll unlock more interesting Power options&r, such as natural gases or petrols.\n\nWhen provided Steam, the turbine will output EU at a ratio of &d2 mB = 1 EU&r.", - "quests.low_voltage.lv_steam_turbine.desc.2": "If you're using a single &3Steam Turbine&r, you only need &a1x Tin Cables&r. On the other hand, if you upgrade to &32 Steam Turbines&r, you should use &a2x Tin Cables&r - else they may end up &cburning&r.\n\nThis is because of the &9Amperage&r mechanic... but that will be explained later so you can enjoy playing. Don't worry!", + "quests.low_voltage.lv_steam_turbine.desc": "The &3Steam Turbine&r is most players' first &7LV&r generator, as you've already got steam production set up from your Steam machines.\n\nWhen provided Steam, the turbine will output EU at a ratio of &d2 mB = 1 EU&r.\n\nOne downside of steam is transporting it, and due to its lack of energy density, you'll need large or huge pipes to carry it around. You may also consider upgrading to the Large Bronze Boiler once you start needing more power than what your single-block boilers can produce.", "quests.low_voltage.lbb.title": "Large Bronze Boiler", "quests.low_voltage.lbb.subtitle": "Boom, boom, boom, boom", - "quests.low_voltage.lbb.desc.1": "The &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this is an alternative to the Create Steam Engine. Later power options are listed in the &bMV&r chapter.\n\nMake sure you set it up so it never runs out of water like your Small Boilers, otherwise it'll &cexplode&r!.", + "quests.low_voltage.lbb.desc.1": "The &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this is an alternative to the Create Steam Engine.\n\nMake sure you set it up so it never runs out of water like your Small Boilers, otherwise it'll &cexplode&r!.", "quests.low_voltage.lbb.desc.2": "Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel. &5With this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25 percent power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines.\n\nWe recommend holding off making this until you're ready to power your EBF, or if you have a lot of steam multiblocks.", - "quests.low_voltage.lbb.desc.3": "In TerraFirmaGreg, you have a few options for fuel. You can use a Hose Pulley to pull Lava out of a deep underground lake, or set up a tree farm into a coke oven for Charcoal and Creosote. Lastly, there are huge surface-level Coal veins that you can extract with some automated mining machines and turn into Coke and significantly more Creosote than charcoal.\n\nIf you go the tree farm route, you'll need three coke ovens to power a full-throttle LBB.", + "quests.low_voltage.lbb.desc.3": "In TerraFirmaGreg, you have a few options for fuel. You can use a Hose Pulley to pull Lava out of a deep underground lake (no, infinite lava is not a thing), or set up a tree farm into a coke oven for Charcoal and Creosote. Lastly, there are huge surface-level Coal veins that you can extract with some automated mining machines and turn into Coke and significantly more Creosote than charcoal.\n\nIf you go the tree farm route, you'll need three coke ovens to power a full-throttle LBB.", "quests.low_voltage.lv_polariser.title": "Basic Polarizer", "quests.low_voltage.lv_polariser.subtitle": "The Polarizer polarizes!", "quests.low_voltage.lv_polariser.desc": "One of the cheapest - if not the cheapest - &7LV&r machine. Use this to make &6Redstone-free Magnetic Rods&r for your Motors. Whenever you start to batch your Motors, this machine will save you stacks and stacks of Redstone.", "quests.low_voltage.link_chapter.title": "Explain energy to me", "quests.low_voltage.link_chapter.subtitle": "There is a whole chapter about energy", - "quests.low_voltage.link_chapter.desc": "View the chapter by clicking here", + "quests.low_voltage.link_chapter.desc": "GregTech's energy system works differently to FE (Forge Energy), the system used by almost every other mod.\n\nIt might look like a lot of reading, but it's important to understand if you want to avoid accidents and get the most out of your power generation.\n\nThere's four ways to generate power in LV, and all are viable options. If you're new to GregTech, Steam is the easiest but falls off fast as you progress to further tiers. Gas fuel is more complicated to produce, but has the cheapest generators. Combustion is somewhere in between.\n\nHere's a link to the energy chapter:", "quests.low_voltage.link_chapter.task": "I read it", "quests.low_voltage.lv_combuston_gen.title": "The Combustion Generator", "quests.low_voltage.lv_combuston_gen.subtitle": "It does boom and make energy", @@ -2945,7 +2944,7 @@ "quests.low_voltage.lv_seeds.desc": "If you come across these plants, you should pick them up and start a farm.\n\nThey will be your best source of &aSeed Oil&r, a liquid used for producing &eBio Diesel&r. Canola is a bit more resistant to lower temperatures, while Sunflowers are happier in warmer climates. You also could grow them in your Electric Greenhouse if you don't want to spend as much time farming, at the expense of having to spend a little power to grow them.", "quests.low_voltage.lv_seeds.task": "Canola or Sunflowers", "quests.low_voltage.lv_gas_turbine.title": "The Gas Turbine", - "quests.low_voltage.lv_gas_turbine.subtitle": "It needs more circuits but less materials", + "quests.low_voltage.lv_gas_turbine.subtitle": "For petrochemical enthusiasts", "quests.low_voltage.lv_gas_turbine.desc": "With the help of &7Syngas&r, you now have a viable way to use the &cGas Turbine&r at &7LV&r. They work exactly like the other &6generators&r but should be a tiny bit cheaper than the &6Combustion Generator&r.", "quests.low_voltage.lv_gas_syngas.title": "Syngas", "quests.low_voltage.lv_gas_syngas.subtitle": "Not Wood Gas", @@ -2957,15 +2956,6 @@ "quests.low_voltage.lv_turbo_charge.subtitle": "Useful to charge your electric tools faster", "quests.low_voltage.lv_turbo_charge.desc": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Turbo Charger&r charges &6RF and EU&r items such as &9Drills&r extremely quickly.\n\nIt accepts up to 4 Amps for every item it charges, making it &6twice as fast&r as the &3Battery Buffer&r. It cannot discharge, though.\n\n&eAny&r Charger will complete this Quest.", "quests.low_voltage.lv_turbo_charge.task": "Any Turbo Charger will do", - "quests.low_voltage.lv_fisher.title": "Fishing Machine", - "quests.low_voltage.lv_fisher.subtitle": "Fully compatible with TFC!", - "quests.low_voltage.lv_fisher.desc": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Fisher&r catches fish from Water. It requires a 5x5 area of Water directly below to operate. It uses the same loot table as normal Fishing. Each operation consumes 1 String and EU equivalent to its tier (32 for &7LV&r, etc.). That's about it.\n\n&eFish Oil&r can be extracted from Fish, which can be used for &6Bio Diesel&r.", - "quests.low_voltage.lv_fisher.task": "Any Fisher will do", - "quests.low_voltage.lv_rock_crusher.title": "Rock Crusher", - "quests.low_voltage.lv_rock_crusher.subtitle": "Cobble is Love, Cobble is Life", - "quests.low_voltage.lv_rock_crusher.desc.1": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Rock Breaker&r is effectively a Cobblestone Generator in a box. You can give it any raw rock or cobblestone block, and it will produce copies of it. Very handy if you want a lot of bricks fast!\n\n&eAny&r Rock Breaker will complete this Quest.", - "quests.low_voltage.lv_rock_crusher.desc.2": "&l&3Lore:&r&o Obsidian requiring Redstone to generate is in reference to an ancient Minecraft bug, &7MC-4239&f. Placing Redstone where the Cobblestone would go in a cobble generator would make it generate Obsidian instead. This bug was resolved in snapshot 14w25b for Minecraft 1.8, over 9 years ago at the time of writing!", - "quests.low_voltage.lv_rock_crusher.task": "Any Rock Crusher will do", "quests.low_voltage.lv_aqueous_accumulator.title": "Aqueous Accumulator", "quests.low_voltage.lv_aqueous_accumulator.subtitle": "Thermal Foundation is calling", "quests.low_voltage.lv_aqueous_accumulator.desc": "The &3Aqueous Accumulator&r is basically a Rock Crusher but for fluids. Simply place the machine next to two source blocks of the appropriate fluid, set the circuit, and voila! It'll keep producing more of that fluid. It effectively does the same thing as a mechanical pump, but using electricity instead of mechanical power, so you may find it easier to fit into your factory. As a bonus, the HV one will make infinite lava too!\n\nYou can safely waterlog the source blocks to prevent them freezing in winter, and the machine will continue to work.", @@ -2986,13 +2976,13 @@ "quests.low_voltage.lv_lathe.task": "Any of these", "quests.low_voltage.universal_cell.title": "Better bucket", "quests.low_voltage.universal_cell.subtitle": "You can see inside, unlike those drums...", - "quests.low_voltage.universal_cell.desc.1": "Cells are an alternative form of Fluid storage. All Cell types with the same type and amount of Fluid inside them &6stack&r. They can be automatically filled with a &3Canning Machine&r.\n\nFluid Cells hold &done bucket&r of Fluid.\n\nNot sold on them yet? Unlike drums and buckets, cells &asafely contain&r their contents, preventing you from getting burnt, frozen, or floating.", - "quests.low_voltage.universal_cell.desc.2": "Universal Cells hold up to &done bucket&r, but also can store &9fractions&r of Buckets. They're particularly ideal if you want to store leftover Fluid without crafting a whole Drum. \n\nCells made from higher tier materials can hold even more fluid, but &9Drums&r and &9Super Tanks&r will hold more by then.\n\nLike Drums, Cells can be placed into a crafting grid to clear their contents.", + "quests.low_voltage.universal_cell.desc.1": "Cells are an alternative form of Fluid storage. All Cell types with the same type and amount of Fluid inside them &6stack&r. They can be automatically filled with a &3Canning Machine&r.\n\nThe basic Fluid Cells hold &done bucket&r of Fluid, while the Steel Cells hold eight buckets.\n\nNot sold on them yet? Unlike drums and buckets, cells &asafely contain&r their contents, preventing you from getting burnt, frozen, or floating. They're also significantly cheaper!", + "quests.low_voltage.universal_cell.desc.2": "Universal Cells hold up to &done bucket&r, but also can store &9fractions&r of Buckets. They're particularly ideal if you want to store leftover Fluid without crafting a whole Drum. \n\nCells made from higher tier materials can hold even more fluid, but &9Drums&r and &9Super Tanks&r can hold even more.\n\nLike Drums, Cells can be placed into a crafting grid to clear their contents.", "quests.low_voltage.universal_cell.task": "Any cell", "quests.low_voltage.machine_auto_output_behaviour.title": "Machine Auto-Output Behaviour", "quests.low_voltage.machine_auto_output_behaviour.subtitle": "Let's learn.", "quests.low_voltage.machine_auto_output_behaviour.desc.1": "All machines typically have one &7Front Face&r, and one &9Output Face&r.\n\nThe &7Front Face&r should be obvious.\nThe &9Output Face&r is the face with a dot or hole on it. By default, this is at the back of the machine as you place it.\n\nMachines can &aauto-output&r through their output face. To enable auto-output, click the appropriate button in the GUI. Fluid and item auto-outputs are toggled separately. Further control over auto-outputs can be achieved with &dFilters&r and &dCovers&r, which are explained in the &dCover Behavior&r quest found in this chapter.", - "quests.low_voltage.machine_auto_output_behaviour.desc.2": "Right-clicking a machine with a &5Wrench&r changes the output side, and shift-right-clicking changes the front side. Keep in mind that the front side &ccannot&r also be the output side! \n\nBy default, items and fluids cannot be inserted through the output side, but this can be toggled with a &5Screwdriver&r. Either right-click the output face directly, or shift-right-click on the grid corresponding to the side of the output.\n\nThere are unique machines that do not process recipes, such as the &3Pump&r, &3Miner&r, &3Fisher&r, &3Item Collector&r, etc. These machines will output on their &7Front Face&r (which is still marked as a dot).", + "quests.low_voltage.machine_auto_output_behaviour.desc.2": "Right-clicking a machine with a &5Wrench&r changes the output side, and shift-right-clicking changes the front side. Keep in mind that the front side &ccannot&r also be the output side! \n\nBy default, items and fluids cannot be inserted through the output side, but this can be toggled with a &5Screwdriver&r. Either right-click the output face directly, or shift-right-click on the grid corresponding to the side of the output.", "quests.low_voltage.machine_auto_output_behaviour.task": "Hmm, how interesting!", "quests.low_voltage.programmed_circuits.title": "Programmed Circuits", "quests.low_voltage.programmed_circuits.subtitle": "Don't want to spend your circuits to select recipes?", @@ -3039,18 +3029,20 @@ "quests.low_voltage.lv_amp_explanation.subtitle": "Amps and You: a how-to", "quests.low_voltage.lv_amp_explanation.desc": "This questline serves as a quick guide to &9GregTech Amperage&r. As for &dVoltage&r mechanics, we'll go over those once you reach &bMV&r.\n\n&6&lTL;DR:&r For safety, match the Amperage limit of your Cables with the max amount of Amps provided by your Energy Producers.\n\nStill confused? Check the &cGregTech Energy&r chapter for a full rundown on GregTech's electricity system!", "quests.low_voltage.lv_ore_prospector.title": "This is Hacking", - "quests.low_voltage.lv_ore_prospector.subtitle": "The future of prospector", + "quests.low_voltage.lv_ore_prospector.subtitle": "Prospector NEO", "quests.low_voltage.lv_ore_prospector.desc": "The Prospector is an amazing tool that'll help you find veins in no time.\n\nIts GUI is interactive. Right-clicking will scan for ores, displaying them on a dynamic map.\n\n&l&3Lore:&r&o Back in OUR day, the portable Prospector was locked to &dLuV&f. Kids these days have it easy.", + "quests.low_voltage.night_vision_goggles.subtitle": "See in the dark!", + "quests.low_voltage.night_vision_goggles.desc": "Charge them up and put them on your face to get a permanent Night Vision effect as long as the batteries last! You can toggle this effect with a keybind, set to &aO&r by default.", "quests.low_voltage.lv_sprayer.title": "Spray Can", "quests.low_voltage.lv_sprayer.subtitle": "Time for server tag wars", - "quests.low_voltage.lv_sprayer.desc": "Unfortunately, this is only an &lEmpty&r Spray Can, which you have to fill with Chemical Dye before using.\n\n&aSpray Cans&r do not provide any functionality involving machines, but can be quite &bvisually appealing and useful&r!\n\nAny (or almost any) GregTech tile entity (machine, pipe, cable...) can be &6painted&r to one of the 16 colors of your choosing. This is great for screenshots, or to separate different setups for convenience in a Multiplayer base. They also help with distinguishing between pipelines and cables.\n\nHolding the &aSpray Can&r in the offhand will automatically paint any block you place.", + "quests.low_voltage.lv_sprayer.desc": "Unfortunately, this is only an &lEmpty&r Spray Can, which you have to fill with Dye before using.\n\n&aSpray Cans&r do not provide any functionality involving machines, but can be quite &bvisually appealing and useful&r!\n\nAny (or almost any) GregTech tile entity (machine, pipe, cable...) can be &6painted&r to one of the 16 colors of your choosing. This is great for screenshots, or to separate different setups for convenience in a Multiplayer base. They also help with distinguishing between pipelines and cables.\n\nHolding the &aSpray Can&r in the offhand will automatically paint any block you place.", "quests.low_voltage.other_machines.title": "But wait, there's more!", "quests.low_voltage.other_machines.subtitle": "You can't escape Greg...", "quests.low_voltage.other_machines.desc": "We won't go over the &dfull scale of regular Ore Processing&r. Why regular? Some ores require special treatment, but that's a topic for much later. Oh no, we're already getting carried away!\n\nSome machines like the &bChemical Bath&r or the &bElectrolyser&r could be useful.\n\nIntimidated by ore processing? Check the dedicated &cOre Processing&r chapter for a full walkthrough!", "quests.low_voltage.other_machines.task": "I agree to lose my sanity", "quests.low_voltage.lv_chemical_bath.title": "Basic Chemical Bath", "quests.low_voltage.lv_chemical_bath.subtitle": "The Chemical Bath bathes...", - "quests.low_voltage.lv_chemical_bath.desc.1": "&lOutside of Ore Processing:&r\n\nYou can use the Chemical Bath to replace recipes made with the &6sealed barrel&r, making paper and leather &6painless&r.\n\nThere are some other less important recipes, such as dyeing various items and blocks, or bleaching them.", + "quests.low_voltage.lv_chemical_bath.desc.1": "&lOutside of Ore Processing:&r\n\nYou can use the Chemical Bath to replace recipes made with the &6sealed barrel&r, making leather and treated wood &6painless&r.\n\nThere are some other less important recipes, such as dyeing various items and blocks, or bleaching them.", "quests.low_voltage.lv_chemical_bath.desc.2": "&lFor Ore Processing:&r\n\nSome &aCrushed Ores&r have alternate routes when washed into &aPurified Ore&r, involving bathing in either &aMercury&r or &aSodium Persulfate&r. This step isn't really important, unless you really want that special &6Byproduct&r. This can be a nice alternate source of Silver (hint, hint!).", "quests.low_voltage.lv_electroliser.title": "Basic Electrolyzer", "quests.low_voltage.lv_electroliser.subtitle": "It goes bzzz", @@ -3059,8 +3051,7 @@ "quests.low_voltage.lv_electroliser.desc.3": "&cTake caution!&r Due to how ores work, directly smelting dusts into Ingots can give higher metal yields than electrolysis. However, it means you lose the other products in the dust. You will have to decide whether you want to prioritise direct value, or byproduct count.", "quests.low_voltage.lv_mixer.title": "Basic Mixer", "quests.low_voltage.lv_mixer.subtitle": "The Mixer mixes...", - "quests.low_voltage.lv_mixer.desc": "Using the mixer will &6significantly speed up&r the process of making colored steel, especially the &4red steel&r for your machine hulls. Even if you don't think you need it now, you'll find it &6essential&r later on.\n\nYou're used to alloying things in a Crucible, but for any new alloys (as well as all of the old ones), the GregTech way of alloying is to &amix together dusts&r and then heat them into ingots or extract them into fluids. Don't look at the Alloy Blast Smelter in JEI, that's not until &5EV&r.", - "quests.low_voltage.lv_mixer.task": "From Create or GregTech", + "quests.low_voltage.lv_mixer.desc": "Using the mixer will &6significantly speed up&r the process of making colored steel, since now it can directly make the &aColored Steel Dust&r. Even if you don't think you need it now, you'll find it &6essential&r later on.\n\nYou're used to alloying things in a Crucible, but for any new alloys (as well as all of the old ones), the GregTech way of alloying is to &amix together dusts&r and then heat them into ingots or extract them into fluids. &7(Don't look at the Alloy Blast Smelter in JEI, that's not until &5EV&r&7.)&r", "quests.low_voltage.soldering_alloy.title": "Soldering Alloy", "quests.low_voltage.soldering_alloy.subtitle": "I got soul but I'm not a solder", "quests.low_voltage.soldering_alloy.desc": "&aSoldering Alloy&r is used solely as a &9Fluid&r, and in most cases is &dinterchangeable&r in circuit recipes as a cheaper alternative to Tin&r.\n\nThe choice is yours. Save more materials? Make Soldering Alloy. Spend less time crafting materials? Tin is the way to go.", @@ -3068,12 +3059,12 @@ "quests.low_voltage.gallium_arsenide.subtitle": "I hate byproducts, they're awesome", "quests.low_voltage.gallium_arsenide.desc": "Many materials going forward cannot be smelted directly from any Ores! They are instead obtained as byproducts from processing of other ores. Gallium and Arsenic are &4among&r these materials.\n\nFor &dGallium&r, you may, ranged from worst to best (compromising difficulty and yields):\n\n&9- &3Electrolyze &aSphalerite&r for a low chance of small dust. Note that you lose out on direct smelting value.\n\n&9-&r Put &aCrushed Bauxite&r in the &3Chemical Bath&r. Note that this requires &9Sodium Persulfate&r.\n\n&9-&r Obtain it as a Byproduct of &aSphalerite&r Ore Processing in the &3Thermal Centrifuge&r or &3Centrifuge&r.\n\nFor &dArsenic&r, you will have to mine and &3centrifuge&r &aRealgar&r, or put &aCobaltite&r through an EBF.", "quests.low_voltage.lv_assembler.title": "Basic Assembler", - "quests.low_voltage.lv_assembler.subtitle": "This bad boy is assembling better than you and IKEA", - "quests.low_voltage.lv_assembler.desc.1": "While this is an extremely &9important&r machine for progression, this will &9&lnot help you immediately&r as it is &cexpensive.&r Most of the recipes you will want to pursue require &cfluids&r. Set up a little bit more infrastructure before rushing this.\n\nWith that out of the way, the &3Assembler&r is crucial to gameplay. Consider it as important as a Crafting Table, except... well, it's a machine, duh.", - "quests.low_voltage.lv_assembler.desc.2": "Once you have enough infrastructure you will be able to make use of better recipes for:\n\n&9-&r &6Vacuum Tubes&r, giving over double the previous yield\n\n&9-&r &6Resistors&r, granting 4 resistors per craft!\n\n&9-&r &6Circuit Boards&r, greatly reducing copper used\n\nWahoo!\n\n&l&3Lore:&r&o Back in the days of GregTech 2, the Assembling Machine only had two slots, and was only really used for alternate Circuit and Hull recipes.", + "quests.low_voltage.lv_assembler.subtitle": "No IKEA instruction manual required", + "quests.low_voltage.lv_assembler.desc.1": "While this is an extremely &9important&r machine for progression, we don't recommend trying to craft it as your first LV machine as it is &cexpensive.&r\n\nHowever, if you've followed the quests up to this point, now is a good time to craft it!\n\nThe &3Assembler&r is crucial to gameplay. Consider it as important as a Crafting Table, except... well, it's a machine, duh.", + "quests.low_voltage.lv_assembler.desc.2": "You will be able to make use of better recipes for:\n\n&9-&r &6Vacuum Tubes&r, giving over double the previous yield\n\n&9-&r &6Resistors&r, granting 4 resistors per craft!\n\n&9-&r &6Circuit Boards&r, greatly reducing copper used.\n\nWahoo!\n\n&l&3Lore:&r&o Back in the days of GregTech 2, the Assembling Machine only had two slots, and was only really used for alternate Circuit and Hull recipes.", "quests.low_voltage.lv_assembler.task": "Basic Assembler", - "quests.low_voltage.t2_circuit_board.subtitle": "Yeah yeah it's wood but don't under estimate it", - "quests.low_voltage.t2_circuit_board.desc.1": "This Circuit Board is used to create &dMV Circuits&r!\n\n&9Note:&r You have <wo&r options when making the Phenolic Printed Circuit Board. If you use &aSodium Persulfate&r or &aIron III Chloride&r, making boards takes &6only a quarter of the Silver&r as opposed to the crafting recipe.\n\n&lHowever&r, given how painful it may be for you to obtain these chemicals &oright now&r, you can simply use more Silver by mining most of a Galena Vein...\n\nThe quest for &aSodium Persulfate&r is in the &bMV&r chapter, if you're down for some light reading.", + "quests.low_voltage.t2_circuit_board.subtitle": "They don't make 'em like this any more...", + "quests.low_voltage.t2_circuit_board.desc.1": "This Circuit Board is used to create &dMV Circuits&r!\n\n&9Note:&r You have <wo&r options when making the Phenolic Printed Circuit Board. If you use &aSodium Persulfate&r or &aIron III Chloride&r, making boards takes &6only a quarter of the Silver&r as opposed to the Artisan Table recipe.\n\n&lHowever&r, given how painful it may be for you to obtain these chemicals &oright now&r, you can simply use more Silver by mining most of a Galena Vein...\n\nThe quest for &aSodium Persulfate&r is in the &bMV&r chapter, if you're down for some light reading.", "quests.low_voltage.t2_circuit_board.desc.2": "&l&3Lore:&r&o Back in GTCEu 1.12.2, these circuit boards were called &2Good Circuit Boards&f. Not exactly a fitting name, as they're &4rather evil&f to craft.", "quests.low_voltage.lv_diode.title": "Diode", "quests.low_voltage.lv_diode.subtitle": "Don't be swayed by EMI!", @@ -3088,22 +3079,30 @@ "quests.low_voltage.lv_greenhouse.title": "Electric Greenhouse", "quests.low_voltage.lv_greenhouse.subtitle": "The power of &mKubejs&r... Java", "quests.low_voltage.lv_greenhouse.desc.1": "The multiblock &3Electric Greenhouse&r can be your source of &aLogs&r and other plants if you prefer making GregTech machines over Create contraptions. It also has the unique property of being able to grow more of TFC's decorative plants!", - "quests.low_voltage.lv_greenhouse.desc.2": "&9Note: &rThis multiblock can have its walls customized to use any valid iron tier greenhouse block. Check the EMI multiblock preview for more usable blocks. The EGH can also be inproved in a few ways, including fertilizer or later in &cHV&r with the &3Hydroponics Loop.&r", + "quests.low_voltage.lv_greenhouse.desc.2": "&9Note: &rThis multiblock can have its walls customized to use any valid iron tier greenhouse block. Check the EMI multiblock preview for more usable blocks. The EGH can also be improved in a few ways, including fertilizer or later in &cHV&r with the &3Hydroponics Loop.&r", "quests.low_voltage.lv_greenhouse.desc.3": "&l&3Lore:&r&o This multiblock was originally created for the GTCEu Community Pack, but is also available on the GTCEu developer documentation. It's significantly slower than default to keep in line with TFC's slower tree growing speeds, but prior to TFG 0.9, it used to take almost an hour for each recipe!\n\nIn TFG 0.11 it was remade from scratch with new recipes, a new structure, a mk2 in the form of the hydroponic facility and custom renders by RubenVerg.\n\nThe original subtitle for this quest was \"The power of Kubejs\" since originally it was an example of a custom machine that could be made in Kubejs--A dev kit. But now the structure is entirely made in Java to support TFC's food properties properly.", "quests.low_voltage.lv_centrifuge.title": "Basic Centrifuge", "quests.low_voltage.lv_centrifuge.subtitle": "It does the opposite of the Mixer", "quests.low_voltage.lv_centrifuge.desc.1": "&lOutside of Ore Processing:&r\n\nOh boy, what can't this machine do? Decomposition recipes to separate dust types, separating air, do your taxes, and many others...\n\nThe list is too long! Let's just say &cyou need the Centrifuge&r.", "quests.low_voltage.lv_centrifuge.desc.2": "&lFor Ore Processing:&r\n\nThis takes &aImpure Dust&r or &aPurified Dust&r and turns them into clean Dust, plus an added tiny Dust &6Byproduct&r. This is outside of the optimal chain for Byproducts, but this is also the cheapest Ore Processing machine of the presented array to run and to setup on a small scale.", "quests.low_voltage.lv_centrifuge.desc.3": "&l&3Lore:&r&o In base GTCE, this was objectively the strongest Ore Processing machine as it was fairly easy to use, and gave three tiny dusts, just like the Ore Washer or the Thermal Centrifuge. We tuned it down in favor of diversity.", - "quests.low_voltage.lv_centrifuge.task": "", "quests.low_voltage.lv_glue.title": "Glued", "quests.low_voltage.lv_glue.subtitle": "What a sticky situation", - "quests.low_voltage.lv_glue.desc": "You can now &3centrifuge&r &aSticky Resin&r, which will give you &aGlue&r in fluid form (and the less useful Plantball, &6for now&r).\n\nGive yourself a headstart and get on producing Glue. You can use it to make &6cheaper Resistors&r, as well as &6cheaper Circuit Boards&r in the &3Assembler&r (and it is especially useful &oin the near future&r).\n\n&eNote:&r You can also centrifuge TFC's &aGlue&r or &aConifer Rosin&r, whichever's easiest!", + "quests.low_voltage.lv_glue.desc": "You can now &3centrifuge&r &aSticky Resin&r, which will give you &aGlue&r in fluid form (and the less useful Plantball, for now).\n\nGive yourself a headstart and get on producing Glue. You can use it to make &6cheaper Resistors&r, as well as &6cheaper Circuit Boards&r in the &3Assembler&r.\n\n&eNote:&r You can also centrifuge TFC's &aGlue&r or &aConifer Rosin&r, whichever's easiest!", "quests.low_voltage.lv_glue.task": "Glue", "quests.low_voltage.lv_cutter.title": "Basic Cutter", "quests.low_voltage.lv_cutter.subtitle": "The Cutter... cuts...", "quests.low_voltage.lv_cutter.desc": "For now, you should use &9Water&r for its recipes instead of trying to acquire Lubricant.\n\nIf you don't have one yet, this machine will also cut &6Rods into four Bolts&r.\n\nThis machine is the only way to obtain &dGem Plates&r, which are needed to craft Filters, and by extension, the &3Gas Collector&r.", "quests.low_voltage.lv_cutter.task": "Any cutter", + "quests.low_voltage.lv_distillery.subtitle": "The distillery distills...", + "quests.low_voltage.lv_distillery.desc": "The Distillery is kind of like a centrifuge, but mostly for organic/petrochemical fluids.\n\nIn &7LV&r, you can only extract one output from one input, but this will change after you get to the Distillation Tower in &6HV&r.\n\nYou won't use this machine for all that much in LV (unless you're using Combustion fuel), but it's essential for obtaining &ePhenol&r.", + "quests.low_voltage.phenolic_resin.subtitle": "Artificial Resin", + "quests.low_voltage.phenolic_resin.desc.1": "Phenolic Resin is made from a chemical reaction of both &6Phenol&r and &aFormaldehyde&r. While you only really have two options for obtaining the Phenol in &7LV&r (distilling either Creosote or Heavy Fuel), the Formaldehyde will require &dMethane&r, which has more options.", + "quests.low_voltage.phenolic_resin.desc.2": "The simplest (and slowest) is with hydrogen and carbon in a chemical reactor, which will also require very slow water electrolysis.\n\nThe distillery also has many options, including via Creosote.\n\nIf you're using Syngas as a fuel, you can also oxidize that into Methane.\n\nLastly, if you're feeling silly, you can also centrifuge a ton of mushrooms from the Beneath.", + "quests.low_voltage.magnesia.subtitle": "Also the name of a place in Greece!", + "quests.low_voltage.magnesia.desc": "Also known as Magnesium Oxide, Magnesia can be obtained in two ways:\n\n- Magnesite Ore\n\n- React Magnesium and Lye to create Magnesium Hydroxide, then calcinate it in a Coke Oven. Magnesium can be obtained from a variety of different ores.", + "quests.low_voltage.refractory_brick.subtitle": "The Cooler™ Fire Bricks", + "quests.low_voltage.refractory_brick.desc": "It's almost time to tear down your old TFC blast furnace setup! If you'd like, you can recycle most of it down into &6Refractory Clay Dust&r (we recommend using the Arc Furnace so you get back both the dust and the iron!), otherwise you can cook up some more Fire Clay. Just make sure you've got a large stockpile of Steel first!\n\nFrom there, mix the refractory clay dust with some Magnesia, Graphite, and Resin to create the improved ceramics required for &dyour first Coils&r.", "quests.low_voltage.lv_gas_collector.title": "Basic Gas Collector", "quests.low_voltage.lv_gas_collector.subtitle": "It'll take your breath away", "quests.low_voltage.lv_gas_collector.desc": "The Gas Collector collects Air that can then be centrifuged into &aOxygen&r and &aNitrogen&r.\n\n&l&3Lore:&r&o GregTech 5 players remember when they had to use a Compressor with IC2 cells to get Compressed Air... here, cell chemistry is no more.", @@ -3111,7 +3110,7 @@ "quests.low_voltage.lv_oxygen.subtitle": "Achtually, it's Dioxygen...", "quests.low_voltage.lv_oxygen.desc.1": "You could waste &o&eprecious years of your life&r in JEI looking for the most optimal Oxygen recipe, given the many ways to obtain it. Various minerals will produce it when electrolyzed.\n\nIf only the quest book had more information!", "quests.low_voltage.lv_oxygen.desc.2": "Surprise! The best source according to us (!) is &acentrifuging Air&r after making a &dGas Collector&r, which you might not be able to make just yet. This recipe also gives &aNitrogen&r, which is handy as it can speed up certain &3Electric Blast Furnace&r recipes&r.\n\nThe second best source according to us (!) is &aelectrolyzing Silicon Dioxide&r. Silicon Dioxide is obtained from various sources, such as Glass Dust and various Stone Dusts. We will come back to &6this method later&r because this one is actually &6god&r.", - "quests.low_voltage.lv_oxygen.desc.3": "The third best source according to us (!) is &aelectrolyzing Water&r. In reality, electrolysis of water is more suitable for &aHydrogen production&r due to the higher energy cost. &4Don't use this method as your main source of Oxygen&r, only for &1Hydrogen&r, once again we will help you later on to make Hydrogen.\n\nThe fourth best source according to us (!) is &ato not void&r it, EVER! Any Oxygen obtained from any source is worth something and should be stored in Tanks.\n\n&eNote:&r Submit a fluid by having it stored in &lany&r tank in your inventory. A bucket will also work.", + "quests.low_voltage.lv_oxygen.desc.3": "The third best source according to us (!) is &aelectrolyzing Water&r. In reality, electrolysis of water is more suitable for &aHydrogen production&r due to the higher energy cost. &4Don't use this method as your main source of Oxygen&r, only for &1Hydrogen&r, once again we will help you later on to make Hydrogen.\n\nThe fourth best source according to us (!) is &ato not void&r it, EVER! Any Oxygen obtained from any source is worth something and should be stored in Tanks.", "quests.low_voltage.lv_oxygen.task": "Oxygen", "quests.low_voltage.lv_nitrogen.title": "Nitrogen Gas", "quests.low_voltage.lv_nitrogen.subtitle": "Your EBF booster", @@ -3129,7 +3128,7 @@ "quests.low_voltage.lv_chemical_reactor.subtitle": "Chemistry for dummies", "quests.low_voltage.lv_chemical_reactor.task": "Liquid Rubber", "quests.low_voltage.lv_chemical_reactor.desc.1": "The &3Chemical Reactor&r will be required for &la lot&r of recipes.\n\nLet's give it a spin - why don't we use your freshly made Chemical Reactor to unlock a new, &6better recipe for Rubber&r? Rubber is &dunusable&r as a Fluid, so you will need to make another machine to process it further.", - "quests.low_voltage.lv_chemical_reactor.desc.2": "You can't make Rubber using the Chemical Reactor alone, so here are some &aother machines&r you might want to aim for: \n\nA &3Solidifier&r is useful to solidify your Rubber directly into &aRubber Sheets&r. You'll want these moving forward.\n\nYou could then make use of an &3Assembler&r to use your molten Rubber for &aCables&r. This isn't important for Tin Cables, but better cables will &eneed&r to be made in the Assembler.\n\n&eNote:&r Submit a fluid by having it stored in &lany&r tank in your inventory. A Drum is the perfect candidate.", + "quests.low_voltage.lv_chemical_reactor.desc.2": "You can't make Rubber using the Chemical Reactor alone, so here are some &aother machines&r you might want to aim for: \n\nA &3Solidifier&r is useful to solidify your Rubber directly into &aRubber Sheets&r. You'll want these moving forward.\n\nYou could then make use of an &3Assembler&r to use your molten Rubber for &aCables&r. This isn't important for Tin Cables, but better cables will &eneed&r to be made in the Assembler.", "quests.low_voltage.lv_fluid_solidifier.title": "Basic Fluid Solidifier", "quests.low_voltage.lv_fluid_solidifier.subtitle": "The Fluid Solidifier solidifies...", "quests.low_voltage.lv_fluid_solidifier.desc": "Build this machine next to your &3Chemical Reactor&r to automatically solidify Rubber into &aRubber Sheets&r.\n\nYou can make your Chemical Reactor auto-output if you &dwrench&r the side of your &3Chemical Reactor&r and enable Fluid &9auto-output&r.\n\nThere will be more Fluids to solidify, so you may re-purpose your &3Fluid Solidifier&r when not crafting Rubber - or make a second one!", @@ -3172,13 +3171,26 @@ "quests.low_voltage.mv_hull.desc2": "Before going further into &bMV&r, remember that in &6TFG&r you can use &6Create&r to reinforce your infrastructure if you don't want to use too much of GregTech. Aluminium Shafts and Cogwheels have 4x the stress capacity of steel ones, so you should be able to run all your machines much faster with them!", "quests.low_voltage.aluminium_greate.title": "Aluminium-tier Greate", "quests.low_voltage.aluminium_greate.subtitle": "Also known as Medium Stress", - "quests.low_voltage.aluminium_greate.desc": "It's been a while since your last upgrade, but now you have access to the next tier of Greate cogs and shafts. Like before, the aluminium ones have &bfour times&r the stress capacity of steel.\n\nContinuing with Greate beyond this point is very optional, and we encourage you to move over to GregTech, but the upgrade may help you de-spaghettify some of your old setups if you'd like to continue using them.\n\nYou can scale up your stress more with a &eSteam Engine&r, or convert EU into SU via the &9Create Additions&r &eElectric Motor&r.", + "quests.low_voltage.aluminium_greate.desc": "It's been a while since your last upgrade, but now you have access to the next tier of Greate cogs and shafts. Like before, the aluminium ones have &bfour times&r the stress capacity of steel.\n\nContinuing with Greate beyond this point is very optional, and we encourage you to move over to GregTech, but the upgrade may help you de-spaghettify some of your old setups if you'd like to continue using them.\n\nYou can scale up your stress production with a &eSteam Engine&r, or convert EU into SU via the &9Create Additions&r &eElectric Motor&r.", "quests.low_voltage.oil.title": "Found Oil early?", "quests.low_voltage.oil.subtitle": "For LV overachievers", - "quests.low_voltage.oil.desc": "If you've found any Oilsands ores or Oil spouts (in deserts) in your travels, you can actually start using a little bit of it in LV.\n\nYou can either convert it into Heavy Fuel and put it in your boilers, or better yet, use it to make a little &bPolyethylene&r!\n\nThe details of this are in the MV chapter, but at this point you can use the polyethylene to make a few things such as cheaper Machine Hulls and Diodes.", + "quests.low_voltage.oil.desc": "If you've found any Oilsands ores or Oil spouts (in deserts) in your travels, you can actually start using a little bit of it in LV.\n\nYou can either convert it into Heavy Fuel and put it in your boilers, convert it into Diesel to power your base.", "quests.low_voltage.glowstone.title": "Permanent Lighting", "quests.low_voltage.glowstone.subtitle": "A roundabout way of inventing light bulbs", "quests.low_voltage.glowstone.desc": "Looking for some cheap, permanent light sources? Now that you've got an LV Extractor (and soon an LV Fluid Solidifer), you can put all that &6Glowstone Dust&r you found in The Beneath to work. Ran out? You can make more in a Mixer.\n\nCheck out JEI for all the new light sources you can make with both liquid glowstone and glowstone blocks. GregTech also has some made with glowstone dust in an assembler.\n\nAs a bonus, you can also use liquid glowstone as an infinite fuel for your lamps!", + "quests.low_voltage.next_machines.title": "Even more machines", + "quests.low_voltage.next_machines.subtitle": "Now the fun begins", + "quests.low_voltage.next_machines.desc": "Now that you've got a few machines going, it's time to put them to work.\n\nTo the right of this quest are some purely optional machines (we don't know where else to put them in this chapter!), but otherwise the Assembler will make electronic components cheaper, while the Chemical Reactor, Extractor, and Fluid Solidifier will make Rubber cheaper. After that, the rest of &7LV&r is yours to explore!", + "quests.low_voltage.food_machines.title": "Food Machines", + "quests.low_voltage.food_machines.subtitle": "Fast Food On The Go", + "quests.low_voltage.food_machines.desc": "The Food Processor and Electric Oven are two custom machines designed specifically to work with TerraFirmaCraft's food system.\n\nThe processor can handle mixing bowl recipes, soups, sandwiches, smoking, brining, drying... You name it, this machine can do it. Except for cooking. That's what the oven is for.\n\nThe Rotten Voiding Cover can be placed on any machine or Input Bus to automatically void any food items that become rotten. Useful to stop your food automation from getting backed up!", + "quests.low_voltage.bakelite.subtitle": "Also known as Poly­oxy­benzyl­methylen­glycol­anhydride... try saying that five times fast", + "quests.low_voltage.bakelite.desc.1": "Your first Polymer! Simply mix Phenolic Resin with either Asbestos or Treated Chipboard Composite to finish it.\nYou'll be using Bakelite for crafting both Phenolic Circuit Boards and MV Machine Hulls, so making a big batch of it is a good idea, though you'll replace it with Polyethylene in &bMV&r.", + "quests.low_voltage.bakelite.desc.2": "&l&3Lore:&r&o Bakelite is the first plastic made from synthetic components. The award for first plastic ever goes to Parkesine, but that requires Nitrocellulose which is a long long chain of recipes to craft - too long for LV. The second ever plastic is Galalith, created with milk proteins and formaldehyde, but milk is difficult to automate.", + "quests.low_voltage.lv_forming_press.subtitle": "The Forming Press forms...", + "quests.low_voltage.lv_forming_press.desc": "This machine usually isn't used for much, but in TFG it can automate any remaining TFC Welding recipes if you still need access to them for any reason. It can also easily duplicate any extruder or casting mold.\n\nMore pressingly (pun intended), you'll need it to craft an essential component for your next circuits, the Phenolic Circuit Board.", + "quests.low_voltage.lv_laser_engraver.subtitle": "Pew pew!", + "quests.low_voltage.lv_laser_engraver.desc": "The Basic Laser Engraver is required to make Transmitter's for Create's logistics system. Other than that, it unfortunately can't do much other than make polished stone.\n\nYou'll deal with lasers more once you get to &bMV&r.", "quests.medium_voltage": "&bMV&r - Medium Voltage", "quests.medium_voltage.subtitle": "Venture into petrochemistry and refine electronics", "quests.medium_voltage.mv_machine_hull.title": "Welcome to MV!", @@ -3870,7 +3882,8 @@ "quests.steam_age.create_tools.desc": "A wrench will let you quickly pick up Create blocks by Sneak + Right-Clicking on them, though an axe or pickaxe will still work too. The goggles will let you see much more detailed information about your machines, such as how much stress they're producing or consuming.\n\nBoth of these are optional for now, but will prove to be very useful, and you'll definitely want them later.\n\nCheck the TFG Tips chapter for help on glassblowing. Did you know that breaking cobblestone with a hammer will turn it into gravel, and breaking that again will turn it into sand...?", "quests.steam_age.basic_millstone.title": "Automatic Ore Processing", "quests.steam_age.basic_millstone.subtitle": "No more querning", - "quests.steam_age.basic_millstone.desc": "The &3Millstone&r is an automatic version of the Quern. You can throw whatever you'd like into the top, and then right-click to take your crushed items back out. It's pretty slow if you connect it directly to your Animal Crank, but you can use gear ratios to increase its speed.\n\nYou will only receive the output in the first slot. The other slots are part of a GregTech mechanic that won't be relevant until much later (&6HV&r).", + "quests.steam_age.basic_millstone.desc.1": "The &3Millstone&r is an automatic version of the Quern. You can throw whatever you'd like into the top, and then right-click to take your crushed items back out. It's pretty slow if you connect it directly to your Animal Crank, but you can use gear ratios to increase its speed.\n\nYou will only receive the output in the first slot. The other slots are part of a GregTech mechanic that won't be relevant until much later (&6HV&r).", + "quests.steam_age.basic_millstone.desc.2": "&l&3Lore:&r&o The millstone can't be used to process grains into flower because Create doesn't understand TFC's food expiry system, which previously led to all sorts of bugs involving rotten items becoming fresh and vice versa. Until you're able to get the Food Processor in &7LV&r, you can still crush your grains via a Mortar in a crafting grid.", "quests.steam_age.horse_crank.title": "Your First Power Source", "quests.steam_age.horse_crank.subtitle": "Make your livestock pay rent", "quests.steam_age.horse_crank.desc.1": "The &3Animal Crank&r is your first accessible source of mechanical power. To use it, place the crank on the center of a 7x7 cleared area and leash an animal to it. Different animals will provide different amounts of power, while the blocks underneath will increase the speed of the output power. The area of multiple cranks can overlap.\n\nYou may need to hold a second lead to attach an animal.", @@ -4061,7 +4074,7 @@ "quests.steam_age.rolling_mill.desc.2": "&l&3Lore:&r &oThis machine existed in older versions of TFG, but it made rods instead of plates, and your best plate-making option before the LV bender had a 20 percent chance of failure!&r", "quests.steam_age.steel_mixer.title": "Steel Mechanical Mixer", "quests.steam_age.steel_mixer.subtitle": "An earlier LV Mixer", - "quests.steam_age.steel_mixer.desc": "The &3Steel Mechanical Mixer&r is the other best steam age machine you can make -- it can mix together your colored steel dusts at a much more efficient rate than the Crucible! It can do a large number of other recipes too, including some that involve gases... don't think about it too much.\n\nYou can use either a Charcoal Forge or a Blaze Burner for the recipes that require heating, and a Mechanical Arm can automatically refuel either.", + "quests.steam_age.steel_mixer.desc": "The &3Steel Mechanical Mixer&r is the other best steam age machine you can make -- it can mix together your black steel dusts at a much more efficient rate than the Crucible! Unfortunately, it can't make red or blue steel dusts directly, but it can make their &aweak versions&r.\n\nIt can do a large number of other recipes too, including some that involve gases... don't think about it too much.\n\nYou can use either a Charcoal Forge or a Blaze Burner for the recipes that require heating, and a Mechanical Arm can automatically refuel either.", "quests.steam_age.potin.title": "Potin Seller...", "quests.steam_age.potin.subtitle": "...I'm going into battle, and I need only your finest Potin.", "quests.steam_age.potin.desc.1": "&dPotin Fluid Pipes&r have a &avery high throughput&r for the material tier and cost. You may want to look into making some of these to aid with fluid logistics.\n\nTo get &dPotin&r, you should start by crafting its &eDust&r form.\n\nThis quest calls for either the small or normal pipe. Get either size to complete it.", @@ -4081,7 +4094,7 @@ "quests.steam_age.what_next.desc": "If you rushed straight here, we suggest machines like the LV Bender, Wiremill, or Mixer first.\nOtherwise, if you made the kinetic machines below, we suggest the Assembler, Arc Furnace, Chemical Reactor, or Polarizer.", "quests.steam_age.alternator.title": "Alternators", "quests.steam_age.alternator.subtitle": "Turning stress into power", - "quests.steam_age.alternator.desc.1": "If you've got a big steam age set up, you probably don't want to immediately scrap it all just to go back to some boilers and LV Steam Turbines. Instead, the &3Alternator&r will convert the SU from your steam engines into electricity. Each steam engine + alternator should give you 1A of LV!\n\nUnfortunately, alternators convert stress into a different electricity system (Forge Energy) than the one GregTech uses (Energy Units), so you'll need an Energy Converter to turn it into usable LV energy. Be sure to hit it with a Soft Mallet to convert it to FE to EU mode.", + "quests.steam_age.alternator.desc.1": "If you've got a big steam age set up, you probably don't want to immediately scrap it all just to go back to some boilers and LV Steam Turbines. Instead, the &3Alternator&r will convert the SU from your steam engines into electricity. Each steam engine + alternator should give you 1A of &7LV&r!\n\nUnfortunately, alternators convert stress into a different electricity system (Forge Energy) than the one GregTech uses (Energy Units), so you'll need an Energy Converter to turn it into usable &7LV&r energy. Be sure to hit it with a Soft Mallet to convert it to &aFE to EU&r mode.", "quests.steam_age.alternator.desc.2": "An example of a steam engine producing 8 amps of LV!\n", "quests.steam_age.packager.title": "Create Logistics", "quests.steam_age.packager.subtitle": "\"We have AE2 at home\"", @@ -4268,6 +4281,7 @@ "quests.stone_age.medical_conditions.subtitle": "Don't eat the Asbestos", "quests.stone_age.medical_conditions.desc.1": "Be careful what you pick up! Not all ores or dusts are safe to touch, and some will cause a buildup of a &6Medical Condition&r.\n\nEverything &cHazardous&r is written on its tooltip, so if you suddenly notice a debuff appearing, get that item out of your inventory! Putting it inside a container like a small vessel or backpack is safe.\n\nMost of these effects will slowly go away on their own, but if you let them build up long enough, you'll start getting a host of other nasty effects, up to and including &cdeath&r.", "quests.stone_age.medical_conditions.desc.2": "You will eventually need to work with some of these materials, so you have ways to deal with them.\n\nThe best way is to avoid getting any conditions in the first place - a Face Mask and Rubber Gloves will prevent inhalation and contact hazards respectively.\n\nThe second-best way is a cure: check out some of the &aPills, Tablets, and Salvos&r you can craft - they all help cure certain effects (and provide helpful buffs!), though the stronger cures have more annoying side-effects.", + "quests.stone_age.medical_conditions.desc.3": "Be careful around anything &cCarcinogenic&r or &cRadioactive&r - these conditions are &epermanent&r until you're able to craft Paracetamol in &7LV&r.", "quests.stone_age.medical_conditions.task": "I'm my own doctor", "quests.stone_age.copper_for_anvil.title": "Copper for the Anvil", "quests.stone_age.copper_for_anvil.subtitle": "You better get used to getting 14 ingots of something.", diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 6f8c264c6..a55a97db4 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -24,6 +24,9 @@ const registerTooltips = (event) => { event.addAdvanced(['tfg:antipoison_tablet'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.antipoison_tablet')) }) + event.addAdvanced(['tfg:polycaprolactam_fabric'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.polycaprolactam')) + }) event.addAdvanced(['tfg:electric_greenhouse'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.machine.electric_greenhouse_1')); text.add(2, Text.translate('tfg.tooltip.machine.electric_greenhouse_2')); diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 5ba0b86fc..81c14d48b 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -9,11 +9,11 @@ const registerCreateAdditionsRecipes = (event) => { // Прокатный стан event.recipes.gtceu.shaped('createaddition:rolling_mill', [ 'ABA', - 'CBC', - 'DED' + 'CEC', + 'DBD' ], { A: 'create:precision_mechanism', - B: 'greate:steel_shaft', + B: '#forge:rods/long/blue_steel', C: '#forge:double_plates/black_steel', D: '#gtceu:circuits/ulv', E: 'gtceu:ulv_machine_hull' diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index aa6173590..6bfd0a31e 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -757,7 +757,7 @@ function registerGreateRecipes(event) { 'FEG' ], { A: '#gtceu:circuits/ulv', - B: 'greate:steel_shaft', + B: '#forge:small_gears/blue_steel', C: 'gtceu:ulv_machine_hull', D: '#forge:plates/black_steel', E: 'gtceu:steel_whisk', @@ -766,7 +766,7 @@ function registerGreateRecipes(event) { }).id('greate:shaped/steel_mechanical_mixer') event.recipes.gtceu.assembler('greate:steel_mechanical_mixer') - .itemInputs('greate:steel_shaft', '2x #gtceu:circuits/ulv', 'gtceu:ulv_machine_hull', 'gtceu:steel_whisk', '2x #forge:plates/black_steel') + .itemInputs('#forge:small_gears/blue_steel', '2x #gtceu:circuits/ulv', 'gtceu:ulv_machine_hull', 'gtceu:steel_whisk', '2x #forge:plates/black_steel') .itemOutputs('greate:steel_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index d50b81cc9..c23447eb6 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -85,4 +85,47 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:mixing/brass_ingot' }) event.remove({ id: /^greate:.*\/integration\/createaddition/ }) + + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_phosphorus_boule' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_phosphorus_boule_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_phosphorus_boule_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_naquadah_boule' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_naquadah_boule_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_naquadah_boule_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_neutronium_boule' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_neutronium_boule_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_neutronium_boule_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nano_cpu' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nano_cpu_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nano_cpu_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_qbit_cpu' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_qbit_cpu_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_qbit_cpu_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_soc' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_soc_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_soc_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_asoc' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_asoc_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_asoc_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hasoc' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hasoc_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hasoc_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nand' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nand_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nand_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nor' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nor_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_nor_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_lpic_wafer' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_lpic_wafer_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_lpic_wafer_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_pic_wafer' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_pic_wafer_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_pic_wafer_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hpic' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hpic_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_hpic_distilled_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_uhpic' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_uhpic_water' }) + event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_uhpic_distilled_water' }) } diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 17f880fdb..cb93b4faa 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -5,7 +5,7 @@ * @param {Internal.RecipesEventJS} event */ function registerGTCEuMachineRecipes(event) { - //#region Выход: Filter Casing + // Filter Casing event.shaped('gtceu:filter_casing', [ 'AAA', @@ -19,9 +19,7 @@ function registerGTCEuMachineRecipes(event) { E: '#forge:rotors/steel' }).id('gtceu:shaped/filter_casing') - //#endregion - - //#region Выход: Assembly Line Grating + // Assembly Line Grating event.shaped('2x gtceu:assembly_line_grating', [ 'ABA', @@ -34,9 +32,7 @@ function registerGTCEuMachineRecipes(event) { D: 'gtceu:mv_electric_motor' }).id('gtceu:shaped/casing_grate_casing') - //#endregion - - //#region Gas Collectors + // #region Gas Collectors event.shaped('gtceu:lv_gas_collector', [ 'ABA', @@ -133,10 +129,9 @@ function registerGTCEuMachineRecipes(event) { D: '#gtceu:circuits/uv', E: 'gtceu:uv_machine_hull' }).id('gtceu:shaped/uv_gas_collector') + // #endregion - //#endregion - - //#region Forge Hammers + // #region Forge Hammers event.shaped('gtceu:lv_forge_hammer', [ 'ABA', @@ -233,10 +228,9 @@ function registerGTCEuMachineRecipes(event) { D: 'gtceu:uv_machine_hull', E: '#tfc:red_or_blue_anvil', }).id('gtceu:shaped/uv_forge_hammer') + // #endregion - //#endregion - - //#region CokeOven + // #region Coke Oven event.remove({ id: 'gtceu:shaped/casing_coke_bricks' }) event.remove({ id: 'gtceu:compressor/coke_bricks' }) @@ -257,7 +251,6 @@ function registerGTCEuMachineRecipes(event) { .duration(50) .EUt(2); - // Coke Oven removeMaceratorRecipe(event, 'macerate_coke_oven') event.recipes.gtceu.shaped('gtceu:coke_oven', [ 'ABA', @@ -287,15 +280,12 @@ function registerGTCEuMachineRecipes(event) { A: 'gtceu:coke_oven_bricks', B: '#forge:chests/wooden' }).addMaterialInfo().id('gtceu:shaped/coke_oven_hatch') - //#endregion - //#region Выход: Стальные машины - // HP Steam Boilers removeMaceratorRecipe(event, 'macerate_hp_steam_solid_boiler') event.recipes.gtceu.shaped('gtceu:hp_steam_solid_boiler', [ - 'AEA', + 'FEF', 'ADA', 'BCB' ], { @@ -303,12 +293,13 @@ function registerGTCEuMachineRecipes(event) { B: ChemicalHelper.get(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy, 1), C: 'gtceu:steel_brick_casing', D: 'tfc:crucible', - E: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) + E: ChemicalHelper.get(TagPrefix.plate, GTMaterials.BlackSteel, 1), + F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_boiler_coal_steel') removeMaceratorRecipe(event, 'macerate_hp_steam_liquid_boiler') event.recipes.gtceu.shaped('gtceu:hp_steam_liquid_boiler', [ - 'AEA', + 'FEF', 'ADA', 'BCB' ], { @@ -316,7 +307,8 @@ function registerGTCEuMachineRecipes(event) { B: ChemicalHelper.get(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy, 1), C: 'gtceu:steel_brick_casing', D: '#forge:glass', - E: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) + E: ChemicalHelper.get(TagPrefix.plate, GTMaterials.BlackSteel, 1), + F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_boiler_lava_steel') removeMaceratorRecipe(event, 'macerate_hp_steam_solar_boiler') @@ -327,12 +319,13 @@ function registerGTCEuMachineRecipes(event) { ], { A: '#forge:glass_panes', B: ChemicalHelper.get(TagPrefix.plateDouble, GTMaterials.Silver, 1), - C: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1), + C: ChemicalHelper.get(TagPrefix.plate, GTMaterials.BlackSteel, 1), D: 'gtceu:steel_brick_casing', E: ChemicalHelper.get(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy, 1), }).addMaterialInfo().id('gtceu:shaped/steam_boiler_solar_steel') - // Экстрактор + // #region Other steam machines + removeMaceratorRecipe(event, 'macerate_hp_steam_extractor') event.recipes.gtceu.shaped('gtceu:hp_steam_extractor', [ 'BEB', @@ -347,7 +340,6 @@ function registerGTCEuMachineRecipes(event) { F: ChemicalHelper.get(TagPrefix.ring, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_extractor_steel') - // Дробитель removeMaceratorRecipe(event, 'macerate_hp_steam_macerator') event.recipes.gtceu.shaped('gtceu:hp_steam_macerator', [ 'BFB', @@ -362,7 +354,6 @@ function registerGTCEuMachineRecipes(event) { F: '#forge:raw_materials/diamond' }).addMaterialInfo().id('gtceu:shaped/steam_macerator_steel') - // Компрессор removeMaceratorRecipe(event, 'macerate_hp_steam_compressor') event.recipes.gtceu.shaped('gtceu:hp_steam_compressor', [ 'BCB', @@ -374,10 +365,9 @@ function registerGTCEuMachineRecipes(event) { C: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Steel, 1), D: ChemicalHelper.get(TagPrefix.plate, GTMaterials.WroughtIron, 1), E: 'minecraft:piston', - F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) + F: ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_compressor_steel') - // Молот removeMaceratorRecipe(event, 'macerate_hp_steam_forge_hammer') event.recipes.gtceu.shaped('gtceu:hp_steam_forge_hammer', [ 'DFD', @@ -392,7 +382,6 @@ function registerGTCEuMachineRecipes(event) { F: 'minecraft:piston' }).addMaterialInfo().id('gtceu:shaped/steam_hammer_steel') - // Печь removeMaceratorRecipe(event, 'macerate_hp_steam_furnace') event.recipes.gtceu.shaped('gtceu:hp_steam_furnace', [ 'BCB', @@ -406,7 +395,6 @@ function registerGTCEuMachineRecipes(event) { F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_furnace_steel') - // Сплавщик removeMaceratorRecipe(event, 'macerate_hp_steam_alloy_smelter') event.recipes.gtceu.shaped('gtceu:hp_steam_alloy_smelter', [ 'FCF', @@ -420,7 +408,6 @@ function registerGTCEuMachineRecipes(event) { F: ChemicalHelper.get(TagPrefix.rod, GTMaterials.BlackSteel, 1) }).addMaterialInfo().id('gtceu:shaped/steam_alloy_smelter_steel') - // Блоко-ломатель removeMaceratorRecipe(event, 'macerate_hp_steam_rock_crusher') event.recipes.gtceu.shaped('gtceu:hp_steam_rock_crusher', [ 'ECE', @@ -434,7 +421,6 @@ function registerGTCEuMachineRecipes(event) { E: ChemicalHelper.get(TagPrefix.screw, GTMaterials.WroughtIron, 1) }).addMaterialInfo().id('gtceu:shaped/steam_rock_breaker_steel') - // Miner removeMaceratorRecipe(event, 'macerate_hp_steam_miner') event.recipes.gtceu.shaped('gtceu:hp_steam_miner', [ 'EFE', @@ -451,7 +437,7 @@ function registerGTCEuMachineRecipes(event) { //#endregion - //#region passthrough hatches + //#region Passthrough hatches event.recipes.gtceu.shaped('gtceu:lv_item_passthrough_hatch', [ ' A ', 'BCB', @@ -623,6 +609,8 @@ function registerGTCEuMachineRecipes(event) { //#region ULV Hatches + event.replaceInput({ id: 'gtceu:shaped/ulv_machine_hull' }, '#forge:plates/wood', '#forge:plates/lead') + event.recipes.gtceu.shaped('gtceu:ulv_input_bus', [ 'CAC', 'CBC', diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 6c780ab13..d4dab7a2b 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -391,6 +391,8 @@ function removeGTCEURecipes(event) { //#region Выход: Бумажная пыль event.remove({ id: 'gtceu:shaped/paper_dust' }) + event.remove({ id: 'gtceu:shaped_fluid_container/paper' }) + event.remove({ id: 'gtceu:macerator/macerate_enchanting_table' }) //#endregion @@ -838,9 +840,13 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__granite' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__diorite' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__andesite' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__marble' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__redrock' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__deepslate' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__blackstone' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__endstone' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__red_granite' }) + event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_tuff' }) removeMaceratorRecipe(event, 'macerate_end_stone'); removeMaceratorRecipe(event, 'macerate_end_stone_bricks'); @@ -900,6 +906,10 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:macerator/macerate_smooth_sandstone' }) event.remove({ id: 'gtceu:macerator/macerate_sandstone' }) event.remove({ id: 'gtceu:macerator/macerate_cut_sandstone' }) + + event.remove({ id: 'gtceu:rock_breaker/obsidian' }) + + event.remove({ id: 'gtceu:alloy_smelter/alloy_smelt_magnesia_refractory_brick_to_nugget' }) } function removeMaceratorRecipe(event, id) { diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 6953a1202..171d3841a 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -112,5 +112,7 @@ function registerGTCEUFluidTags(event) { event.add("c:hidden_from_recipe_viewers", "gtceu:damascus_steel"); event.add("c:hidden_from_recipe_viewers", "gtceu:blaze"); event.add("c:hidden_from_recipe_viewers", "gtceu:thorium"); - + + event.add("c:hidden_from_recipe_viewers", "tfg:molten_weak_red_steel"); + event.add("c:hidden_from_recipe_viewers", "tfg:molten_weak_blue_steel"); } diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 6bc85679e..692fb88a4 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -21,7 +21,7 @@ const registerTFCRecipes = (event) => { ], { A: '#forge:double_plates/wrought_iron', B: 'tfc:crucible' - }).addMaterialInfo().id('tfc:crafting/blast_furnace') + }).id('tfc:crafting/blast_furnace') // Тыква -> Кусочки тыквы event.recipes.tfc.advanced_shapeless_crafting( @@ -250,4 +250,6 @@ const registerTFCRecipes = (event) => { .itemOutputs("4x tfc:powder/flux") .duration(50) .EUt(2); + + event.shapeless('4x tfc:fire_clay', ['tfc:fire_clay_block']) } diff --git a/kubejs/server_scripts/tfc/recipes.removes.js b/kubejs/server_scripts/tfc/recipes.removes.js index a4dd78bbc..90f5266bc 100644 --- a/kubejs/server_scripts/tfc/recipes.removes.js +++ b/kubejs/server_scripts/tfc/recipes.removes.js @@ -130,4 +130,11 @@ function removeTFCRecipes(event) { event.remove({ output: 'tfc:rustic_windmill_blade'}) event.remove({ output: 'tfc:lattice_windmill_blade'}) event.remove({ id: 'tfchotornot:heating/insulating_items'}) + + event.remove({ id: 'tfc:heating/metal/weak_blue_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_blue_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_blue_steel_fire_ingot' }) + event.remove({ id: 'tfc:heating/metal/weak_red_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_red_steel_ingot' }) + event.remove({ id: 'tfc:casting/weak_red_steel_fire_ingot' }) } diff --git a/kubejs/server_scripts/tfcbetterbf/recipes.js b/kubejs/server_scripts/tfcbetterbf/recipes.js index 86cc9ad9e..941c5f5a5 100644 --- a/kubejs/server_scripts/tfcbetterbf/recipes.js +++ b/kubejs/server_scripts/tfcbetterbf/recipes.js @@ -4,16 +4,24 @@ * * @param {Internal.RecipesEventJS} event */ -const registerTFCBetterBFRecipes = (event) => { - event.remove("tfcbetterbf:heating/metal/insulation") - - event.recipes.tfc.heating('tfcbetterbf:insulation', 1535) - .resultFluid(Fluid.of('gtceu:iron', 432)) - .id(`tfcbetterbf:heating/insulation`) +const registerTFCBetterBFRecipes = (event) => { + event.remove("tfcbetterbf:heating/metal/insulation") - event.recipes.tfc.heating('tfcbetterbf:insulated_fire_bricks', 1535) - .resultFluid(Fluid.of('gtceu:iron', 432)) - .id(`tfcbetterbf:heating/insulated_fire_bricks`) + event.recipes.tfc.heating('tfcbetterbf:insulation', 1535) + .resultFluid(Fluid.of('gtceu:iron', 432)) + .id(`tfcbetterbf:heating/insulation`) - TFGHelpers.registerMaterialInfo('tfcbetterbf:insulated_fire_bricks', [GTMaterials.WroughtIron, 3]) + TFGHelpers.registerMaterialInfo('tfcbetterbf:insulation', [GTMaterials.WroughtIron, 3]) + + event.recipes.tfc.heating('tfcbetterbf:insulated_fire_bricks', 1535) + .resultFluid(Fluid.of('gtceu:iron', 432)) + .id(`tfcbetterbf:heating/insulated_fire_bricks`) + + TFGHelpers.registerMaterialInfo('tfcbetterbf:insulated_fire_bricks', [GTMaterials.get('tfg:refractory_clay'), 5, GTMaterials.WroughtIron, 3]) + + event.recipes.gtceu.packer('tfcbetterbf:insulated_fire_bricks') + .itemInputs('tfcbetterbf:insulated_fire_bricks') + .itemOutputs('tfc:fire_bricks', '3x tfcbetterbf:insulation') + .duration(20) + .EUt(2) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.bakelite.js b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js new file mode 100644 index 000000000..fd46fbf09 --- /dev/null +++ b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js @@ -0,0 +1,70 @@ +"use strict"; + +function registerTFGBakeliteRecipes(event) { + + // TODO: move oil PE to MV + + event.recipes.gtceu.chemical_reactor('tfg:formaldehyde_from_methane') + .inputFluids('gtceu:methane 1000', 'gtceu:oxygen 1000') + .outputFluids('gtceu:formaldehyde 1000', 'gtceu:hydrogen 2000') + .circuit(1) + .duration(200) + .EUt(GTValues.VA[GTValues.LV]) + + // add phenol and methane to distillation + event.recipes.gtceu.distillation_tower('gtceu:distill_creosote') + .inputFluids('gtceu:creosote 1000') + .outputFluids('gtceu:lubricant 500') + .outputFluids('gtceu:phenol 50') + .outputFluids('gtceu:carbon_dioxide 200') + .outputFluids('gtceu:methane 250') + // this adds single-block distillery recipes too + .disableDistilleryRecipes(false) + .duration(8 * 20) + .EUt(96) + + event.recipes.gtceu.chemical_reactor('tfg:syngas_to_methane') + .inputFluids('tfg:syngas 1000') + .notConsumable('#forge:dusts/silver') + .outputFluids('gtceu:methane 100') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.chemical_reactor('tfg:phenolic_resin') + .inputFluids('gtceu:phenol 500', 'gtceu:formaldehyde 1000') + .notConsumable('#forge:dusts/sodium_hydroxide') + .outputFluids('tfg:phenolic_resin 1000') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:bakelite_wood') + .inputFluids('tfg:phenolic_resin 144') + .itemInputs('tfg:treated_chipboard_composite') + .outputFluids('tfg:bakelite 144') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:bakelite_asbestos') + .inputFluids('tfg:phenolic_resin 144') + .itemInputs('#forge:dusts/asbestos') + .outputFluids('tfg:bakelite 144') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.remove({ id: 'gtceu:assembler/phenolic_board' }) + + event.recipes.gtceu.forming_press('tfg:phenolic_board') + .itemInputs('2x #forge:foils/bakelite', '2x minecraft:paper', 'gtceu:resin_circuit_board') + .itemOutputs('gtceu:phenolic_circuit_board') + .duration(7.5 * 20) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.assembler('tfg:phenolic_board_pe') + .itemInputs('2x #forge:foils/polyethylene', 'gtceu:wood_plate') + .inputFluids('gtceu:phenol 50') + .itemOutputs('gtceu:phenolic_circuit_board') + .duration(7.5 * 20) + .EUt(GTValues.VA[GTValues.MV]) + + event.replaceInput({ id: 'gtceu:shaped/mv_machine_hull' }, '#forge:plates/wrought_iron', '#forge:plates/bakelite') +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.coils.js b/kubejs/server_scripts/tfg/machines/recipes.coils.js new file mode 100644 index 000000000..850945e8d --- /dev/null +++ b/kubejs/server_scripts/tfg/machines/recipes.coils.js @@ -0,0 +1,77 @@ +"use strict"; + +function registerTFGCoilRecipes(event) { + + // #region Cupronickel Coil + + event.smelting('tfg:refractory_clay_dust', 'tfc:fire_clay') + + event.recipes.gtceu.chemical_reactor('tfg:magnesium_hydroxide') + .itemInputs('#forge:dusts/magnesium') + .inputFluids('tfc:lye 2000') + .itemOutputs('#forge:dusts/magnesium_hydroxide', '2x #forge:dusts/sodium') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.coke_oven('tfg:magnesia') + .itemInputs('#forge:dusts/magnesium_hydroxide') + .itemOutputs('#forge:dusts/magnesia') + .duration(20 * 20) + + event.recipes.gtceu.pyrolyse_oven('tfg:magnesia') + .itemInputs('#forge:dusts/magnesium_hydroxide') + .itemOutputs('#forge:dusts/magnesia') + .duration(20 * 20) + .EUt(GTValues.VHA[GTValues.MV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_sticky') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '#forge:dusts/graphite', '5x gtceu:sticky_resin') + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_sticky_powder') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '4x tfc:powder/graphite', '5x gtceu:sticky_resin') + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_phenolic') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '#forge:dusts/graphite') + .inputFluids(Fluid.of('tfg:phenolic_resin', 144)) + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:magnesia_refractory_brick_dust_phenolic_powder') + .itemInputs('#forge:dusts/magnesia', '#forge:dusts/refractory_clay', '4x tfc:powder/graphite') + .inputFluids(Fluid.of('tfg:phenolic_resin', 144)) + .itemOutputs('3x #forge:dusts/magnesia_refractory_brick') + .duration(5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.alloy_smelter('tfg:magnesia_refractory_brick') + .itemInputs('#forge:dusts/magnesia_refractory_brick') + .notConsumable('gtceu:ingot_casting_mold') + .itemOutputs('#forge:ingots/magnesia_refractory_brick') + .duration(8 * 20) + .EUt(GTValues.VA[GTValues.LV]) + .category(GTRecipeCategories.INGOT_MOLDING) + + event.recipes.gtceu.forming_press('tfg:magnesia_refractory_brick') + .itemInputs('#forge:dusts/magnesia_refractory_brick') + .notConsumable('gtceu:ingot_casting_mold') + .itemOutputs('#forge:ingots/magnesia_refractory_brick') + .duration(4 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.gtceu.assembler('gtceu:coil_cupronickel') + .itemInputs('8x #forge:double_wires/cupronickel', '8x #forge:foils/blue_steel', '8x #forge:ingots/magnesia_refractory_brick') + .inputFluids('gtceu:tin_alloy 144') + .itemOutputs('gtceu:cupronickel_coil_block') + .duration(10 * 20) + .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true, true) + + // #endregion +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js index 65f5b2f21..3b40a47da 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js +++ b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js @@ -98,7 +98,7 @@ function registerTFGMultiblockRecipes(event) { 'ACA', 'ABA' ], { - A: '#forge:plates/brass', + A: '#forge:plates/bronze', B: 'gtceu:potin_large_fluid_pipe', C: 'gtceu:hp_steam_compressor' }).addMaterialInfo().id('gtceu:shaped/steam_squasher') @@ -108,7 +108,7 @@ function registerTFGMultiblockRecipes(event) { 'ACA', 'ABA' ], { - A: '#forge:plates/brass', + A: '#forge:plates/bronze', B: 'tfc:metal/anvil/steel', C: 'gtceu:hp_steam_forge_hammer', D: 'gtceu:potin_large_fluid_pipe' diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js index db441beb3..d132b768a 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.alloys.js @@ -67,6 +67,35 @@ function registerTFGAlloyingRecipes(event) { .circuit(1) .EUt(GTValues.VA[GTValues.MV]) .blastFurnaceTemp(1000) + + event.remove({ id: 'greate:mixing/integration/gtceu/mixer/red_steel' }) + event.remove({ id: 'greate:mixing/integration/gtceu/mixer/blue_steel' }) + + event.recipes.greate.mixing('#forge:dusts/weak_red_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/brass', '#forge:dusts/rose_gold']) + .recipeTier(1) + .circuitNumber(2) + .heated() + .id('tfg:weak_red_steel_greate') + + event.recipes.greate.mixing('#forge:dusts/weak_blue_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/bismuth_bronze', '#forge:dusts/sterling_silver']) + .recipeTier(1) + .circuitNumber(2) + .heated() + .id('tfg:weak_blue_steel_greate') + + event.recipes.greate.mixing('#forge:dusts/red_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/brass', '#forge:dusts/rose_gold']) + .recipeTier(2) + .circuitNumber(1) + .id('tfg:red_steel_greate') + + event.recipes.greate.mixing('#forge:dusts/blue_steel', + ['4x #forge:dusts/black_steel', '2x #forge:dusts/steel', '#forge:dusts/bismuth_bronze', '#forge:dusts/sterling_silver']) + .recipeTier(2) + .circuitNumber(1) + .id('tfg:blue_steel_greate') //#endregion diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js index bdc455e77..8eabb675d 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_tools.js @@ -156,7 +156,7 @@ function processToolHead(event, headTagPrefix, tagPrefixName, extruderMold, cera .circuit(circuitMeta) .itemOutputs(toolHeadItem) .duration(material.getMass() * 6) - .EUt(GTValues.VA[GTValues.LV]) + .EUt(GTValues.VA[GTValues.MV]) } addMaterialRecycling(event, toolHeadItem, material, tagPrefixName, headTagPrefix); diff --git a/kubejs/server_scripts/tfg/primitive/recipes.clay.js b/kubejs/server_scripts/tfg/primitive/recipes.clay.js index 5ea2bf0fd..0b256107b 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.clay.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.clay.js @@ -187,19 +187,16 @@ function registerTFGClayRecipes(event) { .duration(20) .EUt(2) - event.recipes.gtceu.macerator('tfg:casting_channel') - .itemInputs('tfcchannelcasting:channel') - .itemOutputs('1x #forge:dusts/brick') - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .duration(20) - .EUt(2) - - event.recipes.gtceu.macerator('tfg:mold_table') - .itemInputs('tfcchannelcasting:mold_table') - .itemOutputs('5x #forge:dusts/brick') - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .duration(20) - .EUt(2) + var refractoryClay = GTMaterials.get('tfg:refractory_clay'); + TFGHelpers.registerMaterialInfo('tfc:blast_furnace', [GTMaterials.WroughtIron, 16, refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:fire_bricks', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:crucible', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:ceramic/fire_brick', [refractoryClay, 1]) + TFGHelpers.registerMaterialInfo('tfcchannelcasting:channel', [refractoryClay, 5/4]) + TFGHelpers.registerMaterialInfo('tfcchannelcasting:mold_table', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfc:ceramic/fire_ingot_mold', [refractoryClay, 5/2]) + TFGHelpers.registerMaterialInfo('tfg:rod_mold', [refractoryClay, 5]) + TFGHelpers.registerMaterialInfo('tfg:small_gear_mold', [refractoryClay, 5]) // Renewable clay event.recipes.gtceu.rock_breaker("clay_duping") diff --git a/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js b/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js index b6d6c956d..d79899f97 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js @@ -128,13 +128,6 @@ function registerTFGChipboardRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.chemical_bath('gtceu:bath_high_density_treated_fiberboard') - .itemInputs('1x gtceu:wood_plate') - .inputFluids(Fluid.of('gtceu:creosote', 50)) - .itemOutputs('tfg:high_density_treated_fiberboard') - .duration(100) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.chemical_bath('gtceu:bath_treated_wood_dust') .itemInputs('#tfg:wood_dusts') .inputFluids(Fluid.of('gtceu:creosote', 50)) @@ -142,17 +135,9 @@ function registerTFGChipboardRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.compressor('tfg:compressed_treated_chipboard_composite') - .itemInputs('tfg:treated_chipboard_composite') - .itemOutputs('tfg:high_density_treated_fiberboard') - .duration(200) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.assembler('tfg:resin_circuit_assembler') .itemInputs('gtceu:wood_plate', '2x gtceu:sticky_resin') .itemOutputs('gtceu:resin_circuit_board') .duration(20 * 10) .EUt(GTValues.VA[GTValues.ULV]) - - event.replaceInput({ id: 'gtceu:assembler/phenolic_board' }, '#tfg:wood_dusts', 'tfg:high_density_treated_fiberboard') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 3366ed27d..eec9b4a7a 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -56,6 +56,8 @@ const registerTFGRecipes = (event) => { registerTFGMultiblockRecipes(event) registerTFGSteamBloomeryRecipes(event) registerTFGElectronicComponentsRecipes(event) + registerTFGBakeliteRecipes(event) + registerTFGCoilRecipes(event) registerTFGEarlyGasRecipes(event) registerTFGBoilerRecipes(event) diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index be452a79f..4e125b161 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -16,7 +16,7 @@ function registerVintageImprovementsRecipes(event) { B: 'greate:steel_cogwheel', C: '#forge:rods/steel', D: '#forge:double_ingots/black_steel', - E: '#forge:small_gears/steel', + E: '#forge:small_gears/blue_steel', F: '#gtceu:circuits/ulv' }).addMaterialInfo().id('tfg:vi/shaped/spring_coiling_machine') @@ -27,8 +27,8 @@ function registerVintageImprovementsRecipes(event) { ], { A: 'gtceu:ulv_machine_casing', B: 'greate:steel_mechanical_pump', - C: 'create:mechanical_piston', - D: '#forge:springs/wrought_iron', + C: 'minecraft:piston', + D: '#forge:springs/blue_steel', E: 'create:electron_tube', F: '#forge:plates/black_steel', G: 'create:precision_mechanism' diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 38e7473b7..a00a7aea5 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -170,6 +170,8 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:molten_black_bronze_bucket", "gtceu:molten_bismuth_bronze_bucket", + "tfg:molten_weak_blue_steel_bucket", + "tfg:molten_weak_red_steel_bucket", //armor "gtceu:bronze_helmet", diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index 985f022e4..e7c733f4f 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -106,6 +106,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.BlackSteel.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(891, 1188, 1485, 5)); GTMaterials.BlueSteel.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); GTMaterials.RedSteel.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); + GTMaterials.get('tfg:weak_blue_steel').setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); + GTMaterials.get('tfg:weak_red_steel').setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(924, 1232, 1540, 6)); GTMaterials.Gold.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(636, 848, 1060, 1)); GTMaterials.Bismuth.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(162, 216, 270, 1)); @@ -282,7 +284,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD); GTMaterials.Zinc.addFlags(GENERATE_LONG_ROD); GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); - GTMaterials.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); + GTMaterials.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_SPRING, GENERATE_SMALL_GEAR, GENERATE_FOIL); GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_FOIL); GTMaterials.WroughtIron.addFlags(GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SMALL_GEAR); @@ -395,6 +397,8 @@ const registerGTCEuMaterialModification = (event) => { // Remove properties GTMaterials.Glass.getProperties().removeProperty(PropertyKey.GEM) + GTMaterials.Thorium.getProperties().removeProperty(PropertyKey.INGOT) + GTMaterials.Thorium.getProperties().removeProperty(PropertyKey.FLUID) // Color Adjustments GTMaterials.BismuthBronze.setMaterialARGB(0x5A966E) diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 92fadd335..c71f7f7b5 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -73,14 +73,11 @@ const registerTFGItems = (event) => { // Add item for BTX Fuel event.create('tfg:catalyser_pt_re_zsm') - .translationKey('item.tfg.catalyser_pt_re_zsm') .texture('tfg:item/btx/catalyser_zsm') event.create('tfg:used_catalyser') - .translationKey('item.tfg.used_catalyser') .texture('tfg:item/btx/used_catalyser') event.create('tfg:loaded_resin') - .translationKey('item.tfg.loaded_resin') .texture('tfg:item/btx/loaded_resin') } diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 7e8068be4..ad21a71ba 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -16,6 +16,14 @@ const registerTFGMaterials = (event) => { event.create('methoxy') .components('1x oxygen', '1x carbon', '3x hydrogen') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + + event.create('methylene') + .components('1x carbon', '2x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + + event.create('hydroxide') + .components('1x oxygen', '1x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) //#endregion registerTFGPowerReworkMaterials(event); @@ -65,6 +73,40 @@ const registerTFGMaterials = (event) => { .secondaryColor(0x67FFE6) .formula("(Al2Si2O5(OH)4)(BeK4N5)") + // Bakelite + event.create('tfg:bakelite') + .polymer() + .fluid() + .color(0xF29104) + .secondaryColor(0xD96005) + .components('1x phenol', '1x formaldehyde') + .flags( + GTMaterialFlags.DISABLE_DECOMPOSITION, + GTMaterialFlags.NO_SMELTING, + GTMaterialFlags.GENERATE_PLATE, + GTMaterialFlags.GENERATE_FOIL + ) + + event.create('tfg:phenolic_resin') + .fluid() + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x phenol', '1x formaldehyde') + .color(0xFCD7A3) + + // Coils + + event.create('tfg:magnesium_hydroxide') + .dust() + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .components('1x magnesium', '2x hydroxide') + .color(0xC6E4FF) + + event.create('tfg:magnesia_refractory_brick') + .dust() + .ingot() + .iconSet(GTMaterialIconSet.ROUGH) + .flags(GTMaterialFlags.NO_SMELTING) + .color(0xA69D96) //#region Tungsten Line diff --git a/kubejs/startup_scripts/tfg/primitive/items.primitive.js b/kubejs/startup_scripts/tfg/primitive/items.primitive.js index 1e5da063f..fcc217dd5 100644 --- a/kubejs/startup_scripts/tfg/primitive/items.primitive.js +++ b/kubejs/startup_scripts/tfg/primitive/items.primitive.js @@ -25,7 +25,6 @@ function registerTFGPrimitiveItems(event) { // Chipboard event.create('tfg:chipboard_composite') event.create('tfg:treated_chipboard_composite') - event.create('tfg:high_density_treated_fiberboard') // Wax event.create('tfg:paraffin_wax') diff --git a/kubejs/startup_scripts/tfg/primitive/materials.primitive.js b/kubejs/startup_scripts/tfg/primitive/materials.primitive.js index 9edbd241e..1d6a7b7fd 100644 --- a/kubejs/startup_scripts/tfg/primitive/materials.primitive.js +++ b/kubejs/startup_scripts/tfg/primitive/materials.primitive.js @@ -94,5 +94,35 @@ function registerTFGPrimitiveMaterials(event) { .dust() .color(0xf0ccb4) .formula("C6H3(OH)3") - .iconSet('rough') + .iconSet(GTMaterialIconSet.ROUGH) + + // Fire clay + event.create('tfg:refractory_clay') + .dust() + .iconSet(GTMaterialIconSet.ROUGH) + .color(0xB49AA2) + .secondaryColor(0x60545F) + + // Weak colored steel + event.create('tfg:weak_blue_steel') + .dust() + .ingot() + .liquid() + .components('1x sterling_silver', '1x bismuth_bronze', '2x steel', '4x black_steel') + .blastTemp(1000, null, GTValues.VA[GTValues.MV], 25 * 20) + .color(0x697FBD) + .secondaryColor(0x384B82) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.NO_SMELTING, GTMaterialFlags.DISABLE_ALLOY_BLAST) + .iconSet(GTMaterialIconSet.METALLIC) + + event.create('tfg:weak_red_steel') + .dust() + .ingot() + .liquid() + .components('1x brass', '1x rose_gold', '2x steel', '4x black_steel') + .blastTemp(1000, null, GTValues.VA[GTValues.MV], 25 * 20) + .color(0xB55C5C) + .secondaryColor(0x7D3232) + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.NO_SMELTING, GTMaterialFlags.DISABLE_ALLOY_BLAST) + .iconSet(GTMaterialIconSet.METALLIC) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/tag_prefixes.js b/kubejs/startup_scripts/tfg/tag_prefixes.js index 695ed3041..c3bbdfbfe 100644 --- a/kubejs/startup_scripts/tfg/tag_prefixes.js +++ b/kubejs/startup_scripts/tfg/tag_prefixes.js @@ -20,6 +20,9 @@ function registerTFGTagPrefixes(event) { TagPrefix.ingot.setIgnored(GTMaterials.RawRubber); TagPrefix.plate.setIgnored(GTMaterials.RawRubber); TagPrefix.plateDouble.setIgnored(GTMaterials.RawRubber); + + TagPrefix.nugget.setIgnored(GTMaterials.get('tfg:magnesia_refractory_brick')) + TagPrefix.block.setIgnored(GTMaterials.get('tfg:magnesia_refractory_brick')) } function excludeAllGemsButNormal(material) { From 9b31d2439aab71519ac8a495203834cc734a24af Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 27 Jan 2026 01:12:22 +0000 Subject: [PATCH 49/66] move PE to MV, langs, tweak some quests and add another MV phenolic board recipe --- CHANGELOG.md | 16 ++ .../quests/chapters/lv__low_voltage.snbt | 48 ++-- kubejs/assets/minecraft/lang/en_us.json | 3 +- kubejs/assets/minecraft/lang/ru_ru.json | 3 + kubejs/assets/tfcagedalcohol/lang/ru_ru.json | 7 + kubejs/assets/tfg/lang/en_us.json | 36 +-- kubejs/assets/tfg/lang/ru_ru.json | 217 ++++++++++++------ kubejs/server_scripts/gregtech/utility.js | 38 +-- kubejs/server_scripts/minecraft/recipes.js | 17 +- .../tfg/machines/recipes.bakelite.js | 42 +++- pakku-lock.json | 121 ++++++---- 11 files changed, 364 insertions(+), 184 deletions(-) create mode 100644 kubejs/assets/tfcagedalcohol/lang/ru_ru.json diff --git a/CHANGELOG.md b/CHANGELOG.md index a31ec81bc..7b1fdd7c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ ## Unreleased ### Breaking changes - The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie +#### ULV changes +- The vacuum chamber requires a blue steel spring now, so the colored steel anvil can't be skipped +- The steel mechanical mixer can now only make weak red/blue steel dust, not regular (it can still make black steel dust though). The LV mixer can make normal red/blue steel dust +- Changed ULV hulls to needing lead plates instead of wood plates +- Adjusted a few other machine recipes slightly +#### LV changes +- Completely rearranged the quest chapter! Now it should be much less intimidating for new players +- Added Bakelite, a new early plastic used for Phenolic Boards and MV machine hulls (instead of wrought iron plates) +- Removed the other fiberboard that was previously used for phenolic boards +- Added some recipes to get Phenol and Methane in LV +- Added new ceramics required to craft Cupronickel Coils, made out of your recycled TFC blast furnace, Magnesia, and some resin +- Cupronickel coils now also need blue steel foil instead of bronze +- Polyethylene now requires an MV chemical reactor ### Changes - Added the Artisan Table to "knap" circuit boards and GT extruder and casting molds, replacing their crafting table recipes. @BlueBoat29 @Redeix - Added much more music to the different dimensions @Pyritie @@ -14,8 +27,11 @@ - Fixed red granite ores never dropping poor or rich raw ores @Pyritie - Fixed rosin leaves and saplings having tags the wrong way around (#2840) @TanJeeSchuan - Fixed missing borax to flux recipe @Pyritie +- Fixed lavaproof blue steel boots not having armor resistances (#2872) @Paradalope +- Fixed the dye colors used to make Create Deco's bricks (#2859) @silllil ### Translation updates - Chinese (simplified) @jmecn +- Russian @Petr211071 ## [0.11.18] - 23-01-2026 ### Important notes diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 42831456c..9134b341e 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -16,8 +16,8 @@ { id: "46612C429BCA8A18" linked_quest: "6BAC3BE1D4FE0F6B" - x: 2.5d - y: 10.0d + x: 4.5d + y: 14.0d } { id: "5E5AD44B50E0B15B" @@ -76,7 +76,7 @@ type: "item" }] title: "{quests.low_voltage.lv_fluid_regulator.title}" - x: 6.0d + x: 7.0d y: -8.5d } { @@ -96,7 +96,7 @@ type: "item" }] title: "{quests.low_voltage.lv_robot_arm.title}" - x: 6.0d + x: 7.0d y: -11.5d } { @@ -112,7 +112,7 @@ type: "item" }] title: "{quests.low_voltage.lv_conveyor.title}" - x: 4.5d + x: 5.0d y: -10.0d } { @@ -128,7 +128,7 @@ type: "item" }] title: "{quests.low_voltage.lv_pump.title}" - x: 4.5d + x: 5.0d y: -8.5d } { @@ -144,7 +144,7 @@ type: "item" }] title: "{quests.low_voltage.lv_piston.title}" - x: 4.5d + x: 5.0d y: -11.5d } { @@ -254,7 +254,7 @@ type: "checkmark" }] title: "{quests.low_voltage.cover_behaviour.title}" - x: 6.0d + x: 7.0d y: -10.0d } { @@ -957,8 +957,8 @@ type: "item" }] title: "{quests.low_voltage.lv_circuit_assembler.title}" - x: 0.0d - y: 19.5d + x: 4.0d + y: 17.5d } { dependencies: ["1A77CA35F054F988"] @@ -1087,8 +1087,8 @@ item: "gtceu:phenolic_printed_circuit_board" type: "item" }] - x: -3.5d - y: 16.0d + x: -4.5d + y: 17.5d } { dependencies: [ @@ -1125,7 +1125,7 @@ }] title: "{quests.low_voltage.1_mv_circuit.title}" x: 0.0d - y: 16.0d + y: 17.5d } { dependencies: ["1E9BE8D3F8A602DC"] @@ -1490,8 +1490,8 @@ type: "item" }] title: "{quests.low_voltage.lv_greenhouse.title}" - x: 2.5d - y: 16.0d + x: 0.0d + y: 19.5d } { dependencies: ["47B899144B865516"] @@ -1577,7 +1577,7 @@ type: "item" }] title: "{quests.low_voltage.lv_seeds.title}" - x: -6.5d + x: -7.0d y: -6.5d } { @@ -1593,7 +1593,7 @@ type: "item" }] title: "{quests.low_voltage.lv_seed_oil.title}" - x: -5.5d + x: -6.0d y: -6.5d } { @@ -1609,7 +1609,7 @@ type: "item" }] title: "{quests.low_voltage.lv_biodiesel.title}" - x: -4.5d + x: -5.0d y: -6.5d } { @@ -1671,7 +1671,7 @@ type: "checkmark" }] title: "{quests.low_voltage.oil.title}" - x: -5.5d + x: -6.0d y: -5.5d } { @@ -1721,7 +1721,7 @@ } ] title: "{quests.low_voltage.lv_naphtha_light.title}" - x: -4.5d + x: -5.0d y: -5.5d } { @@ -1738,7 +1738,7 @@ type: "item" }] title: "{quests.low_voltage.lv_gas_syngas.title}" - x: 4.5d + x: 5.0d y: -6.0d } { @@ -1888,7 +1888,7 @@ }] title: "{material.tfg.bakelite}" x: -6.5d - y: 16.0d + y: 17.5d } { description: ["{quests.low_voltage.lv_forming_press.desc}"] @@ -1900,8 +1900,8 @@ item: "gtceu:lv_forming_press" type: "item" }] - x: -3.5d - y: 18.0d + x: -4.5d + y: 15.5d } { dependencies: [ diff --git a/kubejs/assets/minecraft/lang/en_us.json b/kubejs/assets/minecraft/lang/en_us.json index 48f1c9820..1c8fbe6ab 100644 --- a/kubejs/assets/minecraft/lang/en_us.json +++ b/kubejs/assets/minecraft/lang/en_us.json @@ -103,5 +103,6 @@ "item.minecraft.milk_bucket": "Cow Milk Bucket", "material.tfg.dripstone": "Travertine", "death.attack.magic": "%1$s was killed by deadly poison", - "death.attack.magic.player": "%1$s was killed by deadly poison whilst trying to escape %2$s" + "death.attack.magic.player": "%1$s was killed by deadly poison whilst trying to escape %2$s", + "effect.minecraft.dolphins_grace": "Swim Speed" } \ No newline at end of file diff --git a/kubejs/assets/minecraft/lang/ru_ru.json b/kubejs/assets/minecraft/lang/ru_ru.json index 6f0606390..14bed099b 100644 --- a/kubejs/assets/minecraft/lang/ru_ru.json +++ b/kubejs/assets/minecraft/lang/ru_ru.json @@ -99,6 +99,9 @@ "item.minecraft.nether_brick": "Кератофировый кирпич", "item.minecraft.furnace_minecart": "Вагонетка с бойлером", "material.tfg.dripstone": "Травертин", + "death.attack.magic": "%1$s был убит смертоносным ядом", + "death.attack.magic.player": "%1$s был убит смертоносным ядом убегая от %2$s", + "effect.minecraft.dolphins_grace": "Скорость плавания", "item.minecraft.gold_nugget": "Золото (Самородок)", "item.minecraft.gold_ingot": "Золото (Слиток)", "item.minecraft.copper_ingot": "Медь (Слиток)", diff --git a/kubejs/assets/tfcagedalcohol/lang/ru_ru.json b/kubejs/assets/tfcagedalcohol/lang/ru_ru.json new file mode 100644 index 000000000..92282b34c --- /dev/null +++ b/kubejs/assets/tfcagedalcohol/lang/ru_ru.json @@ -0,0 +1,7 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.tfcagedalcohol.fluid.aged_mead": "Выдержанная медовуха", + "item.tfcagedalcohol.bucket.aged_mead": "Ведро с выдержанной медовухой", + "fluid.tfcagedalcohol.aged_mead": "Выдержанная медовуха", + "tfc.recipe.barrel.tfcagedalcohol.barrel.aged_mead": "Выдержка медовухи" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 518b158ad..ff499df4f 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -2155,7 +2155,7 @@ "quests.create_logistics.fabricate_rose_quartz.desc": "Since high-level logistics aren't super necessary for progression, you may also consider leaving the procurement of the Lens up until &bMV&r when you will be able to do it at home. &dRose Quartz&r can be crystallized from its dust form (mixed from 8 parts redstone and 1 part nether quartz) with an &bAdvanced &3Autoclave&r, switching out the usual (distilled) water for &bIce Water&r to simulate natural conditions. Similarly, at &bMV&r tier the &dRose Quartz Lens&r itself can be cut from a &dRose Quartz Plate&r, although it has to be acquired from a full block of Rose Quartz (being a gem plate, it must be processed in a &3Cutter&r).", "quests.create_logistics.rose_quartz_lens.title": "Rose-tinted Glasses", "quests.create_logistics.rose_quartz_lens.subtitle": "YONO (You Only Need One)", - "quests.create_logistics.rose_quartz_lens.desc": "Whichever way you obtained the materials needed, you need a &3Lathe&r to actually create the Lens. A &7Basic &3Lathe&r will be enough to create the lens from an &dExquisite Rose Quartz&r gem, but if you want to make the lens from a mere plate you will need better equipment in the form of an &bAdvanced &3Lathe&r.\n\nOne you've crafted it, the lens can be used in a &7Basic &3Laser Engraver&r &dDouble Red Alloy Plate&r to create the &dTransmitter&r unit we need, and won't be consumed in the process.", + "quests.create_logistics.rose_quartz_lens.desc": "Whichever way you obtained the materials needed, you need a &3Lathe&r to actually create the Lens. A &7Basic &3Lathe&r will be enough to create the lens from an &dExquisite Rose Quartz&r gem, but if you want to make the lens from a mere plate you will need better equipment in the form of an &bAdvanced &3Lathe&r.\n\nOne you've crafted it, the lens can be used in a &7Basic &3Laser Engraver&r with a &dDouble Red Alloy Plate&r to create the &dTransmitter&r unit you need, and won't be consumed in the process.", "quests.create_logistics.stock_link.title": "Stock Link", "quests.create_logistics.stock_link.subtitle": "We got storage buses at home", "quests.create_logistics.stock_link.desc": "The first &2High Logistics&r machine you can make is a &3Stock Link&r, which can be used to create a &dLogistics Network&r. When placed onto any side of a &3Packager&r, the Stock Link will &amake the inventory the Packager is attached to visible to the network&r! On its own, the Stock Link isn't super useful, but it is a core component of all the other machines yet to come...\n\nRemember to right click on an existing Stock Link before placing one down to tune the two to share the same network. To cancel this, you can simply craft the Stock Link by itself to clear its attunement.", @@ -2911,16 +2911,16 @@ "quests.low_voltage.lv_age_progression.task": "I... might have some sense of direction now", "quests.low_voltage.lost.title": "Lost?", "quests.low_voltage.lost.subtitle": "This is all very overwhelming", - "quests.low_voltage.lost.desc.1": "Getting into &7LV&r opens up a LOT of options, so it's easy to get lost. Here's our recommendations:\n\n1) Set up a source of power. Check the quests on the bottom right, there's several options, all are viable. Don't cheap out, build multiple generators!\n\nBe sure to &eread the GregTech Energy quest chapter&r so you get a good understanding of how EU, Volts, Amps, and Cable Loss all work.", - "quests.low_voltage.lost.desc.2": "2) Focus on machines that make building more machines cheaper.\n\nThe Polarizer is a super cheap machine that can magnetize rods for basically free. If you didn't craft the Steam Age equivalents, set up a Bender, Wiremill, Lathe, and Cutter. These quests are all on the top left.\n\nAfter that, focus on making Rubber cheaper with a Chemical Reactor and Fluid Solidifier (left), and making electronic components cheaper with an Assembler (bottom).\n\nOnce everything's at its cheapest, make sure you craft components in batches to save you lots of time.", - "quests.low_voltage.lost.desc.3": "3) Build a canner and make some batteries (top right). Battery buffers will help a lot with the growth of your factory, and the Ore Prospector is an absolute game changer.\n\n4) &7LV&r has two main end goals, the &aCircuit Assembler&r and the &aElectric Blast Furnace&r. You should now be ready to tackle those.", + "quests.low_voltage.lost.desc.1": "Getting into &7LV&r opens up a LOT of options, so it's easy to get lost. Here's our recommendations:\n\n1) Set up a source of power. Check the quests below this, there's several options, all are viable. Don't cheap out, build multiple generators!\n\nBe sure to &eread the GregTech Energy quest chapter&r so you get a good understanding of how EU, Volts, Amps, and Cable Loss all work.", + "quests.low_voltage.lost.desc.2": "2) Focus on machines that make building more machines cheaper.\n\nThe Polarizer is a super cheap machine that can magnetize rods for basically free. If you didn't craft the Steam Age equivalents, set up a Bender, Wiremill, Lathe, and Cutter.\n\nAfter that, focus on making Rubber cheaper with a Chemical Reactor and Fluid Solidifier (left), and making electronic components cheaper with an Assembler (bottom).\n\nOnce everything's at its cheapest, make sure you craft components in batches to save you lots of time.", + "quests.low_voltage.lost.desc.3": "3) Build a canner and make some batteries. Battery buffers will help a lot with the growth of your factory, and the Ore Prospector is an absolute game changer.\n\n4) &7LV&r has two main end goals, the &aCircuit Assembler&r and the &aElectric Blast Furnace&r. You should now be ready to tackle those.", "quests.low_voltage.lost.task": "I know what to do now!", "quests.low_voltage.lv_steam_turbine.title": "The Steam Turbine", "quests.low_voltage.lv_steam_turbine.subtitle": "You must construct additional turbines", - "quests.low_voltage.lv_steam_turbine.desc": "The &3Steam Turbine&r is most players' first &7LV&r generator, as you've already got steam production set up from your Steam machines.\n\nWhen provided Steam, the turbine will output EU at a ratio of &d2 mB = 1 EU&r.\n\nOne downside of steam is transporting it, and due to its lack of energy density, you'll need large or huge pipes to carry it around. You may also consider upgrading to the Large Bronze Boiler once you start needing more power than what your single-block boilers can produce.", + "quests.low_voltage.lv_steam_turbine.desc": "The &3Steam Turbine&r is most players' first &7LV&r generator, as you've already got steam production set up from your Steam machines.\n\nWhen provided Steam, the turbine will output EU at a ratio of &d2 mB = 1 EU&r.\n\nOne downside of steam is transporting it, and due to its lack of energy density, you'll need large or huge pipes to carry it around.\n\nYou may also consider upgrading to the Large Bronze Boiler once you start needing more power than what your single-block boilers can produce.", "quests.low_voltage.lbb.title": "Large Bronze Boiler", "quests.low_voltage.lbb.subtitle": "Boom, boom, boom, boom", - "quests.low_voltage.lbb.desc.1": "The &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this is an alternative to the Create Steam Engine.\n\nMake sure you set it up so it never runs out of water like your Small Boilers, otherwise it'll &cexplode&r!.", + "quests.low_voltage.lbb.desc.1": "The &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this is an alternative to the Create Steam Engine.\n\nMake sure you set it up so it never runs out of water like your Small Boilers, otherwise it'll &cexplode&r!", "quests.low_voltage.lbb.desc.2": "Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel. &5With this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25 percent power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines.\n\nWe recommend holding off making this until you're ready to power your EBF, or if you have a lot of steam multiblocks.", "quests.low_voltage.lbb.desc.3": "In TerraFirmaGreg, you have a few options for fuel. You can use a Hose Pulley to pull Lava out of a deep underground lake (no, infinite lava is not a thing), or set up a tree farm into a coke oven for Charcoal and Creosote. Lastly, there are huge surface-level Coal veins that you can extract with some automated mining machines and turn into Coke and significantly more Creosote than charcoal.\n\nIf you go the tree farm route, you'll need three coke ovens to power a full-throttle LBB.", "quests.low_voltage.lv_polariser.title": "Basic Polarizer", @@ -2928,7 +2928,7 @@ "quests.low_voltage.lv_polariser.desc": "One of the cheapest - if not the cheapest - &7LV&r machine. Use this to make &6Redstone-free Magnetic Rods&r for your Motors. Whenever you start to batch your Motors, this machine will save you stacks and stacks of Redstone.", "quests.low_voltage.link_chapter.title": "Explain energy to me", "quests.low_voltage.link_chapter.subtitle": "There is a whole chapter about energy", - "quests.low_voltage.link_chapter.desc": "GregTech's energy system works differently to FE (Forge Energy), the system used by almost every other mod.\n\nIt might look like a lot of reading, but it's important to understand if you want to avoid accidents and get the most out of your power generation.\n\nThere's four ways to generate power in LV, and all are viable options. If you're new to GregTech, Steam is the easiest but falls off fast as you progress to further tiers. Gas fuel is more complicated to produce, but has the cheapest generators. Combustion is somewhere in between.\n\nHere's a link to the energy chapter:", + "quests.low_voltage.link_chapter.desc": "It might look like a lot of reading, but it's important to understand if you want to avoid accidents and get the most out of your power generation.\n\nGregTech's energy system (EU, Energy Units) works differently to FE (Forge Energy), the system used by almost every other mod.\n\nThere's four ways to generate power in LV, and all are viable options. If you're new to GregTech, Steam is the easiest but falls off fast as you progress to further tiers. Gas fuel is more complicated to produce, but has the cheapest generators. Combustion is somewhere in between.\n\nHere's a link to the energy chapter", "quests.low_voltage.link_chapter.task": "I read it", "quests.low_voltage.lv_combuston_gen.title": "The Combustion Generator", "quests.low_voltage.lv_combuston_gen.subtitle": "It does boom and make energy", @@ -3051,10 +3051,10 @@ "quests.low_voltage.lv_electroliser.desc.3": "&cTake caution!&r Due to how ores work, directly smelting dusts into Ingots can give higher metal yields than electrolysis. However, it means you lose the other products in the dust. You will have to decide whether you want to prioritise direct value, or byproduct count.", "quests.low_voltage.lv_mixer.title": "Basic Mixer", "quests.low_voltage.lv_mixer.subtitle": "The Mixer mixes...", - "quests.low_voltage.lv_mixer.desc": "Using the mixer will &6significantly speed up&r the process of making colored steel, since now it can directly make the &aColored Steel Dust&r. Even if you don't think you need it now, you'll find it &6essential&r later on.\n\nYou're used to alloying things in a Crucible, but for any new alloys (as well as all of the old ones), the GregTech way of alloying is to &amix together dusts&r and then heat them into ingots or extract them into fluids. &7(Don't look at the Alloy Blast Smelter in JEI, that's not until &5EV&r&7.)&r", + "quests.low_voltage.lv_mixer.desc": "The electric mixer will &6significantly speed up&r the process of making colored steel, since now it can directly make the &aColored Steel Dust&r. Even if you don't think you need it now, you'll find it &6essential&r later on.\n\nYou're used to alloying things in a Crucible, but for any new alloys (as well as all of the old ones), the GregTech way of alloying is to &amix together dusts&r and then heat them into ingots or extract them into fluids. &7(Don't look at the Alloy Blast Smelter in JEI, that's not until &5EV&r&7.)&r", "quests.low_voltage.soldering_alloy.title": "Soldering Alloy", "quests.low_voltage.soldering_alloy.subtitle": "I got soul but I'm not a solder", - "quests.low_voltage.soldering_alloy.desc": "&aSoldering Alloy&r is used solely as a &9Fluid&r, and in most cases is &dinterchangeable&r in circuit recipes as a cheaper alternative to Tin&r.\n\nThe choice is yours. Save more materials? Make Soldering Alloy. Spend less time crafting materials? Tin is the way to go.", + "quests.low_voltage.soldering_alloy.desc": "&aSoldering Alloy&r is used solely as a &9Fluid&r, and in most cases is &dinterchangeable&r in circuit recipes as a cheaper alternative to Tin&r.\n\nThe choice is yours. Save more materials? Make Soldering Alloy. Spend less time crafting materials? Tin is the way to go.\n\nRemember that you'll need to mix the soldering alloy dust first, then use an extractor to turn it into liquid. Ignore the Alloy Blast Smelter recipes in JEI!", "quests.low_voltage.gallium_arsenide.title": "Gallium Arsenide", "quests.low_voltage.gallium_arsenide.subtitle": "I hate byproducts, they're awesome", "quests.low_voltage.gallium_arsenide.desc": "Many materials going forward cannot be smelted directly from any Ores! They are instead obtained as byproducts from processing of other ores. Gallium and Arsenic are &4among&r these materials.\n\nFor &dGallium&r, you may, ranged from worst to best (compromising difficulty and yields):\n\n&9- &3Electrolyze &aSphalerite&r for a low chance of small dust. Note that you lose out on direct smelting value.\n\n&9-&r Put &aCrushed Bauxite&r in the &3Chemical Bath&r. Note that this requires &9Sodium Persulfate&r.\n\n&9-&r Obtain it as a Byproduct of &aSphalerite&r Ore Processing in the &3Thermal Centrifuge&r or &3Centrifuge&r.\n\nFor &dArsenic&r, you will have to mine and &3centrifuge&r &aRealgar&r, or put &aCobaltite&r through an EBF.", @@ -3097,7 +3097,7 @@ "quests.low_voltage.lv_distillery.subtitle": "The distillery distills...", "quests.low_voltage.lv_distillery.desc": "The Distillery is kind of like a centrifuge, but mostly for organic/petrochemical fluids.\n\nIn &7LV&r, you can only extract one output from one input, but this will change after you get to the Distillation Tower in &6HV&r.\n\nYou won't use this machine for all that much in LV (unless you're using Combustion fuel), but it's essential for obtaining &ePhenol&r.", "quests.low_voltage.phenolic_resin.subtitle": "Artificial Resin", - "quests.low_voltage.phenolic_resin.desc.1": "Phenolic Resin is made from a chemical reaction of both &6Phenol&r and &aFormaldehyde&r. While you only really have two options for obtaining the Phenol in &7LV&r (distilling either Creosote or Heavy Fuel), the Formaldehyde will require &dMethane&r, which has more options.", + "quests.low_voltage.phenolic_resin.desc.1": "Phenolic Resin is made from a chemical reaction of &6Phenol&r and &aFormaldehyde&r.\n\nWhile you only really have two options for obtaining the Phenol in &7LV&r (distilling either Creosote or Heavy Fuel), the Formaldehyde will require &dMethane&r, which has more options.", "quests.low_voltage.phenolic_resin.desc.2": "The simplest (and slowest) is with hydrogen and carbon in a chemical reactor, which will also require very slow water electrolysis.\n\nThe distillery also has many options, including via Creosote.\n\nIf you're using Syngas as a fuel, you can also oxidize that into Methane.\n\nLastly, if you're feeling silly, you can also centrifuge a ton of mushrooms from the Beneath.", "quests.low_voltage.magnesia.subtitle": "Also the name of a place in Greece!", "quests.low_voltage.magnesia.desc": "Also known as Magnesium Oxide, Magnesia can be obtained in two ways:\n\n- Magnesite Ore\n\n- React Magnesium and Lye to create Magnesium Hydroxide, then calcinate it in a Coke Oven. Magnesium can be obtained from a variety of different ores.", @@ -3143,7 +3143,7 @@ "quests.low_voltage.cupronickel_ingot.desc": "A big part of progression in GregTech revolves around gaining access to new materials that you'll use to upgrade your machines or unlock advanced components.\n\nOne such material you'll encounter is &bCupronickel&r — the beginning of a long journey.\nThis material is used to build your first &6Electric Blast Furnace&r, an essential step in your industrial growth.\n\nLuckily, this first step is fairly simple: an Alloy Smelter will get the job done.\nSo even if the recipe asks for &b128 Cupronickel&r, don't worry — it's easier than it looks!&r\n\nLater on, their counterparts will become much more complex, so enjoy the simplicity while it lasts!", "quests.low_voltage.cupronickel_coil.title": "Cupronickel Coils", "quests.low_voltage.cupronickel_coil.subtitle": "Baby's first heating coil", - "quests.low_voltage.cupronickel_coil.desc": "Prepare &a128 Cupronickel&r, &a32 Bronze&r and &a16 Tin Alloy&r to craft the Heating Coils required for your first Electric Blast Furnace.\n\nThis is still less than half (!) of the cost of the whole EBF in raw materials. You will also need about a stack each of Invar and Steel, so get mining.\n\nThe Cupronickel Coils will allow the EBF to perform recipes up to &d1,800K&r (ignoring Voltage bonuses). That's pretty hot if you ask us.\n\n&6Tutorial on Coils in the &lGregTech Energy&r&6 tab - check it out to learn more!&r", + "quests.low_voltage.cupronickel_coil.desc": "Prepare &a128 Cupronickel&r, &a32 Blue Steel&r and &a16 Tin Alloy&r ingots, as well as &a128 Refractory Bricks&r to craft the Heating Coils required for your first Electric Blast Furnace.\n\nThis is still less than half (!) of the cost of the whole EBF in raw materials. You will also need about a stack each of Invar and Steel, so get mining.\n\nThe Cupronickel Coils will allow the EBF to perform recipes up to &d1,800K&r (ignoring Voltage bonuses). That's pretty hot if you ask us.\n\n&6Tutorial on Coils in the &lGregTech Energy&r&6 tab - check it out to learn more!&r", "quests.low_voltage.lv_ebf.title": "The Electric Blast Furnace", "quests.low_voltage.lv_ebf.subtitle": "One of the core machines of GregTech. We like it big.", "quests.low_voltage.lv_ebf.desc.1": "This quest explains the core mechanic of the &3Electric Blast Furnace&r, while the quest just over this one will explain the mechanics of the Multiblock Parts that you'll also need. Be sure to check this quest out.\n\nAnyway, the &3EBF&r is your &efirst electric multiblock&r! Congrats. It's used to process materials at high temperatures.\n\nYou'll become familiar with the EBF to make &aAluminium&r and progress to &d&bMV Age&r. It can also make &7Steel&r faster than the the &6Blast Furnace&r, which means you can finally tear down your old TFC smithy if you'd like.", @@ -3174,7 +3174,7 @@ "quests.low_voltage.aluminium_greate.desc": "It's been a while since your last upgrade, but now you have access to the next tier of Greate cogs and shafts. Like before, the aluminium ones have &bfour times&r the stress capacity of steel.\n\nContinuing with Greate beyond this point is very optional, and we encourage you to move over to GregTech, but the upgrade may help you de-spaghettify some of your old setups if you'd like to continue using them.\n\nYou can scale up your stress production with a &eSteam Engine&r, or convert EU into SU via the &9Create Additions&r &eElectric Motor&r.", "quests.low_voltage.oil.title": "Found Oil early?", "quests.low_voltage.oil.subtitle": "For LV overachievers", - "quests.low_voltage.oil.desc": "If you've found any Oilsands ores or Oil spouts (in deserts) in your travels, you can actually start using a little bit of it in LV.\n\nYou can either convert it into Heavy Fuel and put it in your boilers, convert it into Diesel to power your base.", + "quests.low_voltage.oil.desc": "If you've found any Oilsands ores or Oil spouts (in deserts) in your travels, you can actually start using a little bit of it in LV.\n\nYou can either convert it into Heavy Fuel and put it in your boilers, or convert it into Diesel to power your Combustion Generators.", "quests.low_voltage.glowstone.title": "Permanent Lighting", "quests.low_voltage.glowstone.subtitle": "A roundabout way of inventing light bulbs", "quests.low_voltage.glowstone.desc": "Looking for some cheap, permanent light sources? Now that you've got an LV Extractor (and soon an LV Fluid Solidifer), you can put all that &6Glowstone Dust&r you found in The Beneath to work. Ran out? You can make more in a Mixer.\n\nCheck out JEI for all the new light sources you can make with both liquid glowstone and glowstone blocks. GregTech also has some made with glowstone dust in an assembler.\n\nAs a bonus, you can also use liquid glowstone as an infinite fuel for your lamps!", @@ -3182,15 +3182,15 @@ "quests.low_voltage.next_machines.subtitle": "Now the fun begins", "quests.low_voltage.next_machines.desc": "Now that you've got a few machines going, it's time to put them to work.\n\nTo the right of this quest are some purely optional machines (we don't know where else to put them in this chapter!), but otherwise the Assembler will make electronic components cheaper, while the Chemical Reactor, Extractor, and Fluid Solidifier will make Rubber cheaper. After that, the rest of &7LV&r is yours to explore!", "quests.low_voltage.food_machines.title": "Food Machines", - "quests.low_voltage.food_machines.subtitle": "Fast Food On The Go", + "quests.low_voltage.food_machines.subtitle": "Fast Food on the Go", "quests.low_voltage.food_machines.desc": "The Food Processor and Electric Oven are two custom machines designed specifically to work with TerraFirmaCraft's food system.\n\nThe processor can handle mixing bowl recipes, soups, sandwiches, smoking, brining, drying... You name it, this machine can do it. Except for cooking. That's what the oven is for.\n\nThe Rotten Voiding Cover can be placed on any machine or Input Bus to automatically void any food items that become rotten. Useful to stop your food automation from getting backed up!", "quests.low_voltage.bakelite.subtitle": "Also known as Poly­oxy­benzyl­methylen­glycol­anhydride... try saying that five times fast", - "quests.low_voltage.bakelite.desc.1": "Your first Polymer! Simply mix Phenolic Resin with either Asbestos or Treated Chipboard Composite to finish it.\nYou'll be using Bakelite for crafting both Phenolic Circuit Boards and MV Machine Hulls, so making a big batch of it is a good idea, though you'll replace it with Polyethylene in &bMV&r.", - "quests.low_voltage.bakelite.desc.2": "&l&3Lore:&r&o Bakelite is the first plastic made from synthetic components. The award for first plastic ever goes to Parkesine, but that requires Nitrocellulose which is a long long chain of recipes to craft - too long for LV. The second ever plastic is Galalith, created with milk proteins and formaldehyde, but milk is difficult to automate.", + "quests.low_voltage.bakelite.desc.1": "Your first Polymer! Simply mix Phenolic Resin with either Asbestos or Treated Chipboard Composite to finish it.\n\nYou'll be using Bakelite for crafting both Phenolic Circuit Boards and MV Machine Hulls, so making a big batch of it is a good idea, though you'll replace it with Polyethylene in &bMV&r.\n\nYou now also have access to a cheaper recipe for ULV and LV Machine Hulls!", + "quests.low_voltage.bakelite.desc.2": "&l&3Lore:&r&o Bakelite is the first plastic made from synthetic components. The award for first plastic ever goes to Parkesine, but that requires Nitrocellulose which is a long long chain of recipes to craft - too long for LV.\n\nThe second ever plastic is Galalith, created with milk proteins and formaldehyde, but milk is difficult to automate.", "quests.low_voltage.lv_forming_press.subtitle": "The Forming Press forms...", - "quests.low_voltage.lv_forming_press.desc": "This machine usually isn't used for much, but in TFG it can automate any remaining TFC Welding recipes if you still need access to them for any reason. It can also easily duplicate any extruder or casting mold.\n\nMore pressingly (pun intended), you'll need it to craft an essential component for your next circuits, the Phenolic Circuit Board.", + "quests.low_voltage.lv_forming_press.desc": "This machine usually isn't used for much, but in TFG it can do TFC Welding recipes if you still need access to them for any reason. It can also easily duplicate any extruder or casting mold.\n\nMore pressingly (pun intended), you'll need it to craft an essential component for your next circuits, the &aPhenolic Circuit Board&r.", "quests.low_voltage.lv_laser_engraver.subtitle": "Pew pew!", - "quests.low_voltage.lv_laser_engraver.desc": "The Basic Laser Engraver is required to make Transmitter's for Create's logistics system. Other than that, it unfortunately can't do much other than make polished stone.\n\nYou'll deal with lasers more once you get to &bMV&r.", + "quests.low_voltage.lv_laser_engraver.desc": "The Basic Laser Engraver is required to make Transmitters for Create's logistics system. Other than that, it unfortunately can't do much other than make polished stone.\n\nYou'll deal with lasers more once you get to &bMV&r.", "quests.medium_voltage": "&bMV&r - Medium Voltage", "quests.medium_voltage.subtitle": "Venture into petrochemistry and refine electronics", "quests.medium_voltage.mv_machine_hull.title": "Welcome to MV!", @@ -3883,7 +3883,7 @@ "quests.steam_age.basic_millstone.title": "Automatic Ore Processing", "quests.steam_age.basic_millstone.subtitle": "No more querning", "quests.steam_age.basic_millstone.desc.1": "The &3Millstone&r is an automatic version of the Quern. You can throw whatever you'd like into the top, and then right-click to take your crushed items back out. It's pretty slow if you connect it directly to your Animal Crank, but you can use gear ratios to increase its speed.\n\nYou will only receive the output in the first slot. The other slots are part of a GregTech mechanic that won't be relevant until much later (&6HV&r).", - "quests.steam_age.basic_millstone.desc.2": "&l&3Lore:&r&o The millstone can't be used to process grains into flower because Create doesn't understand TFC's food expiry system, which previously led to all sorts of bugs involving rotten items becoming fresh and vice versa. Until you're able to get the Food Processor in &7LV&r, you can still crush your grains via a Mortar in a crafting grid.", + "quests.steam_age.basic_millstone.desc.2": "&l&3Lore:&r&o The millstone can't be used to process grains into flour because Create doesn't understand TFC's food expiry system, which previously led to all sorts of bugs involving rotten items becoming fresh and vice versa. Until you're able to get the Food Processor in &7LV&r, you can still crush your grains via a Mortar in a crafting grid.", "quests.steam_age.horse_crank.title": "Your First Power Source", "quests.steam_age.horse_crank.subtitle": "Make your livestock pay rent", "quests.steam_age.horse_crank.desc.1": "The &3Animal Crank&r is your first accessible source of mechanical power. To use it, place the crank on the center of a 7x7 cleared area and leash an animal to it. Different animals will provide different amounts of power, while the blocks underneath will increase the speed of the output power. The area of multiple cranks can overlap.\n\nYou may need to hold a second lead to attach an animal.", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index 522ddb6b4..16c1b92fd 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -251,14 +251,14 @@ "block.tfg.rock.aqueduct_nether": "Кератофировый акведук", "block.tfg.rock.hardened_moon_stone": "Укреплённый анортозит", "block.tfg.rock.moon_stone_wall": "Анортозитовая ограда", - "block.tfg.rock.cobble_moon_stone_wall": "Ограда из анортозитового булыжника", + "block.tfg.rock.cobble_moon_wall": "Ограда из анортозитового булыжника", "block.tfg.rock.mossy_cobble_moon": "Замшелый анортозитовый булыжник", "block.tfg.rock.mossy_cobble_moon_stairs": "Ступеньки из замшелого анортозитового булыжника", "block.tfg.rock.mossy_cobble_moon_slab": "Плита из замшелого анортозитового булыжника", "block.tfg.rock.mossy_cobble_moon_wall": "Ограда из замшелого анортозитового булыжника", "block.tfg.rock.mossy_bricks_moon": "Замшелые анортозитовые кирпичи", "block.tfg.rock.mossy_bricks_moon_stairs": "Ступеньки из замшелых анортозитовых кирпичей", - "block.tfg.rock.mossy_bricks_moon_stone_slab": "Плита из замшелых анортозитовых кирпичей", + "block.tfg.rock.mossy_bricks_moon_slab": "Плита из замшелых анортозитовых кирпичей", "block.tfg.rock.mossy_bricks_moon_wall": "Ограда из замшелых анортозитовых кирпичей", "block.tfg.rock.chiseled_bricks_moon_wall": "Ограда из резного анортозита", "block.tfg.rock.gravel_moon": "Анортозитовый гравий", @@ -437,6 +437,76 @@ "block.tfg.loose.red_granite": "Камешек красного гранита", "block.tfg.spike.red_granite_spike": "Сталагмит красного гранита", "block.tfg.rock.aqueduct_red_granite": "Акведук из красного гранита", + "block.tfg.rock.sandy_jadestone_stairs": "Ступеньки из лампроита", + "block.tfg.rock.sandy_jadestone_slab": "Плита из лампроита", + "block.tfg.rock.sandy_jadestone_wall": "Ограда из лампроита", + "block.tfg.rock.hardened_sandy_jadestone": "Укреплённый лампроит", + "block.tfg.spike.sandy_jadestone_spike": "Сталагмит из лампроита", + "block.tfg.sandy_jadestone_support": "Опора из лампроита", + "block.tfg.rock.cobble_sandy_jadestone": "Лампроитовый булыжник", + "block.tfg.rock.cobble_sandy_jadestone_stairs": "Ступеньки из лампроитового булыжника", + "block.tfg.rock.cobble_sandy_jadestone_slab": "Плита из лампроитового булыжника", + "block.tfg.rock.cobble_sandy_jadestone_wall": "Ограда из лампроитового булыжника", + "block.tfg.rock.gravel_sandy_jadestone": "Лампроитовый гравий", + "block.tfg.rock.aqueduct_sandy_jadestone": "Лампроитовый акведук", + "block.tfg.rock.bricks_sandy_jadestone_stairs": "Ступеньки из лампроитовых кирпичей", + "block.tfg.rock.bricks_sandy_jadestone_slab": "Плита из лампроитовых кирпичей", + "block.tfg.rock.bricks_sandy_jadestone_wall": "Ограда из лампроитовых кирпичей", + "block.tfg.rock.polished_sandy_jadestone_stairs": "Ступеньки из полированного лампроита", + "block.tfg.rock.polished_sandy_jadestone_slab": "Плита из полированного лампроита", + "block.tfg.rock.polished_sandy_jadestone_wall": "Ограда из полированного лампроита", + "block.tfg.rock.chiseled_sandy_jadestone_stairs": "Ступеньки из резного лампроита", + "block.tfg.rock.chiseled_sandy_jadestone_slab": "Плита из резного лампроита", + "block.tfg.rock.chiseled_sandy_jadestone_wall": "Ограда из резного лампроита", + "block.tfg.loose.sandy_jadestone": "Камешек лампроита", + "block.tfg.rock.flavolite_stairs": "Ступеньки из игнимбрита", + "block.tfg.rock.flavolite_slab": "Плита из игнимбрита", + "block.tfg.rock.flavolite_wall": "Ограда из игнимбрита", + "block.tfg.rock.hardened_flavolite": "Укреплённый игнимбрит", + "block.tfg.spike.flavolite_spike": "Сталагмит из игнимбрита", + "block.tfg.flavolite_support": "Опора из игнимбрита", + "block.tfg.rock.cobble_flavolite": "Игнимбритовый булыжник", + "block.tfg.rock.cobble_flavolite_stairs": "Ступеньки из игнимбритового булыжника", + "block.tfg.rock.cobble_flavolite_slab": "Плита из игнимбритового булыжника", + "block.tfg.rock.cobble_flavolite_wall": "Ограда из игнимбритового булыжника", + "block.tfg.rock.gravel_flavolite": "Игнимбритовый гравий", + "block.tfg.rock.aqueduct_flavolite": "Акведук из игнимбрита", + "block.tfg.rock.bricks_flavolite_stairs": "Ступеньки из игнимбрита", + "block.tfg.rock.bricks_flavolite_slab": "Плита из игнимбрита", + "block.tfg.rock.bricks_flavolite_wall": "Ограда из игнимбрита", + "block.tfg.rock.polished_flavolite_stairs": "Ступеньки из полированного игнимбрита", + "block.tfg.rock.polished_flavolite_slab": "Плита из полированного игнимбрита", + "block.tfg.rock.polished_flavolite_wall": "Ограда из полированного игнимбрита", + "block.tfg.rock.chiseled_flavolite_stairs": "Ступеньки из резного игнимбрита", + "block.tfg.rock.chiseled_flavolite_slab": "Плита из резного игнимбрита", + "block.tfg.rock.chiseled_flavolite_wall": "Ограда из резного игнимбрита", + "block.tfg.loose.flavolite": "Камешек игнимбрита", + "block.tfg.rock.scoria_stairs": "Ступеньки из пепла", + "block.tfg.rock.scoria_slab": "Плита из пепла", + "block.tfg.rock.scoria_wall": "Ограда из пепла", + "block.tfg.rock.hardened_scoria": "Укреплённый пепел", + "block.tfg.spike.scoria_spike": "Сталагмит из пепла", + "block.tfg.scoria_support": "Опора из пепла", + "block.tfg.rock.cobble_scoria": "Булыжник из пепла", + "block.tfg.rock.cobble_scoria_stairs": "Ступеньки из булыжника из пепла", + "block.tfg.rock.cobble_scoria_slab": "Плита из булыжника из пепла", + "block.tfg.rock.cobble_scoria_wall": "Ограда из булыжника из пепла", + "block.tfg.rock.gravel_scoria": "Гравий из пепла", + "block.tfg.rock.aqueduct_scoria": "Акведук из пепла", + "block.tfg.loose.scoria": "Камешек пепла", + "block.tfg.rock.scorchia_stairs": "Ступеньки из тёмного пепла", + "block.tfg.rock.scorchia_slab": "Плита из тёмного пепла", + "block.tfg.rock.scorchia_wall": "Ограда из тёмного пепла", + "block.tfg.rock.hardened_scorchia": "Укреплённый тёмный пепел", + "block.tfg.spike.scorchia_spike": "Сталагмит из тёмного пепла", + "block.tfg.scorchia_support": "Опора из тёмного пепла", + "block.tfg.rock.cobble_scorchia": "Булыжник из м пепла", + "block.tfg.rock.cobble_scorchia_stairs": "Ступеньки из булыжника из тёмного пепла", + "block.tfg.rock.cobble_scorchia_slab": "Плита из булыжника из тёмного пепла", + "block.tfg.rock.cobble_scorchia_wall": "Ограда из булыжника из тёмного пепла", + "block.tfg.rock.gravel_scorchia": "Гравий из тёмного пепла", + "block.tfg.rock.aqueduct_scorchia": "Акведук из тёмного пепла", + "block.tfg.loose.scorchia": "Камешек тёмного пепла", "block.tfg.rock.stone_wall": "Ограда из восстановленного камня", "block.tfg.rock.smooth_stone_stairs": "Ступеньки из полированного восстановленного камня", "block.tfg.rock.smooth_stone_wall": "Ограда из полированного восстановленного камня", @@ -740,6 +810,8 @@ "block.tfg.impure_moderate_core": "Нечистое ядро стабилизатора", "block.tfg.moderate_core_frame": "Каркас с ядром стабилизатора", "block.tfg.impure_moderate_core_frame": "Каркас с нечистым ядром стабилизатора", + "tfg.block_entity.artisan_table": "Ремесленный стол", + "block.tfg.artisan_table": "Ремесленный стол", "fluid.tfg.heavy_ammoniacal_water": "Тяжёлая аммиачная вода", "fluid.tfg.semiheavy_ammoniacal_water": "Полутяжёлая аммиачная вода", "fluid.tfg.sulfur_fumes": "Пары серы", @@ -1308,6 +1380,13 @@ "material.tfg.chloroplasts": "Хлоропласты", "material.tfg.nitrate_rich_water": "Нитратный раствор", "material.tfg.nitrate_rich_semiheavy_ammoniacal_water": "Полутяжёлый нитратно-аммиачный раствор", + "material.tfg.weak_red_steel": "Сырая красная сталь", + "material.tfg.weak_blue_steel": "Сырая синяя сталь", + "material.tfg.refractory_clay": "Огнеупорная глина", + "material.tfg.bakelite": "Бакелит", + "material.tfg.phenolic_resin": "Фенольная смола", + "material.tfg.magnesium_hydroxide": "Гидроксид магния", + "material.tfg.magnesia_refractory_brick": "Склеенный смолой магнезиальный огнеупорный кирпич", "ore_vein.tfg.deep_sheldonite": "Куперит и Борнит", "ore_vein.tfg.deep_garnet_amethyst": "Аметист и гранат", "ore_vein.tfg.deep_garnet_opal": "Опал и гранат", @@ -1756,79 +1835,83 @@ "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_orange_block": "Окрашивание", "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_red_block": "Окрашивание", "tfc.recipe.barrel.simplylight.barrel.dyeing.illuminant_brown_block": "Окрашивание", - "tfc.recipe.barrel.tfg.barrel.treated_chipboard_composite": "Treating Chipboard Composite", + "tfc.recipe.barrel.tfg.barrel.treated_chipboard_composite": "Пропитка ДСП", "tfc.recipe.barrel.tfg.barrel.soak_hardwood_strip": "Пропитка деревянных полосок", + "tfc.recipe.barrel.tfg.barrel.treated_wood_dust": "Пропитка деревянной пыли", "tfc.recipe.barrel.tfg.barrel.treated_wood_planks": "Обработка деревянных досок", "tfc.recipe.barrel.tfg.barrel.packed_ice": "Заморозка льда", - "tfc.recipe.barrel.tfg.barrel.cooling_water_1": "Cooling Water", - "tfc.recipe.barrel.tfg.barrel.cooling_water_2": "Cooling Water", - "tfc.recipe.barrel.tfg.barrel.cooling_water_3": "Cooling Water", - "tfc.recipe.barrel.tfg.barrel.cooling_water_4": "Cooling Water", + "tfc.recipe.barrel.tfg.barrel.cooling_water_1": "Охлаждение воды", + "tfc.recipe.barrel.tfg.barrel.cooling_water_2": "Охлаждение воды", + "tfc.recipe.barrel.tfg.barrel.cooling_water_3": "Охлаждение воды", + "tfc.recipe.barrel.tfg.barrel.cooling_water_4": "Охлаждение воды", "tfc.recipe.barrel.tfg.sealed_barrel.prepared_leather_gloves": "Подготовленные Кожаные Перчатки", - "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "Extracting Canola Oil", - "tfc.recipe.barrel.tfg.barrel.sunflower_to_oil": "Extracting Sunflower Oil", - "tfc.recipe.barrel.tfg.barrel.maple_syrup_to_sugar": "Making sugar", - "tfc.recipe.barrel.tfg.barrel.birch_syrup_to_sugar": "Making sugar", - "tfc.recipe.barrel.tfg.barrel.light_concrete": "Solidifying Concrete", - "tfc.recipe.barrel.tfg.barrel.reinforced_light_concrete_support": "Solidifying Concrete", - "tfc.recipe.barrel.tfg.barrel.dark_concrete": "Dyeing", - "tfc.recipe.barrel.tfg.barrel.dark_concrete_support": "Dyeing", - "tfc.recipe.barrel.tfg.barrel.reinforced_dark_concrete_support": "Dyeing", + "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "Извлечения растительного масла", + "tfc.recipe.barrel.tfg.barrel.sunflower_to_oil": "Извлечения растительного масла", + "tfc.recipe.barrel.tfg.barrel.maple_syrup_to_sugar": "Производство сахара", + "tfc.recipe.barrel.tfg.barrel.birch_syrup_to_sugar": "Производство сахара", + "tfc.recipe.barrel.tfg.barrel.develop_black_and_white_film": "Разработка плёнки", + "tfc.recipe.barrel.tfg.barrel.develop_color_film": "Разработка плёнки", + "tfc.recipe.barrel.tfg.barrel.light_concrete": "Затвердевание бетона", + "tfc.recipe.barrel.tfg.barrel.reinforced_light_concrete_support": "Затвердевание бетона", + "tfc.recipe.barrel.tfg.barrel.dark_concrete": "Окрашивание", + "tfc.recipe.barrel.tfg.barrel.dark_concrete_support": "Окрашивание", + "tfc.recipe.barrel.tfg.barrel.reinforced_dark_concrete_support": "Окрашивание", "gtceu.aqueous_accumulator": "Жидкостный коллектор", "tfg.food_recipe.brining": "Засаливание", "tfg.food_recipe.smoking": "Копчение", "tfg.food_recipe.drying": "Сушка", "tfg.food_recipe.freeze_drying": "Лиофилизация", - "tfg.recipe.macerator_warning": "Only outputs first slot until HV", + "tfg.food_recipe.deep_frying": "Жарка во фритюре", + "tfg.recipe.macerator_warning": "Производит лишь первый слот до HV", "tfg.grapplemod.repair": "Рецепт починки, сохраняет ваши улучшения. §rНИКОГДА не объединяйте две крюк-кошки или вы потеряете ВСЕ ваши улучшения!§r", - "tfg.grapplemod.upgrades.maxlen": "Increases §lMax Length§r by 20, up to 200.", - "tfg.grapplemod.downgrades.maxlen": "Decreases §lMax Length§r by 20, down to 20. (Jute Rope is Returned).", - "tfg.grapplemod.upgrades.motor.lv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1\n§lMotorAcceleration§r set to 0.125", - "tfg.grapplemod.upgrades.motor.mv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.14\n§lMotorAcceleration§r set to 0.25", - "tfg.grapplemod.upgrades.motor.hv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.28\n§lMotorAcceleration§r set to 0.375", - "tfg.grapplemod.upgrades.motor.ev": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.42\n§lMotorAcceleration§r set to 0.5", - "tfg.grapplemod.upgrades.motor.iv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.56\n§lMotorAcceleration§r set to 0.625", - "tfg.grapplemod.upgrades.motor.luv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.7\n§lMotorAcceleration§r set to 0.75", - "tfg.grapplemod.upgrades.motor.zpm": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 1.84\n§lMotorAcceleration§r set to 0.875", - "tfg.grapplemod.upgrades.motor.uv": "Enables the §lMotor§r Upgrade, automatically reeling you in.\n§lMotorMaxSpeed§r set to 2\n§lMotorAcceleration§r set to 1", - "tfg.grapplemod.downgrades.motor": "Disables the §lMotor§r Upgrade, returning the original motor.\nOnly works if you use the same type of Motor as before.", - "tfg.grapplemod.upgrades.smart_motor": "Enables the §lSmart Motor§r Upgrade, requires a Motor to be installed.", - "tfg.grapplemod.downgrades.smart_motor": "Disables the §lSmart Motor§r Upgrade, can be removed with the Motor already uninstalled. Returns the Basic Electronic Circuit", - "tfg.grapplemod.upgrades.sticky": "Enables the §lSticky§r Upgrade, causing the hook to stick to any block the rope touches.", - "tfg.grapplemod.downgrades.sticky": "Disables the §lSticky§r Upgrade, returning the Sticky Resin", - "tfg.grapplemod.upgrades.forcefield.lv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 0.625", - "tfg.grapplemod.upgrades.forcefield.mv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 1.25", - "tfg.grapplemod.upgrades.forcefield.hv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 1.875", - "tfg.grapplemod.upgrades.forcefield.ev": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 2.5", - "tfg.grapplemod.upgrades.forcefield.iv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 3.125", - "tfg.grapplemod.upgrades.forcefield.luv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 3.75", - "tfg.grapplemod.upgrades.forcefield.zpm": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 4.375", - "tfg.grapplemod.upgrades.forcefield.uv": "Enables the §lForce Field§r Upgrade, repelling you from nearby blocks while Grappling.\n§lRepel Force§r set to 5", - "tfg.grapplemod.downgrades.forcefield": "Disables the §lForce Field§r Upgrade, returning the original Field Generator.\nOnly works if you use the same type of Field Generator as before.", - "tfg.grapplemod.upgrades.magnet.magnetic_iron_ingot": "Enables the §lMagnet§r Upgrade, causing the hook itself to attach to nearby blocks.\n§lAttraction Radius§r set to 1.25", - "tfg.grapplemod.upgrades.magnet.magnetic_steel_ingot": "Enables the §lMagnet§r Upgrade, causing the hook itself to attach to nearby blocks.\n§lAttraction Radius§r set to 2.5", - "tfg.grapplemod.upgrades.magnet.magnetic_neodymium_ingot": "Enables the §lMagnet§r Upgrade, causing the hook itself to attach to nearby blocks.\n§lAttraction Radius§r set to 3.75", - "tfg.grapplemod.upgrades.magnet.magnetic_samarium_ingot": "Enables the §lMagnet§r Upgrade, causing the hook itself to attach to nearby blocks.\n§lAttraction Radius§r set to 5", - "tfg.grapplemod.downgrades.magnet": "Disables the §lMagnet§r Upgrade, returning the original Magnetic Ingot.\nOnly works if you use the same type of Magnetic Ingot as before.", - "tfg.grapplemod.upgrades.gravity.0.5": "Lowers the Hook's §lGravity§r to 50% (1 -> 0.5)", - "tfg.grapplemod.downgrades.gravity.0.5": "Returns the Hook's §lGravity§r back to 100% (0.5 -> 1).\nThe empty bucket will be filled with the Helium you used", - "tfg.grapplemod.upgrades.gravity.0": "Lowers the Hook's §lGravity§r to 0% (1 -> 0)", - "tfg.grapplemod.downgrades.gravity.0": "Returns the Hook's §lGravity§r back to 100% (0 -> 1).\nThe Gravitation Engine Unit will be returned.", - "tfg.grapplemod.upgrades.throwspeed.lv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 2.25", - "tfg.grapplemod.upgrades.throwspeed.mv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 2.5", - "tfg.grapplemod.upgrades.throwspeed.hv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 2.75", - "tfg.grapplemod.upgrades.throwspeed.ev": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 3", - "tfg.grapplemod.upgrades.throwspeed.iv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 3.25", - "tfg.grapplemod.upgrades.throwspeed.luv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 3.5", - "tfg.grapplemod.upgrades.throwspeed.zpm": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 3.75", - "tfg.grapplemod.upgrades.throwspeed.uv": "Increases the §lThrow Speed§r of the Hook, causing it to travel farther.\n§lThrow Speed§r set to 4", - "tfg.grapplemod.downgrades.throwspeed": "Resets the §lThrow Speed§r of the hook back to normal, returning the original Piston.\nOnly works if you use the same type of Piston as before.", - "tfg.grapplemod.upgrades.doublehook": "Adds a §lSecondary Hook§r to your Grappling Hook", - "tfg.grapplemod.downgrades.doublehook": "Removes the §lSecondary Hook§r from your Grappling Hook", - "tfg.grapplemod.upgrades.vertical_throwing_angle": "Increases the §lVertical Throwing Angle§r of the hook by 5°, up to 90°.", - "tfg.grapplemod.downgrades.vertical_throwing_angle": "Decreases the §lVertical Throwing Angle§r of the hook by 5°, down to 0°.", - "tfg.grapplemod.upgrades.angle": "Increases the §lHorizontal Angle§r for throwing your §lDouble Hooks§r by 5°, up to 90°.\nOnly accessible with a §lDouble Hook§r installed.", - "tfg.grapplemod.downgrades.angle": "Decreases the §lHorizontal Angle§r for throwing your §lDouble Hooks§r by 5°, down to 5°°.\nOnly accessible with a §lDouble Hook§r installed.", + "tfg.grapplemod.upgrades.maxlen": "Увеличивает §lМаксимальную длину§r на 20, вплоть до 200.", + "tfg.grapplemod.downgrades.maxlen": "Уменьшает §lМаксимальную длину§r на 20, вплоть до 20. (Моток веревки вернётся).", + "tfg.grapplemod.upgrades.motor.lv": "Включает улучшение §lМотор§r, автоматически подтягивая игрока. n§lМаксСкоростьМотора§r будет равна 1\n§lУскорениеМотора§r будет равно 0.125", + "tfg.grapplemod.upgrades.motor.mv": "Включает улучшение §lМотор§r, автоматически подтягивая игрока. n§lМаксСкоростьМотора§r будет равна 1.14\n§lУскорениеМотора§r будет равно 0.25", + "tfg.grapplemod.upgrades.motor.hv": "Включает улучшение §lМотор§r, автоматически подтягивая игрока. n§lМаксСкоростьМотора§r будет равна 1.28\n§lУскорениеМотора§r будет равно 0.375", + "tfg.grapplemod.upgrades.motor.ev": "Включает улучшение §lМотор§r, автоматически подтягивая игрока. n§lМаксСкоростьМотора§r будет равна 1.42\n§lУскорениеМотора§r будет равно 0.5", + "tfg.grapplemod.upgrades.motor.iv": "Включает улучшение §lМотор§r, автоматически подтягивая игрока. n§lМаксСкоростьМотора§r будет равна 1.56\n§lУскорениеМотора§r будет равно 0.625", + "tfg.grapplemod.upgrades.motor.luv": "Включает улучшение §lМотор§r, автоматически подтягивая игрока. n§lМаксСкоростьМотора§r будет равна 1.7\n§lУскорениеМотора§r будет равно 0.75", + "tfg.grapplemod.upgrades.motor.zpm": "Включает улучшение §lМотор§r, автоматически подтягивая игрока. n§lМаксСкоростьМотора§r будет равна 1.84\n§lУскорениеМотора§r будет равно 0.875", + "tfg.grapplemod.upgrades.motor.uv": "Включает улучшение §lМотор§r, автоматически подтягивая игрока. n§lМаксСкоростьМотора§r будет равна 2\n§lУскорениеМотора§r будет равно 1", + "tfg.grapplemod.downgrades.motor": "Выключает улучшение §lМотор§r, возращая мотор.\nРаботает только при использовании того же типа мотора, что и раньше.", + "tfg.grapplemod.upgrades.smart_motor": "Включает улучшение §lУмныйМотор§r, для работы необходим установленное улучшения мотора.", + "tfg.grapplemod.downgrades.smart_motor": "Выключает улучшение §lУмныйМотор§r, его можно снять, даже если двигатель уже снят. Возращает обычную микросхему", + "tfg.grapplemod.upgrades.sticky": "Включает улучшение §lЛипкая верёвка§r, в результате чего крюк прилипает к любому блоку, которого касается веревка.", + "tfg.grapplemod.downgrades.sticky": "Выключает улучшение the §lЛипкая верёвка§r, возвращение липкой смолы", + "tfg.grapplemod.upgrades.forcefield.lv": "Включает улучшение §lОтталкивающееПоле§r, отталкивает вас от ближайших блоков во время использования крюка.\n§lСилаОтталкивания§r будет равна 0.625", + "tfg.grapplemod.upgrades.forcefield.mv": "Включает улучшение §lОтталкивающееПоле§r, отталкивает вас от ближайших блоков во время использования крюка.\n§lСилаОтталкивания§r будет равна 1.25", + "tfg.grapplemod.upgrades.forcefield.hv": "Включает улучшение §lОтталкивающееПоле§r, отталкивает вас от ближайших блоков во время использования крюка.\n§lСилаОтталкивания§r будет равна 1.875", + "tfg.grapplemod.upgrades.forcefield.ev": "Включает улучшение §lОтталкивающееПоле§r, отталкивает вас от ближайших блоков во время использования крюка.\n§lСилаОтталкивания§r будет равна 2.5", + "tfg.grapplemod.upgrades.forcefield.iv": "Включает улучшение §lОтталкивающееПоле§r, отталкивает вас от ближайших блоков во время использования крюка.\n§lСилаОтталкивания§r будет равна 3.125", + "tfg.grapplemod.upgrades.forcefield.luv": "Включает улучшение §lОтталкивающееПоле§r, отталкивает вас от ближайших блоков во время использования крюка.\n§lСилаОтталкивания§r будет равна 3.75", + "tfg.grapplemod.upgrades.forcefield.zpm": "Включает улучшение §lОтталкивающееПоле§r, отталкивает вас от ближайших блоков во время использования крюка.\n§lСилаОтталкивания§r будет равна 4.375", + "tfg.grapplemod.upgrades.forcefield.uv": "Включает улучшение §lОтталкивающееПоле§r, отталкивает вас от ближайших блоков во время использования крюка.\n§lСилаОтталкивания§r будет равна 5", + "tfg.grapplemod.downgrades.forcefield": "Выключает улучшение the §lОтталкивающееПоле§r, возращает генератор поля.\nРаботает только при использовании того же типа генератора полей, что и раньше", + "tfg.grapplemod.upgrades.magnet.magnetic_iron_ingot": "Включает улучшение §lМагнит§r, в результате чего сам крюк прикрепляется к ближайшим блокам..\n§lAttraction Radius§r будет равно 1.25", + "tfg.grapplemod.upgrades.magnet.magnetic_steel_ingot": "Включает улучшение §lМагнит§r, в результате чего сам крюк прикрепляется к ближайшим блокам..\n§lAttraction Radius§r будет равно 2.5", + "tfg.grapplemod.upgrades.magnet.magnetic_neodymium_ingot": "Включает улучшение §lМагнит§r, в результате чего сам крюк прикрепляется к ближайшим блокам..\n§lAttraction Radius§r будет равно 3.75", + "tfg.grapplemod.upgrades.magnet.magnetic_samarium_ingot": "Включает улучшение §lМагнит§r, в результате чего сам крюк прикрепляется к ближайшим блокам..\n§lAttraction Radius§r будет равно 5", + "tfg.grapplemod.downgrades.magnet": "Выключает улучшение the §lМагнит§r, возращает магнитный слиток.\nРаботает только при использовании того же типа магнитного слитка, что и раньше", + "tfg.grapplemod.upgrades.gravity.0.5": "Уменьшает §lГравитацию§r крюка до 50% (1 -> 0.5)", + "tfg.grapplemod.downgrades.gravity.0.5": "Возращает §lГравитацию§r крюка к 100% (0.5 -> 1).\nПустое ведро будет наполнено использованным гелием", + "tfg.grapplemod.upgrades.gravity.0": "Уменьшает §lГравитацию§r крюка до 0% (1 -> 0)", + "tfg.grapplemod.downgrades.gravity.0": "Возращает §lГравитацию§r крюка к 100% (0 -> 1).\nГравитационный двигатель будет возвращен.", + "tfg.grapplemod.upgrades.throwspeed.lv": "Увеличивает §lСкорость броска§r крюка, в результате чего он кинется дальше.\n§lСкорость броска§r будет равно 2.25", + "tfg.grapplemod.upgrades.throwspeed.mv": "Увеличивает §lСкорость броска§r крюка, в результате чего он кинется дальше.\n§lСкорость броска§r будет равно 2.5", + "tfg.grapplemod.upgrades.throwspeed.hv": "Увеличивает §lСкорость броска§r крюка, в результате чего он кинется дальше.\n§lСкорость броска§r будет равно 2.75", + "tfg.grapplemod.upgrades.throwspeed.ev": "Увеличивает §lСкорость броска§r крюка, в результате чего он кинется дальше.\n§lСкорость броска§r будет равно 3", + "tfg.grapplemod.upgrades.throwspeed.iv": "Увеличивает §lСкорость броска§r крюка, в результате чего он кинется дальше.\n§lСкорость броска§r будет равно 3.25", + "tfg.grapplemod.upgrades.throwspeed.luv": "Увеличивает §lСкорость броска§r крюка, в результате чего он кинется дальше.\n§lСкорость броска§r будет равно 3.5", + "tfg.grapplemod.upgrades.throwspeed.zpm": "Увеличивает §lСкорость броска§r крюка, в результате чего он кинется дальше.\n§lСкорость броска§r будет равно 3.75", + "tfg.grapplemod.upgrades.throwspeed.uv": "Увеличивает §lСкорость броска§r крюка, в результате чего он кинется дальше.\n§lСкорость броска§r будет равно 4", + "tfg.grapplemod.downgrades.throwspeed": "Возращает §lСкорость броска§r крюка к нормальной, возращает поршень.\nРаботает только при использовании поршня того же типа, что и раньше.", + "tfg.grapplemod.upgrades.doublehook": "Добавляет §lВторой крюк§r к крюку", + "tfg.grapplemod.downgrades.doublehook": "Убирает §lВторой крюк§r из крюка", + "tfg.grapplemod.upgrades.vertical_throwing_angle": "Увеличивает §lВертикальный угол броска§r крюка на 5°, вплоть до 90°.", + "tfg.grapplemod.downgrades.vertical_throwing_angle": "Уменьшает §lВертикальный угол броска§r крюка на 5°, вплоть до 0°.", + "tfg.grapplemod.upgrades.angle": "Увеличивает §lГоризонтальный угол броска§r §lВторого крюка§r на 5°, вплоть до 90°.\nДоступно только с установленным улучшением §lВторой крюк§r.", + "tfg.grapplemod.downgrades.angle": "Уменьшает §lГоризонтальный угол броска§r §lВторого крюка§r на 5°, вплоть до 5°°.\nДоступно только с установленным улучшением §lВторой крюк§r.", "quests.ae2": "Applied Energistics 2", "quests.ae2.subtitle": "Самый мощный инструмент, который поможет вам с GregTech, открывается после вашего первого полёта на Луну", "quests.ae2.certus_quartz.title": "Истинный кварц", @@ -2505,7 +2588,7 @@ "quests.gregtech_energy.fission_reactor.title": "Ядерный реактор MK I", "quests.gregtech_energy.fission_reactor.subtitle": "Пристегните ремни, это сложно.", "quests.gregtech_energy.fission_reactor.desc.1": "&dЯдерный реактор&r — безусловно редкое зрелище в GregTech, как по тематике, так и по принципу работы. Но не бойся — мы здесь, чтобы провести тебя через этот многоцелевой мультиблок для настоящих технарей!\n\nФизику мы пока опустим, &eколлега-инженер&r. Самое важное, что тебе нужно знать: этот реактор — как большая тепловая &dбатарея-генератор&r. Ты подаёшь подходящее топливо и получаешь &cтепло&r (по сути как &6EU/t&r), которое накапливается в реакторе в виде &cрастущей температуры&r (сохранённой &6EU&r).\n\nЗатем ты можешь передать это тепло в &9охлаждающие жидкости&r для работы турбин или выполнения рецептов крафта в стиле ЭДП. Иногда этого тепла может быть даже &cслишком много&r. Ах да, ещё ты получаешь новые элементы для создания новых топлив, схем и прочих вещей. Может, стоит ещё немного исследовать Солнечную систему? Скукотища.", - "quests.gregtech_energy.fission_reactor.desc.2": "Для начала добудь немного &dТория&r. Не забудь надеть зазитный костюм — &eDeatek Intergalactic&r не несёт ответственности за любые телесные повреждения, полученные в результате неправильного обращения с нестабильными материалами. Честно говоря, на этом этапе нам уже не стоило бы тебе об этом напоминать. Если нужно освежить память — загляни в задание про опасности.\n\nДалее скрафть несколько пустых &dтопливных стержней&r и заполни их с помощью &dЗавода по производству ядерного топлива&r. Стержни многоразовые, так что делать их слишком много не нужно. На самом деле, на первое время тебе вполне хватит всего &oодного&r.\n\nРазумеется, тебе также понадобится полностью собранный реактор. Посмотри превью в EMI. Обрати внимание: в центре находится колонна держателей топлива, а вокруг — дополнительные колонны для компонентов и держателей материалов. К ним мы вернёмся позже.\n\nПодожди. Почему всего &oодин&r стержень? О, &eкак же мы&r рады, что ты спросил. Давай погрузимся в механику реактора подробнее на следующей странице.", + "quests.gregtech_energy.fission_reactor.desc.2": "Для начала добудь немного &dТория&r. Не забудь надеть защитный костюм — &eDeatek Intergalactic&r не несёт ответственности за любые телесные повреждения, полученные в результате неправильного обращения с нестабильными материалами. Честно говоря, на этом этапе нам уже не стоило бы тебе об этом напоминать. Если нужно освежить память — загляни в задание про опасности.\n\nДалее скрафть несколько пустых &dтопливных стержней&r и заполни их с помощью &dЗавода по производству ядерного топлива&r. Стержни многоразовые, так что делать их слишком много не нужно. На самом деле, на первое время тебе вполне хватит всего &oодного&r.\n\nРазумеется, тебе также понадобится полностью собранный реактор. Посмотри превью в EMI. Обрати внимание: в центре находится колонна держателей топлива, а вокруг — дополнительные колонны для компонентов и держателей материалов. К ним мы вернёмся позже.\n\nПодожди. Почему всего &oодин&r стержень? О, &eкак же мы&r рады, что ты спросил. Давай погрузимся в механику реактора подробнее на следующей странице.", "quests.gregtech_energy.fission_reactor.desc.3": "Чем больше топливных стержней ты установишь в реактор, тем &cгорячее&r он станет. А чем он горячее, тем больше тепла сможет передать в охлаждающую жидкость и обрабатываемые материалы. Но у физики есть свои пределы, и реактор не может нагреваться бесконечно — есть максимум, &cнасколько горячим&r он может быть, так что не стоит устанавливать слишком много топливных стержней.\n\nНо не бойся! Вопреки тому, что утверждает пропагандистская большая машина &0нефти&r, ядерная энергия &aабсолютно безопасна&r. Если уровень тепла реактора приближается к опасной зоне, он запускает &9автоматическую последовательность охлаждения&r и не запустится снова, пока всё тепло не будет &aбезопасно рассеяно&r. Правда, процесс это довольно медленный.\n\nДолжен же быть способ сделать его горячее и быстрее? И снова — хорошо, что ты спросил! &eНаши гениальные инженеры&r уже подготовили для тебя решение!", "quests.gregtech_energy.fission_reactor.desc.4": "Помимо 5 &dдержателей топлива&r, ты можешь установить &oдо&r 20 &dкомпонентов&r. Реакторы от некоторых других производителей требуют очень точного размещения, но наш реактор умнее. &6Характеристики&r всех установленных компонентов просто &6суммируются&r — и на этом всё!\n\nНа данный момент реактор умеет использовать их тремя&7*&r разными способами:\n&e1)&r Максимальная температура &7(изоляция)&r\n&e2)&r Эффективность &7(топливо служит дольше)&r\n&e3)&r Дросселирование &7(замедляет реакции)&r\n\n&7*)&r Возможно, в твоей галактике нет необходимых материалов для всех вариантов. Мы предполагаем, что материалы доступны только для первой категории.\n\nНо будь осторожен. Повышение &cтемпературы&r имеет и &cобратную сторону&r.", "quests.gregtech_energy.fission_reactor.desc.5": "Хотя более &cгорячий&r реактор делает производство охлаждающих жидкостей и обработку &cбыстрее&r, он также становится более требовательным к топливным стержням. Каждый топливный стержень имеет ограниченную прочность, и её расход линейно зависит от температуры.\n\nПоскольку для более высокой температуры тебе требуется больше топливных стержней, в итоге износ масштабируется &nквадратично&r. Если ты хочешь максимально эффективно нагревать охлаждающие жидкости, используй низкую температуру. А если тебе нужна более быстрая переработка ядерных материалов — поднимай температуру настолько высоко, насколько позволяет изоляция.", @@ -3857,7 +3940,7 @@ "quests.steam_age.resin_boards.desc": "Знаете ли вы, что подсочки могут капать прямо в трубы и бочки GregTech? Теперь знаете!", "quests.steam_age.circuit_boards.title": "Электроника #2: Прорезиненная Электросхема", "quests.steam_age.circuit_boards.subtitle": "Более простой компонент для схем", - "quests.steam_age.circuit_boards.desc": "Скомбинируйте Прорезиненные Подложки с медными проводами, и у вас получится основа для вашей первой &aСхемы&r!", + "quests.steam_age.circuit_boards.desc": "Немного тонкой работы за &3Ремесленным столом&r позволит тебе объединить прорезиненные подложки с медными проводами и создать свои первые &aэлектросхемы&r!\n\nРемесленный стол работает по тому же принципу, что и обработка камня, но на этот раз с дополнительными предметами и инструментами.", "quests.steam_age.vacuum_chamber.title": "Вакуумная камера", "quests.steam_age.vacuum_chamber.subtitle": "Добавляем вакуум в вакуумные лампы", "quests.steam_age.vacuum_chamber.desc": "Эта машина — финальный шаг в создании ваших первых вакуумных ламп. Разместите её над чашей, подключите питание и убедитесь, что машина находится в режиме Ваакумирование.\n\nТакже эта машина помогает разжижать клей и резину, если её нагревать в Charcoal Forge или с помощью Горелки Всполоха.", diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index b81f7b361..9f7c9aa08 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -134,7 +134,7 @@ function addCircuitToRecipe(event, recipeId, circuitNumber) { let hasCircuit = false; for (let i = 0; i < itemArray.size(); i++) { const el = itemArray.get(i); - if (!el.isJsonObject()) {continue;} + if (!el.isJsonObject()) { continue; } const obj = el.getAsJsonObject(); const content = obj.get("content"); if (content && content.isJsonObject()) { @@ -351,21 +351,21 @@ function woodBuilder(event, name, lumber, logs, log, stripped_log, plank, stair, * @throws {TypeError} Throws an error if input, output, or multiplier is invalid. */ function sterilizeItem(event, input, output, multiplier, cleanroom) { - // Collect errors. - const errors = []; + // Collect errors. + const errors = []; if (input === undefined || (Array.isArray(input) && input.length !== 1) || output === undefined || (Array.isArray(output) && output.length !== 1)) { errors.push("input or output is undefined or not equal to one item"); }; - if (multiplier <= 0) { - errors.push(`invalid multiplier (${multiplier})`); - }; + if (multiplier <= 0) { + errors.push(`invalid multiplier (${multiplier})`); + }; - // If there are any errors, log them all and throw once. - if (errors.length > 0) { - const message = `sterilizeItem errors:\n - ${ errors.join("\n - ")}`; - throw new TypeError(message); - }; + // If there are any errors, log them all and throw once. + if (errors.length > 0) { + const message = `sterilizeItem errors:\n - ${errors.join("\n - ")}`; + throw new TypeError(message); + }; // Set default multiplier. let recipe_multiplier = 1; @@ -376,32 +376,32 @@ function sterilizeItem(event, input, output, multiplier, cleanroom) { // Create recipes. const ethanol_recipe = event.recipes.gtceu.chemical_bath(`tfg:ethanol_cleaning/${linuxUnfucker(input)}_to_${linuxUnfucker(output)}`) .itemInputs(input) - .inputFluids(Fluid.of('gtceu:ethanol', 500*recipe_multiplier)) + .inputFluids(Fluid.of('gtceu:ethanol', 500 * recipe_multiplier)) .itemOutputs(output) - .duration(10*20*recipe_multiplier) + .duration(10 * 20 * recipe_multiplier) .EUt(GTValues.VA[GTValues.MV]); const hydrogen_peroxide_recipe = event.recipes.gtceu.chemical_bath(`tfg:hydrogen_peroxide_cleaning/${linuxUnfucker(input)}_to_${linuxUnfucker(output)}`) .itemInputs(input) - .inputFluids(Fluid.of('gtceu:hydrogen_peroxide', 200*recipe_multiplier)) + .inputFluids(Fluid.of('gtceu:hydrogen_peroxide', 200 * recipe_multiplier)) .itemOutputs(output) - .duration(10*20*recipe_multiplier) + .duration(10 * 20 * recipe_multiplier) .EUt(GTValues.VA[GTValues.MV]); const sodium_dodecyl_sulfate_recipe = event.recipes.gtceu.chemical_bath(`tfg:sodium_dodecyl_sulfate_cleaning/${linuxUnfucker(input)}_to_${linuxUnfucker(output)}`) .itemInputs(input) - .inputFluids(Fluid.of('tfg:sodium_dodecyl_sulfate', 50*recipe_multiplier)) + .inputFluids(Fluid.of('tfg:sodium_dodecyl_sulfate', 50 * recipe_multiplier)) .itemOutputs(output) - .duration(10*20*recipe_multiplier) + .duration(10 * 20 * recipe_multiplier) .EUt(GTValues.VA[GTValues.MV]); const autoclave_recipe = event.recipes.gtceu.autoclave(`tfg:autoclave_cleaning/${linuxUnfucker(input)}_to_${linuxUnfucker(output)}`) .itemInputs(input) .perTick(true) - .inputFluids(Fluid.of('gtceu:steam', 100*recipe_multiplier)) + .inputFluids(Fluid.of('gtceu:steam', 100 * recipe_multiplier)) .perTick(false) .itemOutputs(output) - .duration(240*20*recipe_multiplier) + .duration(240 * 20 * recipe_multiplier) .EUt(GTValues.VA[GTValues.MV]); if (cleanroom) { diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index b45eecc8c..149d38722 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -994,21 +994,14 @@ const registerMinecraftRecipes = (event) => { //#endregion //#region Glowing Ink Sacs - - event.recipes.gtceu.chemical_bath('minecraft:glow_inc_sac4') - .itemInputs("gtceu:thorium_dust") - .inputFluids(Fluid.of('gtceu:glowstone', 512)) - .itemOutputs('16x minecraft:glow_ink_sac') - .duration(20) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.chemical_bath('minecraft:glow_inc_sac1') - .itemInputs("#forge:dyes/black") - .inputFluids(Fluid.of('gtceu:glowstone', 144)) + + event.recipes.gtceu.fluid_solidifier('tfg:glow_ink_sac') + .inputFluids('gtceu:glowstone 36') + .notConsumable('gtceu:ball_casting_mold') .itemOutputs('minecraft:glow_ink_sac') .duration(40) .EUt(GTValues.VA[GTValues.LV]) - + //#endregion //#region Gunpowder diff --git a/kubejs/server_scripts/tfg/machines/recipes.bakelite.js b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js index fd46fbf09..92262887e 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.bakelite.js +++ b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js @@ -2,8 +2,22 @@ function registerTFGBakeliteRecipes(event) { - // TODO: move oil PE to MV + // Make PE exclusively MV+, it's fine if the LCR recipe stays LV since you can't make an LCR in LV anyway + event.recipes.gtceu.chemical_reactor('gtceu:polyethylene_from_oxygen') + .inputFluids('gtceu:oxygen 1000', 'gtceu:ethylene 144') + .circuit(1) + .outputFluids('gtceu:polyethylene 216') + .duration(2 * 20) + .EUt(GTValues.VA[GTValues.MV]) + event.recipes.gtceu.chemical_reactor('gtceu:polyethylene_from_air') + .inputFluids('gtceu:air 1000', 'gtceu:ethylene 144') + .circuit(1) + .outputFluids('gtceu:polyethylene 144') + .duration(2 * 20) + .EUt(GTValues.VA[GTValues.MV]) + + // Formaldehyde event.recipes.gtceu.chemical_reactor('tfg:formaldehyde_from_methane') .inputFluids('gtceu:methane 1000', 'gtceu:oxygen 1000') .outputFluids('gtceu:formaldehyde 1000', 'gtceu:hydrogen 2000') @@ -53,18 +67,40 @@ function registerTFGBakeliteRecipes(event) { event.remove({ id: 'gtceu:assembler/phenolic_board' }) - event.recipes.gtceu.forming_press('tfg:phenolic_board') + event.recipes.gtceu.forming_press('tfg:phenolic_board_lv') .itemInputs('2x #forge:foils/bakelite', '2x minecraft:paper', 'gtceu:resin_circuit_board') .itemOutputs('gtceu:phenolic_circuit_board') .duration(7.5 * 20) .EUt(GTValues.VA[GTValues.LV]) - event.recipes.gtceu.assembler('tfg:phenolic_board_pe') + event.recipes.gtceu.assembler('tfg:phenolic_board_mv') + .itemInputs('2x #forge:foils/bakelite', 'gtceu:wood_plate') + .inputFluids('gtceu:phenol 50') + .itemOutputs('gtceu:phenolic_circuit_board') + .duration(7.5 * 20) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.assembler('tfg:phenolic_board_mv_pe') .itemInputs('2x #forge:foils/polyethylene', 'gtceu:wood_plate') .inputFluids('gtceu:phenol 50') .itemOutputs('gtceu:phenolic_circuit_board') .duration(7.5 * 20) .EUt(GTValues.VA[GTValues.MV]) + // machine hull changes/additions event.replaceInput({ id: 'gtceu:shaped/mv_machine_hull' }, '#forge:plates/wrought_iron', '#forge:plates/bakelite') + + event.recipes.gtceu.assembler('tfg:ulv_hull_bakelite') + .itemInputs('gtceu:ulv_machine_casing', '2x #forge:single_cables/red_alloy') + .inputFluids('tfg:bakelite 432') + .itemOutputs('gtceu:ulv_machine_hull') + .duration(25) + .EUt(16) + + event.recipes.gtceu.assembler('tfg:lv_hull_bakelite') + .itemInputs('gtceu:lv_machine_casing', '2x #forge:single_cables/tin') + .inputFluids('tfg:bakelite 432') + .itemOutputs('gtceu:lv_machine_hull') + .duration(50) + .EUt(16) } \ No newline at end of file diff --git a/pakku-lock.json b/pakku-lock.json index 476d7096d..d315e4777 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4945,24 +4945,24 @@ "files": [ { "type": "curseforge", - "file_name": "domum_ornamentum-1.20.1-1.0.295-snapshot-universal.jar", + "file_name": "domum_ornamentum-1.20.1-1.0.295-universal.jar", "mc_versions": [ "1.20.1" ], "loaders": [ "forge" ], - "release_type": "beta", - "url": "https://edge.forgecdn.net/files/7421/161/domum_ornamentum-1.20.1-1.0.295-snapshot-universal.jar", - "id": "7421161", + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7530/695/domum_ornamentum-1.20.1-1.0.295-universal.jar", + "id": "7530695", "parent_id": "527361", "hashes": { - "sha1": "f5fc47a7006445e4f999611d1cc95bda55c70b1f", - "md5": "e85e022d42829065eb6f3d804abeb9d0" + "sha1": "29950245b98ec35184d806e3b9ace700e67ac585", + "md5": "2f8435a8c43ebff6df70299ea212b336" }, "required_dependencies": [], - "size": 1141562, - "date_published": "2026-01-05T14:36:53.033Z" + "size": 1141554, + "date_published": "2026-01-26T15:27:31.327Z" } ] }, @@ -6276,7 +6276,7 @@ "files": [ { "type": "curseforge", - "file_name": "FastSuite-1.20.1-5.1.1.jar", + "file_name": "FastSuite-1.20.1-5.1.2.jar", "mc_versions": [ "1.20.1" ], @@ -6285,18 +6285,18 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7428/292/FastSuite-1.20.1-5.1.1.jar", - "id": "7428292", + "url": "https://edge.forgecdn.net/files/7527/943/FastSuite-1.20.1-5.1.2.jar", + "id": "7527943", "parent_id": "475117", "hashes": { - "sha1": "dfceb81524a9e1be19bf89d0281c05b6edf5326c", - "md5": "806f80e876eff6f121c8b508825ce368" + "sha1": "32ea4495b0e646f8f060e4e97d17044dd9fdefbd", + "md5": "efca8ff65bbf93e3a0f776998ee181e9" }, "required_dependencies": [ "283644" ], - "size": 26603, - "date_published": "2026-01-07T04:03:31.723Z" + "size": 26600, + "date_published": "2026-01-26T00:38:18.357Z" } ] }, @@ -7231,7 +7231,7 @@ "files": [ { "type": "curseforge", - "file_name": "gtmoldraw-3.0.0.jar", + "file_name": "gtmoldraw-3.0.1.jar", "mc_versions": [ "1.20.1" ], @@ -7239,18 +7239,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7404/876/gtmoldraw-3.0.0.jar", - "id": "7404876", + "url": "https://edge.forgecdn.net/files/7529/672/gtmoldraw-3.0.1.jar", + "id": "7529672", "parent_id": "1348330", "hashes": { - "sha1": "9377694e2e3d8c62bdacd400e125acc732c54803", - "md5": "e6d36dbc5383b0649bbfa76a829c6170" + "sha1": "caaf28b88afe1b01ec4180a4458c2795184255bc", + "md5": "aae6cd78a4f17cbcbd2b0dc984fe4a8b" }, "required_dependencies": [ "890405" ], - "size": 907581, - "date_published": "2026-01-01T18:19:59.917Z" + "size": 908933, + "date_published": "2026-01-26T10:36:48.937Z" } ] }, @@ -10552,7 +10552,7 @@ "files": [ { "type": "modrinth", - "file_name": "particle_core-0.3.1+1.20.1+forge.jar", + "file_name": "particle_core-0.3.2+1.20.1+forge.jar", "mc_versions": [ "1.20.1" ], @@ -10561,23 +10561,23 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/RSeLon5O/versions/dtIZJ1r3/particle_core-0.3.1+1.20.1+forge.jar", - "id": "dtIZJ1r3", + "url": "https://cdn.modrinth.com/data/RSeLon5O/versions/qSjxrRl9/particle_core-0.3.2+1.20.1+forge.jar", + "id": "qSjxrRl9", "parent_id": "RSeLon5O", "hashes": { - "sha512": "63a2c186e74851fef7ce7871c09126deb0a8090de417753873b74cfe3db3e2d61b699e2fd6033526f38356881c1817e759e34e5b536224c17247bd3b3a6d6be8", - "sha1": "935a8c19cc7a72364fdfe494d9ddbd599f01588d" + "sha512": "042a26c72ed13a5b7a961afd575561442fe979295e2adc5901127e2be578391f597ce24d17d92fdf6ad515a19033f1b7cde0a455e7e9e9b0a36a8089caddf459", + "sha1": "57079d1607ce044533fb076d2db0e2a3d277a4fb" }, "required_dependencies": [ - "hYykXjDp", - "ordsPcFz" + "ordsPcFz", + "hYykXjDp" ], - "size": 770117, - "date_published": "2026-01-22T01:13:37.946023Z" + "size": 773147, + "date_published": "2026-01-25T16:04:41.088385Z" }, { "type": "curseforge", - "file_name": "particle_core-0.3.1+1.20.1+forge.jar", + "file_name": "particle_core-0.3.2+1.20.1+forge.jar", "mc_versions": [ "1.20.1" ], @@ -10586,19 +10586,19 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7504/78/particle_core-0.3.1+1.20.1+forge.jar", - "id": "7504078", + "url": "https://edge.forgecdn.net/files/7525/37/particle_core-0.3.2+1.20.1+forge.jar", + "id": "7525037", "parent_id": "985426", "hashes": { - "sha1": "935a8c19cc7a72364fdfe494d9ddbd599f01588d", - "md5": "4386c25fd855cc4de76c3458b9a182a5" + "sha1": "57079d1607ce044533fb076d2db0e2a3d277a4fb", + "md5": "5ebd6c2396924c3e33ea96003ec10b0c" }, "required_dependencies": [ - "351264", - "1005914" + "1005914", + "351264" ], - "size": 770117, - "date_published": "2026-01-22T01:13:31.647Z" + "size": 773147, + "date_published": "2026-01-25T16:04:36.363Z" } ] }, @@ -15246,6 +15246,47 @@ } ] }, + { + "pakku_id": "D8FJfLqFF1y0WOqV", + "pakku_links": [ + "7N9O2rPIAVKoRYOH" + ], + "type": "MOD", + "slug": { + "curseforge": "tacz-sbw-playerrevive-gun-mod-compitability" + }, + "name": { + "curseforge": "[TaCZ/SBW] PlayerRevive gun mod compitability" + }, + "id": { + "curseforge": "1440963" + }, + "files": [ + { + "type": "curseforge", + "file_name": "playerrevive_compat-1.0.1-1d0e244.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7528/776/playerrevive_compat-1.0.1-1d0e244.jar", + "id": "7528776", + "parent_id": "1440963", + "hashes": { + "sha1": "05d191e5bb7c4ada8b2cbb7c604b3ab7d5040563", + "md5": "7be622f95b711409c493da13c5c08772" + }, + "required_dependencies": [ + "266890" + ], + "size": 198416, + "date_published": "2026-01-26T05:31:05.240Z" + } + ] + }, { "pakku_id": "MpkpUO55EJhBt1az", "pakku_links": [ From cd7926a3333ff5902fedb6bb980bc831d0a8baf9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 27 Jan 2026 02:42:32 +0000 Subject: [PATCH 50/66] bloomery block -> doors --- .../field_guide/en_us/entries/mechanics/bloomery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json index 4bf3920e4..1c351fdd3 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/bloomery.json @@ -34,7 +34,7 @@ }, { "type": "patchouli:text", - "text": "If you don't want to do the math, we recommend $(item)25 metal ore dusts$() and $(item)22 fuel items$().$(br2)After filling the bloomery with a combination of $(thing)Fuel$() and $(thing)Ore$(), light the bloomery block, and wait 15 hours for the bloomery to smelt. When the bloomery shuts off, it leaves behind a $(thing)Bloom$() block. This contains $(thing)Raw Iron Blooms$() which can be obtained by mining the $(thing)Bloom$() repeatedly with a pickaxe." + "text": "If you don't want to do the math, we recommend $(item)25 metal ore dusts$() and $(item)22 fuel items$().$(br2)After filling the bloomery with a combination of $(thing)Fuel$() and $(thing)Ore$(), light the bloomery doors, and wait 15 hours for the bloomery to smelt. When the bloomery shuts off, it leaves behind a $(thing)Bloom$() block. This contains $(thing)Raw Iron Blooms$() which can be obtained by mining the $(thing)Bloom$() repeatedly with a pickaxe." }, { "type": "patchouli:multiblock", From 03d5ba581b00a174b2d17be72d005fe4b508bb19 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 27 Jan 2026 14:23:10 +0000 Subject: [PATCH 51/66] add gt magnet quest to lv --- .../quests/chapters/lv__low_voltage.snbt | 36 +++++++++++++++++-- .../gregtech/recipes.removes.js | 1 + 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 9134b341e..c22390137 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -58,7 +58,7 @@ linked_quest: "2D2CB8104E40E808" shape: "heart" x: 7.0d - y: 6.0d + y: 5.5d } ] quests: [ @@ -663,7 +663,7 @@ }] title: "{quests.low_voltage.lv_ore_prospector.title}" x: 7.0d - y: 7.0d + y: 6.5d } { dependencies: [ @@ -1218,6 +1218,7 @@ "2E36E5755B2F551C" "4B4F052F00435AFE" "2D2CB8104E40E808" + "07EDEA9613D6F02D" ] dependency_requirement: "one_completed" description: ["{quests.low_voltage.lv_turbo_charge.desc}"] @@ -1367,7 +1368,7 @@ type: "item" }] x: 7.0d - y: 5.0d + y: 4.5d } { dependencies: ["7FA1525D681C4B4A"] @@ -1995,6 +1996,35 @@ x: -10.5d y: 2.0d } + { + dependencies: ["3E6DC423FE4A99F7"] + description: ["{quests.tfg_tips.magnets.desc}"] + icon: { + Count: 1 + id: "gtceu:lv_item_magnet" + tag: { + Charge: 100000L + } + } + id: "07EDEA9613D6F02D" + optional: true + shape: "heart" + subtitle: "{quests.tfg_tips.magnets.subtitle}" + tasks: [{ + id: "10DEC029D9788B72" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:lv_item_magnet)item(gtceu:hv_item_magnet))" + } + } + type: "item" + }] + title: "{quests.tfg_tips.magnets.title}" + x: 7.0d + y: 7.5d + } ] subtitle: ["{quests.low_voltage.subtitle}"] title: "{quests.low_voltage}" diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index d4dab7a2b..be346ced9 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -846,6 +846,7 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__blackstone' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__endstone' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__red_granite' }) + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__basalt' }) event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_tuff' }) removeMaceratorRecipe(event, 'macerate_end_stone'); From c0ae890ecf12dece49df9066701c68b7cfab875f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 27 Jan 2026 15:04:48 +0000 Subject: [PATCH 52/66] fix dupe with ad astra steel trapdoor --- kubejs/server_scripts/ad_astra/recipes.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 79270e13e..e700d283b 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -461,7 +461,8 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('ad_astra:steel_trapdoor') .duration(100) .EUt(GTValues.VA[GTValues.LV]) - .addMaterialInfo(true, true) + + TFGHelpers.registerMaterialInfo('ad_astra:steel_trapdoor', [GTMaterials.Steel, 1, GTMaterials.Glass, 3/4, GTMaterials.Polyethylene, 1/4]) // Etrium only has factory block, encased block, plateblock, panel, and (storage) block From 941c22ff92218145aa4af9d52eedf87d279885fc Mon Sep 17 00:00:00 2001 From: Coox1e <166007852+Coox1e@users.noreply.github.com> Date: Wed, 28 Jan 2026 07:56:24 +1100 Subject: [PATCH 53/66] Pure fertilizer utility patch (#2884) * Added pure fertilizers at 100% Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com> * Changed pure compost recipes to match their updated value Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com> * Changed pure recipes to LV Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com> --------- Signed-off-by: Coox1e <166007852+Coox1e@users.noreply.github.com> --- kubejs/server_scripts/tfc/data.js | 6 ++++- .../tfg/primitive/recipes.compost.js | 24 ++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index 7fe74b566..f9dfc7602 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -109,6 +109,10 @@ const registerTFCFertilizers = (event) => { event.fertilizer('gtceu:tiny_ammonium_chloride_dust', 0.03, null, null) event.fertilizer('gtceu:small_ammonium_chloride_dust', 0.075, null, null) event.fertilizer('gtceu:ammonium_chloride_dust', 0.3, null, null) + + event.fertilizer('tfc:pure_nitrogen', 1, null, null) + event.fertilizer('tfc:pure_phosphorus', null, 1, null) + event.fertilizer('tfc:pure_potassium', null, null, 1) } @@ -117,4 +121,4 @@ const registerTFCFertilizers = (event) => { const registerTFCKnappingTypes = (event) => { event.knappingType('minecraft:flint', 1, 1, 'tfc:item.knapping.stone', true, false, true, 'minecraft:flint', 'tfg:flint') event.knappingType('tfc:straw', 4, 4, 'tfc:item.knapping.leather', false, false, false, 'tfc:straw', 'tfg:straw') -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfg/primitive/recipes.compost.js b/kubejs/server_scripts/tfg/primitive/recipes.compost.js index 623e231a2..ee9d26ed1 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.compost.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.compost.js @@ -22,21 +22,33 @@ function registerTFGCompostRecipes(event) { .EUt(30) event.recipes.gtceu.centrifuge('tfg:gtceu/centrifuge/pure_fertilizers') - .itemInputs('1x gtceu:fertilizer') + .itemInputs('8x gtceu:fertilizer') .itemOutputs('1x tfc:pure_nitrogen', '1x tfc:pure_potassium', '1x tfc:pure_phosphorus') .duration(340) .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.mixer('tfg:tfc/mixer/fertilizer') - .itemInputs('1x tfc:pure_nitrogen', '1x tfc:pure_potassium', '1x tfc:pure_phosphorus', ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Clay, 1)) + .itemInputs('8x tfc:pure_nitrogen', '8x tfc:pure_potassium', '8x tfc:pure_phosphorus', ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Clay, 1)) .itemOutputs('1x gtceu:fertilizer') .duration(160) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.gas_pressurizer('tfg:pure_nitrogen') + event.recipes.gtceu.mixer('tfg:pure_nitrogen') .itemInputs('#forge:wax') - .inputFluids(Fluid.of('gtceu:nitrogen', 1000)) - .itemOutputs('16x tfc:pure_nitrogen') + .inputFluids(Fluid.of('gtceu:nitrogen', 8000)) + .itemOutputs('4x tfc:pure_nitrogen') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:pure_potassium') + .itemInputs('#forge:wax', '8x gtceu:potassium_dust') + .itemOutputs('4x tfc:pure_potassium') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('tfg:pure_phosphorus') + .itemInputs('#forge:wax', '8x gtceu:phosphorus_dust') + .itemOutputs('4x tfc:pure_phosphorus') .duration(100) .EUt(GTValues.VA[GTValues.LV]) //#endregion @@ -191,4 +203,4 @@ function registerTFGCompostRecipes(event) { .itemOutputs(Item.of('tfg:universal_compost_browns', 4)) .duration(20) .EUt(8) -} \ No newline at end of file +} From 32e4e90759e744745d6fcf7bc5ab7de5c3eafab4 Mon Sep 17 00:00:00 2001 From: TanJeeSchuan <89920999+TanJeeSchuan@users.noreply.github.com> Date: Wed, 28 Jan 2026 04:58:24 +0800 Subject: [PATCH 54/66] Feature/crop index (#2849) * Add anchors to sunflower, canola, and flax crop entries Added to the sunflower, canola, and flax sections in the crops Patchouli book entry. * Add Crop Index entry to Patchouli field guide Introduces a new 'Crop Index' entry in the field guide, listing all crops alphabetically with clickable links * Update crop index entry text * Remove Crop Index Section * Add contents section to crops Patchouli entry --------- Co-authored-by: Redeix --- .../field_guide/en_us/entries/mechanics/crops.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json index 4d4630e96..92926b373 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json @@ -12,6 +12,15 @@ "type": "patchouli:text", "text": "In addition to finding wild crops, seeds can also be produced from existing crops. When a fully mature crop dies - either by weather, or leaving it to rot - it will go to seed, dropping more seeds that can be used to grow even more crops next season." }, + { + "type": "patchouli:text", + "title": "Contents", + "text": "$(li)$(l:tfc:mechanics/crops#barley)Barley$()$(li)$(l:tfc:mechanics/crops#beet)Beet$()$(li)$(l:tfc:mechanics/crops#cabbage)Cabbage$()$(li)$(l:tfc:mechanics/crops#canola)Canola$()$(li)$(l:tfc:mechanics/crops#carrot)Carrot$()$(li)$(l:tfc:mechanics/crops#flax)Flax$()$(li)$(l:tfc:mechanics/crops#garlic)Garlic$()$(li)$(l:tfc:mechanics/crops#green_bean)Green Bean$()$(li)$(l:tfc:mechanics/crops#jute)Jute$()$(li)$(l:tfc:mechanics/crops#maize)Maize$()$(li)$(l:tfc:mechanics/crops#melon)Melon$()$(li)$(l:tfc:mechanics/crops#oat)Oat$()$(li)$(l:tfc:mechanics/crops#onion)Onion$()" + }, + { + "type": "patchouli:text", + "text": "$(li)$(l:tfc:mechanics/crops#papyrus)Papyrus$()$(li)$(l:tfc:mechanics/crops#potato)Potato$()$(li)$(l:tfc:mechanics/crops#pumpkin)Pumpkin$()$(li)$(l:tfc:mechanics/crops#red_bell_pepper)Red Bell Pepper$()$(li)$(l:tfc:mechanics/crops#rice)Rice$()$(li)$(l:tfc:mechanics/crops#rye)Rye$()$(li)$(l:tfc:mechanics/crops#soybean)Soybean$()$(li)$(l:tfc:mechanics/crops#squash)Squash$()$(li)$(l:tfc:mechanics/crops#sugarcane)Sugarcane$()$(li)$(l:tfc:mechanics/crops#sunflower)Sunflower$()$(li)$(l:tfc:mechanics/crops#tomatoes)Tomato$()$(li)$(l:tfc:mechanics/crops#wheat)Wheat$()$(li)$(l:tfc:mechanics/crops#yellow_bell_pepper)Yellow Bell Pepper$()" + }, { "type": "tfc:rock_knapping_recipe", "recipes": [ @@ -3298,6 +3307,7 @@ }, { "type": "patchouli:text", + "anchor": "sunflower", "text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): 5 - 40 °C$(br)$(bold)$(l:mechanics/hydration)Hydration$(): 20 - 80 %$(br)$(bold)Nutrient$(): Nitrogen$(br2)A Sunflower is a two block tall crop. Sunflower seeds can be planted on farmland, will grow two blocks tall, and will produce $(item)Sunflower Caps$() which can be processed into $(thing)Seed Oil$(). Seed Oil can both be used as Lamp Fuel, as well as $(thing)Bio Diesel$() later on.$(br)A Sunflower also counts as a Flower for the purposes of $(l:firmalife/beekeeping)Beekeeping$().", "title": "Sunflower" }, @@ -3456,6 +3466,7 @@ }, { "type": "patchouli:text", + "anchor": "canola", "text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): -5 - 25 °C$(br)$(bold)$(l:mechanics/hydration)Hydration$(): 10 - 60 %$(br)$(bold)Nutrient$(): Phosphorus$(br2)Canola is a two block tall crop. Canola seeds can be planted on farmland, will grow two blocks tall, and will produce $(item)Canola Ovules$() which can be processed into $(thing)Seed Oil$(). Seed Oil can both be used as Lamp Fuel, as well as $(thing)Bio Diesel$() later on.$(br)Canola also counts as a Flower for the purposes of $(l:firmalife/beekeeping)Beekeeping$().", "title": "Canola" }, @@ -3615,6 +3626,7 @@ }, { "type": "patchouli:text", + "anchor": "flax", "text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): -8 - 25 °C$(br)$(bold)$(l:mechanics/hydration)Hydration$(): 15 - 65 %$(br)$(bold)Nutrient$(): Nitrogen$(br2)Flax is a two block tall crop. Flax seeds can be planted on farmland, will grow two blocks tall, and will produce $(item)Flax Stems$() which can be processed into $(thing)Linen$() or $(thing)Burlap$().$(br)Flax also counts as a Flower for the purposes of $(l:firmalife/beekeeping)Beekeeping$().", "title": "Flax" }, From e32a79736832e9c1620916f7820612d0e11c67c2 Mon Sep 17 00:00:00 2001 From: Madeline Vergani Date: Tue, 27 Jan 2026 22:01:05 +0100 Subject: [PATCH 55/66] Noodle and Cereal Box icon sets (#2875) * Create a new material icon set `noodle` and give it to vanadium * Create the `cereal_box` material set for ostrum * Make Osmium Iodide be a cereal box * Add a model for radioactive hot ingots --- .../item/material_sets/cereal_box/ingot.json | 8 ++++++++ .../item/material_sets/cereal_box/ingot_hot.json | 9 +++++++++ .../models/item/material_sets/noodle/ingot.json | 8 ++++++++ .../item/material_sets/noodle/ingot_hot.json | 9 +++++++++ .../item/material_sets/radioactive/ingot_hot.json | 6 ++++++ .../item/material_sets/cereal_box/ingot.png | Bin 0 -> 487 bytes .../cereal_box/ingot_hot_overlay.png | Bin 0 -> 667 bytes .../material_sets/cereal_box/ingot_overlay.png | Bin 0 -> 405 bytes .../material_sets/cereal_box/ingot_secondary.png | Bin 0 -> 504 bytes .../textures/item/material_sets/noodle/ingot.png | Bin 0 -> 490 bytes .../material_sets/noodle/ingot_hot_overlay.png | Bin 0 -> 639 bytes .../item/material_sets/noodle/ingot_overlay.png | Bin 0 -> 404 bytes .../item/material_sets/noodle/ingot_secondary.png | Bin 0 -> 565 bytes .../gtceu/material_modification.js | 4 ++-- kubejs/startup_scripts/tfg/icon_sets.js | 5 +++++ kubejs/startup_scripts/tfg/mars/materials.mars.js | 4 ++-- 16 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot_hot.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/noodle/ingot.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/noodle/ingot_hot.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/radioactive/ingot_hot.json create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_hot_overlay.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_overlay.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_secondary.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_hot_overlay.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_overlay.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_secondary.png diff --git a/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot.json b/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot.json new file mode 100644 index 000000000..66e76423a --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/cereal_box/ingot", + "layer1": "gtceu:item/material_sets/cereal_box/ingot_secondary", + "layer2": "gtceu:item/material_sets/cereal_box/ingot_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot_hot.json b/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot_hot.json new file mode 100644 index 000000000..3c7709efb --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/cereal_box/ingot_hot.json @@ -0,0 +1,9 @@ +{ + "parent": "gtceu:item/material_sets/cereal_box/ingot", + "textures": { + "layer0": "gtceu:item/material_sets/cereal_box/ingot", + "layer1": "gtceu:item/material_sets/cereal_box/ingot_secondary", + "layer2": "gtceu:item/material_sets/cereal_box/ingot_overlay", + "layer3": "gtceu:item/material_sets/cereal_box/ingot_hot_overlay" + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot.json b/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot.json new file mode 100644 index 000000000..9351df688 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/noodle/ingot", + "layer1": "gtceu:item/material_sets/noodle/ingot_secondary", + "layer2": "gtceu:item/material_sets/noodle/ingot_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot_hot.json b/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot_hot.json new file mode 100644 index 000000000..b1b980e91 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/noodle/ingot_hot.json @@ -0,0 +1,9 @@ +{ + "parent": "gtceu:item/material_sets/noodle/ingot", + "textures": { + "layer0": "gtceu:item/material_sets/noodle/ingot", + "layer1": "gtceu:item/material_sets/noodle/ingot_secondary", + "layer2": "gtceu:item/material_sets/noodle/ingot_overlay", + "layer3": "gtceu:item/material_sets/noodle/ingot_hot_overlay" + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/material_sets/radioactive/ingot_hot.json b/kubejs/assets/gtceu/models/item/material_sets/radioactive/ingot_hot.json new file mode 100644 index 000000000..58452c41d --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/radioactive/ingot_hot.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/ingot_hot", + "textures": { + "layer1": "gtceu:item/material_sets/radioactive/ingot_secondary" + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot.png b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..20b490e7b730b1b50e8c84a9ac0ce0e0d363967f GIT binary patch literal 487 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU49JS3Y>~;QaaX<>lr7|NoymcP;}1gR`-F2?GNI zM@f)h@P7zkxYxWll7WGNv%n*=n1O-sFbFdq&tH+kz`!6`;u=vBoS#-wo>-L15RjOe zSEA?V8lqsTXQ*dr*u^1sj)8$;M{0y;ny0500|x^G11p0RBP#0|SFJlnwHR z1|u_AoQZ*f!H|)OL6CugA&P;4A+wzYES|#v0SO=FtCa^QGFfcF} z7#SNdE`XQ|vXgZI#H?u$qZpVN7#WzrDuXO77?>EKx(p2rKnmDQuM}_UFS2G}V2Ji~ zaSYK24n5z<#h}Q+9PoV3-~aORna4z3-YRx&dp6^1vGSgO?Pur41zkVDZt?tkdE=IA+$L5Vt6pb&TOJYn4gP%9(}boL#c%J7?^;#-72zvUh5)&s&g{ Mp00i_>zopr09=}SF#rGn literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_hot_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_hot_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..26055b67027de610ef1868ff8508c99525f02dae GIT binary patch literal 667 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=jH>b(;!AMFflMPFo9JDSz0hKF+g=08W?~Su$f*d-qc@Y&A`Cu?&;zf zV&UIA+0mQHQKD`BOQkje5l1f$HZ@IA#fy>a8%thEec`tH#s5j+%F4W^3nzm)VqXin z%y@8=_e;QA$7Y8BmzM&U6X#}1mtSNTYx`L?PxfBE{S0QyEKkcU&*FNuPmdQVyX&s} zIDw;>+2L7oD8r_i9G!1DR<|cM6)v~PQx-G-y0f0CQpk3h8P7&}sUYdL6S}fzC+Y0q z@7@$E7`9&JRM}Ji*GYHE3$LGi%Dk_2YG3G_ xS*@B=TsTwg!me(9*!bOG<@)!%<+b&%Irk@N)R?{(k6i)^UQbs)mvv4FO#siS$8rDw literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..2afe4ed61a1f479eb459450195848c9d1902bf05 GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=jH>b(;!AMFflMPFo9JDSz0hKF+g=08W?~Su$f*d-qc@Y&A`Cm=;`7Z zV&R{hAi=8A{Qv)d_66Ms8SPGjSPv$*Gncrwm>4bMHdr8e=){Q~jG@y!8qSBM9B9#V g(2_81;9?8lVfY{;S2owcN)KePr>mdKI;Vst08)Wbh5!Hn literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/cereal_box/ingot_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..2c1d06a1d7c0de4bdac540ab9534be2b32fe9244 GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=jH>b(;!AMFflMPFo9JDSz0hKF+g=08W?~Su$f*d-qc@Y&A`C0#M8ww z#KM2-q=TZ&iX1MUQnyPI8O0KLvF$n@@+&^N_RtACoe&#e3;lECcprsKxm zeMi{0d)HhjTF$J~G%e`Vo12_k+aB2V{Y%$Kcy@W7?U|aY^Cisr0lgi&I%Mk1L_1C_ zRP}dE)oO_Ey#7vtE67W}y6?lh)eE+!eVs7p^Xcq|T!K=3_7fL5EA8_6RkC!-KZ&qC jnWA&bn8Jgyd2LUL_sHe=K8b1f2D#nS)z4*}Q$iB}4X1({ literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot.png b/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..b9532d4e6e0482cf6ce88e7306192f8651e4f6a1 GIT binary patch literal 490 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU3ye_V%TvrR&zMV_;xdF5|L+ zfq{XuB*-uLKNK(o`&S5o1PeSOiy0XB4ude`@%$Aj3=9mCC9V-A!TD(=<%vb93;~Im zc_n&&t|1DhdWL$2hFu(D=NK3mcBDplrg?g5F>o+2Ft9R6F|sl+GB7ZBfgA*7gS?`_ z$P5-|Vqjn}WMpCxWME*3Vqjp%Y-a(B=P*D(0?3yP3=A+D-Btz$W(I}{>*0)3xwk+zdb;|# JtaD0e0sw{?drbfU literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_hot_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_hot_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..49cdbba64b7b1e7f658d1b43f540eff16211b99c GIT binary patch literal 639 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=jH>b(;!AMFflMPFo9JDSz0hKF+g=08W?~Su$f*d-qc@Y&A`B@?djqe zV&Q*vqM>(Fph(+%Y28)@7RC9^4+Ge@I8wKRKs%TlM{7IlcF-JDq;}UabpOf1kc6-dy&r`PGM> zXMVh}i1NCAB8^FivpGjK(v~YCO1`bx|IDYhpTP^3mYkK{G?O7=)e&B%S&^2^3gWK= z-yh|8Tq)tHPnRjPqk@k}vMT`etM<3_ix;l1q*;JD(*E7|N1$CJUegrcbJPlhB)-v~?+1I$9 z*L#Z@ihs>1R{GDH_4EL%T$I=KV_jc=`Y$*dlK5)T`4s*v*F{O`5BFW1?lSib`~GX* V1yZVQy|JJm^mO%eS?83{1OROR!KMHJ literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/noodle/ingot_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..d27dfaeba23e3de76cd619655f28e30c5ac0a53d GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=jH>b(;!AMFflMPFo9JDSz0hKF+g=08W?~Su$f*d-qc@Y&A`Cm;OXKR zV&R{hAi?^D{r~^}{qE0k44ofy`glX=O&z`&C3 z=jH>b(;!AMFflMPFo9JDSz0hKF+g=08W?~Su$f*d-qc@Y&A`C$(9^{+ z#KQmTq>a6Y4Fp)OA6lN*(8_U6Vq^R3CI-gP4?7!PI|)kf@R-=Kx>z9h`EVFeA zJsNd;&DQ;PN?H9qXa1PHIJI9eG?d{$_4|9AFSFKqyo}R+&XXpVCiZ^s?G^GLOwWIo xbYPy4)WgJJc { GTMaterials.Cobalt.setMaterialSecondaryARGB(0x1D2688) GTMaterials.CertusQuartz.setMaterialARGB(0xB8D8FC) GTMaterials.CertusQuartz.setMaterialSecondaryARGB(0xADCCEF) - GTMaterials.Vanadium.setMaterialARGB(0xD8D4E7) - GTMaterials.Vanadium.setMaterialSecondaryARGB(0x7E988F) + GTMaterials.Vanadium.setMaterialARGB(0xA7AAC6) + GTMaterials.Vanadium.setMaterialSecondaryARGB(0xC4EFE6) GTMaterials.Brass.setMaterialSecondaryARGB(0x791905) GTMaterials.Aluminium.setMaterialARGB(0xb6e5ff) GTMaterials.Aluminium.setMaterialSecondaryARGB(0x7ca29b) diff --git a/kubejs/startup_scripts/tfg/icon_sets.js b/kubejs/startup_scripts/tfg/icon_sets.js index fed183e4d..be0ac333c 100644 --- a/kubejs/startup_scripts/tfg/icon_sets.js +++ b/kubejs/startup_scripts/tfg/icon_sets.js @@ -37,6 +37,9 @@ function registerTFGIconSets(event) { event.create('nether_quartz').parent('quartz') + event.create('noodle').parent('metallic') + event.create('cereal_box').parent('bright') + // Credits to Flare from the Cosmic Frontiers team event.create('chonky').parent('shiny') } @@ -152,6 +155,8 @@ function modifyTFGIconSets(event) { GTMaterials.Zirconium.setMaterialIconSet(GTMaterialIconSet.getByName('chonky')) + GTMaterials.Vanadium.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") $GreateMaterials.RoseQuartz.setMaterialIconSet(GTMaterialIconSet.getByName('nether_quartz')) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/mars/materials.mars.js b/kubejs/startup_scripts/tfg/mars/materials.mars.js index 58eeab18a..e048876ce 100644 --- a/kubejs/startup_scripts/tfg/mars/materials.mars.js +++ b/kubejs/startup_scripts/tfg/mars/materials.mars.js @@ -81,7 +81,7 @@ function registerTFGMarsMaterials(event) { .components('2x pitchblende', '1x tricalcium_phosphate', '1x bauxite', '1x silver', '1x beryllium') .color(0xbd7980) .secondaryColor(0xA66C8D) - .iconSet(GTMaterialIconSet.getByName('tfc_cassiterite')) + .iconSet(GTMaterialIconSet.getByName('cereal_box')) .ingot() .liquid() .blastTemp(3700, 'mid', GTValues.VA[GTValues.EV]) @@ -99,7 +99,7 @@ function registerTFGMarsMaterials(event) { .liquid() .components('2x ostrum', 'iodine') .blastTemp(3700, 'mid', GTValues.VA[GTValues.IV], (20*120)) - .iconSet(GTMaterialIconSet.BRIGHT) + .iconSet(GTMaterialIconSet.getByName('cereal_box')) .flags(GTMaterialFlags.GENERATE_GEAR) .color(0xc696f2) .secondaryColor(0x9b99ff) From 68e79a1009cd3a6a2b30876cb403ddc785728481 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 27 Jan 2026 21:16:19 +0000 Subject: [PATCH 56/66] fix belt sander speed to match what's in the ponder --- CHANGELOG.md | 2 ++ defaultconfigs/vintageimprovements-server.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b1fdd7c8..75b7ab677 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ - Vanadium magnetite is now usable as an iron ore for TFC purposes (#2834) @Pyritie - Added steam alloy smelter glass batch recipes (#2853) @Pyritie - Paracetamol now cures a small amount of the Radioactive condition, and RadAway now cures everything completely @Pyritie +- High speed on a Belt Grinder now only requires 64 RPM instead of 128 RPM +- Glow ink now just requires a fluid solidifier and a ball mold, instead of whatever it was doing before @Pyritie ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie diff --git a/defaultconfigs/vintageimprovements-server.toml b/defaultconfigs/vintageimprovements-server.toml index acec72cc1..8a85d7c1f 100644 --- a/defaultconfigs/vintageimprovements-server.toml +++ b/defaultconfigs/vintageimprovements-server.toml @@ -21,7 +21,7 @@ #. #Medium speed value for grinder crafts, speedLimits = 2. #Range: 1 ~ 256 - mediumSpeedValue = 128 + mediumSpeedValue = 64 #. #Allows sandpaper crafts on belt grinder, when recipes collides belt grinder recipe have priority. allowSandpaperPolishingOnGrinder = true From edad4cc7e45ac49a4cfb10f24524384e14f5095b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 27 Jan 2026 23:42:29 +0000 Subject: [PATCH 57/66] fix chorus fruit in greenhouse --- CHANGELOG.md | 6 +++++- kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75b7ab677..f70a6bec5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Paracetamol now cures a small amount of the Radioactive condition, and RadAway now cures everything completely @Pyritie - High speed on a Belt Grinder now only requires 64 RPM instead of 128 RPM - Glow ink now just requires a fluid solidifier and a ball mold, instead of whatever it was doing before @Pyritie +- TFC "pure" fertilisers are now all craftable and provide 100 fertiliser instead of 15 (#2884) @Coox1e ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie @@ -31,9 +32,12 @@ - Fixed missing borax to flux recipe @Pyritie - Fixed lavaproof blue steel boots not having armor resistances (#2872) @Paradalope - Fixed the dye colors used to make Create Deco's bricks (#2859) @silllil +- Fixed the Electric Greenhouse outputting way less Chorus Fruit than before @Pyritie +- Fixed the hot ingot icons for Ostrum and Vanadium ingots looking inconsistent with the regular ingots (#2875) @RubenVerg ### Translation updates - Chinese (simplified) @jmecn -- Russian @Petr211071 +- Russian @Petr211071 + @Nixieeunrare +- Spanish @NikoNeko17 ## [0.11.18] - 23-01-2026 ### Important notes diff --git a/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js b/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js index 84f2ea84e..2c88edd43 100644 --- a/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js +++ b/kubejs/server_scripts/tfg/aquaponics/recipes.greenhouse.js @@ -534,10 +534,10 @@ const registerTFGGreenhouseRecipes = (event) => { generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:chorus_mushroom_seeds', 'betterend:chorus_mushroom_product', 1); generateCropGreenHouseRecipe(event, 'ad_astra:mars', 'betterend:shadow_berry_seeds', 'betterend:shadow_berry_product', 1); - // Moon Crops - generateCropGreenHouseRecipe(event, 'ad_astra:moon', 'tfg:lunar_chorus_flower', 'minecraft:chorus_fruit', 2); - // Moon Plants + generateGreenHouseRecipe(event, 'ad_astra:moon', '8x tfg:lunar_chorus_flower', [ + '64x minecraft:chorus_fruit', '8x minecraft:chorus_fruit', '8x tfg:lunar_chorus_flower', '8x tfg:lunar_chorus_flower' + ], 1); generateGreenHouseRecipe(event, 'ad_astra:moon', '8x minecraft:twisting_vines', [ '16x minecraft:twisting_vines', '8x minecraft:pearlescent_froglight', '8x minecraft:verdant_froglight', '8x minecraft:ochre_froglight' ], 1); From 989d572eb9cb37eb6125db81a8088df1631ff224 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 27 Jan 2026 23:42:34 +0000 Subject: [PATCH 58/66] gurman updates --- kubejs/server_scripts/tfc/tags.js | 4 + kubejs/server_scripts/tfc_gurman/recipes.js | 150 +++++++++++++++++--- 2 files changed, 137 insertions(+), 17 deletions(-) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 9748229f5..70a218388 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -459,6 +459,10 @@ function registerTFCItemTags(event) { }) event.add('tfc:fluxstone', 'tfg:loose/dripstone') + + event.add('tfc:food/bell_peppers', 'tfc:food/green_bell_pepper'); + event.add('tfc:food/bell_peppers', 'tfc:food/yellow_bell_pepper'); + event.add('tfc:food/bell_peppers', 'tfc:food/red_bell_pepper'); } /** @param {TagEvent.Block} event */ diff --git a/kubejs/server_scripts/tfc_gurman/recipes.js b/kubejs/server_scripts/tfc_gurman/recipes.js index f19231358..c506ce5f7 100644 --- a/kubejs/server_scripts/tfc_gurman/recipes.js +++ b/kubejs/server_scripts/tfc_gurman/recipes.js @@ -47,7 +47,7 @@ function registerTFCGurmanRecipes(event) { global.cookingRecipe(event, 'oladyi', 'tfc_gurman:raw_oladyi', 'tfc_gurman:oladyi'); // Falafel - from soybean (no raw version) - global.cookingRecipe(event, 'falafel', 'tfc:food/soybean', 'tfc_gurman:falafel'); + global.cookingRecipe(event, 'falafel', 'tfc_gurman:raw_falafel', 'tfc_gurman:falafel'); global.cookingRecipe(event, 'pelmeni', 'tfc_gurman:raw_pelmeni', 'tfc_gurman:pelmeni', '#tfg:clean_water 500'); @@ -58,8 +58,15 @@ function registerTFCGurmanRecipes(event) { //#region Food Processor Recipes // Borscht + global.processorRecipe(event, 'sliced_cabbage', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['tfc:food/cabbage'], + itemOutputs: ['2x tfc_gurman:sliced_cabbage'], + circuit: 1, + itemOutputProvider: TFC.isp.of('2x tfc_gurman:sliced_cabbage').copyOldestFood() + }); + global.processorRecipe(event, 'borscht', 300, GTValues.VA[GTValues.LV], { - itemInputs: ['tfc:food/beet', 'tfc:food/cabbage', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/tomato', '3x #tfc:bowls'], + itemInputs: ['tfc:food/beet', 'tfc_gurman:sliced_cabbage', 'tfc:food/carrot', 'tfc:food/onion', '#tfc:foods/cooked_meats', '3x #tfc:bowls'], fluidInputs: ['minecraft:water 1000'], itemOutputs: ['3x tfc_gurman:borscht'], circuit: 20, @@ -93,7 +100,7 @@ function registerTFCGurmanRecipes(event) { // Compote global.processorRecipe(event, 'compote', 1000, GTValues.VHA[GTValues.LV], { - itemInputs: ['2x #tfc:foods/fruits'], + itemInputs: ['2x #tfc_gurman:compote_fruits'], fluidInputs: ['minecraft:water 1000'], fluidOutputs: ['tfc_gurman:compote 1000'], circuit: 6 @@ -101,7 +108,7 @@ function registerTFCGurmanRecipes(event) { // Lemonade global.processorRecipe(event, 'lemonade', 1500, GTValues.VHA[GTValues.LV], { - itemInputs: ['2x tfc:food/lemon', '#tfc:sweetener'], + itemInputs: ['2x tfc:food/lemon'], fluidInputs: ['minecraft:water 1000'], fluidOutputs: ['tfc_gurman:lemonade 1000'], circuit: 2 @@ -338,13 +345,126 @@ function registerTFCGurmanRecipes(event) { // Adjika global.processorRecipe(event, 'adjika', 300, GTValues.VA[GTValues.LV], { - itemInputs: ['tfc:food/green_bell_pepper', 'tfc:food/red_bell_pepper', 'tfc:powder/salt', 'tfc:food/garlic', 'firmalife:plant/cilantro', '5x #tfc:bowls'], + itemInputs: ['#tfc:food/bell_peppers', '#tfc:food/bell_peppers', 'tfc:powder/salt', 'tfc:food/garlic', "tfg:spice/cilantro_leaves", '5x #tfc:bowls'], fluidInputs: ['minecraft:water 500'], itemOutputs: ['5x tfc_gurman:adjika'], circuit: 8, itemOutputProvider: TFC.isp.of('5x tfc_gurman:adjika').simpleModifier('tfg:force_add_bowl').copyOldestFood() }); + // Onion soup with bread + global.processorRecipe(event, 'onion_soup_with_bread', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['2x tfc:food/onion', '#firmalife:foods/flatbreads', '#firmalife:foods/cheeses', 'tfc:powder/salt', '#tfc:bowls'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:fresh_onion_soup_bread'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:fresh_onion_soup_bread').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Lentil soup + global.processorRecipe(event, 'lentil_soup', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['2x tfc:food/soybean', 'tfc:food/onion', 'tfc:food/garlic', 'tfc:powder/salt', '#tfc:bowls'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:lent_soup'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:lent_soup').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Gazpacho + global.processorRecipe(event, 'gazpacho', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['2x tfc:food/tomato', '#tfc:food/bell_peppers', '#firmalife:foods/flatbreads', 'tfc:food/garlic', '#tfc:bowls'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:gazpacho'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:gazpacho').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Kharcho + global.processorRecipe(event, 'kharcho', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['tfc_gurman:plant_mix', 'tfc:food/garlic', 'tfc:food/onion', 'tfc:food/rice_grain', 'tfc:food/cooked_beef'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:kharcho'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:kharcho').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Kholodnik + global.processorRecipe(event, 'kholodnik', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['tfc:food/potato', '2x tfc:food/beet', '#forge:eggs', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:kholodnik'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:kholodnik').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Shurpa + global.processorRecipe(event, 'shurpa', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['#tfc:food/bell_peppers', 'tfc:food/onion', 'tfc:food/potato', 'tfc:food/cooked_mutton', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:shurpa'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:shurpa').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + global.processorRecipe(event, 'shurpa2', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['#tfc:food/bell_peppers', 'tfc:food/onion', 'tfc:food/potato', 'tfc:food/cooked_beef', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:shurpa'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:shurpa').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Fish tomato soup + global.processorRecipe(event, 'fish_tomato_soup', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['#firmalife:foods/raw_fish', 'tfc:food/tomato', 'tfc:food/onion', 'tfc:food/garlic', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:fish_soup_tomato'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:fish_soup_tomato').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Pea soup + global.processorRecipe(event, 'pea_soup', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['2x tfc:food/green_bean', 'tfc:food/onion', '#tfc:foods/cooked_meats', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:pea_soup'], + circuit: 16, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:pea_soup').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Minestrone + global.processorRecipe(event, 'minestrone', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['tfc:food/rice_grain', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/garlic', '#tfc:foods/cooked_meats'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:minestrone'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:minestrone').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + global.processorRecipe(event, 'minestrone2', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['firmalife:food/raw_egg_noodles', 'tfc:food/carrot', 'tfc:food/onion', 'tfc:food/garlic', '#tfc:foods/cooked_meats'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:minestrone'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:minestrone').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // Fish soup + global.processorRecipe(event, 'fish_soup', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['#firmalife:foods/raw_fish', 'tfc:food/onion', 'tfc:food/potato', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:fish_soup'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:fish_soup').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + + // French onion soup with toast + global.processorRecipe(event, 'french_onion_soup', 300, GTValues.VA[GTValues.LV], { + itemInputs: ['2x tfc:food/onion', '#firmalife:foods/slices', '#firmalife:foods/cheeses', 'tfc:powder/salt'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ['3x tfc_gurman:fresh_onion_soup'], + circuit: 20, + itemOutputProvider: TFC.isp.of('3x tfc_gurman:fresh_onion_soup').simpleModifier('tfg:force_add_bowl').copyOldestFood() + }); + //#endregion // #region Drying @@ -377,22 +497,18 @@ function registerTFCGurmanRecipes(event) { }); // #endregion Drying - // #region Crafting table foods - - // TODO: unfinished - global.processorRecipe(event, 'margarita_pizza', 300, GTValues.VA[GTValues.LV], { - itemInputs: ['firmalife:food/pizza_dough', 'firmalife:food/shredded_cheese', 'tfc:food/tomato', 'tfc:food/red_bell_pepper', 'tfc_gurman:plant_mix', 'firmalife:food/tomato_sauce'], - itemOutputs: ['tfc_gurman:raw_margarita_pizza'], - circuit: 4, - itemOutputProvider: TFC.isp.of('tfc_gurman:raw_margarita_pizza').simpleModifier('tfg:force_add_bowl').copyOldestFood() - }); - - // #endregion - // #region Replacements event.replaceInput({ id: "tfc_gurman:crafting/tiramisu" }, "minecraft:sugar", "#tfg:sugars"); + event.shapeless('2x tfc_gurman:plant_mix', [ + "2x firmalife:spice/basil_leaves", + "tfg:spice/oregano_leaves", + "tfg:spice/cilantro_leaves", + ]).id("tfc_gurman:crafting/plant_mix") + + event.replaceInput({ id: "tfc_gurman:pot/adjika_bowl" }, "firmalife:plant/cilantro", "tfg:spice/cilantro_leaves"); + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of('4x tfc_gurman:raw_takoyaki').copyOldestFood(), [ TFC.ingredient.notRotten('tfg:food/raw_crawlermari'), TFC.ingredient.notRotten('#tfc:foods/flour'), From b4fd0e023fb9dd95ad298db82ae9b6ae9fbdb466 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 28 Jan 2026 00:04:49 +0000 Subject: [PATCH 59/66] fix the recipe of pressing nothing into fluix gems --- kubejs/server_scripts/greate/recipes.removes.js | 2 +- .../tfg/ores_and_materials/recipes.material_ores.js | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index c23447eb6..2330e20fe 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -78,7 +78,7 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:cutting/integration/create/cutting/runtime_generated/compat/minecraft/bamboo_planks_to_bamboo_button' }) event.remove({ id: 'greate:mixing/integration/gtceu/mixer/fire_charge' }) - event.remove({ id: 'toomanyrecipeviewers:/greate/milling/integration/gtceu/macerator/macerate_cocoa' }) + event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_cocoa' }) event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_honeycomb' }) event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_honeycomb_block'}) event.remove({ id: 'greate:milling/integration/gtceu/macerator/quartz_sand_from_sand' }) diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js index 9624a3cd3..09f9e62f1 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js @@ -565,9 +565,12 @@ function processGems(event, material) { } const amount = getMaterialAmount(TagPrefix.block, material); - event.recipes.greate.pressing(ChemicalHelper.get(TagPrefix.gem, material, amount), ChemicalHelper.get(TagPrefix.block, material, 1)) - .recipeTier(0) - .id(`greate:pressing/unpacking_${materialName}_block`) + const block = ChemicalHelper.get(TagPrefix.block, material, 1); + if (!block.isEmpty()) { + event.recipes.greate.pressing(ChemicalHelper.get(TagPrefix.gem, material, amount), block) + .recipeTier(0) + .id(`greate:pressing/unpacking_${materialName}_block`) + } event.recipes.tfc.quern(ChemicalHelper.get(TagPrefix.dust, material, 1), gemItem) .id(`tfg:quern/${materialName}_gem_to_dust`) From 22262aac785853992c2a485692841634f7ef8a21 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 28 Jan 2026 00:21:42 +0000 Subject: [PATCH 60/66] alternative for lv hermetic casing --- kubejs/server_scripts/tfg/machines/recipes.bakelite.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/kubejs/server_scripts/tfg/machines/recipes.bakelite.js b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js index 92262887e..271f10084 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.bakelite.js +++ b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js @@ -103,4 +103,13 @@ function registerTFGBakeliteRecipes(event) { .itemOutputs('gtceu:lv_machine_hull') .duration(50) .EUt(16) + + event.shaped('gtceu:lv_hermetic_casing', [ + 'AAA', + 'ABA', + 'AAA' + ], { + A: '#forge:plates/steel', + B: '#forge:storage_blocks/bakelite' + }).tfg('tfg:shaped/lv_hermetic_casing_bakelite') } \ No newline at end of file From ec477c70d8540dd2243c5ebf7112de7b9eb54e4a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 28 Jan 2026 00:54:03 +0000 Subject: [PATCH 61/66] flying up high enough now sends you into orbit --- kubejs/data/simplystacked/config/glacio_to_orbit.json | 8 ++++++++ kubejs/data/simplystacked/config/mars_to_orbit.json | 8 ++++++++ kubejs/data/simplystacked/config/mercury_to_orbit.json | 8 ++++++++ kubejs/data/simplystacked/config/overworld_to_orbit.json | 8 ++++++++ kubejs/data/simplystacked/config/venus_to_orbit.json | 8 ++++++++ 5 files changed, 40 insertions(+) create mode 100644 kubejs/data/simplystacked/config/glacio_to_orbit.json create mode 100644 kubejs/data/simplystacked/config/mars_to_orbit.json create mode 100644 kubejs/data/simplystacked/config/mercury_to_orbit.json create mode 100644 kubejs/data/simplystacked/config/overworld_to_orbit.json create mode 100644 kubejs/data/simplystacked/config/venus_to_orbit.json diff --git a/kubejs/data/simplystacked/config/glacio_to_orbit.json b/kubejs/data/simplystacked/config/glacio_to_orbit.json new file mode 100644 index 000000000..b8b694ae7 --- /dev/null +++ b/kubejs/data/simplystacked/config/glacio_to_orbit.json @@ -0,0 +1,8 @@ +{ + "from": "ad_astra:glacio", + "to": "ad_astra:glacio_orbit", + "from_y_min": 500, + "from_y_max": 600, + "to_y": -64, + "cloud_platform": false +} \ No newline at end of file diff --git a/kubejs/data/simplystacked/config/mars_to_orbit.json b/kubejs/data/simplystacked/config/mars_to_orbit.json new file mode 100644 index 000000000..e6f441294 --- /dev/null +++ b/kubejs/data/simplystacked/config/mars_to_orbit.json @@ -0,0 +1,8 @@ +{ + "from": "ad_astra:mars", + "to": "ad_astra:mars_orbit", + "from_y_min": 500, + "from_y_max": 600, + "to_y": -64, + "cloud_platform": false +} \ No newline at end of file diff --git a/kubejs/data/simplystacked/config/mercury_to_orbit.json b/kubejs/data/simplystacked/config/mercury_to_orbit.json new file mode 100644 index 000000000..c17b6f585 --- /dev/null +++ b/kubejs/data/simplystacked/config/mercury_to_orbit.json @@ -0,0 +1,8 @@ +{ + "from": "ad_astra:mercury", + "to": "ad_astra:mercury_orbit", + "from_y_min": 500, + "from_y_max": 600, + "to_y": -64, + "cloud_platform": false +} \ No newline at end of file diff --git a/kubejs/data/simplystacked/config/overworld_to_orbit.json b/kubejs/data/simplystacked/config/overworld_to_orbit.json new file mode 100644 index 000000000..2255822cf --- /dev/null +++ b/kubejs/data/simplystacked/config/overworld_to_orbit.json @@ -0,0 +1,8 @@ +{ + "from": "minecraft:overworld", + "to": "ad_astra:earth_orbit", + "from_y_min": 500, + "from_y_max": 600, + "to_y": -64, + "cloud_platform": false +} \ No newline at end of file diff --git a/kubejs/data/simplystacked/config/venus_to_orbit.json b/kubejs/data/simplystacked/config/venus_to_orbit.json new file mode 100644 index 000000000..3860a103c --- /dev/null +++ b/kubejs/data/simplystacked/config/venus_to_orbit.json @@ -0,0 +1,8 @@ +{ + "from": "ad_astra:venus", + "to": "ad_astra:venus_orbit", + "from_y_min": 500, + "from_y_max": 600, + "to_y": -64, + "cloud_platform": false +} \ No newline at end of file From 5504e548eb6b822a9943f49af0ad618962eec541 Mon Sep 17 00:00:00 2001 From: ashlen Date: Wed, 28 Jan 2026 01:55:19 +0100 Subject: [PATCH 62/66] feat: add food automation quest (#2888) --- .../quests/chapters/queststfc_tips.snbt | 36 +++++++++++++++++++ kubejs/assets/tfg/lang/en_us.json | 3 ++ 2 files changed, 39 insertions(+) diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index ed36edbd7..6628a862d 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -2158,6 +2158,42 @@ x: 0.0d y: -10.5d } + { + dependencies: ["30DD0DDF86C96926", "1F41C35890E2C44F"] + dependency_requirement: "one_completed" + description: ["{quests.tfg_tips.food_automation.desc}"] + icon: "tfg:lv_food_oven" + id: "46111F4D970EE3C5" + optional: true + subtitle: "{quests.tfg_tips.food_automation.subtitle}" + tasks: [ + { + id: "770BC20A8062A6BD" + item: "tfg:lv_food_processor" + optional_task: true + type: "item" + } + { + id: "3EB084CA435F8C19" + item: "tfg:lv_food_oven" + optional_task: true + type: "item" + } + { + id: "150B81D83DFFB9A1" + item: "gtceu:lv_robot_arm" + optional_task: true + type: "item" + } + { + id: "2332EB45D64DB9FB" + type: "checkmark" + } + ] + title: "{quests.tfg_tips.food_automation.title}" + x: 0.0d + y: -12.0d + } ] subtitle: ["{quests.tfg_tips.subtitle}"] title: "{quests.tfg_tips}" diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index ff499df4f..db382add8 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -4866,6 +4866,9 @@ "quests.tfg_tips.greenhouse_automation.title": "Greenhouse Automation", "quests.tfg_tips.greenhouse_automation.subtitle": "By your powers combined...", "quests.tfg_tips.greenhouse_automation.desc": "With the combination of Firmalife's &2Picker&r and &2Sweeper&r, Create's Deployers, and GregTech's Item Collectors, it's possible to completely automate your greenhouse!\n\nPickers will pull mature crops from Hydroponic Planters and Quad Planters when they receive a redstone pulse, while Sweepers will harvest mature crops from the other types in a 3x3 area around it while connected to a redstone signal.\n\nThese machines will produce loose items, but an Item Collector will suck those up in a large area around it.\n\nFrom there, pipe the seeds back into Deployers to plant them in the Planters!", + "quests.tfg_tips.food_automation.title": "Food Automation", + "quests.tfg_tips.food_automation.subtitle": "Automate your kitchen.", + "quests.tfg_tips.food_automation.desc": "You can completely automate food starting from &7LV&r using the &3Food Oven&r and &3Food Processor&r.\n\nTo properly make food out of multiple ingredients in a Food Processor, such as sandwiches, you will have to use the &3Robot Arm&r with the \"Keep Exact\" button enabled (or have your Create logstics deliver exact amounts to your machines).\n\nTo prevent spoiled food from filling up your storage you should use the &3Rotten Voiding Cover&r.\n\nThis will later pair nicely with a refrigerator in &bMV&r.", "quests.tfg_tips.beekeeping.title": "Beekeeping", "quests.tfg_tips.beekeeping.subtitle": "They're so small now...", "quests.tfg_tips.beekeeping.desc": "&bBeekeeping&r has a plethora of uses. Not only do bees fertilize nearby crops (assuming you have the correct trait), you will be able to obtain useful resources such as &aWax&r and &aHoney.&r Breed bees to achieve better stats.\nThe &2Field Guide&r offers an extensive explanation of all &bbeekeeping&r mechanics.", From f0a2f5651052ce58b35ca0e6bb11b12a5a91f269 Mon Sep 17 00:00:00 2001 From: Petr211071 <55793813+Petr211071@users.noreply.github.com> Date: Wed, 28 Jan 2026 23:58:29 +0300 Subject: [PATCH 63/66] Ru ru translation (#2893) * Delete Bread * Blast furnace and bloomery --- .../entries/mechanics/blast_furnace.json | 68 +++++++++++++++++++ .../ru_ru/entries/mechanics/bloomery.json | 6 +- .../ru_ru/entries/mechanics/bread.json | 55 --------------- 3 files changed, 71 insertions(+), 58 deletions(-) create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/blast_furnace.json delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bread.json diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/blast_furnace.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/blast_furnace.json new file mode 100644 index 000000000..712207330 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/blast_furnace.json @@ -0,0 +1,68 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "name": "Доменная печь", + "category": "tfc:mechanics", + "icon": "tfc:blast_furnace", + "pages": [ + { + "type": "patchouli:text", + "text": "$(thing)Доменная печь$() — это продвинутая установка, используемая для создания $(thing)Стали$(). Смешивая $(l:getting_started/finding_ores)Железные руды$(), $(l:tfg_tips/basic_automation)Кокс$() или $(l:beneath/ores_and_minerals#cursecoal)Антрацит$(), и $(thing)флюс$() в контролируемой горячей среде, вы можете создать металл, прочнее чугуна или кованого железа.$(br2)Чтобы получить доменную печь, вам сначала понадобится $(l:mechanics/crucible)Тигель$() и много $(thing)листов кованного железа$()." + }, + { + "type": "patchouli:crafting", + "recipe": "tfc:crafting/blast_furnace", + "text": "Для создания самой доменной печи потребуется $(thing)Тигель$(), а также несколько $(thing)двойных пластин кованого железа$()." + }, + { + "type": "patchouli:text", + "text": "Затем вам нужно будет построить доменную печь вместе с ее $(thing)Дымоходом$(). Дымоход должен быть составлен из $(l:mechanics/fire_clay#fire_bricks)Огнеупорных кирпичей$(), так как они достаточно прочны, чтобы выдержать интенсивный жар. Затем его следует выложить $(thing)пластинами из кованного железа$() для дополнительного укрепления. Пластины могут быть применены к наружним сторонам кирпичей при нажатии $(item)$(k:key.sneak)$() + $(item)$(k:key.use)$() с пластиной в руке, или скрафчены в $(l:mechanics/blast_furnace_insulation)Изоляцию для доменной печи$()." + }, + { + "type": "patchouli:multiblock", + "multiblock_id": "tfc:blast_furnace", + "name": "Доменная печь", + "text": "Доменная печь с дымоходом минимальной высоты.", + "enable_visualize": true + }, + { + "type": "patchouli:text", + "text": "Дымоход доменной печи может состоять из пяти слоев - каждый слой требует четыре $(thing)Огнеупорных кирпичей$() и двенадцати $(thing)Кованых железных листов$(), для завершения строительства. Наличие большего количества слоев увеличивает общую вместимость доменной печи, позволяя плавить больше стали за один раз. Каждый слой дымохода (максимум - пять слоёв), позволяет доменной печи вмещать на четыре дополнительных предмета руды больше." + }, + { + "type": "patchouli:text", + "text": "Чтобы использовать доменную печь, вы должны бросить предметы в верхнюю часть дымохода - для производства стали, вы должны добавить равное количество предметов $(l:getting_started/finding_ores)Железных руд$() и $(l:mechanics/flux)флюса$(). Подойдут любые железные руды или предметы, которые могут плавиться в $(thing)Чугун$(). Вам также нужно будет добавить $(l:tfg_tips/basic_automation)Кокс$() или $(l:beneath/ores_and_minerals#cursecoal)Антрацит$(), который будет расходоваться по мере работы доменной печи." + }, + { + "type": "patchouli:text", + "text": "Использование доменной печи откроет интерфейс печи, показанный справа. В этом интерфейсе вы увидите индикаторы содержания руды и топлива доменной печи. В верхнем правом слоте должна находиться $(thing)Фурма$(), металлическая труба, используемая для направления воздуха в высокую печь, необходимая для достижения максимальных температур для плавки стали. Фурму можно выковать на $(l:mechanics/anvils)Наковальне$()." + }, + { + "type": "patchouli:image", + "images": [ + "tfc:textures/gui/book/gui/blast_furnace.png" + ], + "text": "Интерфейс доменной печи", + "border": false + }, + { + "type": "patchouli:text", + "text": "Вам также понадобятся $(l:mechanics/bellows)Меха$(), чтобы доменная печь достигла температуры, при которой железо расплавится. Его можно установить на любой из четырех сторон доменной печи." + }, + { + "type": "patchouli:multiblock", + "multiblock_id": "tfc:full_blast_furnace", + "name": "", + "text": "Доменная печь полного размера с прикрепленными мехами и тиглем.", + "enable_visualize": true + }, + { + "type": "patchouli:text", + "text": "Наконец, чтобы начать, зажгите доменную печь с помощью $(l:getting_started/firepit#firestarter)Примитивного огнива$() или $(thing)Стального огнива$(). Она начнет нагревать руды внутри. Убедитесь, что в доменной печи остаётся топливо, и используйте меха, чтобы нагнетать воздух в печь после того, как ее внутренняя температура достигнет максимума, который может выдать уголь. После нагрева руды внутри, она расплавится и превратится в $(l:mechanics/steel)Чугун$()." + }, + { + "type": "patchouli:text", + "text": "Жидкий металл будет стекать в любой металлический контейнер для жидкости, установленный непосредственно под доменной печью, такой как $(l:mechanics/crucible)Тигель$(). Его можно отлить в формы для слитков из выходного слота тигля и переработать в $(l:mechanics/steel)Сталь$()." + } + ], + "read_by_default": true +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bloomery.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bloomery.json index 2965665dd..edf100f4e 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bloomery.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bloomery.json @@ -22,19 +22,19 @@ }, { "type": "patchouli:text", - "text": "Сыродутный горн вмещает до 48 $(thing)Предметов$(), по 16 за каждый уровень камина. Чтобы добавить уровней дымоходу, поставьте ещё два слоя из каменный блоков.$(br2)Чтобы добавить предметы в горн, заберитесь наверх и закиньте их внутрь, после чего на их месте образуется серая масса." + "text": "Сыродутный горн вмещает до 48 $(thing)Предметов$(), по 16 за каждый уровень камина. Чтобы добавить уровней дымоходу, поставьте ещё два слоя из каменный блоков.$(br2)Чтобы добавить предметы в горн, заберитесь наверх и закиньте их внутрь, после чего на их месте образуется серая масса.$(br2Ты можешь использовть так и $(item)Древесный уголь$(), так и $(item)Уголь$() в качестве топлива для горна." }, { "type": "patchouli:image", "images": [ "tfc:textures/gui/book/tutorial/bloomery_hole.png" ], - "text": "Добавление предметов в доменную печь.", + "text": "Горну требуется $(thing)1 Древесный уголь$(), и $(thing)144 Л (mB) Железной руды$() чтобы создать 1 $(thing)Крицу$().", "border": true }, { "type": "patchouli:text", - "text": "Горну требуется $(thing)1 Древесный уголь$(), и $(thing)144 Л (mB) Железной руды$() чтобы создать 1 $(thing)Крицу$(). После заполнения горна смесью $(thing)Древесного угля$() и $(thing)Руды$(), зажгите двери горна и подождите 15 минут, пока руда плавится. Когда горн потухает, он создаёт блок $(thing)Крицы$(). Эти блоки содержат $(thing)Кричное железо$(), которое можно добыть повторно ломая блок $(thing)Крицы$() киркой или молотом." + "text": "Если тебе лень считать, мы рекомендуем использовать $(item)25 пыли рудного железа$() и $(item)22 топлива$(). После заполнения горна смесью $(thing)топлива$() и $(thing)Руды$(), зажгите двери горна и подождите 15 минут, пока руда плавится. Когда горн потухает, он создаёт блок $(thing)Крицы$(). Эти блоки содержат $(thing)Кричное железо$(), которое можно добыть повторно ломая блок $(thing)Крицы$() киркой." }, { "type": "patchouli:multiblock", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bread.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bread.json deleted file mode 100644 index bd3de7807..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/mechanics/bread.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "name": "Хлеб", - "category": "tfc:mechanics", - "icon": "tfc:textures/item/food/barley_bread.png", - "pages": [ - { - "type": "patchouli:text", - "text": "Хлеб - это обработанная форма различных зерновых культур, таких как $(l:mechanics/crops#barley)Ячмень$(). Сбор зерновой культуры дает сырой, необработанный зерновой предмет, который сам по себе не пригоден для использования. Его необходимо переработать в $(thing)Хлеб$(), который затем можно есть или использовать в $(l:mechanics/sandwiches)Бутербродах$()." - }, - { - "type": "patchouli:crafting", - "recipe": "tfc:crafting/barley_cutting", - "text": "Сначала, срежьте солому с еды с помощью $(thing)Ножа$()." - }, - { - "type": "patchouli:spotlight", - "item": "tfc:food/rye_grain", - "link_recipes": false, - "text": "Зерна - это самая долговечная стадия процесса, они портятся гораздо медленнее, чем большинство продуктов. Само по себе свежее зерно хранится 10 месяцев и 7 дней. В маленьком сосуде оно хранится 1 год, 9 месяцев и 7 дней." - }, - { - "type": "tfc:quern_recipe", - "recipe": "tfc:quern/oat_grain", - "text": "Затем зерно должно быть перемолото в $(l:mechanics/quern)жернове$(), чтобы получить муку." - }, - { - "type": "patchouli:crafting", - "recipe": "tfc:crafting/dough/barley_dough_1", - "text": "Тесто готовится путем добавления ведра $(thing)Свежей воды$() к муке." - }, - { - "type": "tfc:heat_recipe", - "recipe": "tfc:heating/barley_dough", - "text": "Затем тесто можно $(l:mechanics/heating)нагреть$(), чтобы сделать хлеб. На этом этапе его также можно использовать в $(l:mechanics/sandwiches)Бутербродах$()." - } - ], - "read_by_default": true, - "extra_recipe_mappings": { - "tag:tfc:sandwich_bread": 0, - "tag:tfc:foods/dough": 0, - "tfc:food/barley_grain": 0, - "tfc:food/maize_grain": 0, - "tfc:food/oat_grain": 0, - "tfc:food/rice_grain": 0, - "tfc:food/rye_grain": 0, - "tfc:food/wheat_grain": 0, - "tfc:food/barley_flour": 0, - "tfc:food/maize_flour": 0, - "tfc:food/oat_flour": 0, - "tfc:food/rice_flour": 0, - "tfc:food/rye_flour": 0, - "tfc:food/wheat_flour": 0 - } -} \ No newline at end of file From 025921aece525faa31a9995a0dcfda34eb0a4bf2 Mon Sep 17 00:00:00 2001 From: Yan <115050813@qq.com> Date: Thu, 29 Jan 2026 04:59:46 +0800 Subject: [PATCH 64/66] Update zh_cn translation for tfg patchouli book (#2894) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: update zh_cn translation for new drinkings * feat: update zh_cn lang for patchouli book * feat: update zh_cn translation for tfg patchouli_book --------- Co-authored-by: 闫茂源 --- .../zh_cn/entries/beneath/curious_blocks.json | 5 + .../zh_cn/entries/mechanics/crops.json | 1142 +++++++++-------- .../zh_cn/entries/the_world/wild_crops.json | 661 ++++++++++ 3 files changed, 1243 insertions(+), 565 deletions(-) create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/the_world/wild_crops.json diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/curious_blocks.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/curious_blocks.json index 73f70cb95..90c7f8230 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/curious_blocks.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/beneath/curious_blocks.json @@ -13,6 +13,11 @@ "recipe": "tfg:shapeless/hellbricks_from_soot", "text": "地狱砖是一种建筑方块，也用于地狱熔炉建造。" }, + { + "type": "patchouli:spotlight", + "item": "beneath:ancient_altar", + "text": "辉石岩基座可用于展示你想炫耀的物品！" + }, { "type": "patchouli:crafting", "recipe": "beneath:crafting/blackstone_brick", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json index 3d67d0e77..2dad79376 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/mechanics/crops.json @@ -14,172 +14,33 @@ }, { "type": "tfc:rock_knapping_recipe", - "recipes": [ - "tfg:rock_knapping/stone_hoe_head_1" - ], + "title": "Contents", "text": "要开始，首先通过$(thing)打制石器$()做一把$(thing)石锄$()" }, { "type": "patchouli:crafting", - "recipe": "tfc:crafting/stone/hoe_sedimentary", "text": "将锄头与木棍合成一把锄。$(br2)锄的功能与原版相同，$(item)$(k:key.use)$()点击泥土方块即可将其转化为$(thing)耕地$()。它还可以用于将$(thing)缠根泥土$()转化为$(thing)土$()。" }, { "type": "patchouli:text", - "text": "所有作物都需要种植在耕地上才能生长。有些作物还有额外的要求，比如只能种在水里或者需要插一根木棍才能生长。$(br2)作物不需要$(thing)营养物质$()就能生长，但营养物质能加速其成熟。营养物质分为三种：$(b)氮$()、$(6)磷$()和$(d)钾$()。每种作物都有一种偏爱的养分。", - "title": "种植作物" + "recipes": [ + "tfg:rock_knapping/stone_hoe_head_1" + ], + "text": "所有作物都需要种植在耕地上才能生长。有些作物还有额外的要求，比如只能种在水里或者需要插一根木棍才能生长。$(br2)作物不需要$(thing)营养物质$()就能生长，但营养物质能加速其成熟。营养物质分为三种：$(b)氮$()、$(6)磷$()和$(d)钾$()。每种作物都有一种偏爱的养分。" }, { "type": "patchouli:text", + "recipe": "tfc:crafting/stone/hoe_sedimentary", "text": "消耗偏爱的营养物质可以加速作物的生长，并提高收获时的产量。作物消耗耕地中的某种营养物质的同时，会小幅产出其他两种营养物质。$(br2)接下来的几页会列出群峦传说中所有的作物。" }, { "type": "patchouli:text", - "anchor": "barley", "text": "$(bold)$(l:the_world/climate#temperature)温度$()：-8 - 26 °C$(br)$(bold)$(l:mechanics/hydration)湿度$()：18 - 75 %$(br)$(bold)营养物质$()：氮$(br2)大麦是一种一格高的农作物。种植大麦会产出$(thing)大麦$()和$(thing)大麦种子$()。", "title": "大麦" }, { "type": "tfc:multimultiblock", - "text": "", - "multiblocks": [ - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=0]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=1]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=2]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=3]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=4]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=5]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=6]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/barley[age=7]", - "Y": "tfc:farmland/loam" - } - } - ] + "text": "" }, { "type": "patchouli:text", @@ -497,15 +358,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/maize[age=0,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/maize[age=0,part=bottom]" } }, { @@ -518,15 +375,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/maize[age=1,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/maize[age=1,part=bottom]" } }, { @@ -539,15 +392,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/maize[age=2,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/maize[age=2,part=bottom]" } }, { @@ -560,15 +409,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/maize[age=3,part=top]", - "Y": "tfc:crop/maize[age=3,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/maize[age=3,part=bottom]" } }, { @@ -581,15 +426,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/maize[age=4,part=top]", - "Y": "tfc:crop/maize[age=4,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/maize[age=4,part=bottom]" } }, { @@ -602,15 +443,45 @@ ], [ "Z" + ] + ], + "mapping": { + "X": "tfc:crop/maize[age=5,part=top]", + "Y": "tfc:crop/maize[age=5,part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" ], [ "0" ] ], "mapping": { - "X": "tfc:crop/maize[age=5,part=top]", - "Y": "tfc:crop/maize[age=5,part=bottom]", - "Z": "tfc:farmland/loam" + "X": "tfc:crop/rye[age=6]", + "Y": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/rye[age=7]", + "Y": "tfc:farmland/loam" } } ] @@ -633,13 +504,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=0]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } }, { @@ -650,13 +525,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=1]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } }, { @@ -667,13 +546,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=2]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } }, { @@ -684,13 +567,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=3]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } }, { @@ -701,13 +588,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=4]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } }, { @@ -718,47 +609,17 @@ [ "Y" ], + [ + "0" + ], [ "0" ] ], "mapping": { "X": "tfc:crop/wheat[age=5]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/wheat[age=6]", - "Y": "tfc:farmland/loam" - } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/wheat[age=7]", - "Y": "tfc:farmland/loam" + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" } } ] @@ -1022,6 +883,40 @@ "X": "tfc:crop/beet[age=5]", "Y": "tfc:farmland/loam" } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/rice[age=6,fluid=water]", + "Y": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/rice[age=7,fluid=water]", + "Y": "tfc:farmland/loam" + } } ] }, @@ -1233,6 +1128,23 @@ "X": "tfc:crop/carrot[age=4]", "Y": "tfc:farmland/loam" } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/cabbage[age=5]", + "Y": "tfc:farmland/loam" + } } ] }, @@ -1353,15 +1265,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/green_bean[age=0,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=0,part=bottom,stick=true]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/green_bean[age=0,part=bottom,stick=true]" } }, { @@ -1374,15 +1282,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/green_bean[age=1,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=1,part=bottom,stick=true]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/green_bean[age=1,part=bottom,stick=true]" } }, { @@ -1395,15 +1299,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/green_bean[age=2,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=2,part=bottom,stick=true]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/green_bean[age=2,part=bottom,stick=true]" } }, { @@ -1416,15 +1316,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/green_bean[age=3,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=3,part=bottom,stick=true]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/green_bean[age=3,part=bottom,stick=true]" } }, { @@ -1437,14 +1333,43 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/green_bean[age=4,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=4,part=bottom,stick=true]", + "Y": "tfc:crop/green_bean[age=4,part=bottom,stick=true]" + } + } + ] + }, + { + "type": "patchouli:text", + "anchor": "potato", + "text": "$(bold)$(l:the_world/climate#temperature)温度$()：-1 - 37 °C$(br)$(bold)$(l:mechanics/hydration)湿度$()：50 - 100 %$(br)$(bold)营养物质$()：钾$(br2)马铃薯是一种一格高的农作物。种植马铃薯会产出$(thing)马铃薯$()和$(thing)马铃薯种子$()。", + "title": "马铃薯" + }, + { + "type": "tfc:multimultiblock", + "text": "", + "multiblocks": [ + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/potato[age=0]", + "Y": "tfc:farmland/loam", "Z": "tfc:farmland/loam" } }, @@ -1457,15 +1382,15 @@ "Y" ], [ - "Z" + "0" ], [ "0" ] ], "mapping": { - "X": "tfc:crop/green_bean[age=5,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=5,part=bottom,stick=true]", + "X": "tfc:crop/potato[age=1]", + "Y": "tfc:farmland/loam", "Z": "tfc:farmland/loam" } }, @@ -1478,15 +1403,99 @@ "Y" ], [ - "Z" + "0" ], [ "0" ] ], "mapping": { - "X": "tfc:crop/green_bean[age=6,part=top,stick=true]", - "Y": "tfc:crop/green_bean[age=6,part=bottom,stick=true]", + "X": "tfc:crop/potato[age=2]", + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/potato[age=3]", + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/potato[age=4]", + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/potato[age=5]", + "Y": "tfc:farmland/loam", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/potato[age=6]", + "Y": "tfc:farmland/loam", "Z": "tfc:farmland/loam" } }, @@ -1515,9 +1524,9 @@ }, { "type": "patchouli:text", - "anchor": "potato", - "text": "$(bold)$(l:the_world/climate#temperature)温度$()：-1 - 37 °C$(br)$(bold)$(l:mechanics/hydration)湿度$()：50 - 100 %$(br)$(bold)营养物质$()：钾$(br2)马铃薯是一种一格高的农作物。种植马铃薯会产出$(thing)马铃薯$()和$(thing)马铃薯种子$()。", - "title": "马铃薯" + "anchor": "pumpkin", + "text": "$(bold)$(l:the_world/climate#temperature)温度$()：0 - 30 °C$(br)$(bold)$(l:mechanics/hydration)湿度$()：30 - 80 %$(br)$(bold)营养物质$()：磷$(br2)南瓜是一种爬行作物。种植在耕地上时，南瓜梗会在成熟后在相邻位置放置最多两颗$(thing)南瓜$()。南瓜梗在入冬前可结果多次。南瓜可以制作成$(l:mechanics/lighting#jack_o_lanterns)南瓜灯$()。", + "title": "南瓜" }, { "type": "tfc:multimultiblock", @@ -1526,10 +1535,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1543,10 +1552,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1560,10 +1569,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1577,10 +1586,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1594,10 +1603,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1611,10 +1620,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1628,10 +1637,10 @@ { "pattern": [ [ - "X" + " " ], [ - "Y" + "GGG" ], [ "0" @@ -1644,178 +1653,6 @@ } ] }, - { - "type": "patchouli:text", - "anchor": "pumpkin", - "text": "$(bold)$(l:the_world/climate#temperature)温度$()：0 - 30 °C$(br)$(bold)$(l:mechanics/hydration)湿度$()：30 - 80 %$(br)$(bold)营养物质$()：磷$(br2)南瓜是一种爬行作物。种植在耕地上时，南瓜梗会在成熟后在相邻位置放置最多两颗$(thing)南瓜$()。南瓜梗在入冬前可结果多次。南瓜可以制作成$(l:mechanics/lighting#jack_o_lanterns)南瓜灯$()。", - "title": "南瓜" - }, - { - "type": "tfc:multimultiblock", - "text": "", - "multiblocks": [ - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=0]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=1]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=2]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=3]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=4]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=5]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=6]", - "P": "minecraft:air" - } - }, - { - "pattern": [ - [ - " ", - " CP", - " " - ], - [ - "GGG", - "G0G", - "GGG" - ] - ], - "mapping": { - "G": "tfc:farmland/loam", - "0": "tfc:farmland/loam", - "C": "tfc:crop/pumpkin[age=7]", - "P": "tfc:pumpkin" - } - } - ] - }, { "type": "patchouli:text", "anchor": "melon", @@ -2001,120 +1838,161 @@ { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=0]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=0]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=1]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=1]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=2]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=2]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=3]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=3]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=4]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=4]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=5]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=5]", + "P": "minecraft:air" } }, { "pattern": [ [ - "X" + "X", + " CP", + " " ], [ - "Y" - ], - [ - "0" + "Y", + "G0G", + "GGG" ] ], "mapping": { - "X": "tfc:crop/red_bell_pepper[age=6]", - "Y": "tfc:farmland/loam" + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=6]", + "P": "minecraft:air" + } + }, + { + "pattern": [ + [ + " ", + " CP", + " " + ], + [ + "GGG", + "G0G", + "GGG" + ] + ], + "mapping": { + "G": "tfc:farmland/loam", + "0": "tfc:farmland/loam", + "C": "tfc:crop/melon[age=7]", + "P": "tfc:melon" } } ] @@ -2640,23 +2518,6 @@ "X": "tfc:crop/squash[age=6]", "Y": "tfc:farmland/loam" } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:crop/squash[age=7]", - "Y": "tfc:farmland/loam" - } } ] }, @@ -2680,15 +2541,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/sugarcane[age=0,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=0,part=bottom]" } }, { @@ -2701,15 +2558,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/sugarcane[age=1,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=1,part=bottom]" } }, { @@ -2722,15 +2575,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/sugarcane[age=2,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=2,part=bottom]" } }, { @@ -2743,15 +2592,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "minecraft:air", - "Y": "tfc:crop/sugarcane[age=3,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=3,part=bottom]" } }, { @@ -2764,15 +2609,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/sugarcane[age=4,part=top]", - "Y": "tfc:crop/sugarcane[age=4,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=4,part=bottom]" } }, { @@ -2785,15 +2626,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/sugarcane[age=5,part=top]", - "Y": "tfc:crop/sugarcane[age=5,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=5,part=bottom]" } }, { @@ -2806,15 +2643,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/sugarcane[age=6,part=top]", - "Y": "tfc:crop/sugarcane[age=6,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=6,part=bottom]" } }, { @@ -2827,15 +2660,11 @@ ], [ "Z" - ], - [ - "0" ] ], "mapping": { "X": "tfc:crop/sugarcane[age=7,part=top]", - "Y": "tfc:crop/sugarcane[age=7,part=bottom]", - "Z": "tfc:farmland/loam" + "Y": "tfc:crop/sugarcane[age=7,part=bottom]" } } ] @@ -3155,6 +2984,48 @@ "Y": "tfc:crop/jute[age=5,part=bottom]", "Z": "tfc:farmland/loam" } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/tomato[age=6,part=top,stick=true]", + "Y": "tfc:crop/tomato[age=6,part=bottom,stick=true]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:crop/tomato[age=7,part=top,stick=true]", + "Y": "tfc:crop/tomato[age=7,part=bottom,stick=true]", + "Z": "tfc:farmland/loam" + } } ] }, @@ -3298,11 +3169,13 @@ }, { "type": "patchouli:text", + "anchor": "papyrus", "text": "$(bold)$(l:the_world/climate#temperature)温度$()：5 - 40 °C$(br)$(bold)$(l:mechanics/hydration)湿度$()：20 - 80 %$(br)$(bold)营养物质$()：氮$(br2)向日葵是一种两格高的作物。向日葵种子可以种植在耕地上，生长到两格高，并生产可加工为$(thing)种子油$()的$(item)向日葵花盘$()。种子油既可用作灯油，也可在后期用于制作$(thing)生物柴油$()。$(br)在$(l:firmalife/beekeeping)养蜂$()系统中，向日葵同样被视为有效花源。", "title": "向日葵" }, { "type": "tfc:multimultiblock", + "text": "$(thing)野生向日葵$()生长于5°C至40°C的温度区间及100至450毫米的降雨环境。其种子亦可烘烤食用！", "multiblocks": [ { "pattern": [ @@ -3429,33 +3302,12 @@ "Y": "tfg:sunflower[age=5,part=bottom]", "Z": "tfc:farmland/loam" } - }, - { - "pattern": [ - [ - "X" - ], - [ - "Y" - ], - [ - "Z" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfg:sunflower[age=6,part=top]", - "Y": "tfg:sunflower[age=6,part=bottom]", - "Z": "tfc:farmland/loam" - } } - ], - "text": "$(thing)野生向日葵$()生长于5°C至40°C的温度区间及100至450毫米的降雨环境。其种子亦可烘烤食用！" + ] }, { "type": "patchouli:text", + "anchor": "sunflower", "text": "$(bold)$(l:the_world/climate#temperature)温度$(): -5 - 25 °C$(br)$(bold)$(l:mechanics/hydration)湿度$(): 10 - 60 %$(br)$(bold)营养物质$()：磷$(br2)油菜是一种两格高的作物。油菜种子可种植在耕地上，生长到两格高，并生产可加工为$(thing)种子油$()的$(item)油菜籽荚$()。种子油既可用作灯油，也可在后期用于制作$(thing)生物柴油$()。$(br)在$(l:firmalife/beekeeping)养蜂$()系统中，油菜同样被视为有效花源。", "title": "油菜" }, @@ -3610,11 +3462,11 @@ } } ], - "text": "$(thing)野生油菜$()（亦称$(thing)芸苔$()）生长于-7°C至25°C的温度区间及50至350毫米的降雨环境。", - "enable_visualize": false + "text": "$(thing)野生油菜$()（亦称$(thing)芸苔$()）生长于-7°C至25°C的温度区间及50至350毫米的降雨环境。" }, { "type": "patchouli:text", + "anchor": "canola", "text": "$(bold)$(l:the_world/climate#temperature)温度$()：5 - 37 °C$(br)$(bold)$(l:mechanics/hydration)湿度$()：25 - 100 %$(br)$(bold)营养物质$()：氮$(br2)亚麻是一种两格高的农作物。亚麻种子可以种植在耕地上，生长到两格高，并生产用于加工为$(thing)亚麻布$()的$(item)亚麻茎杆$()。$(br)在$(l:firmalife/beekeeping)养蜂$()系统中，亚麻同样被视为有效花源。", "title": "亚麻" }, @@ -3769,7 +3621,167 @@ } } ], - "text": "$(thing)野生亚麻$()生长于-5°C至23°C的温度区间及175至475毫米的降雨环境。" + "text": "$(thing)野生亚麻$()生长于-5°C至23°C的温度区间及175至475毫米的降雨环境。", + "enable_visualize": false + }, + { + "type": "patchouli:text", + "anchor": "flax", + "text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): -8 - 25 °C$(br)$(bold)$(l:mechanics/hydration)Hydration$(): 15 - 65 %$(br)$(bold)Nutrient$(): Nitrogen$(br2)Flax is a two block tall crop. Flax seeds can be planted on farmland, will grow two blocks tall, and will produce $(item)Flax Stems$() which can be processed into $(thing)Linen$() or $(thing)Burlap$().$(br)Flax also counts as a Flower for the purposes of $(l:firmalife/beekeeping)Beekeeping$().", + "title": "Flax" + }, + { + "type": "tfc:multimultiblock", + "multiblocks": [ + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "minecraft:air", + "Y": "tfg:flax[age=0,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "minecraft:air", + "Y": "tfg:flax[age=1,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "minecraft:air", + "Y": "tfg:flax[age=2,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "minecraft:air", + "Y": "tfg:flax[age=3,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfg:flax[age=4,part=top]", + "Y": "tfg:flax[age=4,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfg:flax[age=5,part=top]", + "Y": "tfg:flax[age=5,part=bottom]", + "Z": "tfc:farmland/loam" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "Z" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfg:flax[age=6,part=top]", + "Y": "tfg:flax[age=6,part=bottom]", + "Z": "tfc:farmland/loam" + } + } + ], + "text": "$(thing)Wild Flax$() grows between -5 and 23C, and 175 to 475mm of rainfall." } ], "read_by_default": true, diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/the_world/wild_crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/the_world/wild_crops.json new file mode 100644 index 000000000..5fcfe90ac --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/the_world/wild_crops.json @@ -0,0 +1,661 @@ +{ + "name": "野生作物", + "category": "tfc:the_world", + "icon": "tfc:textures/gui/book/icons/wild_crops.png", + "pages": [ + { + "type": "patchouli:text", + "text": "$(thing)野生作物$()可以在世界各地零星找到，它们以小片的形式生长。收获它们可以得到食物和种子，这些种子随后可以自行培育成非野生的形态。$(br2)你可以徒手，或者使用$(thing)小刀$()和其他锋利工具来收获野生作物。破坏时，它们会掉落$(thing)种子$()和一些$(thing)产物$()。" + }, + { + "type": "patchouli:multiblock", + "multiblock": { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/wheat[mature=true]" + } + }, + "name": "野生小麦", + "text": "例如$(l:mechanics/crops#wheat)小麦$()就是一种野生作物。", + "enable_visualize": false + }, + { + "type": "patchouli:text", + "text": "每一种可以培育的$(l:mechanics/crops)作物$()也都能在野外找到。野生作物看起来与人工培育的同类相似，但更隐蔽地生长在草丛中。野生作物仅在六月到十月间成熟。在其他月份，它们会呈现枯死状态，直到下一个夏季。" + }, + { + "type": "tfc:multimultiblock", + "text": "所有不同品种的野生作物", + "multiblocks": [ + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/barley" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/oat" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/rye" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/maize[part=top]", + "Y": "tfc:wild_crop/maize[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/barley" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/rice[fluid=water]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/beet" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/cabbage" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/carrot" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/garlic" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/green_bean[part=top]", + "Y": "tfc:wild_crop/green_bean[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/potato" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/onion" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/soybean" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/squash" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/sugarcane[part=top]", + "Y": "tfc:wild_crop/sugarcane[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/tomato[part=top]", + "Y": "tfc:wild_crop/tomato[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "Y" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/jute[part=top]", + "Y": "tfc:wild_crop/jute[part=bottom]" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/pumpkin" + } + }, + { + "pattern": [ + [ + "X" + ], + [ + "0" + ] + ], + "mapping": { + "X": "tfc:wild_crop/melon" + } + } + ] + }, + { + "type": "patchouli:text", + "text": "野生作物会在接近其可培育气候的区域生成，因此，如果你在寻找特定作物，请到该作物可以生长的气候区寻找。然而，与玩家种植的$(l:mechanics/crops)作物$()不同，野生作物不需要$(l:mechanics/hydration)水分$()。相反，它们的分布取决于该地区的平均$()温度$()和$()降雨量$()。", + "title": "寻找野生作物" + }, + { + "type": "patchouli:text", + "text": "接下来的页面展示了可找到野生作物的生长环境对照表。" + }, + { + "type": "tfc:table", + "strings": [ + { + "text": "作物", + "bold": true + }, + { + "text": "温度（°C）", + "bold": true + }, + { + "text": "降雨量（毫米）", + "bold": true + }, + { + "text": "大麦" + }, + { + "text": " -8 - 26" + }, + { + "text": " 70 - 310" + }, + { + "text": "燕麦" + }, + { + "text": " 3 - 40" + }, + { + "text": "140 - 400" + }, + { + "text": "黑麦" + }, + { + "text": "-11 - 30" + }, + { + "text": "100 - 350" + }, + { + "text": "玉米" + }, + { + "text": " 13 - 40" + }, + { + "text": "300 - 500" + }, + { + "text": "小麦" + }, + { + "text": " -4 - 35" + }, + { + "text": "100 - 400" + }, + { + "text": "水稻" + }, + { + "text": " 15 - 30" + }, + { + "text": "100 - 500" + }, + { + "text": "甜菜" + }, + { + "text": " -5 - 20" + }, + { + "text": " 70 - 300" + }, + { + "text": "卷心菜" + }, + { + "text": "-10 - 27" + }, + { + "text": " 60 - 280" + }, + { + "text": "胡萝卜" + }, + { + "text": " 3 - 30" + }, + { + "text": "100 - 400" + }, + { + "text": "大蒜" + }, + { + "text": "-20 - 18" + }, + { + "text": " 60 - 310" + }, + { + "text": "四季豆" + }, + { + "text": " 2 - 35" + }, + { + "text": "150 - 410" + }, + { + "text": "西瓜" + }, + { + "text": " 5 - 37" + }, + { + "text": "200 - 500" + } + ], + "text": "", + "title": "野生作物需求", + "legend": [], + "columns": 2, + "first_column_width": 80, + "column_width": 70, + "row_height": 10, + "left_buffer": 2, + "top_buffer": 12, + "draw_background": false + }, + { + "type": "patchouli:empty", + "draw_filler": false + }, + { + "type": "tfc:table", + "strings": [ + { + "text": "作物", + "bold": true + }, + { + "text": "温度（°C）", + "bold": true + }, + { + "text": "降雨量（毫米）", + "bold": true + }, + { + "text": "马铃薯" + }, + { + "text": " -1 - 37" + }, + { + "text": "200 - 410" + }, + { + "text": "南瓜" + }, + { + "text": " 0 - 30" + }, + { + "text": "120 - 390" + }, + { + "text": "洋葱" + }, + { + "text": " 0 - 30" + }, + { + "text": "100 - 390" + }, + { + "text": "大豆" + }, + { + "text": " 8 - 30" + }, + { + "text": "160 - 410" + }, + { + "text": "西葫芦" + }, + { + "text": " 5 - 33" + }, + { + "text": " 90 - 390" + }, + { + "text": "甘蔗" + }, + { + "text": " 12 - 38" + }, + { + "text": "160 - 500" + }, + { + "text": "番茄" + }, + { + "text": " 0 - 36" + }, + { + "text": "120 - 390" + }, + { + "text": "黄麻" + }, + { + "text": " 5 - 37" + }, + { + "text": "100 - 410" + }, + { + "text": "纸莎草" + }, + { + "text": " 19 - 37" + }, + { + "text": "310 - 500" + }, + { + "text": "红甜椒" + }, + { + "text": " 16 - 30" + }, + { + "text": "190 - 400" + }, + { + "text": "黄甜椒" + }, + { + "text": " 16 - 30" + }, + { + "text": "190 - 400" + }, + { + "text": "向日葵" + }, + { + "text": " 5 - 40" + }, + { + "text": "100 - 450" + } + ], + "text": "", + "title": "野生作物需求", + "legend": [], + "columns": 2, + "first_column_width": 80, + "column_width": 70, + "row_height": 10, + "left_buffer": 2, + "top_buffer": 12, + "draw_background": false + }, + { + "type": "patchouli:empty", + "draw_filler": false + }, + { + "type": "tfc:table", + "strings": [ + { + "text": "作物", + "bold": true + }, + { + "text": "温度（°C）", + "bold": true + }, + { + "text": "降雨量（毫米）", + "bold": true + }, + { + "text": "油菜" + }, + { + "text": " -5 - 25" + }, + { + "text": " 50 - 350" + }, + { + "text": "亚麻" + }, + { + "text": " -8 - 25" + }, + { + "text": "175 - 475" + } + ], + "text": "", + "title": "野生作物需求", + "legend": [], + "columns": 2, + "first_column_width": 80, + "column_width": 70, + "row_height": 10, + "left_buffer": 2, + "top_buffer": 12, + "draw_background": false + }, + { + "type": "patchouli:empty", + "draw_filler": false + } + ], + "read_by_default": true, + "sortnum": 4, + "extra_recipe_mappings": { + "tag:tfc:wild_crops": 0 + } +} \ No newline at end of file From 6c8931300a45932d4f7205e658d1228cbbd5456c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 28 Jan 2026 23:04:44 +0000 Subject: [PATCH 65/66] pakku, fix lv hermetic casing typo --- .../tfg/machines/recipes.bakelite.js | 2 +- pakku-lock.json | 115 +++++++++--------- 2 files changed, 57 insertions(+), 60 deletions(-) diff --git a/kubejs/server_scripts/tfg/machines/recipes.bakelite.js b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js index 271f10084..99ebb9b4c 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.bakelite.js +++ b/kubejs/server_scripts/tfg/machines/recipes.bakelite.js @@ -111,5 +111,5 @@ function registerTFGBakeliteRecipes(event) { ], { A: '#forge:plates/steel', B: '#forge:storage_blocks/bakelite' - }).tfg('tfg:shaped/lv_hermetic_casing_bakelite') + }).id('tfg:shaped/lv_hermetic_casing_bakelite') } \ No newline at end of file diff --git a/pakku-lock.json b/pakku-lock.json index d315e4777..28949f71e 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -7652,7 +7652,7 @@ "files": [ { "type": "modrinth", - "file_name": "ImmediatelyFast-Forge-1.5.3+1.20.4.jar", + "file_name": "ImmediatelyFast-Forge-1.5.4+1.20.4.jar", "mc_versions": [ "1.20", "1.20.1", @@ -7664,20 +7664,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/5ZwdcRci/versions/a4stvpj6/ImmediatelyFast-Forge-1.5.3+1.20.4.jar", - "id": "a4stvpj6", + "url": "https://cdn.modrinth.com/data/5ZwdcRci/versions/OomXW3xp/ImmediatelyFast-Forge-1.5.4+1.20.4.jar", + "id": "OomXW3xp", "parent_id": "5ZwdcRci", "hashes": { - "sha512": "ef57ecc7aa7138c1b06fac6d6b49707d6ef324b6220cd604f567cfdbabd5b9ca0e76a2a4ed354d08029976c773f40c65b7692372a3f70637d7ae446be2b3ace0", - "sha1": "d4695d013e9da7089e2906db3f56bc5398e478e2" + "sha512": "b4a30951b41367cbf6567e38d7ddada4a381b430e2bd2d2b01e195d1a8c434e9811af61b28962c1152bf5c669f3ede2551694df4e1b500b35cdf78178aa9e9f0", + "sha1": "e2e60485a0c3efa72f1948c952b095150e3ba4fc" }, "required_dependencies": [], - "size": 426980, - "date_published": "2025-12-09T20:19:33.206344Z" + "size": 538992, + "date_published": "2026-01-27T21:06:43.866649Z" }, { "type": "curseforge", - "file_name": "ImmediatelyFast-Forge-1.5.3+1.20.4.jar", + "file_name": "ImmediatelyFast-Forge-1.5.4+1.20.4.jar", "mc_versions": [ "1.20.2", "1.20.1", @@ -7689,16 +7689,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7313/94/ImmediatelyFast-Forge-1.5.3+1.20.4.jar", - "id": "7313094", + "url": "https://edge.forgecdn.net/files/7537/759/ImmediatelyFast-Forge-1.5.4+1.20.4.jar", + "id": "7537759", "parent_id": "686911", "hashes": { - "sha1": "d4695d013e9da7089e2906db3f56bc5398e478e2", - "md5": "1e5278b2585bab1db76d4b1ab61e82c1" + "sha1": "e2e60485a0c3efa72f1948c952b095150e3ba4fc", + "md5": "8fb21bb328cc322c6d9749eff087509f" }, "required_dependencies": [], - "size": 426980, - "date_published": "2025-12-09T20:19:33.393Z" + "size": 538992, + "date_published": "2026-01-27T21:06:43.760Z" } ] }, @@ -9558,7 +9558,7 @@ "files": [ { "type": "modrinth", - "file_name": "moonlight-1.20-2.16.23-forge.jar", + "file_name": "moonlight-1.20-2.16.27-forge.jar", "mc_versions": [ "1.20.1" ], @@ -9567,20 +9567,20 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/XCFIOCRA/moonlight-1.20-2.16.23-forge.jar", - "id": "XCFIOCRA", + "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/lrpPgviq/moonlight-1.20-2.16.27-forge.jar", + "id": "lrpPgviq", "parent_id": "twkfQtEc", "hashes": { - "sha512": "2baeeafd86a7df76b81d41cf20f6dde2f1ecfed3bfda19f299d6acd59fd52eedda47829b56ac0f4da4647e9f7be50a8ec6f677c421f91c0bb5c8f5f8d0710b49", - "sha1": "c63750ef54ac17d0dc1e58c246c6dac3d8d9ac87" + "sha512": "30b9a16c4643bbbf643304e14d524f72f7aa2343317ba40e136b88a433d2110dc727b7747003126dc9a220e18b5da69585b24c8b3135844ddeef07e5d6006afa", + "sha1": "0a1b384ec20d63e94c56123b53e264dc2afe5b17" }, "required_dependencies": [], - "size": 1390855, - "date_published": "2026-01-16T18:52:42.739110Z" + "size": 1392973, + "date_published": "2026-01-28T16:55:17.211884Z" }, { "type": "curseforge", - "file_name": "moonlight-1.20-2.16.23-forge.jar", + "file_name": "moonlight-1.20-2.16.27-forge.jar", "mc_versions": [ "1.20.1" ], @@ -9589,16 +9589,16 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7469/722/moonlight-1.20-2.16.23-forge.jar", - "id": "7469722", + "url": "https://edge.forgecdn.net/files/7541/536/moonlight-1.20-2.16.27-forge.jar", + "id": "7541536", "parent_id": "499980", "hashes": { - "sha1": "c63750ef54ac17d0dc1e58c246c6dac3d8d9ac87", - "md5": "a6659ba4650f16630293ce633c3ae4e7" + "sha1": "0a1b384ec20d63e94c56123b53e264dc2afe5b17", + "md5": "7e819bab11a4cf9973d0e24fb52c367b" }, "required_dependencies": [], - "size": 1390855, - "date_published": "2026-01-16T18:52:33.317Z" + "size": 1392973, + "date_published": "2026-01-28T16:55:09.907Z" } ] }, @@ -12911,31 +12911,7 @@ "files": [ { "type": "modrinth", - "file_name": "tfc_gurman-1.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "beta", - "url": "https://cdn.modrinth.com/data/ERme2o65/versions/NVqgySaW/tfc_gurman-1.3.0.jar", - "id": "NVqgySaW", - "parent_id": "ERme2o65", - "hashes": { - "sha512": "b82f4b893f85f152a305a9949df8a87337b2e1d75e80a1723c512de5ede3dfa056f17a2186511acf96556e4b5ce1b1c55927d6f97fabf109ac8fdf8ba20f197c", - "sha1": "c55512789128af89d57fe0c9a2f3b4d59a491724" - }, - "required_dependencies": [ - "JaCEZUhg", - "5bKeBHw2" - ], - "size": 542077, - "date_published": "2026-01-02T13:41:35.488377Z" - }, - { - "type": "curseforge", - "file_name": "tfc_gurman-1.3.0.jar", + "file_name": "tfc_gurman-1.4.1.jar", "mc_versions": [ "1.20.1" ], @@ -12943,19 +12919,40 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7408/157/tfc_gurman-1.3.0.jar", - "id": "7408157", + "url": "https://cdn.modrinth.com/data/ERme2o65/versions/zhoqj2Wr/tfc_gurman-1.4.1.jar", + "id": "zhoqj2Wr", + "parent_id": "ERme2o65", + "hashes": { + "sha512": "dbfa8e9423dc6bb4fa98a17b99478651b99081e4990f1b9f01bfc5ade6ec35955756f8c856d2bfd3f4865779aaff4a7c68b6bb3b7e93f397afbf407c83c992c3", + "sha1": "0be72570ba157b7600c3b9f4ea694744a227112a" + }, + "required_dependencies": [], + "size": 520225, + "date_published": "2026-01-28T01:09:39.160234Z" + }, + { + "type": "curseforge", + "file_name": "tfc_gurman-1.4.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/7538/795/tfc_gurman-1.4.1.jar", + "id": "7538795", "parent_id": "1363944", "hashes": { - "sha1": "c55512789128af89d57fe0c9a2f3b4d59a491724", - "md5": "fd8ba6a9ec34193beda55f5d34e359f1" + "sha1": "0be72570ba157b7600c3b9f4ea694744a227112a", + "md5": "d5734cf9b727fbb11b8025ceb26fe8aa" }, "required_dependencies": [ "302973", "453394" ], - "size": 542077, - "date_published": "2026-01-02T13:43:05.680Z" + "size": 520225, + "date_published": "2026-01-28T01:08:21.107Z" } ] }, From 34039b2517f3d60642fa0bf5f454eb3758668764 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 28 Jan 2026 23:05:13 +0000 Subject: [PATCH 66/66] langs --- kubejs/assets/ae2/lang/es_es.json | 23 +++ kubejs/assets/beneath/lang/es_es.json | 30 ++++ kubejs/assets/betterend/lang/es_es.json | 123 ++++++++++++++++ .../assets/createstockbridge/lang/en_us.json | 16 +++ .../assets/createstockbridge/lang/ru_ru.json | 16 +++ .../assets/createstockbridge/lang/zh_cn.json | 16 +++ kubejs/assets/gtceu/lang/zh_cn.json | 4 +- kubejs/assets/minecraft/lang/zh_cn.json | 3 +- kubejs/assets/tfg/lang/en_us.json | 5 +- kubejs/assets/tfg/lang/ru_ru.json | 30 ++-- kubejs/assets/tfg/lang/zh_cn.json | 132 +++++++++++------- 11 files changed, 331 insertions(+), 67 deletions(-) create mode 100644 kubejs/assets/ae2/lang/es_es.json create mode 100644 kubejs/assets/beneath/lang/es_es.json create mode 100644 kubejs/assets/betterend/lang/es_es.json create mode 100644 kubejs/assets/createstockbridge/lang/en_us.json create mode 100644 kubejs/assets/createstockbridge/lang/ru_ru.json create mode 100644 kubejs/assets/createstockbridge/lang/zh_cn.json diff --git a/kubejs/assets/ae2/lang/es_es.json b/kubejs/assets/ae2/lang/es_es.json new file mode 100644 index 000000000..7ca1fbcfd --- /dev/null +++ b/kubejs/assets/ae2/lang/es_es.json @@ -0,0 +1,23 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "gui.ae2.inWorldCraftingPresses": "Las prensas de fabricación son obtenidas al romper un cubo misterioso. Los cubos misteriosos se ubican en el centro de meteoritos los cuales pueden ser hallados en La Luna.", + "gui.advanced_ae.AdvPatternProvider": "", + "gui.expandedae.exp_pattern_provider": "", + "item.ae2.sky_dust": "Polvo de suevita", + "block.ae2.sky_stone_block": "Suevita en bruto", + "block.ae2.sky_stone_stairs": "Escaleras de suevita", + "block.ae2.sky_stone_wall": "Muro de suevita", + "block.ae2.sky_stone_slab": "Losa de suevita", + "block.ae2.smooth_sky_stone_block": "Suevita lisa", + "block.ae2.smooth_sky_stone_stairs": "Escaleras de suevita lisas", + "block.ae2.smooth_sky_stone_wall": "Muro de suevita liso", + "block.ae2.smooth_sky_stone_slab": "Losa de suevita lisa", + "block.ae2.sky_stone_brick": "Ladrillos de suevita", + "block.ae2.sky_stone_brick_stairs": "Escaleras de ladrillos de suevita", + "block.ae2.sky_stone_brick_wall": "Muro de ladrillos de suevita", + "block.ae2.sky_stone_brick_slab": "Losa de ladrillos de suevita", + "block.ae2.sky_stone_small_brick": "Ladrillos pequeños de suevita", + "block.ae2.sky_stone_small_brick_stairs": "Escaleras de ladrillos pequeños de suevita", + "block.ae2.sky_stone_small_brick_wall": "Muro de ladrillos pequeños de suevita", + "block.ae2.sky_stone_small_brick_slab": "Losa de ladrillos pequeños de suevita" +} \ No newline at end of file diff --git a/kubejs/assets/beneath/lang/es_es.json b/kubejs/assets/beneath/lang/es_es.json new file mode 100644 index 000000000..e87d2d8ce --- /dev/null +++ b/kubejs/assets/beneath/lang/es_es.json @@ -0,0 +1,30 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.beneath.blackstone_pebble": "Piroxenita suelta", + "block.beneath.blackstone_aqueduct": "Acueducto de piroxenita", + "block.beneath.loose_blackstone": "Piroxenita suelta", + "block.beneath.ore.nether_cursecoal": "Mena de antracita de migmatita", + "block.beneath.ore.nether_cursecoal.prospected": "Antracita", + "block.beneath.cursecoal_pile": "Pila de antracita", + "block.beneath.ore.blackstone_sylvite": "Mena de silvina de piroxenita", + "block.beneath.crackrack": "Queratofira en bruto", + "block.beneath.soul_clay": "Arcilla fangosa", + "block.beneath.wood.log.crimson": "Tallo carmesí", + "block.beneath.wood.stripped_log.crimson": "Tallo carmesí pelado", + "block.beneath.wood.wood.crimson": "Hifas carmesí", + "block.beneath.wood.stripped_wood.crimson": "Hifas carmesí peladas", + "block.beneath.wood.fallen_leaves.crimson": "Lamella carmesí caída", + "block.beneath.wood.leaves.crimson": "Lamella carmesí", + "block.beneath.wood.log.warped": "Tallo distorsionado", + "block.beneath.wood.stripped_log.warped": "Tallo distorsionado pelado", + "block.beneath.wood.wood.warped": "Hifas distorsionadas", + "block.beneath.wood.stripped_wood.warped": "Hifas distorsionadas peladas", + "block.beneath.wood.fallen_leaves.warped": "Lamella distorsionada caída", + "block.beneath.wood.leaves.warped": "Lamella distorsionada", + "block.beneath.ancient_altar": "Pedestal de piroxenita", + "item.beneath.cursed_hide": "Piel ignífuga", + "item.beneath.blackstone_brick": "Ladrillo de piroxenita", + "item.beneath.cursecoal": "Antracita", + "item.beneath.crackrack_rock": "Roca de queratofiro", + "item.beneath.loose_blackstone": "Piroxenita suelta" +} \ No newline at end of file diff --git a/kubejs/assets/betterend/lang/es_es.json b/kubejs/assets/betterend/lang/es_es.json new file mode 100644 index 000000000..b20b22cf0 --- /dev/null +++ b/kubejs/assets/betterend/lang/es_es.json @@ -0,0 +1,123 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.betterend.aeridium": "Erídio", + "block.betterend.amaranita_stem": "Tallo de amaranita", + "block.betterend.amber_grass": "Césped de ámbar", + "block.betterend.amber_root_wild": "Brotes de ámbar silvestres", + "block.betterend.amber_root_dead": "Brotes de ámbar secos", + "block.betterend.amber_root": "Brotes de ámbar", + "block.betterend.aurant_polypore": "Poliporo áureo", + "block.betterend.blooming_cooksonia": "Coccionia floreciente", + "block.betterend.blossom_berry": "Bayaflor", + "block.betterend.blossom_berry_wild": "Bayaflor silvestre", + "block.betterend.blossom_berry_dead": "Bayaflor seca", + "block.betterend.bolux_mushroom": "Colonia de hongos Bolux", + "block.betterend.bolux_mushroom_wild": "Colonia de hongos Bolux silvestre", + "block.betterend.bolux_mushroom_dead": "Colonia de hongos Bolux seca", + "block.betterend.brimstone": "Azufrita", + "block.betterend.bushy_grass": "Hierbanueva", + "block.betterend.bulb_moss": "Musgo bulboso", + "block.betterend.cave_bush": "Lamella carmín", + "block.betterend.cave_bush_fallen": "Lamela carmín pequeña", + "block.betterend.cave_grass": "Vermiligma", + "block.betterend.cave_pumpkin": "Bulbo cavernario", + "block.betterend.cave_pumpkin_wild": "Tallo de bulbo cavernario silvestre", + "block.betterend.cave_pumpkin_dead": "Tallo de bulbo cavernario seco", + "block.betterend.cave_pumpkin_plant": "Tallo de bulbo cavernario", + "block.betterend.charnia_cyan": "Carnia cián", + "block.betterend.charnia_green": "Carnia verde", + "block.betterend.charnia_light_blue": "Carnia verdácea", + "block.betterend.charnia_orange": "Carnia naranja", + "block.betterend.charnia_purple": "Carnia morada", + "block.betterend.charnia_red": "Carnia roja", + "block.betterend.chorus_grass": "Hierba coral", + "block.betterend.chorus_lily": "Lirio coral", + "block.betterend.chorus_mushroom": "Colonia de hongos Calmia", + "block.betterend.chorus_mushroom_wild": "Colonia de hongos Calmia silvestre", + "block.betterend.chorus_mushroom_dead": "Colonia de hongos Calmia seca", + "block.betterend.clawfern": "Helecho acerado", + "block.betterend.crystal_grass": "Hierba cristalina", + "block.betterend.end_lily": "Lirio de Deimos", + "block.betterend.end_lily_seed": "Brote de lirio de Deimos", + "block.betterend.end_lotus_flower": "Flor de loto de Fobos", + "block.betterend.end_lotus_leaf": "Hoja de loto de Fobos", + "block.betterend.end_lotus_stem": "Tallo de loto de Fobos", + "block.betterend.end_lotus_seed": "Brote de loto de Fobos", + "block.betterend.filalux_wings": "Alas filalúceas", + "block.betterend.flamaea": "Hongo flamigero", + "block.betterend.flammalix": "Hongo flamante", + "block.betterend.flavolite": "Lucitita en bruto", + "block.betterend.flavolite_bricks": "Ladrillos de lucitita", + "block.betterend.flavolite_pillar": "Pilar de lucitita", + "block.betterend.flavolite_polished": "Lucitita pulida", + "block.betterend.flavolite_tiles": "Baldosas de lucitita", + "block.betterend.fracturn": "Fracturno", + "block.betterend.glacian_hymenophore": "Himenóforo glacial", + "block.betterend.globulagus": "Globulago", + "block.betterend.hydrothermal_vent": "Ventilación térmica", + "block.betterend.hydralux": "Hidralúz", + "block.betterend.hydralux_sapling": "Brote de hidralúz", + "block.betterend.inflexia": "Inflexia", + "block.betterend.lacugrove": "Alga lacustre", + "block.betterend.lacugrove_bark": "Adaquita en bruto", + "block.betterend.lamellarium": "Lamellaria", + "block.betterend.lanceleaf": "Hoja lanceolada", + "block.betterend.lanceleaf_small": "Daga de hoja lanceolada", + "block.betterend.large_amaranita_mushroom": "Hongo de amaranita grande", + "block.betterend.lucernia_leaves": "Lamella de lucernia", + "block.betterend.lucernia_leaves_fallen": "Lamella de lucernia pequeña", + "block.betterend.lucernia_outer_leaves": "Hifas de lucernia", + "block.betterend.lucernia_bark": "Chapitel siniestro", + "block.betterend.lutebus": "Lutebio", + "block.betterend.magnula": "Magnulea", + "block.betterend.nightshade_moss": "Musgo de Nox", + "block.betterend.orango": "Orango", + "block.betterend.pond_anemone": "Anemona", + "block.betterend.purple_polypore": "Poliporo morado", + "block.betterend.rubinea": "Rubineda", + "block.betterend.ruscus": "Hierba de rusco", + "block.betterend.salteago": "Salteago", + "block.betterend.sandy_jadestone": "Lamprita en bruto", + "block.betterend.sandy_jadestone_bricks": "Ladrillos de lamprita", + "block.betterend.sandy_jadestone_pillar": "Pilar de lamprita", + "block.betterend.sandy_jadestone_polished": "Lamprita pulida", + "block.betterend.sandy_jadestone_tiles": "Baldosa de lamprita", + "block.betterend.selagine": "Selegina", + "block.betterend.shadow_berry": "Bayas de Nox", + "block.betterend.shadow_berry_wild": "Bayas de Nox silvestres", + "block.betterend.shadow_berry_dead": "Bayas de Nox secas", + "block.betterend.small_amaranita_mushroom": "Hongo de Amaranita pequeño", + "block.betterend.sulphur_crystal": "Cristal de azufre", + "block.betterend.sulphuric_rock": "Ignimbrita en bruto", + "block.betterend.sulphuric_rock_bricks": "Ladrillos de ignimbrita", + "block.betterend.sulphuric_rock_pillar": "Pilar de ignimbrita", + "block.betterend.sulphuric_rock_polished": "Ignimbrita pulida", + "block.betterend.sulphuric_rock_tiles": "Baldosa de ignimbrita", + "block.betterend.tube_worm": "Gusano de tubo", + "block.betterend.twisted_moss": "Musgo distorsionado", + "block.betterend.twisted_umbrella_moss": "Musgo paraguas distorsionado", + "block.betterend.twisted_umbrella_moss_tall": "Musgo paraguas distorsionado", + "block.betterend.twisted_vine": "Enredadera distorsionada", + "block.betterend.umbrella_moss": "Musgo paraguas", + "block.betterend.umbrella_moss_tall": "Musgo paraguas", + "block.betterend.vaiolush_fern": "Helecho vaciluceo", + "item.betterend.amber_root_product": "Brotes de ámbar", + "item.betterend.amber_root_seeds": "Semillas de brotes de ámbar", + "item.betterend.blossom_berry_product": "Bayaflor", + "item.betterend.blossom_berry_seeds": "Semillas de bayaflor", + "item.betterend.bolux_mushroom_cooked": "Hongo de Bolux cocinado", + "item.betterend.bolux_mushroom_product": "Hongo de Bolux", + "item.betterend.bolux_mushroom_seeds": "Esporas de hongos de Bolux", + "item.betterend.cave_pumpkin_chunks": "Porciones de bulbo cavernario", + "item.betterend.cave_pumpkin_product": "Bulbo cavernario", + "item.betterend.cave_pumpkin_plant_seeds": "Semillas de bulbo cavernario", + "item.betterend.cave_pumpkin_pie_dough": "Masa de bulbo cavernario", + "item.betterend.cave_pumpkin_pie_raw": "Pastel de bulbo cavernario crudo", + "item.betterend.cave_pumpkin_pie": "Pastel de bulbo cavernario", + "item.betterend.chorus_mushroom_cooked": "Hongo Calmia cocinado", + "item.betterend.chorus_mushroom_product": "Hongo Calmia", + "item.betterend.chorus_mushroom_seeds": "Esporas de hongo Calmia", + "item.betterend.shadow_berry_cooked": "Baya de Nox cocinada", + "item.betterend.shadow_berry_product": "Baya de Nox", + "item.betterend.shadow_berry_seeds": "Semillas de baya de Nox" +} \ No newline at end of file diff --git a/kubejs/assets/createstockbridge/lang/en_us.json b/kubejs/assets/createstockbridge/lang/en_us.json new file mode 100644 index 000000000..3fc0dec6e --- /dev/null +++ b/kubejs/assets/createstockbridge/lang/en_us.json @@ -0,0 +1,16 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.createstockbridge.ae_bridge": "AE Stock Bridge", + "gui.createstockbridge.address": "Package Address:", + "gui.stockbridge.remote_items": "Create Stock System Items", + "tooltip.stockbridge.remote_item": "Item in Remote System", + "item.createstockbridge.request_pattern": "Request Pattern", + "createstockbridge.ponder.ae_stockbridge.header": "Connecting the Stock System to AE", + "createstockbridge.ponder.ae_stockbridge.text_1": "AE Stock Bridge links the Create Stock system with AE", + "createstockbridge.ponder.ae_stockbridge.text_2": "Right-Click to bind to the stock network before placing", + "createstockbridge.ponder.ae_stockbridge.text_3": "Set the AE Stock Bridge address to match the Frogport address", + "createstockbridge.ponder.ae_stockbridge.text_4": "AE", + "createstockbridge.ponder.ae_stockbridge.text_5": "AE", + "createstockbridge.ponder.ae_stockbridge.text_6": "AE can request items by 'crafting'", + "createstockbridge.ponder.ae_stockbridge.text_7": "Create can request stored items from AE" +} \ No newline at end of file diff --git a/kubejs/assets/createstockbridge/lang/ru_ru.json b/kubejs/assets/createstockbridge/lang/ru_ru.json new file mode 100644 index 000000000..e6a799fb7 --- /dev/null +++ b/kubejs/assets/createstockbridge/lang/ru_ru.json @@ -0,0 +1,16 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.createstockbridge.ae_bridge": "AE Мост-хранилище", + "gui.createstockbridge.address": "Адрес пакета:", + "gui.stockbridge.remote_items": "Предметы системы Create Stock", + "tooltip.stockbridge.remote_item": "Предмет в удалённой системе", + "item.createstockbridge.request_pattern": "Шаблон запроса", + "createstockbridge.ponder.ae_stockbridge.header": "Подключение системы Stock к AE", + "createstockbridge.ponder.ae_stockbridge.text_1": "AE Мост-хранилище связывает систему Create Stock с AE", + "createstockbridge.ponder.ae_stockbridge.text_2": "ПКМ для привязки к сети Stock перед установкой", + "createstockbridge.ponder.ae_stockbridge.text_3": "Настройте адрес AE Моста-хранилища так, чтобы он совпадал с адресом Frogport", + "createstockbridge.ponder.ae_stockbridge.text_4": "AE", + "createstockbridge.ponder.ae_stockbridge.text_5": "AE", + "createstockbridge.ponder.ae_stockbridge.text_6": "AE может запрашивать предметы через 'крафт'", + "createstockbridge.ponder.ae_stockbridge.text_7": "Create может запрашивать хранящиеся предметы из AE" +} \ No newline at end of file diff --git a/kubejs/assets/createstockbridge/lang/zh_cn.json b/kubejs/assets/createstockbridge/lang/zh_cn.json new file mode 100644 index 000000000..b243f3a6f --- /dev/null +++ b/kubejs/assets/createstockbridge/lang/zh_cn.json @@ -0,0 +1,16 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.createstockbridge.ae_bridge": "AE仓储桥接器", + "gui.createstockbridge.address": "包裹地址：", + "gui.stockbridge.remote_items": "机械动力仓储系统物品", + "tooltip.stockbridge.remote_item": "位于远端系统的物品", + "item.createstockbridge.request_pattern": "请求样板", + "createstockbridge.ponder.ae_stockbridge.header": "将仓储系统连接至应用能源", + "createstockbridge.ponder.ae_stockbridge.text_1": "AE仓储桥接器可让机械动力的仓储系统与应用能源（AE）相连", + "createstockbridge.ponder.ae_stockbridge.text_2": "放置前需先右击绑定库存网络", + "createstockbridge.ponder.ae_stockbridge.text_3": "为蛙港和AE仓储桥接器设置相同的地址", + "createstockbridge.ponder.ae_stockbridge.text_4": "AE", + "createstockbridge.ponder.ae_stockbridge.text_5": "AE", + "createstockbridge.ponder.ae_stockbridge.text_6": "AE可以通过“自动合成”请求物品", + "createstockbridge.ponder.ae_stockbridge.text_7": "机械动力可以请求AE系统中的物品" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index ede962ce3..61fd14ab4 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -190,10 +190,12 @@ "block.gtceu.wire_coil.tooltip_cracking": "§8裂化机，月壤和紫金采集器：§r", "tooltip.moldraw.shift_view_molecule": "§7§o按住(Shift)查看分子结构§r", "tooltip.moldraw.shift_view_alloy": "§7§o按住(Shift)查看合金成分§r", + "gtceu.medical_condition.antidote.description.effect_removed": "上述疾病效果持续时间降低%s%%", + "gtceu.medical_condition.antidote.description.effect_removed.all": "消除上述所有疾病效果", "gtceu.greenhouse": "电力温室", "gtceu.steam_bloomery": "蒸汽锻铁炉", "gtceu.food_oven": "电烤箱", - "gtceu.food_processor": "食物处理机", + "gtceu.food_processor": "食品加工机", "gtceu.large_solar_panel": "大型太阳能阵列 MK I", "gtceu.large_solar_panel_tier2": "大型太阳能阵列 MK II", "gtceu.large_solar_panel_tier3": "大型太阳能阵列 MK III", diff --git a/kubejs/assets/minecraft/lang/zh_cn.json b/kubejs/assets/minecraft/lang/zh_cn.json index 9249a8440..f44571d73 100644 --- a/kubejs/assets/minecraft/lang/zh_cn.json +++ b/kubejs/assets/minecraft/lang/zh_cn.json @@ -103,5 +103,6 @@ "item.minecraft.milk_bucket": "牛奶桶", "material.tfg.dripstone": "石灰华", "death.attack.magic": "%1$s 被毒死了", - "death.attack.magic.player": "%1$s在试图逃离%2$s时被毒死了" + "death.attack.magic.player": "%1$s在试图逃离%2$s时被毒死了", + "effect.minecraft.dolphins_grace": "游泳速度" } \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index ff499df4f..103ffd610 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -3188,7 +3188,7 @@ "quests.low_voltage.bakelite.desc.1": "Your first Polymer! Simply mix Phenolic Resin with either Asbestos or Treated Chipboard Composite to finish it.\n\nYou'll be using Bakelite for crafting both Phenolic Circuit Boards and MV Machine Hulls, so making a big batch of it is a good idea, though you'll replace it with Polyethylene in &bMV&r.\n\nYou now also have access to a cheaper recipe for ULV and LV Machine Hulls!", "quests.low_voltage.bakelite.desc.2": "&l&3Lore:&r&o Bakelite is the first plastic made from synthetic components. The award for first plastic ever goes to Parkesine, but that requires Nitrocellulose which is a long long chain of recipes to craft - too long for LV.\n\nThe second ever plastic is Galalith, created with milk proteins and formaldehyde, but milk is difficult to automate.", "quests.low_voltage.lv_forming_press.subtitle": "The Forming Press forms...", - "quests.low_voltage.lv_forming_press.desc": "This machine usually isn't used for much, but in TFG it can do TFC Welding recipes if you still need access to them for any reason. It can also easily duplicate any extruder or casting mold.\n\nMore pressingly (pun intended), you'll need it to craft an essential component for your next circuits, the &aPhenolic Circuit Board&r.", + "quests.low_voltage.lv_forming_press.desc": "This machine usually isn't used for much, but in TFG it can do TFC Welding recipes if you still need access to them for any reason. It can also easily duplicate any extruder or casting mold.\n\nMore pressingly (pun intended), you'll need it to craft an essential component for your next circuits, the &aPhenolic Circuit Board&r.\n\nYou'll gain access to a cheaper recipe once you're in &bMV&r.", "quests.low_voltage.lv_laser_engraver.subtitle": "Pew pew!", "quests.low_voltage.lv_laser_engraver.desc": "The Basic Laser Engraver is required to make Transmitters for Create's logistics system. Other than that, it unfortunately can't do much other than make polished stone.\n\nYou'll deal with lasers more once you get to &bMV&r.", "quests.medium_voltage": "&bMV&r - Medium Voltage", @@ -4866,6 +4866,9 @@ "quests.tfg_tips.greenhouse_automation.title": "Greenhouse Automation", "quests.tfg_tips.greenhouse_automation.subtitle": "By your powers combined...", "quests.tfg_tips.greenhouse_automation.desc": "With the combination of Firmalife's &2Picker&r and &2Sweeper&r, Create's Deployers, and GregTech's Item Collectors, it's possible to completely automate your greenhouse!\n\nPickers will pull mature crops from Hydroponic Planters and Quad Planters when they receive a redstone pulse, while Sweepers will harvest mature crops from the other types in a 3x3 area around it while connected to a redstone signal.\n\nThese machines will produce loose items, but an Item Collector will suck those up in a large area around it.\n\nFrom there, pipe the seeds back into Deployers to plant them in the Planters!", + "quests.tfg_tips.food_automation.title": "Food Automation", + "quests.tfg_tips.food_automation.subtitle": "Automate your kitchen.", + "quests.tfg_tips.food_automation.desc": "You can completely automate food starting from &7LV&r using the &3Food Oven&r and &3Food Processor&r.\n\nTo properly make food out of multiple ingredients in a Food Processor, such as sandwiches, you will have to use the &3Robot Arm&r with the \"Keep Exact\" button enabled (or have your Create logstics deliver exact amounts to your machines).\n\nTo prevent spoiled food from filling up your storage you should use the &3Rotten Voiding Cover&r.\n\nThis will later pair nicely with a refrigerator in &bMV&r.", "quests.tfg_tips.beekeeping.title": "Beekeeping", "quests.tfg_tips.beekeeping.subtitle": "They're so small now...", "quests.tfg_tips.beekeeping.desc": "&bBeekeeping&r has a plethora of uses. Not only do bees fertilize nearby crops (assuming you have the correct trait), you will be able to obtain useful resources such as &aWax&r and &aHoney.&r Breed bees to achieve better stats.\nThe &2Field Guide&r offers an extensive explanation of all &bbeekeeping&r mechanics.", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index 16c1b92fd..95f8aaeec 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -878,22 +878,18 @@ "item.tfg.unfinished_inscriber_accumulation_press": "Незаконченный аккумулирующий пресс", "item.tfg.brick.deepslate": "Мигматитовый кирпич", "item.tfg.brick.dripstone": "Травертиновый кирпич", - "item.tfg.loose.moon_stone": "Камешек анортозита", "item.tfg.brick.moon_stone": "Анортозитовый кирпич", - "item.tfg.loose.moon_deepslate": "Камешек норита", "item.tfg.brick.moon_deepslate": "Норитовый кирпич", - "item.tfg.loose.mars_stone": "Камешек аргиллита", "item.tfg.brick.mars_stone": "Аргиллитовый кирпич", - "item.tfg.loose.venus_stone": "Камушек трахита", "item.tfg.brick.venus_stone": "Трахитовый кирпич", - "item.tfg.loose.mercury_stone": "Камушек коматиита", "item.tfg.brick.mercury_stone": "Коматиитовый кирпич", - "item.tfg.loose.glacio_stone": "Камушек фонолита", "item.tfg.brick.glacio_stone": "Фонолитовый кирпич", - "item.tfg.loose.permafrost": "Permafrost Chunk", "item.tfg.brick.permafrost": "Кирпич вечной мерзлоты", - "item.tfg.loose.red_granite": "Камушек красного гранита", "item.tfg.brick.red_granite": "Кирпич красного гранита", + "item.tfg.brick.sandy_jadestone": "Лампроитовый кирпич", + "item.tfg.brick.flavolite": "Игнимбритовый кирпич", + "item.tfg.brick.scoria": "Кирпич из пепла", + "item.tfg.brick.scorchia": "Кирпич из тёмного пепла", "item.tfg.terra_firma_greg": "TerraFirmaGreg", "item.tfg.scaffolding_frame": "Обшивка строительных лесов", "item.tfg.airship_hull": "Корпус дирижабля", @@ -1206,10 +1202,12 @@ "item.tfg.fish_roe": "Икра %s", "item.tfg.rotten_voiding_cover": "Удаление гнили(Улучшение)", "item.tfg.flora_pellets": "Растительные гранулы", + "item.tfg.magnesia_refractory_brick_ingot": "Склеенный смолой магнезиальный огнеупорный кирпич", "material.tfg.latex": "Латекс", "material.tfg.vulcanized_latex": "Вулканизированный латекс", "material.tfg.fluix": "Флюис", "material.tfg.conifer_pitch": "Хвойная смола", + "material.tfg.pyrogallol": "Пирогаллол", "material.gtceu.lactose": "Лактоза", "material.tfg.gabbro": "Габбро", "material.tfg.shale": "Сланец", @@ -1408,6 +1406,8 @@ "ore_vein.tfg.normal_copper": "Медь и Халькопирит", "ore_vein.tfg.normal_garnet_tin": "Гранатовый и Касситеритовый песок", "ore_vein.tfg.normal_garnierite": "Гарниерит и Кобальтит", + "ore_vein.tfg.normal_garnierite.emi.0": "Подсказка: Габбро всегда находится", + "ore_vein.tfg.normal_garnierite.emi.1": "под Базальтом.", "ore_vein.tfg.normal_gold": "Золото, Лимонит и Гематит", "ore_vein.tfg.normal_graphite": "Графит и Алмаз", "ore_vein.tfg.normal_gypsum": "Гипс и Кальцит", @@ -1423,6 +1423,8 @@ "ore_vein.tfg.normal_olivine": "Бентонит и Оливин", "ore_vein.tfg.normal_quartz": "Кварцы", "ore_vein.tfg.normal_redstone": "Редстоун, Киноварь и Рубин", + "ore_vein.tfg.normal_redstone.emi.0": "Подсказка: Гранит всегда находится", + "ore_vein.tfg.normal_redstone.emi.1": "под Риолитом.", "ore_vein.tfg.normal_salt": "Соли и Бура", "ore_vein.tfg.normal_saltpeter": "Селитра и Электротин", "ore_vein.tfg.normal_silver": "Серебро, Галена и Свинец", @@ -1529,9 +1531,10 @@ "ore_vein.tfg.nether_sulfur": "Сера и Пирит", "ore_vein.tfg.nether_tetrahedrite": "Тетраэдрит", "ore_vein.tfg.nether_topaz": "Топаз и Халькозин", - "ore_vein.tfg.venus_manual_salt": "Salts & Spodumene", - "ore_vein.tfg.venus_manual_salt.emi.0": "Only in Salt Flats.", + "ore_vein.tfg.venus_manual_salt": "Соли и Cподумен", + "ore_vein.tfg.venus_manual_salt.emi.0": "Только в Соляных равнинах.", "ore_vein.tfg.venus_manual_sulfur": "Сера и Пирит", + "ore_vein.tfg.venus_manual_sulfur.emi.0": "Только в Сернистое ущелье.", "tfg.creative_tab.tfg": "TerraFirmaGreg", "tfg.disabled_portal": "Магия портала заблокирована неизвестной силой, попробуйте получить доступ к измерению поднявшись в небо или спустившись в глубины.", "tfg.tooltip.food_trait.refrigerating": "§bОхлаждённое", @@ -1603,7 +1606,6 @@ "trim_material.tfc.salt_tfc": "Соль", "trim_material.tfc.sapphire_tfc": "Сапфир", "trim_material.tfc.sodalite_tfc": "Содалит", - "trim_material.tfc.coke_tfc": "Кокс", "trim_material.tfc.armalcolite_tfc": "Армальколит", "trim_material.tfc.spessartine_tfc": "Спасерит", "trim_material.tfc.topaz_tfc": "Топаз", @@ -1706,6 +1708,7 @@ "tfg.tooltip.hotornot_hot_equipment": "§7Дает защиту от всех §6горячих§7 предметов, жидкостей и труб.§r", "tfg.tooltip.hotornot_cold_equipment": "§7Дает защиту от всех §bхолодных§7 предметов, жидкостей и труб.§r", "tfg.tooltip.hotornot_floating_equipment": "§7Дает защиту от всех §eлегче воздуха§7 газов.§r", + "tfg.tooltip.polycaprolactam": "Также известный как Нейлон", "tfg.tooltip.machine.one_energy_hatch": "Принимает ровно §6один§r энергетический разъём.", "tfg.tooltip.machine.two_energy_hatches": "Принимает до §6двух§r энергетических разъёма.", "tfg.tooltip.machine.subtick": "Эта машина §2Сабтик§r!", @@ -1754,6 +1757,8 @@ "tfg.tooltip.component.nuclear_turbine_2": "Каждый держатель ротора выше §5EV§r §7добавляет§r 10% эффективности и умножает EU/t на 2.", "tfg.tooltip.component.smr_generator_1": "§eПроиводит:§r 4096 EU/t", "tfg.tooltip.component.smr_generator_2": "Предназначен для производства энергии из sCO2 с использованием малого модульного реактора.\n Используйте смазку и Ускоритель для повышения эффективности и управления охлаждением ММР.", + "tfg.tooltip.show_recipes": "Показать рецепты", + "emi.category.tfg.artisan_table": "Ремесленный стол", "tfg.gui.refrigerator.unify_dates.enabled": "Объединение сроков годности: §aВкл.", "tfg.gui.refrigerator.unify_dates.disabled": "Объединение сроков годности: §cВыкл.", "tfg.machine.food_refrigerator_power_usage": "§7Потребляет§r %s EU/t §7во время работы, чтобы сохранить вашу еду.§r", @@ -1972,6 +1977,7 @@ "quests.ae2.interface_automation.title": "Автоматизация интерфейса", "quests.ae2.interface_automation.desc": "Лучший способ пассивно маршрутизировать предметы и жидкости по базе — использовать &bМЭ интерфейс&r. Поскольку интерфейсы не выталкивают своё содержимое, тебе потребуется установить улучшения машин на машину или трубу.\n\nНе забудь включить опцию &eРазрешить ввод со стороны выхода&r на выходной стороне в интерфейсе машины GregTech, чтобы можно было и забирать, и вставлять предметы с одной и той же стороны.\n\nИспользование фильтров на крышках также может быть удобным способом, чтобы несколько машин забирали предметы из одного и того же интерфейса.\n\nЧтобы избежать переполнения входных слотов предметов в машине, тебе нужно использовать улучшение машины \"Роботизированный манипулятор\" в режиме &eПоддерживать ровно&r с фильтром.\n\nС вводом жидкостей такой проблемы нет, так как он автоматически заполняет только один слот.", "quests.ae2.crafting_accelerator.desc": "Просто воспользуйся внутриигровым руководством — оно объяснит всё гораздо лучше, чем мы когда-либо смогли бы в рамках задания.\n\nНе спеши и внимательно прочитай его — это отличный источник информации!", + "quests.ae2.export_bus.title": "МЭ шина экспорта", "quests.ae2.export_bus.desc": "&dМЭ шина экспорта&r — это мощный инструмент для вывода предметов или жидкостей из твоей &dМЭ сети&r.\nКак только у тебя появится возможность их крафтить, особенно обрати внимание на варианты из &eExtendedAE&r — они могут сильно помочь с автоматизацией.\n\n&cВажно&r: они оказывают значительно большее &4влияние на TPS&r, чем, например, MЭ интерфейсы, поэтому использовать их стоит умеренно.", "quests.ae2.export_bus.task": "Любая шина экспорта", "quests.ae2.import_bus.desc": "&dМЭ шина импорта&r — это один из способов ввода предметов и жидкостей в твою &dМЭ сеть&r. Впрочем, для того же результата ты можешь просто отправлять предметы и жидкости в интерфейс или поставщик шаблонов, поэтому шины импорта используются более нишево.\n\n&cВажно&r: они оказывают значительно большее &4влияние на TPS&r, чем, например, МЭ-интерфейсы, поэтому использовать их стоит умеренно.", @@ -2000,6 +2006,8 @@ "quests.ae2.universal_circuits.title": "Универсальные схемы", "quests.ae2.universal_circuits.subtitle": "Так вот для чего они!", "quests.ae2.universal_circuits.desc": "Вы когда-нибудь задумывались, для чего нужны Универсальные схемы? Помимо красивых значков заданий, они в основном используются в AE2!\n\nAE2 плохо обрабатывает теги предметов в шаблонах, поэтому универсальные схемы разработаны для использования в любых шаблонах, требующих схем. Таким образом, всякий раз, когда вы открываете новый тип схемы, вам нужно добавить только один шаблон, чтобы преобразовать новую схему в универсальную, вместо обновления &oвсехl& ваших старых шаблонов!", + "quests.ae2.stock_bridge.title": "AE Мост-хранилище", + "quests.ae2.stock_bridge.desc": "Если вы вложили много сил в логистическую сеть Create, мысль о необходимости её снести и заменить на AE2 может привести в отчаяние. &bМост-хранилище&r служит связующим звеном между вашей ME-сетью и сетью Create. Ознакомьтесь с его Ponder-сценарием, чтобы узнать, как его настроить.\n\nМы всё же рекомендуем со временем перенести старые системы на AE2 — в основном из-за значительно меньшей нагрузки на производительность игры.", "quests.ae2.iv.title": "AE2 уровня IV", "quests.ae2.iv.desc": "Вся эта ветка становится полностью доступной, как только ты достигнешь &1IV&r.", "quests.ae2.accumulation_press.desc": "Чтобы получить этот &eНовый пресс для вырезателя&r, тебе придётся немного инвестировать.\n\nВо-первых, нужно улучшить свой имплозионный компрессор, установив в него &5два энергетических люка EV&r.\n\nЗатем обзавестись новым IV лазерным гравировщиком, если у тебя его ещё нет.\n\nИ наконец, подготовь много промышленного динамита — для этого процесса подходит &cтолько он&r.\n\nПланируй всё заранее, так как этот этап довольно требовательный!", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index c40e74d68..291c2fe7e 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -581,14 +581,14 @@ "block.tfg.zpm_aqueous_accumulator": "§c精英蓄水器 III§r", "block.tfg.uv_aqueous_accumulator": "§3终极蓄水器§r", "block.tfg.electric_greenhouse": "电力温室", - "block.tfg.lv_food_processor": "基础食物处理机", - "block.tfg.mv_food_processor": "§b高级食物处理机§r", - "block.tfg.hv_food_processor": "§6高级食物处理机 II§r", - "block.tfg.ev_food_processor": "§5高级食物处理机 III§r", - "block.tfg.iv_food_processor": "§9精英食物处理机§r", - "block.tfg.luv_food_processor": "§d精英食物处理机 II§r", - "block.tfg.zpm_food_processor": "§c精英食物处理机 III§r", - "block.tfg.uv_food_processor": "§3终极食物处理机§r", + "block.tfg.lv_food_processor": "基础食品加工机", + "block.tfg.mv_food_processor": "§b高级食品加工机§r", + "block.tfg.hv_food_processor": "§6高级食品加工机 II§r", + "block.tfg.ev_food_processor": "§5高级食品加工机 III§r", + "block.tfg.iv_food_processor": "§9精英食品加工机§r", + "block.tfg.luv_food_processor": "§d精英食品加工机 II§r", + "block.tfg.zpm_food_processor": "§c精英食品加工机 III§r", + "block.tfg.uv_food_processor": "§3终极食品加工机§r", "block.tfg.lv_food_oven": "基础电烤箱", "block.tfg.mv_food_oven": "§b进阶电烤箱§r", "block.tfg.hv_food_oven": "§6进阶电烤箱 II§r", @@ -1296,6 +1296,7 @@ "item.tfg.fish_roe": "%s鱼卵", "item.tfg.rotten_voiding_cover": "腐烂物销毁覆盖板", "item.tfg.flora_pellets": "植物颗粒", + "item.tfg.magnesia_refractory_brick_ingot": "树脂结合镁质耐火砖", "material.tfg.latex": "乳胶", "material.tfg.vulcanized_latex": "硫化乳胶", "material.tfg.fluix": "福鲁伊克斯", @@ -1471,6 +1472,13 @@ "material.tfg.chloroplasts": "叶绿体", "material.tfg.nitrate_rich_water": "富硝酸水", "material.tfg.nitrate_rich_semiheavy_ammoniacal_water": "富硝酸半重氨水", + "material.tfg.weak_red_steel": "脆红钢", + "material.tfg.weak_blue_steel": "脆蓝钢", + "material.tfg.refractory_clay": "耐火黏土", + "material.tfg.bakelite": "电木", + "material.tfg.phenolic_resin": "酚醛树脂", + "material.tfg.magnesium_hydroxide": "氢氧化镁", + "material.tfg.magnesia_refractory_brick": "树脂结合镁质耐火砖", "ore_vein.tfg.deep_sheldonite": "硫铂矿, 斑铜矿", "ore_vein.tfg.deep_garnet_amethyst": "紫水晶, 石榴石", "ore_vein.tfg.deep_garnet_opal": "蛋白石, 石榴石", @@ -1785,6 +1793,7 @@ "tfg.tooltip.hotornot_hot_equipment": "§7提供对所有§6高温§7物品、流体和管道的防护。§r", "tfg.tooltip.hotornot_cold_equipment": "§7提供对所有§b低温§7物品、流体和管道的防护。§r", "tfg.tooltip.hotornot_floating_equipment": "§7提供对所有§e比空气轻§7的气体的防护。§r", + "tfg.tooltip.polycaprolactam": "也称为尼龙", "tfg.tooltip.machine.one_energy_hatch": "只允许有且仅有§61个§f能源仓。", "tfg.tooltip.machine.two_energy_hatches": "允许有最多§62个§r能源仓。", "tfg.tooltip.machine.subtick": "这台机器支持§2子刻机制§r！", @@ -2231,7 +2240,7 @@ "quests.create_logistics.fabricate_rose_quartz.desc": "由于高级物流对于进程推进并非超级必要，你也可以考虑将获取透镜的任务留到&b中压（MV）&r阶段，那时你将能够在家完成。&d玫瑰石英&r可以从其粉尘形式（由8份红石和1份下界石英混合而成）通过一台&b高级&3高压灭菌器&r结晶出来，用&b冰水&r代替通常的（蒸馏）水来模拟自然条件。类似地，在&b中压&r等级，&d玫瑰石英透镜&r本身可以从&d玫瑰石英板&r切割而来，尽管它必须从完整的玫瑰石英块中获取（作为宝石板，它必须在&3切割机&r中加工）。", "quests.create_logistics.rose_quartz_lens.title": "玫瑰色眼镜", "quests.create_logistics.rose_quartz_lens.subtitle": "你只需要一个（YONO）", - "quests.create_logistics.rose_quartz_lens.desc": "无论你以何种方式获得了所需材料，你都需要一台&3车床&r来实际制造透镜。一台&7基础&3车床&r足以用一颗&d精美玫瑰石英&r宝石制作透镜，但如果你想仅用一块板来制作透镜，你将需要更好的设备，即一台&b高级&3车床&r。\n\n一旦制作完成，该透镜可以用于在&7基础&3激光刻录机&r中刻录&d双重红合金板&r来制造我们需要的&d发射器&r单元，并且在此过程中不会被消耗。", + "quests.create_logistics.rose_quartz_lens.desc": "无论你以何种方式获得了所需材料，你都需要一台&3车床&r来实际制造透镜。一台&7基础&3车床&r足以用一颗&d精美玫瑰石英&r宝石制作透镜，但如果你想仅用一块板来制作透镜，你将需要更好的设备，即一台&b高级&3车床&r。\n\n一旦制作完成，该透镜可以用于在&7基础&3激光刻录机&r中刻录&d双层红色合金板&r来制造你所需要的&d发射器&r单元，并且在此过程中不会被消耗。", "quests.create_logistics.stock_link.title": "仓储链接站", "quests.create_logistics.stock_link.subtitle": "家里有存储总线了", "quests.create_logistics.stock_link.desc": "你可以制造的第一个&2高级物流&r机器是&3仓储链接站&r，它可用于创建&d物流网络&r。当放置到&3打包机&r的任意一面时，仓储链接站将&a使打包机所连接的库存对网络可见&r！就其本身而言，仓储链接站并不是超级有用，但它是所有其他即将到来的机器的核心组件……\n\n记得先手持仓储链接站右键点击已放置的仓储链接站，将两者绑定以共享同一网络。要取消此操作，你可以简单地单独合成仓储链接站来清除其调谐。", @@ -2974,10 +2983,10 @@ "quests.low_voltage.lv_machine_hull.title": "你的第二个机器外壳", "quests.low_voltage.lv_machine_hull.subtitle": "是时候接触电力了", "quests.low_voltage.lv_machine_hull.desc.1": "你离你的&6第一台LV机器&r和电气时代的开端非常近了！如果你还没有制作任何&4红钢&r，现在你必须做了，但作为回报，你将获得&6新的方法&r来改进你的生产。\n\n这就是格雷科技的理念：&6你进步得越远，新的配方就越好&r。\n\n开始时尝试制作至少3或4个外壳。", - "quests.low_voltage.lv_machine_hull.desc.2": "对于某些玩家来说，达到一个新的等级是以制作第一个&6电路&r为标志，对于其他人则是&6机器外壳&r或&6能源舱&r。你可以使用任何最适合你的方式，但为了组织有序，这些任务将使用机器外壳作为标志。\n\n不知道从何开始？我们建议寻找那些能让其他所有东西都变得更便宜（事半功倍）的机器，从你最讨厌的事情开始。", - "quests.low_voltage.lv_machine_casing.title": "用于机械动力的LV机械方块？", + "quests.low_voltage.lv_machine_hull.desc.2": "对于某些玩家来说，达到一个新的等级是以制作第一个&6电路&r为标志，对于其他人则是&6机器外壳&r或&6能源舱&r。你可以使用任何最适合你的方式，但为了组织有序，这些任务将使用机器外壳作为标志。\n\n快速提醒：除非机器有特别说明，否则当机器&c任何相邻的方块暴露在雨或水中时&r，机器会发生爆炸。", + "quests.low_voltage.lv_machine_casing.title": "你的下一代机器", "quests.low_voltage.lv_machine_casing.subtitle": "更多选择！", - "quests.low_voltage.lv_machine_casing.desc": "为降低入门LV阶段的难度，&5TFG&r允许你使用&6机械动力&r的机器替代部分&6格雷科技&r机器。\n\n我们在&6上一章节&r已介绍过这些内容，只需记住：当存在格雷科技机器的替代方案时，你都能在任务中自行选择。", + "quests.low_voltage.lv_machine_casing.desc": "既然已通上电，现在就该好好利用它了！我们建议你先制造一些机器，它们能让后续制造更多机器变得更轻松、更廉价。\n\n为降低入门LV阶段的难度，&5TFG&r允许你使用&6机械动力&r的机器替代部分&6格雷科技&r机器。\n\n我们在&6上一章节&r已介绍过这些内容，只需记住：当存在格雷科技机器的替代方案时，你都能在任务中自行选择。", "quests.low_voltage.lv_motor.title": "众多马达中的第一个", "quests.low_voltage.lv_motor.subtitle": "低压在召唤……", "quests.low_voltage.lv_motor.desc": "记住，如果配方让你不知所措，&2EMI是你的朋友&r。你可以点击任何配方右下角带有四个堆叠方块的按钮，EMI会显示所有合成成分的树状图，你甚至可以让它将“购物清单”添加到你的收藏中！\n\n言归正传，通过制作6个&aLV电动马达&r来为&7LV&r阶段做好准备！这可能看起来很多，但这是进入&7LV&r阶段好东西的&6最低要求&r。", @@ -2987,25 +2996,24 @@ "quests.low_voltage.lv_age_progression.task": "我……现在可能有点方向感了", "quests.low_voltage.lost.title": "迷路了？", "quests.low_voltage.lost.subtitle": "这一切让人应接不暇", - "quests.low_voltage.lost.desc.1": "进入&7LV&r阶段会解锁大量选项，很容易让人不知所措。以下是我们推荐的发展路线：\n\n1）建立一个稳定的电力来源。查看右下角的任务，有好几种方案可选，都可行。别吝啬，多建几台发电机！\n\n务必&e仔细阅读格雷科技能源任务章节&r，以便充分理解EU（能量单位）、电压、电流和线损是如何运作的。", - "quests.low_voltage.lost.desc.2": "2）专注于建造那些能让后续机器造价更便宜的机器。\n\n两极磁化机是一台超级便宜的机器，几乎可以免费磁化金属棒。如果你还没造蒸汽时代对应的机器，那就搭建起卷板机、线材轧机、车床和切割机。这些任务都在左上角。\n\n之后，重点利用化学反应釜和流体固化机（左侧）来降低橡胶成本，并用组装机（下方）来降低电子元件成本。\n\n当所有东西的成本都降到最低后，确保批量合成组件以节省大量时间。", - "quests.low_voltage.lost.desc.3": "3）建造一台装罐机并制作一些电池（右上角）。电池箱将对你的工厂扩张大有裨益，而探矿仪绝对是改变游戏体验的神器。\n\n4）&7LV&r阶段有两个主要终极目标：&a电路组装机&r和&a电力高炉&r。现在你应该准备好挑战它们了。", + "quests.low_voltage.lost.desc.1": "进入&7LV&r阶段会解锁大量选项，很容易让人不知所措。以下是我们推荐的发展路线：\n\n1）建立一个稳定的电力来源。查看下方的任务，有好几种方案可选，都可行。别吝啬，多建几台发电机！\n\n务必&e仔细阅读格雷科技能源任务章节&r，以便充分理解EU（能量单位）、电压、电流和线损是如何运作的。", + "quests.low_voltage.lost.desc.2": "2）专注于建造那些能让后续机器造价更便宜的机器。\n\n两极磁化机是一台超级便宜的机器，几乎可以免费磁化金属棒。如果你还没造蒸汽时代对应的机器，那就搭建起卷板机、线材轧机、车床和切割机。\n\n之后，重点利用化学反应釜和流体固化机（左侧）来降低橡胶成本，并用组装机（下方）来降低电子元件成本。\n\n当所有东西的成本都降到最低后，确保批量合成组件以节省大量时间。", + "quests.low_voltage.lost.desc.3": "3）建造一台装罐机并制作一些电池。电池箱将对你的工厂扩张大有裨益，而探矿仪绝对是改变游戏体验的神器。\n\n4）&7LV&r阶段有两个主要终极目标：&a电路组装机&r和&a电力高炉&r。现在你应该准备好挑战它们了。", "quests.low_voltage.lost.task": "太棒了，我逐渐理解一切！", "quests.low_voltage.lv_steam_turbine.title": "蒸汽轮机", "quests.low_voltage.lv_steam_turbine.subtitle": "你必须建造更多的涡轮机", - "quests.low_voltage.lv_steam_turbine.desc.1": "&3蒸汽轮机&r是你在&7LV&r阶段实际上可以使用的为数不多的发电机之一。&2稍后，你将解锁更有趣的能源选项&r，例如天然气或汽油。\n\n当提供蒸汽时，涡轮机将以&d2mB=1EU&r的比例输出电力。", - "quests.low_voltage.lv_steam_turbine.desc.2": "如果你使用单个&3蒸汽轮机&r，只需要&a1x锡电缆&r。但若升级到&32台蒸汽涡轮&r，则应使用&a2x锡电缆&r——否则它们可能会&c烧毁&r。\n\n这涉及&9电流&r机制……不过具体原理将留待后续说明，现在你只需专注享受游戏。别担心！", + "quests.low_voltage.lv_steam_turbine.desc": "&3蒸汽轮机&r是大多数玩家的第一台&7LV&r发电机，因为你已经建造出蒸汽锅炉实现了蒸汽的量产。\n\n当输入蒸汽时，蒸汽轮机将以&d2mB=1EU&r的比例输出电力。\n\n蒸汽的一个缺点在于运输，由于其能量密度较低，你需要使用大型或巨型管道来进行输送。\n\n一旦单方块锅炉的产能无法满足你的需求，你也可以考虑升级到大型青铜锅炉。", "quests.low_voltage.lbb.title": "大型青铜锅炉", "quests.low_voltage.lbb.subtitle": "轰！轰！轰！轰！", - "quests.low_voltage.lbb.desc.1": "&3大型锅炉&r是小型锅炉的&6可选的&r大号版本，可使用固体或液体燃料驱动。\n\n若想采用蒸汽发电方案，这是替代机械动力蒸汽引擎的选项。后续能源方案将在&bMV&r章节列出。\n\n请确保其供水永不中断——就像操作小型锅炉时那样，否则它会&c爆炸&r！", + "quests.low_voltage.lbb.desc.1": "&3大型锅炉&r是小型锅炉的&6可选的&r大号版本，可使用固体或液体燃料驱动。\n\n若想采用蒸汽发电方案，这是替代机械动力蒸汽引擎的选项。\n\n请确保其供水永不中断——就像操作小型锅炉时那样，否则它会&c爆炸&r！", "quests.low_voltage.lbb.desc.2": "一旦完全预热，&3大型青铜锅炉&r可产出800mB/t的蒸汽，经转换可得&d400EU/t&r能量，相当于12.5台基础蒸汽轮机的产能。如此（相对）巨大的能量输出需要消耗&l大量&r可燃燃料。&5考虑到这点&r，其GUI允许你将锅炉&9调节&r至25%%功率，即200mB/t，对应&d100EU/t&r的电力，略高于3台基础蒸汽轮机的输出。\n\n我们建议等到你准备运行为电力高炉供电时再建造此设备，除非你有很多的蒸汽多方块机器。", - "quests.low_voltage.lbb.desc.3": "在TerraFirmaGreg整合包中，你有多种燃料选择方案。你可以使用软管滑轮从深层地下湖抽取岩浆，或建立树场配合焦炉生产木炭与杂酚油。此外，地表存在大型煤炭矿脉，可通过自动化采矿设备开采，并转化为焦炭以及远超木炭产出的杂酚油。\n\n若选择树场方案，需配备三座焦炉才能维持大型青铜锅炉全功率运行。", + "quests.low_voltage.lbb.desc.3": "在TerraFirmaGreg整合包中，你有多种燃料选择方案。你可以使用软管滑轮从深层地下湖抽取岩浆（不，无限岩浆是不会存在的），或建立树场配合焦炉生产木炭与杂酚油。此外，地表存在大型煤炭矿脉，可通过自动化采矿设备开采，并转化为焦炭以及远超木炭产出的杂酚油。\n\n若选择树场方案，需配备三座焦炉才能维持大型青铜锅炉全功率运行。", "quests.low_voltage.lv_polariser.title": "基础两极磁化机", "quests.low_voltage.lv_polariser.subtitle": "两极磁化机用于磁化！", "quests.low_voltage.lv_polariser.desc": "在&7LV&r阶段，这可以说是最经济的机器之一，能用于制造&6无需红石的磁化金属杆&r来生产电机。当你开始批量制造电机时，这台机器能为你节省大量红石。", "quests.low_voltage.link_chapter.title": "给我解释一下能量", "quests.low_voltage.link_chapter.subtitle": "有一整章关于能量的内容", - "quests.low_voltage.link_chapter.desc": "点击此处查看章节", + "quests.low_voltage.link_chapter.desc": "这看起来可能需要阅读很多内容，但如果你想避免意外并充分利用你的发电设备，理解这些内容是很重要的。\n\n格雷科技的能量系统（EU，能量单位）与几乎所有其他模组使用的 FE（Forge能量）系统的工作方式不同。\n\n在&7LV&r阶段有四种发电方式，而且都是可行的选择。如果你是格雷科技的新手，蒸汽发电是最简单的，但随着你进入更高的等级，它的效率会迅速下降。气体燃料的生产更为复杂，但对应的发电机成本最低。内燃机则介于两者之间。\n\n这里是格雷科技能源章节的链接", "quests.low_voltage.link_chapter.task": "我读过了", "quests.low_voltage.lv_combuston_gen.title": "内燃发电机", "quests.low_voltage.lv_combuston_gen.subtitle": "它会轰隆作响并产生能量", @@ -3021,7 +3029,7 @@ "quests.low_voltage.lv_seeds.desc": "若遇到这类作物，建议采集并建立农场种植。\n\n它们将成为&a种子油&r的最佳来源，该液体可用于生产&e生物柴油&r。油菜籽耐寒性较强，而向日葵更适宜温暖环境。若不愿花费过多时间耕作，也可在电力温室中培育，仅需消耗少量电力即可实现自动化种植。", "quests.low_voltage.lv_seeds.task": "油菜或向日葵", "quests.low_voltage.lv_gas_turbine.title": "燃气轮机", - "quests.low_voltage.lv_gas_turbine.subtitle": "它需要更多电路，但更少材料", + "quests.low_voltage.lv_gas_turbine.subtitle": "面向石化爱好者", "quests.low_voltage.lv_gas_turbine.desc": "借助&7合成气&r，你现在拥有了在&7LV&r阶段使用&c燃气轮机&r的可行方案。它们与其他&6发电机&r工作原理完全相同，但应比&6内燃机&r略微节省材料。", "quests.low_voltage.lv_gas_syngas.title": "合成气", "quests.low_voltage.lv_gas_syngas.subtitle": "并非木煤气", @@ -3033,15 +3041,6 @@ "quests.low_voltage.lv_turbo_charge.subtitle": "可更快为电动工具充电", "quests.low_voltage.lv_turbo_charge.desc": "&o本任务主题为可选内容，但可能仍会引发你的兴趣。我们出于内容完整性的考虑将其放置于此。&r\n\n&3闪聚充电箱&r可为&6RF与EU&r设备（例如&9钻头&r）提供极速充电。\n\n该设备对每件充电物品最高支持4安培电流，使其充电速度达到&3电池箱&r的&6两倍&r，但不具备放电功能。\n\n&e任何&r类型的充电箱均可完成本任务。", "quests.low_voltage.lv_turbo_charge.task": "任何闪聚充电箱都行", - "quests.low_voltage.lv_fisher.title": "捕鱼机", - "quests.low_voltage.lv_fisher.subtitle": "完全兼容群峦传说！", - "quests.low_voltage.lv_fisher.desc": "&o本任务主题为可选内容，但可能仍会引发你的兴趣。我们出于内容完整性的考虑将其放置于此。&r\n\n&3捕鱼机&r可从水中捕捞鱼类，需在其正下方配备5x5水域范围方可运作。其使用与普通钓鱼相同的战利品表，每次操作消耗1根线以及与其等级对应的电力（&7LV&r阶段为32EU，等等）。基本机制便是如此。\n\n从鱼类中可提取&e鱼油&r，该材料可用于制作&6生物柴油&r。", - "quests.low_voltage.lv_fisher.task": "任何捕鱼机都行", - "quests.low_voltage.lv_rock_crusher.title": "碎岩机", - "quests.low_voltage.lv_rock_crusher.subtitle": "圆石是爱，圆石是生命", - "quests.low_voltage.lv_rock_crusher.desc.1": "&o本任务主题为可选内容，但可能仍会引发你的兴趣。我们出于内容完整性的考虑将其放置于此。&r\n\n&3碎岩机&r实质上是个箱式刷石机。只需提供任意天然岩石或圆石方块，它就能持续复制该方块。若想快速获取大量砖块材料，这将是非常便捷的选择！\n\n&e任何&r等级的碎岩机均可完成本任务。", - "quests.low_voltage.lv_rock_crusher.desc.2": "&l&3背景知识：&r&o黑曜石需要红石才能生成的设定，源自一个Minecraft的远古漏洞&7MC-4239&f。当年在圆石生成器的岩浆水流接触处放置红石，便会生成黑曜石。该漏洞已在Minecraft 1.8的14w25b快照中修复，截至撰写本文时已是&o距今9年前&r的往事了！", - "quests.low_voltage.lv_rock_crusher.task": "任何碎岩机都行", "quests.low_voltage.lv_aqueous_accumulator.title": "蓄水器", "quests.low_voltage.lv_aqueous_accumulator.subtitle": "热力基本（Thermal Foundation）模组在召唤", "quests.low_voltage.lv_aqueous_accumulator.desc": "&3蓄水器&r本质上相当于流体版的碎岩机。只需将机器放置在两个对应流体的源方块旁，配置好电路即可持续生成该流体！其功能实质上与动力泵相同，但使用电力驱动而非机械动力，因此能更便捷地融入你的工厂体系。额外优势在于，HV等级的该设备还能无限生成岩浆！\n\n你可以将源方块置于含水状态以防止冬季冻结，机器仍可正常运作。", @@ -3062,13 +3061,13 @@ "quests.low_voltage.lv_lathe.task": "以下任何一个", "quests.low_voltage.universal_cell.title": "更好的桶", "quests.low_voltage.universal_cell.subtitle": "内部结构一目了然，不像那些桶完全封闭得严严实实……", - "quests.low_voltage.universal_cell.desc.1": "单元是流体存储的另一种形式。所有储存同类等量流体的单元均可&6堆叠&r，并可通过&3装罐机&r实现自动灌装。\n\n每个流体单元可容纳&d一桶&r流体。\n\n还没被说服吗？与桶和大木桶不同，单元能&a安全地容纳&r其中的内容，防止你被烫伤、冻伤或飘起来。", + "quests.low_voltage.universal_cell.desc.1": "单元是流体存储的另一种形式。所有储存同类等量流体的单元均可&6堆叠&r，并可通过&3装罐机&r实现自动灌装。\n\n每个基础的流体单元可容纳&d1桶&r流体，而钢单元可以容纳8桶。\n\n还没被说服吗？与桶和大木桶不同，单元能&a安全地容纳&r其中的内容，防止你被烫伤、冻伤或飘起来。同时它们也非常便宜！", "quests.low_voltage.universal_cell.desc.2": "通用单元最多可容纳&d一桶&r流体，同时支持存储&9微量&r流体。若需暂存残余流体而不想专门制作整只桶，这类容器尤为理想。\n\n采用高阶材料制造的单元能承载更多流体，不过届时&9桶&r和&9超级缸&r将提供更大容量。\n\n与桶类似，将单元放入合成栏即可清空其内容物。", "quests.low_voltage.universal_cell.task": "任意单元", "quests.low_voltage.machine_auto_output_behaviour.title": "机器自动输出行为", "quests.low_voltage.machine_auto_output_behaviour.subtitle": "我们来了解相关知识。", "quests.low_voltage.machine_auto_output_behaviour.desc.1": "所有机器通常包含一个&7正面&r与一个&9输出面&r。\n\n&7正面&r应该很明显。\n&9输出面&r则是带有点状或孔洞标记的面，默认位于机器放置时的背面。\n\n机器可通过输出面实现&a自动输出&r功能。需在图形界面中点击对应按钮启用该功能，流体与物品的自动输出需分别设置。通过&d过滤卡&r和&d覆盖板&r可对自动输出进行精细化控制，具体机制请参阅本章节中的&d覆盖板行为&r任务。。", - "quests.low_voltage.machine_auto_output_behaviour.desc.2": "使用&5扳手&r右键点击机器可更改输出面，按住潜行右键点击则能调整正面方向。需注意：机器的正面&c不可&r同时设置为输出面！\n\n默认情况下，物品与流体无法通过输出面输入，但使用&5螺丝刀&r可切换此功能。可直接右键点击输出面，或按住潜行右键点击界面中对应输出面的网格栏位进行调整。\n\n存在部分特殊功能机器（如&3泵&r、&3采矿机&r、&3捕鱼机&r、&3物品收集器&r等）不执行合成配方。这类机器将在其&7正面&r进行输出（该面仍以点状标记标识）。", + "quests.low_voltage.machine_auto_output_behaviour.desc.2": "使用&5扳手&r右键点击机器可更改输出面，按住潜行右键点击则能调整正面方向。需注意：机器的正面&c不可&r同时设置为输出面！\n\n默认情况下，物品与流体无法通过输出面输入，但使用&5螺丝刀&r可切换此功能。可直接右键点击输出面，或按住潜行右键点击界面中对应输出面的网格栏位进行调整。", "quests.low_voltage.machine_auto_output_behaviour.task": "嗯，真有趣！", "quests.low_voltage.programmed_circuits.title": "编程电路", "quests.low_voltage.programmed_circuits.subtitle": "不想花费你的电路来选择配方？", @@ -3115,18 +3114,20 @@ "quests.low_voltage.lv_amp_explanation.subtitle": "《电流机制入门指南》", "quests.low_voltage.lv_amp_explanation.desc": "本任务线将简要讲解&9格雷科技电流机制&r，至于&d电压&r机制则待你抵达&bMV&r阶段后详解。\n\n&6&l核心要点：&r为确保安全，请使电缆的电流承载上限与发电设备的输出电流总量相匹配。\n\n仍有疑惑？请查阅&c格雷科技能源&r章节获取完整的电力系统详解！", "quests.low_voltage.lv_ore_prospector.title": "这是黑客行为", - "quests.low_voltage.lv_ore_prospector.subtitle": "勘探者的未来", + "quests.low_voltage.lv_ore_prospector.subtitle": "新一代探矿仪", "quests.low_voltage.lv_ore_prospector.desc": "探矿仪是一个能助你快速定位矿脉的神奇工具。\n\n它的GUI支持交互操作，右键点击即可扫描矿石并实时显示在动态地图上。\n\n&l&3背景知识：&r&o想当年便携式探矿仪曾锁定在&dLuV等级&f才能使用，现在的孩子们可太轻松了。", + "quests.low_voltage.night_vision_goggles.subtitle": "使玩家不再迷失于黑暗中！", + "quests.low_voltage.night_vision_goggles.desc": "为眼镜充好电并戴在脸上，只要电池还有电，你就能获得永久性的夜视效果！你可以通过快捷键切换此效果，默认设置为&aO&r键。", "quests.low_voltage.lv_sprayer.title": "喷漆罐", "quests.low_voltage.lv_sprayer.subtitle": "服务器标签争夺战开始！", - "quests.low_voltage.lv_sprayer.desc": "可惜这只是一个&l空的&r喷漆罐，你必须在使用前填充化学染料。\n\n&a喷漆罐&r不提供任何涉及机器的功能，但能带来相当&b出色的视觉效果与实用性&r！\n\n几乎所有格雷科技方块实体（机器、管道、电缆等）均可被&6喷涂&r成16种颜色中的任意一种。无论是用于制作精美截图，还是在多人基地中区分不同设备布局都极为便利，同时也有助于分辨各类管道与线缆。\n\n将&a喷罐&r持于副手时，你放置的任何方块都会自动喷涂上颜色。", + "quests.low_voltage.lv_sprayer.desc": "可惜这只是一个&l空的&r喷漆罐，你必须在使用前填充染料。\n\n&a喷漆罐&r不提供任何涉及机器的功能，但能带来相当&b出色的视觉效果与实用性&r！\n\n几乎所有格雷科技方块实体（机器、管道、电缆等）均可被&6喷涂&r成16种颜色中的任意一种。无论是用于制作精美截图，还是在多人基地中区分不同设备布局都极为便利，同时也有助于分辨各类管道与线缆。\n\n将&a喷罐&r持于副手时，你放置的任何方块都会自动喷涂上颜色。", "quests.low_voltage.other_machines.title": "等等，还有更多！", "quests.low_voltage.other_machines.subtitle": "你逃不出格雷的掌心……", "quests.low_voltage.other_machines.desc": "我们暂不展开&d常规矿物处理的全套流程&r。为什么强调常规？有些矿石需要特殊处理，但这属于后期内容。糟糕，差点又跑题了！\n\n诸如&b化学浸洗器&r或&b电解机&r等设备可能会派上用场。\n\n若对矿物处理感到困惑，请查阅专属的&c矿石处理&r章节获取完整指南！", "quests.low_voltage.other_machines.task": "我自愿放弃理智", "quests.low_voltage.lv_chemical_bath.title": "基础化学浸洗机", "quests.low_voltage.lv_chemical_bath.subtitle": "化学浸洗机用于浸洗……", - "quests.low_voltage.lv_chemical_bath.desc.1": "&l矿石处理之外的用途：&r\n\n化学浸洗机可替代&6密封大桶&r配方，使纸和皮革的制作变得&6轻松省力&r。\n\n还包括其他辅助功能，例如对各类物品与方块进行染色或漂白处理。", + "quests.low_voltage.lv_chemical_bath.desc.1": "&l矿石处理之外的用途：&r\n\n化学浸洗机可替代&6密封大桶&r配方，使皮革和防腐木的制作变得&6轻松省力&r。\n\n还包括其他辅助功能，例如对各类物品与方块进行染色或漂白处理。", "quests.low_voltage.lv_chemical_bath.desc.2": "&l对于矿石处理：&r\n\n部分&a粉碎矿石&r通过化学浸洗转化为&a纯净矿石&r时存在替代途径：使用&a汞&r或&a过硫酸钠&r进行处理。此步骤并非必需，但若想获取特殊&6副产品&r则至关重要（提示：这可是银的绝佳替代来源！）", "quests.low_voltage.lv_electroliser.title": "基础电解机", "quests.low_voltage.lv_electroliser.subtitle": "嗡嗡作响", @@ -3135,21 +3136,20 @@ "quests.low_voltage.lv_electroliser.desc.3": "&c注意！&r受矿物特性影响，将金属粉尘直接冶炼成锭相比电解分解能获得更高金属产量，但代价是你会损失粉尘中蕴含的其他副产品。必须根据需求权衡：优先追求直接收益，还是最大化获取副产物种类。", "quests.low_voltage.lv_mixer.title": "基础搅拌机", "quests.low_voltage.lv_mixer.subtitle": "搅拌机用于搅拌……", - "quests.low_voltage.lv_mixer.desc": "使用搅拌机将&6大幅加快&r彩色钢的制备过程，尤其是制作机器外壳所需的&4红钢&r。即使现在认为不需要，后续阶段你会发现它&6不可或缺&r。\n\n你可能已经习惯了在坩埚中进行合金冶炼，但对于任何新合金（以及所有旧合金），格雷科技的合金制作方式是&a将粉末混合&r，然后将其加热成锭或提取为流体。先别去JEI里查看合金冶炼炉，那要到&5EV&r阶段才有。", - "quests.low_voltage.lv_mixer.task": "来自机械动力或格雷科技", + "quests.low_voltage.lv_mixer.desc": "电动搅拌机将&6大幅加快&r彩色钢的制备过程，因其可以直接制作&a彩色钢粉&a。即使现在认为不需要，后续阶段你会发现它&6不可或缺&r。\n\n你可能已经习惯了在坩埚中进行合金冶炼，但对于任何新合金（以及所有旧合金），格雷科技的合金制作方式是&a将粉末混合&r，然后将其加热成锭或提取为流体。&7（先别去JEI里查看合金冶炼炉，那要到&5EV&r&7阶段才有。）&r", "quests.low_voltage.soldering_alloy.title": "焊锡", "quests.low_voltage.soldering_alloy.subtitle": "我拥有灵魂却非焊将（注：英文谐音梗）", - "quests.low_voltage.soldering_alloy.desc": "&a焊锡&r仅作为&9流体&r使用，在多数电路配方中可作为&a锡&r的廉价替代品进行&d互换&r。\n\n选择权在你手中：想节省材料？就用焊锡。想减少材料制备时间？直接使用锡更为便捷。", + "quests.low_voltage.soldering_alloy.desc": "&a焊锡&r仅作为&9流体&r使用，在多数电路配方中可作为&a锡&r的廉价替代品进行&d互换&r。\n\n选择权在你手中：想节省材料？就用焊锡。想减少材料制备时间？直接使用锡更为便捷。\n\n记住，你需要先用搅拌机制作焊锡粉，然后使用提取机将其转化为流体。别管JEI中的合金冶炼炉配方！", "quests.low_voltage.gallium_arsenide.title": "砷化镓", "quests.low_voltage.gallium_arsenide.subtitle": "我讨厌副产物，但它们太棒了", "quests.low_voltage.gallium_arsenide.desc": "后续许多材料无法通过直接冶炼矿石获取！它们只能通过加工其他矿石产生的副产品来获得。镓和砷&4正属于&r这类材料。\n\n镓的获取途径，按从劣到优排序（综合考虑难度与产出）：\n\n&9-&r&3电解&a闪锌矿&r获得微量粉尘概率较低。注意此方法将损失直接冶炼收益。\n\n&9-&r将&a粉碎铝土矿&r放入&3化学浸洗机&r处理，需消耗&9过硫酸钠&r。\n\n&9-&r通过&3热力离心机&r或&3离心机&r处理&a闪锌矿&r时作为副产品获取。\n\n对于&d砷&r，你将不得不开采&a雄黄&r并用&3离心机&r处理，或者将&a辉钴矿&r放入&3电力高炉&r中进行加工。", "quests.low_voltage.lv_assembler.title": "基础组装机", - "quests.low_voltage.lv_assembler.subtitle": "这家伙组装起来比你和宜家都利索！", - "quests.low_voltage.lv_assembler.desc.1": "虽然这是发展进程中极其&9关键&r的机器，但它&9&l无法立即发挥作用&r——因为造价&c十分昂贵&r。大部分重要配方都需要&c流体&r支持，建议先完善基础配套设施再着手建造。\n\n明确这点后，请将&3组装机&r视作与工作台同等重要的核心设备，只不过...嗯，它毕竟是台机器。", - "quests.low_voltage.lv_assembler.desc.2": "当基础设施完善后，你将能解锁以下材料的优化配方：\n\n&9-&r &6真空管&r产量提升至两倍以上\n\n&9-&r &6电阻&r每次合成可产出4个！\n\n&9-&r &6电路板&r大幅减少铜材消耗\n\n哇哦！\n\n&l&3背景知识：&r&o在格雷科技2时代，组装机仅有两个槽位，且仅用于特殊电路与机器外壳的替代配方，可谓一脉相承的纯正血统。", + "quests.low_voltage.lv_assembler.subtitle": "无需宜家说明书", + "quests.low_voltage.lv_assembler.desc.1": "尽管这是发展进程中极其&9关键&r的机器，但我们不建议你将它作为首个LV机器来制作，因为它&c造价高昂&r。\n\n不过，如果你已跟随任务指引至此，那么现在正是制作它的好时机！\n\n&3组装机&r对游戏进程至关重要。请将其视作与工作台同等重要的核心设备，只不过……咳，它毕竟是台机器嘛。", + "quests.low_voltage.lv_assembler.desc.2": "你将能解锁以下材料的优化配方：\n\n&9-&r &6真空管&r产量提升至两倍以上\n\n&9-&r &6电阻&r每次合成可产出4个！\n\n&9-&r &6电路板&r大幅减少铜材消耗\n\n哇哦！\n\n&l&3背景知识：&r&o在格雷科技2时代，组装机仅有两个槽位，且仅用于特殊电路与机器外壳的替代配方，可谓一脉相承的纯正血统。", "quests.low_voltage.lv_assembler.task": "基础组装机", - "quests.low_voltage.t2_circuit_board.subtitle": "是啊是啊，是木头的，但别低估它", - "quests.low_voltage.t2_circuit_board.desc.1": "该电路板用于制造&dMV电路&r！\n\n&9注意：&r制作酚醛印刷电路板时你有&l两种&r选择。若使用&a过硫酸钠&r或&a三氯化铁&r进行化学蚀刻，制作电路板&6仅需消耗原配方四分之一的银&r。\n\n&l但考虑到&r当前获取这些化学试剂较为困难，你也可以直接通过开采&o方铅矿脉&r来获取更多白银……\n\n若想了解&a过硫酸钠&r的制备方法，可在&bMV&r章节找到相应任务（就当是份轻松阅读材料）。", + "quests.low_voltage.t2_circuit_board.subtitle": "现在他们再也造不出这样的东西了……", + "quests.low_voltage.t2_circuit_board.desc.1": "该电路板用于制造&dMV电路&r！\n\n&9注意：&r制作酚醛印刷电路板时你有&l两种&r选择。若使用&a过硫酸钠&r或&a三氯化铁&r进行化学蚀刻，制作电路板&6需消耗的银仅为工匠台配方的四分之一&r。\n\n&l但考虑到&r当前获取这些化学试剂较为困难，你也可以直接通过开采&o方铅矿脉&r来获取更多白银……\n\n若想了解&a过硫酸钠&r的制备方法，可在&bMV&r章节找到相应任务（就当是份轻松阅读材料）。", "quests.low_voltage.t2_circuit_board.desc.2": "&l&3背景故事：&r&o在GTCEu1.12.2中，这些电路板被称为&2优质电路板&f。这个名字并不完全合适，因为它们&4相当邪恶&f。", "quests.low_voltage.lv_diode.title": "二极管", "quests.low_voltage.lv_diode.subtitle": "不要被EMI动摇！", @@ -3171,15 +3171,23 @@ "quests.low_voltage.lv_centrifuge.desc.1": "&l矿石处理之外的用途：&r\n\n好家伙，有什么是这台机器办不到的？分解不同种类的粉末、分离空气、帮你报税等等……\n\n功能多到列不完！我们只能说&c你需要离心机&r。", "quests.low_voltage.lv_centrifuge.desc.2": "&l对于矿石处理：&r\n\n该设备可将&a含杂矿粉&r或&a洁净矿粉&r转化为纯净的矿粉，并额外产出微量&6副产品&r矿粉。虽非获取副产物的最优工艺路线，但这是当前所有矿石处理设备中&c造价最低廉、最适合小规模配置&r的解决方案。", "quests.low_voltage.lv_centrifuge.desc.3": "&l&3背景知识：&r&o在基础版GTCE中，离心机曾是性能碾压其他矿石处理设备的存在——不仅操作简便，还能像洗矿机或热力离心机一样稳定产出三份微量粉尘。当前版本我们为其进行了平衡性调整，以促进工艺路线的多样性发展。", - "quests.low_voltage.lv_centrifuge.task": "", "quests.low_voltage.lv_glue.title": "粘住了", "quests.low_voltage.lv_glue.subtitle": "真是棘手的情况", - "quests.low_voltage.lv_glue.desc": "现在你可以通过&3离心机&r处理&a粘性树脂&r来获得液态&a胶水&r（以及目前实用性较低的植物球）。\n\n立即开始制备胶水能抢占先机。它可用于制作&6成本更低的电阻&r，并在&3组装机&r中生产&6更经济的电路板&r（尤其在&o近期发展&r阶段价值显著）。\n\n&e提示：&r你也可以离心处理群峦传说模组中的&a胶水&r或&a松脂&r，哪种材料更易获取就选哪种！", + "quests.low_voltage.lv_glue.desc": "现在你可以通过&3离心机&r处理&a粘性树脂&r来获得液态&a胶水&r（以及目前实用性较低的植物球）。\n\n立即开始制备胶水能抢占先机。它可用于制作&6成本更低的电阻&r，并在&3组装机&r中生产&6更经济的电路板&r。\n\n&e提示：&r你也可以离心处理群峦传说模组中的&a胶水&r或&a松脂&r，哪种材料更易获取就选哪种！", "quests.low_voltage.lv_glue.task": "胶水", "quests.low_voltage.lv_cutter.title": "基础切割机", "quests.low_voltage.lv_cutter.subtitle": "切割机……用于切割……", "quests.low_voltage.lv_cutter.desc": "目前你应使用&9水&r来执行相关配方，无需费力获取润滑液。\n\n若尚未配备此设备，它还能将&6金属杆切割成四个螺栓&r。\n\n该机器是获取&d宝石板&r的唯一途径，该材料是制造过滤卡及后续&3集气室&r的必要组件。", "quests.low_voltage.lv_cutter.task": "任何切割机", + "quests.low_voltage.lv_distillery.subtitle": "蒸馏室用于蒸馏……", + "quests.low_voltage.lv_distillery.desc": "蒸馏室的功能类似于离心机，但主要用于处理有机或石化流体。\n\n在&7LV&r阶段，你只能从单一输入中提取一种产物，但当你升级至&6HV&r的蒸馏塔后，这一限制将会改变。\n\n这台机器在LV阶段的使用频率并不高（除非你用它来生产内燃机燃料），但它是获取&e苯酚&r的关键设备。", + "quests.low_voltage.phenolic_resin.subtitle": "人造树脂", + "quests.low_voltage.phenolic_resin.desc.1": "酚醛树脂由&6苯酚&r与&a甲醛&r通过化学反应制成。\n\n虽然在&7LV&r阶段，你获取苯酚的途径其实只有两种（蒸馏杂酚油或重燃油），但生产甲醛所需的&d甲烷&r则有更多获取方式。", + "quests.low_voltage.phenolic_resin.desc.2": "最简单（也最慢）的方法是在化学反应釜中用氢和碳合成，但这同时需要非常缓慢的水电解来供应氢气。\n\n蒸馏室也提供了多种选择，包括通过处理杂酚油来获取。\n\n如果你在使用合成气作为燃料，也可以将其氧化为甲烷。\n\n最后，如果你想尝试一些特别的方法，还可以离心巨量幽冥之地的蘑菇来获取。", + "quests.low_voltage.magnesia.subtitle": "这也是希腊的一个地名！", + "quests.low_voltage.magnesia.desc": "氧化镁，亦称苦土，可通过两种方式获取：\n\n- 开采菱镁矿石\n\n- 使镁与碱液反应生成氢氧化镁，随后在焦炉中煅烧。镁可从多种不同的矿石中提炼获得。", + "quests.low_voltage.refractory_brick.subtitle": "酷冷™耐火砖", + "quests.low_voltage.refractory_brick.desc": "是时候拆掉你那套旧的群峦高炉了！如果愿意，你可以将大部分材料回收制成&6耐火黏土粉&r（推荐使用电弧炉，这样既能得到粉末又能回收铁！），或者你也可以烧制更多耐火黏土。但务必确保你已储备了大量钢材！\n\n然后，将耐火黏土粉与一些氧化镁、石墨及树脂混合，制作出改进型陶瓷材料，这正是制造&d首批线圈&r所需的。", "quests.low_voltage.lv_gas_collector.title": "基础集气室", "quests.low_voltage.lv_gas_collector.subtitle": "它会让你喘不过气来", "quests.low_voltage.lv_gas_collector.desc": "集气室可采集空气，并通过离心分离获得&a氧气&r与&a氮气&r。\n\n&l&3背景知识：&r&o格雷科技5的老玩家定会记得当年需用压缩机配合IC2气罐获取压缩空气的岁月…如今气罐化学体系已彻底革新。", @@ -3187,7 +3195,7 @@ "quests.low_voltage.lv_oxygen.subtitle": "严格来说，应该叫双氧分子（Dioxygen）...", "quests.low_voltage.lv_oxygen.desc.1": "你大可在JEI里耗费&o&e宝贵的生命年华&r寻找最优的氧气制备方案——毕竟获取途径实在繁多。电解各类矿物均能产出氧气。\n\n要是任务手册能提供更多信息就好了！", "quests.low_voltage.lv_oxygen.desc.2": "惊喜！在我们看来（！），最佳获取方式其实是制造&d集气室&r后&a离心空气&r——虽然你可能暂时还造不出来。此方法同时能产出&a氮气&r，可有效加速某些&3电力高炉&r配方的运行效率。\n\n在我们看来（！）次优方案是&a电解二氧化硅&r。二氧化硅可通过玻璃粉及各类石粉等多种途径获取。我们&6稍后会重点回顾此方案&r，因为它堪称&6终极解法&r。", - "quests.low_voltage.lv_oxygen.desc.3": "在我们看来（！）位列第三的方案是&a电解水&r。实际上，由于能耗较高，水电解更适用于&a制氢&r。&4请勿将此方法作为主要氧源&r——它应专用于&1氢气&r生产，关于制氢我们后续将提供详细指导。\n\n在我们看来（！）位列第四的方案是：&a绝对不要&r随意浪费氧气！无论通过何种途径获得的氧气都具有重要价值，应当妥善存储在储罐中。\n\n&e注意：&r将存放在物品栏内&l任意&r储罐中的流体提交即可完成任务，使用气态氧桶同样有效。", + "quests.low_voltage.lv_oxygen.desc.3": "在我们看来（！）位列第三的方案是&a电解水&r。实际上，由于能耗较高，水电解更适用于&a制氢&r。&4请勿将此方法作为主要氧源&r——它应专用于&1氢气&r生产，关于制氢我们后续将提供详细指导。\n\n在我们看来（！）位列第四的方案是：&a绝对不要&r随意浪费氧气！无论通过何种途径获得的氧气都具有重要价值，应当妥善存储在储罐中。", "quests.low_voltage.lv_oxygen.task": "氧", "quests.low_voltage.lv_nitrogen.title": "氮气", "quests.low_voltage.lv_nitrogen.subtitle": "你的电力高炉增幅剂", @@ -3205,7 +3213,7 @@ "quests.low_voltage.lv_chemical_reactor.subtitle": "化学入门指南", "quests.low_voltage.lv_chemical_reactor.task": "液态橡胶", "quests.low_voltage.lv_chemical_reactor.desc.1": "&3化学反应釜&r将在&l大量&r配方中成为必备设备。\n\n让我们立即试用——何不利用刚造好的化学反应釜解锁全新的&6改良橡胶配方&r？橡胶在&d流体状态无法直接使用&r，因此你需要另造一台机器进行后续加工。", - "quests.low_voltage.lv_chemical_reactor.desc.2": "仅靠化学反应釜无法完成橡胶制作，以下是你可能需要打造的&a其他设备&r：\n\n&3固化机&r能直接将橡胶凝固成&a橡胶片&r，这是后续发展必需的材料。\n\n随后可利用&3组装机&r将液态橡胶加工成&a线缆&r。虽然对锡质线缆影响不大，但更高级的线缆&e必须&r通过组装机制造。\n\n&e注意：&r将存储在物品栏&l任意&r储罐中的流体提交即可完成任务，推荐使用桶作为容器。", + "quests.low_voltage.lv_chemical_reactor.desc.2": "仅靠化学反应釜无法完成橡胶制作，以下是你可能需要打造的&a其他设备&r：\n\n&3固化机&r能直接将橡胶凝固成&a橡胶片&r，这是后续发展必需的材料。\n\n随后可利用&3组装机&r将液态橡胶加工成&a线缆&r。虽然对锡质线缆影响不大，但更高级的线缆&e必须&r通过组装机制造。", "quests.low_voltage.lv_fluid_solidifier.title": "基础流体固化器", "quests.low_voltage.lv_fluid_solidifier.subtitle": "流体固化器用于固化……", "quests.low_voltage.lv_fluid_solidifier.desc": "将这台机器与&3化学反应釜&r相邻放置，即可自动将橡胶固化成&a橡胶片&r。\n\n使用&d扳手&r调整&3化学反应釜&r侧面方向并开启流体&9自动输出&r，即可实现自动化传输。\n\n后续还有其他流体需要固化处理，你可以在非橡胶生产时段&3重新调配流体固化器&r的功能——或者直接建造第二台专用设备！", @@ -3220,7 +3228,7 @@ "quests.low_voltage.cupronickel_ingot.desc": "格雷科技进阶的一大核心在于获取新材料，这些材料将用于升级机器和解锁高级组件。\n\n你即将接触的其中一种材料是&b白铜&r——这仅是漫长征程的起点。\n该材料用于建造你的第一座&6电力高炉&r，乃是工业发展不可或缺的关键步骤。\n\n幸运的是，这第一步相当简单：一台&7合金炉&r即可胜任。\n因此即便配方显示需要&b128个白铜&r也无需担忧——实际操作比看起来容易得多！&r\n\n后续阶段的合金制备将日趋复杂，趁简单的时候好好享受吧！", "quests.low_voltage.cupronickel_coil.title": "白铜线圈", "quests.low_voltage.cupronickel_coil.subtitle": "宝宝的第一个加热线圈", - "quests.low_voltage.cupronickel_coil.desc": "准备&a128份白铜&r、&a32份青铜&r与&a16份锡合金&r，用于制造初代电力高炉所需的加热线圈。\n\n这仍不到整座电力高炉原材料成本的一半（！）。你还需要准备约各一组的殷钢与钢材，请尽快投入采矿作业。\n\n白铜线圈能使电力高炉处理最高&d1800K&r的配方（未计入电压增益）。这个温度在我们看来相当炙热。\n\n&6线圈详解教程位于&l格雷科技能源&r&6标签页——前往查阅以了解更多！&r", + "quests.low_voltage.cupronickel_coil.desc": "准备&a128份白铜&r、&a32份蓝钢&r与&a16份锡合金&r锭，以及&a128个耐火砖&r ，用于制造初代电力高炉所需的加热线圈。\n\n这仍不到整座电力高炉原材料成本的一半（！）。你还需要准备约各一组的殷钢与钢材，请尽快投入采矿作业。\n\n白铜线圈能使电力高炉处理最高&d1800K&r的配方（未计入电压增益）。这个温度在我们看来相当炙热。\n\n&6线圈详解教程位于&l格雷科技能源&r&6标签页——前往查阅以了解更多！&r", "quests.low_voltage.lv_ebf.title": "电力高炉", "quests.low_voltage.lv_ebf.subtitle": "格雷科技的核心机器之一，我们喜欢这个庞然大物。", "quests.low_voltage.lv_ebf.desc.1": "这个任务解释了&3电动高炉&r的核心机制，而旁边的任务将解释多方块部件的机制。一定要查看那个任务。\n\n总之，&3电力高炉&r是你的&e第一个电动多方块结构&r！恭喜。它用于在高温下处理材料。\n\n你将熟悉电力高炉来制造&a铝&r并进步到&d&bMV时代&r。它还能比&6高炉&r更快地制造&7钢&r，这意味着你终于可以拆除旧的群峦传说铁匠铺了。", @@ -3248,13 +3256,26 @@ "quests.low_voltage.mv_hull.desc2": "在深入&bMV&r阶段之前请记住，若不想过度依赖格雷科技，在&6TFG&r整合包中你可以运用&6机械动力&r来强化基础设施。铝制传动杆与齿轮的应力容量是钢制的四倍，装配后所有机器都能更快地运转！", "quests.low_voltage.aluminium_greate.title": "铝级格雷机械", "quests.low_voltage.aluminium_greate.subtitle": "也被称为“中应力”阶段", - "quests.low_voltage.aluminium_greate.desc": "距上次升级已有一段时日，现在你终于解锁了全新等级的格雷机械齿轮与传动轴。与之前一样，铝质部件的应力容量达到了钢质的&b四倍&r。\n\n继续推进格雷机械系列内容完全属于可选流程——我们更建议你转向格雷科技主线发展。但若你希望继续沿用原有设备，本次升级将帮助你&b理顺&r部分旧装置的杂乱布局。\n\n你可以通过&e蒸汽引擎&r进一步提升整体应力规模，或利用&9Create Additions&r的&e电动马达&r将EU电能转化为SU应力单位。", + "quests.low_voltage.aluminium_greate.desc": "距上次升级已有一段时日，现在你终于解锁了全新等级的格雷机械齿轮与传动轴。与之前一样，铝质部件的应力容量达到了钢质的&b四倍&r。\n\n继续推进格雷机械系列内容完全属于可选流程——我们更建议你转向格雷科技主线发展。但若你希望继续沿用原有设备，本次升级将帮助你&b理顺&r部分旧装置的杂乱布局。\n\n你可以通过&e蒸汽引擎&r进一步提升整体应力产出，或利用&9Create Additions&r的&e电动马达&r将EU电能转化为SU应力单位。", "quests.low_voltage.oil.title": "提前发现石油了？", "quests.low_voltage.oil.subtitle": "致LV阶段的卷王", - "quests.low_voltage.oil.desc": "若你在旅途中发现任何油砂矿或（沙漠中的）石油喷口，其实在LV阶段便可稍加利用。\n\n你可将其转化为重燃油用于锅炉，或更佳——用它生产少量&b聚乙烯&r！\n\n相关细节虽在MV章节，但此刻你已可用聚乙烯制造数种物品，例如成本更低的机器外壳与二极管。", + "quests.low_voltage.oil.desc": "若你在旅途中发现任何油砂矿或（沙漠中的）石油喷口，其实在LV阶段便可稍加利用。\n\n你可将其转化为重燃油用于锅炉，或者将其转化为柴油用于内燃发电机。", "quests.low_voltage.glowstone.title": "永久照明", "quests.low_voltage.glowstone.subtitle": "发明电灯泡的迂回方式", "quests.low_voltage.glowstone.desc": "想找一些廉价的永久光源？现在你有了LV提取机（很快还会有LV流体固化机），正好可以好好利用在下界攒下的那些&6荧石粉&r。不够用？用搅拌机还能自己造。\n\n打开JEI看看，所有用液态荧石和荧石块合成的新光源都在里面。格雷科技还提供了直接用荧石粉在组装机里制作的款式。\n\n还有个福利：液态荧石可以直接作为灯笼的无限燃料！", + "quests.low_voltage.next_machines.title": "甚至更多机器", + "quests.low_voltage.next_machines.subtitle": "好戏开场", + "quests.low_voltage.next_machines.desc": "既然你已有几台机器在运转，现在是时候让它们投入工作了。\n\n在本任务右侧列出了一些完全可选的机器（本章节不知还能将它们放在何处！），除此之外，组装机能让电子元件更便宜，而化学反应釜、提取机和流体固化机则能降低橡胶成本。完成这些之后，剩下的&7LV&r阶段就任你探索了！", + "quests.low_voltage.food_machines.title": "食品加工机器", + "quests.low_voltage.food_machines.subtitle": "快餐即刻享用", + "quests.low_voltage.food_machines.desc": "食品加工机与电烤箱是两台专门为适配群峦传说食物系统而设计的定制机器。\n\n食品加工机能够处理搅拌碗配方、汤、三明治、熏制、腌制、风干……你能想到的它几乎都能做。除了烹饪——那是电烤箱的职责。\n\n腐烂物销毁覆盖板可以安装在任何机器或输入总线上，自动销毁任何变质的食物。它能有效防止你的食物自动化流水线发生堵塞！", + "quests.low_voltage.bakelite.subtitle": "亦称聚氧基苄基甲基乙二醇酐……试试看能快速念五遍不", + "quests.low_voltage.bakelite.desc.1": "你的第一种聚合物！只需将酚醛树脂与石棉或防腐刨花板复合材料混合即可制成。\n\n你将使用电木来制作酚醛电路板和MV机器外壳，因此批量生产是个好主意，不过到&bMV&r阶段你将用聚乙烯替代它。\n\n现在你还获得了一种更便宜的ULV和LV机器外壳配方！", + "quests.low_voltage.bakelite.desc.2": "&l&3背景知识：&r&o电木是第一种由合成组分制成的塑料。历史上第一种塑料的殊荣属于帕克辛（硝化纤维素塑料），但其原料硝化纤维素的合成链过长——对低压阶段来说过于复杂。\n\n第二种塑料是加拉利斯（酪蛋白塑料），由乳蛋白和甲醛制成，但牛奶的自动化生产较为困难。", + "quests.low_voltage.lv_forming_press.subtitle": "冲压机床用于塑形……", + "quests.low_voltage.lv_forming_press.desc": "这台机器通常用途不多，但在TFG中，如果你因任何原因仍需使用TFC的焊接配方，它都可以胜任。它也能轻松复制任何模头或模具。\n\n更迫在眉睫的是（双关语见谅），你需要用它来制作下一阶段电路的关键组件——&a酚醛电路板&r。\n\n进入&bMV&r阶段后，你将获得一个更便宜的配方。", + "quests.low_voltage.lv_laser_engraver.subtitle": "biu biu！", + "quests.low_voltage.lv_laser_engraver.desc": "制作机械动力物流系统所需的发信线圈需要用到基础激光蚀刻机。除此之外，它目前的功能不多，只能制作磨制石头。\n\n关于激光的更多应用，要等到&bMV&r阶段再处理了。", "quests.medium_voltage": "&bMV&r - 中压", "quests.medium_voltage.subtitle": "进军石油化工，精炼电子技术", "quests.medium_voltage.mv_machine_hull.title": "欢迎来到MV！", @@ -3946,7 +3967,8 @@ "quests.steam_age.create_tools.desc": "使用扳手可以通过潜行+右键单击来快速拾起机械动力方块，当然，用斧或镐也可以。戴上护目镜则能让你查看机器的更详细信息，例如它们产生或消耗的应力。\n\n目前这两样工具都并非强制使用，但它们会非常有用，你之后肯定会需要它们的。\n\n关于吹制玻璃的帮助，请查阅 TFG 提示章节。你知道用锤子破坏圆石会将其变为沙砾，再次破坏沙砾则会变成沙子……吗？", "quests.steam_age.basic_millstone.title": "自动化矿石处理", "quests.steam_age.basic_millstone.subtitle": "告别手推磨", - "quests.steam_age.basic_millstone.desc": "&3石磨&r是手推磨的自动化版本。你可以把任何你想粉碎的东西从顶部扔进去，然后右键单击取出粉碎后的物品。如果你直接把它连接到动物曲柄上，它会相当慢，但你可以使用齿轮比来提高它的速度。\n\n请注意：产出物仅会出现在第一个槽位。其余槽位属于格雷科技机制的一部分，在&6HV&r阶段前都无需关注。", + "quests.steam_age.basic_millstone.desc.1": "&3石磨&r是手推磨的自动化版本。你可以把任何你想粉碎的东西从顶部扔进去，然后右键单击取出粉碎后的物品。如果你直接把它连接到动物曲柄上，它会相当慢，但你可以利用齿轮比来提高它的速度。\n\n请注意：产出物仅会出现在第一个槽位。其余槽位属于格雷科技机制的一部分，在&6HV&r阶段前都无需关注。", + "quests.steam_age.basic_millstone.desc.2": "&l&3背景知识：&r&o石磨之所以不能将谷物磨成面粉，是因为机械动力模组无法正确处理群峦传说中的食物腐败机制——此前这曾引发各种问题，比如腐烂食物变新鲜或新鲜食物直接腐烂。在&7LV阶段&r解锁食品加工机之前，你仍需通过研钵在合成栏里加工谷物。", "quests.steam_age.horse_crank.title": "你的第一个动力源", "quests.steam_age.horse_crank.subtitle": "让你的牲畜付租金", "quests.steam_age.horse_crank.desc.1": "&3动物曲柄&r 是你第一个可获得的机械动力源。要使用它，将曲柄放在一个7x7清空区域的中心，并用拴绳将动物拴在上面。不同的动物会提供不同数量的动力，而下面的方块会增加输出动力的速度。多个曲柄的区域可以重叠。\n\n你可能需要手持第二根拴绳来拴住动物。", @@ -4137,7 +4159,7 @@ "quests.steam_age.rolling_mill.desc.2": "&l&3背景知识：&r &o该机器在旧版TFG中就已存在，但当时生产的是金属杆而非板材，而在LV卷板机问世之前，制作板材的最佳方案竟有20%%的失败概率！&r", "quests.steam_age.steel_mixer.title": "钢动力搅拌器", "quests.steam_age.steel_mixer.subtitle": "LV搅拌机的早期版本", - "quests.steam_age.steel_mixer.desc": "&3钢动力搅拌器&r是蒸汽时代另一台值得制造的顶尖设备——它能以远胜坩埚的效率混合各类彩色钢粉！此外还能执行大量其他配方，包括某些涉及气体的反应……不必深究其原理。\n\n需要加热的配方可使用木炭炉或烈焰人燃烧室提供热源，并通过机械臂实现自动添料。", + "quests.steam_age.steel_mixer.desc": "&3钢动力搅拌器&r是蒸汽时代另一台值得制造的顶尖设备——它能以远胜坩埚的效率混合各类黑钢粉！遗憾的是，它无法直接制作红钢或蓝钢粉，但能够生产它们的&a脆钢版本&r。\n\n此外还能执行大量其他配方，包括某些涉及气体的反应……不必深究其原理。\n\n需要加热的配方可使用木炭炉或烈焰人燃烧室提供热源，并通过机械臂实现自动添料。", "quests.steam_age.potin.title": "粗青铜管道商……", "quests.steam_age.potin.subtitle": "……我要上战场了，只需要你最好的粗青铜合金。", "quests.steam_age.potin.desc.1": "&d粗青铜合金流体管道&r在当前材料等级中拥有&a极高的性价比与吞吐量&r。若想优化流体输送系统，建议考虑制作此类管道。\n\n要获取&d粗青铜合金&r，请先合成其&e粉末&r形态。\n\n本任务要求制作细径或标准尺寸的管道，完成任意尺寸即可。", @@ -4157,7 +4179,7 @@ "quests.steam_age.what_next.desc": "若你直接快速推进至此，建议优先制造LV卷板机、线材轧机或搅拌器等设备。\n若已制作了下面的动能机器，则建议选择组装机、电弧炉、化学反应釜或磁化机。", "quests.steam_age.alternator.title": "交流发电机", "quests.steam_age.alternator.subtitle": "将应力转化为电力", - "quests.steam_age.alternator.desc.1": "若你已搭建了规模可观的蒸汽时代设备，大可不必为了改用锅炉和LV蒸汽涡轮而立即将其全部拆除。&3交流发电机&r能够将蒸汽引擎产生的应力单位转化为电力。每台蒸汽引擎配合交流发电机可输出1安LV电流！\n\n但需注意，交流发电机是将应力转换为了另一套电力系统（FE），因此你需要通过能量转换器将其转化为格雷科技可用的LV电力（EU）。记得用软槌将其切换至\"FE转EU\"模式。", + "quests.steam_age.alternator.desc.1": "若你已搭建了规模可观的蒸汽时代设备，大可不必为了改用锅炉和LV蒸汽涡轮而立即将其全部拆除。&3交流发电机&r能够将蒸汽引擎产生的应力单位转化为电力。每台蒸汽引擎配合交流发电机可输出1安&7LV&r电流！\n\n但需注意，交流发电机是将应力转换为了另一套电力系统（FE），因此你需要通过能量转换器将其转化为格雷科技可用的&7LV&r电力（EU）。记得用软槌将其切换至&a\"FE转EU\"&r模式。", "quests.steam_age.alternator.desc.2": "一个蒸汽引擎输出8安LV电流的示例！\n", "quests.steam_age.packager.title": "机械动力物流", "quests.steam_age.packager.subtitle": "“我们家有AE2”", @@ -4344,6 +4366,7 @@ "quests.stone_age.medical_conditions.subtitle": "别吃石棉", "quests.stone_age.medical_conditions.desc.1": "小心你捡起的东西！并非所有矿石或粉尘都可以安全触碰，有些会导致&6健康状况&r的累积。\n\n所有&c危险&r信息都会写在物品提示上，所以如果你突然发现身上出现了负面效果，赶紧把那件物品移出你的物品栏！把它放进像小缸或背包这样的容器里是安全的。\n\n大多数这类效果会随着时间慢慢自行消退，但如果你让它们累积得足够久，就会开始引发一大堆其他讨厌的效果，甚至包括&c死亡&r。", "quests.stone_age.medical_conditions.desc.2": "你终究需要处理其中一些材料，因此也有应对它们的方法。\n\n最好的方法是首先避免染上任何病症——口罩和橡胶手套能分别防止吸入危害和接触危害。\n\n次优的方法是进行治疗：查看一些你可以合成的&a药丸、药片和药膏&r——它们都有助于治愈特定的效果（并能提供有用的增益！），不过更强效的药物也会有更恼人的副作用。", + "quests.stone_age.medical_conditions.desc.3": "请务必远离任何具有&c致癌性&r或&c放射性&r的物质——在你能够于&7LV&r阶段制作出对乙酰氨基酚之前，这些负面状态将是&e永久性&r的。", "quests.stone_age.medical_conditions.task": "做自己的医生", "quests.stone_age.copper_for_anvil.title": "为制作砧准备铜锭", "quests.stone_age.copper_for_anvil.subtitle": "你最好习惯弄到14个某种锭。", @@ -4928,6 +4951,9 @@ "quests.tfg_tips.greenhouse_automation.title": "温室自动化", "quests.tfg_tips.greenhouse_automation.subtitle": "集众力于一身……", "quests.tfg_tips.greenhouse_automation.desc": "通过结合Firmalife的&2采摘器&r与&2清扫器&r、机械动力的机械臂、以及格雷科技的物品收集器，你完全可以实现温室的全自动化运行！\n\n&2采摘器&r在收到红石脉冲时，会从水培种植盆和四槽种植盆中采摘成熟作物；而&2清扫器&r在连接红石信号时，会收割其周围3x3区域内其他类型种植盆中的成熟作物。\n\n这些机器会产出掉落物形式的物品，而物品收集器能吸附其周围大范围内的这些物品。\n\n最后，通过管道将种子送回机械臂，即可重新种植到种植盆中！", + "quests.tfg_tips.food_automation.title": "食品自动化", + "quests.tfg_tips.food_automation.subtitle": "自动化你的厨房。", + "quests.tfg_tips.food_automation.desc": "从&7LV&r阶段开始，你就可以使用&3电烤箱&r和&3食品加工机&r来实现食物的完全自动化生产。\n\n为了在食品加工机中正确使用多种原料制作食物（例如三明治），你需要使用&3机械臂&r并开启“保持补给”按钮（或者利用机械动力物流将精确数量的原料配送到你的机器中）。\n\n为了防止腐烂的食物堆满你的存储空间，你应该使用&3腐烂物销毁覆盖板&r。\n\n这在后期将与&bMV&r阶段的电冰箱完美配合。", "quests.tfg_tips.beekeeping.title": "养蜂", "quests.tfg_tips.beekeeping.subtitle": "它们现在这么小...", "quests.tfg_tips.beekeeping.desc": "&b养蜂&r有着诸多用途。蜜蜂不仅能给附近的作物授粉（需具备相应特性），你还能从中获取&a蜜蜡&r和&a蜂蜜&r等实用资源。通过培育可提升蜜蜂的各项属性。\n&2野外指南&r对&b养蜂&r的所有机制提供了详尽的解说。",