From b504926b1e620a2faa45b31c3c24668283d615c8 Mon Sep 17 00:00:00 2001 From: Aiz <66974576+Aiz0@users.noreply.github.com> Date: Sat, 22 Jun 2024 22:23:37 +0200 Subject: [PATCH] Tinkers contruct (real) (#189) * feat(mods): tinkers construct * feat(recipes): moving stuff from metalurgy to tconstruct * Tinkers update (#187) * Fixes (#186) * fix(recipes): backpack upgrades * fix: stuff not working? * revert(mods): rm teleporters and spawners (#183) * feat(mods): modelfix (#182) add modelfix to fix models. * chore(packwiz): file stuff someone forgor * fix(recipes): tinker casting gears. currently no copper gear is craftable. * fix: rm duplicate fluids * feat(recipes): cast in table to upgrade tiers * chore(remove): goodbye metallurgy * fix(world gen): I KILLED IT (tungsten) --------- Co-authored-by: Sam * tungsten textures * Remove metallurgy (#188) * fix(ponder): rm metallurgy ponder * chore(mods): packwiz index mod stuff * fix: rm metallurgy recipe making stuff * fix(recipes): backpack uses tconstruct brass. * fix(recipes): fumo use tconstruct fluid * fix(recipes): coal dust for cast iron still need to add coal dust recipe. * fix: tconstruct fluid instead of metallurgy. * fix(recipes): tconstruct alloying * feat(recipes): add back alloy mixing for early game. * chore(unify): rm metallurgy from list * fix(recipes): rm metallurgy recipes * chore: rm metallurgy lang file * chore: remove final metallurgy stuff. * chore: update tinkers construct * chore: mantle update * chore: removals * feature: world gen Silver/Nickel * ignore update * ignore packwiz update * added casting helper functions * updates / more helper functions * fixes * remove metallurgy complete merge me --------- Co-authored-by: Sam --------- Co-authored-by: Sam --- .gitignore | 7 +- .packwizignore | 8 +- config/almostunified/unify.json | 1 - index.toml | 84 ++++--- .../textures/vehicles/tier_2_rocket.png | Bin 2161 -> 9971 bytes .../assets/createmetallurgy/lang/en_us.json | 6 - .../textures/block/dense_tungsten_hull.png | Bin 707 -> 0 bytes .../block/high_density_tungsten_block.png | Bin 707 -> 0 bytes .../textures/item/high_density_tungsten.png | Bin 659 -> 0 bytes .../item/high_density_tungsten_sheet.png | Bin 253 -> 0 bytes .../grand_expanse/textures/raw_tungsten.png | Bin 0 -> 279 bytes .../grand_expanse/textures/tungsten_ingot.png | Bin 0 -> 267 bytes kubejs/assets/tconstruct/lang/en_us.json | 4 + .../models/block/smeltery/basin.json | 185 ++++++++++++++++ .../models/block/smeltery/table.json | 143 ++++++++++++ .../textures/block/casting_basin.png | Bin 0 -> 886 bytes .../textures/block/casting_table.png | Bin 0 -> 760 bytes kubejs/client_scripts/ponder.js | 57 ----- kubejs/server_scripts/backpacks.js | 2 +- kubejs/server_scripts/crafting.js | 76 +------ kubejs/server_scripts/create-recipes.js | 81 +++---- kubejs/server_scripts/fumo.js | 6 +- kubejs/server_scripts/item-tags.js | 38 +--- kubejs/server_scripts/metallurgy.js | 205 ------------------ kubejs/server_scripts/removals.js | 16 +- kubejs/server_scripts/tconstruct.js | 103 +++++++++ kubejs/startup_scripts/blocks.js | 8 - kubejs/startup_scripts/config.js | 108 +-------- kubejs/startup_scripts/fluids.js | 11 - kubejs/startup_scripts/items.js | 21 -- kubejs/startup_scripts/tool-tiers.js | 10 - kubejs/startup_scripts/world-gen.js | 21 +- mods/building-gadgets.pw.toml | 6 +- mods/chat-heads.pw.toml | 8 +- mods/corpse.pw.toml | 8 +- mods/create-compression.pw.toml | 8 +- mods/create-enchantment-industry.pw.toml | 8 +- mods/create-metallurgy.pw.toml | 13 -- mods/create-power-loader.pw.toml | 8 +- mods/cupboard.pw.toml | 6 +- mods/curios.pw.toml | 8 +- mods/custom-machinery-create.pw.toml | 8 +- mods/custom-machinery.pw.toml | 8 +- mods/cyclops-core.pw.toml | 8 +- mods/embeddium.pw.toml | 8 +- mods/entity-model-features.pw.toml | 8 +- mods/entitytexturefeatures.pw.toml | 8 +- mods/ftb-chunks-forge.pw.toml | 6 +- mods/ftb-quests-forge.pw.toml | 6 +- mods/ftb-xmod-compat.pw.toml | 6 +- mods/in-control.pw.toml | 8 +- mods/item-obliterator.pw.toml | 8 +- mods/journeymap.pw.toml | 8 +- mods/kubejs.pw.toml | 8 +- mods/lootr.pw.toml | 8 +- mods/mantle.pw.toml | 13 ++ mods/modelfix.pw.toml | 8 +- mods/modernfix.pw.toml | 8 +- mods/no-mo-portals.pw.toml | 8 +- mods/ping-wheel.pw.toml | 8 +- mods/placebo.pw.toml | 6 +- mods/polymorph.pw.toml | 8 +- mods/rechiseled.pw.toml | 8 +- mods/redstonepen.pw.toml | 8 +- mods/rei.pw.toml | 8 +- mods/saturn.pw.toml | 8 +- mods/sophisticated-backpacks.pw.toml | 6 +- mods/sophisticated-core.pw.toml | 6 +- mods/suggestion-tweaker.pw.toml | 8 +- mods/tinkers-construct.pw.toml | 13 ++ mods/toms-storage.pw.toml | 8 +- mods/zume.pw.toml | 8 +- resourcepacks/fancy-crops.pw.toml | 8 +- resourcepacks/toms-create-storage.pw.toml | 8 +- 74 files changed, 761 insertions(+), 775 deletions(-) delete mode 100644 kubejs/assets/createmetallurgy/lang/en_us.json delete mode 100644 kubejs/assets/grand_expanse/textures/block/dense_tungsten_hull.png delete mode 100644 kubejs/assets/grand_expanse/textures/block/high_density_tungsten_block.png delete mode 100644 kubejs/assets/grand_expanse/textures/item/high_density_tungsten.png delete mode 100644 kubejs/assets/grand_expanse/textures/item/high_density_tungsten_sheet.png create mode 100644 kubejs/assets/grand_expanse/textures/raw_tungsten.png create mode 100644 kubejs/assets/grand_expanse/textures/tungsten_ingot.png create mode 100644 kubejs/assets/tconstruct/lang/en_us.json create mode 100644 kubejs/assets/tconstruct/models/block/smeltery/basin.json create mode 100644 kubejs/assets/tconstruct/models/block/smeltery/table.json create mode 100644 kubejs/assets/tconstruct/textures/block/casting_basin.png create mode 100644 kubejs/assets/tconstruct/textures/block/casting_table.png delete mode 100644 kubejs/server_scripts/metallurgy.js create mode 100644 kubejs/server_scripts/tconstruct.js delete mode 100644 kubejs/startup_scripts/tool-tiers.js delete mode 100644 mods/create-metallurgy.pw.toml create mode 100644 mods/mantle.pw.toml create mode 100644 mods/tinkers-construct.pw.toml diff --git a/.gitignore b/.gitignore index 637348b..bf5bd22 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ .vscode -reload.sh \ No newline at end of file +reload.sh +kubejs/.idea +refresh.bat +reload.bat +serve.bat +update-fork.bat diff --git a/.packwizignore b/.packwizignore index 7f6d067..3b35985 100644 --- a/.packwizignore +++ b/.packwizignore @@ -8,4 +8,10 @@ # probe stuff should not be necessary. /kubejs/probe # Aiz reload script -/reload.sh \ No newline at end of file +/reload.sh +# Star's scripts +kubejs/.idea +refresh.bat +reload.bat +serve.bat +update-fork.bat \ No newline at end of file diff --git a/config/almostunified/unify.json b/config/almostunified/unify.json index ab5edba..635aceb 100644 --- a/config/almostunified/unify.json +++ b/config/almostunified/unify.json @@ -6,7 +6,6 @@ "crafttweaker", "create", "thermal", - "createmetallurgy", "immersiveengineering", "mekanism", "quark" diff --git a/index.toml b/index.toml index 50e902f..1024723 100644 --- a/index.toml +++ b/index.toml @@ -54,6 +54,39 @@ file = "config/zume.json5" [[files]] file = "defaultconfigs/create-server.toml" +[[files]] +file = "kubejs/.vscode/fluid-attributes.json" + +[[files]] +file = "kubejs/.vscode/item-attributes.json" + +[[files]] +file = "kubejs/.vscode/item-tag-attributes.json" + +[[files]] +file = "kubejs/.vscode/lang-keys.json" + +[[files]] +file = "kubejs/.vscode/probe.class-definitions.json" + +[[files]] +file = "kubejs/.vscode/probe.code-snippets" + +[[files]] +file = "kubejs/.vscode/probe.doc-schema.json" + +[[files]] +file = "kubejs/.vscode/probe.lang-schema.json" + +[[files]] +file = "kubejs/.vscode/probe.lang_key-definitions.json" + +[[files]] +file = "kubejs/.vscode/probe.registry-definitions.json" + +[[files]] +file = "kubejs/.vscode/settings.json" + [[files]] file = "kubejs/README.txt" @@ -102,9 +135,6 @@ file = "kubejs/assets/create/textures/block/deployer.png" [[files]] file = "kubejs/assets/create/textures/item/brass_hand.png" -[[files]] -file = "kubejs/assets/createmetallurgy/lang/en_us.json" - [[files]] file = "kubejs/assets/flopper/textures/blocks/flopper_inside.png" @@ -132,9 +162,6 @@ file = "kubejs/assets/grand_expanse/textures/block/copper_coil_block.png" [[files]] file = "kubejs/assets/grand_expanse/textures/block/copper_coil_block.png.mcmeta" -[[files]] -file = "kubejs/assets/grand_expanse/textures/block/dense_tungsten_hull.png" - [[files]] file = "kubejs/assets/grand_expanse/textures/block/diamond_head.png" @@ -159,9 +186,6 @@ file = "kubejs/assets/grand_expanse/textures/block/electrolyzer/tank.png" [[files]] file = "kubejs/assets/grand_expanse/textures/block/electrolyzer/tank_water.png" -[[files]] -file = "kubejs/assets/grand_expanse/textures/block/high_density_tungsten_block.png" - [[files]] file = "kubejs/assets/grand_expanse/textures/block/sturdy_hull.png" @@ -201,12 +225,6 @@ file = "kubejs/assets/grand_expanse/textures/item/fumo_base.png" [[files]] file = "kubejs/assets/grand_expanse/textures/item/gear_mold.png" -[[files]] -file = "kubejs/assets/grand_expanse/textures/item/high_density_tungsten.png" - -[[files]] -file = "kubejs/assets/grand_expanse/textures/item/high_density_tungsten_sheet.png" - [[files]] file = "kubejs/assets/grand_expanse/textures/item/incomplete_electron_tube.png" @@ -234,6 +252,21 @@ file = "kubejs/assets/sophisticatedbackpacks/textures/block/diamond_clips.png" [[files]] file = "kubejs/assets/sophisticatedbackpacks/textures/block/gold_clips.png" +[[files]] +file = "kubejs/assets/tconstruct/lang/en_us.json" + +[[files]] +file = "kubejs/assets/tconstruct/models/block/smeltery/basin.json" + +[[files]] +file = "kubejs/assets/tconstruct/models/block/smeltery/table.json" + +[[files]] +file = "kubejs/assets/tconstruct/textures/block/casting_basin.png" + +[[files]] +file = "kubejs/assets/tconstruct/textures/block/casting_table.png" + [[files]] file = "kubejs/assets/tinkers_construct/readme.txt" @@ -378,9 +411,6 @@ file = "kubejs/server_scripts/furnace.js" [[files]] file = "kubejs/server_scripts/item-tags.js" -[[files]] -file = "kubejs/server_scripts/metallurgy.js" - [[files]] file = "kubejs/server_scripts/removals.js" @@ -390,6 +420,9 @@ file = "kubejs/server_scripts/server.js" [[files]] file = "kubejs/server_scripts/sifter.js" +[[files]] +file = "kubejs/server_scripts/tconstruct.js" + [[files]] file = "kubejs/startup_scripts/blocks.js" @@ -405,9 +438,6 @@ file = "kubejs/startup_scripts/item-events.js" [[files]] file = "kubejs/startup_scripts/items.js" -[[files]] -file = "kubejs/startup_scripts/tool-tiers.js" - [[files]] file = "kubejs/startup_scripts/world-gen.js" @@ -499,10 +529,6 @@ metafile = true file = "mods/create-mechanical-extruder.pw.toml" metafile = true -[[files]] -file = "mods/create-metallurgy.pw.toml" -metafile = true - [[files]] file = "mods/create-power-loader.pw.toml" metafile = true @@ -699,6 +725,10 @@ metafile = true file = "mods/lootr.pw.toml" metafile = true +[[files]] +file = "mods/mantle.pw.toml" +metafile = true + [[files]] file = "mods/mekanism-generators.pw.toml" metafile = true @@ -891,6 +921,10 @@ metafile = true file = "mods/thermal-foundation.pw.toml" metafile = true +[[files]] +file = "mods/tinkers-construct.pw.toml" +metafile = true + [[files]] file = "mods/toms-storage.pw.toml" metafile = true diff --git a/kubejs/assets/ad_astra/textures/vehicles/tier_2_rocket.png b/kubejs/assets/ad_astra/textures/vehicles/tier_2_rocket.png index e93434f10c5f1a7ba582c65cbb101bb1a8ac40fd..5e60a9f51fb6a625842a355c9d47c2c110c96405 100644 GIT binary patch literal 9971 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TA2QDNC6(n%9LI^P;wq=| z!4;>Hd`YD$Uy@Wj{*)@aQe}^`cxDt^_KZY{;xZyga1n`>#M(P3iNMSGo%?R%q0xT13#}ncsC}J*Neovii1?4f4w1l@*FA8`~r_L*_DH?}<@i_s@*Rp+!oU3w7tM~Qoo45bCKHWB&4cOTRXx|`cjxAi`VSoL(<}Kty1;;AvSxQz zw>fe0jJPu=Vch530uyS0P7$dkNzhCIyVrtLcps`$o!K!l)izYu;Fps1hjlksvg6`rMbEYVH=Ol0PkH7_W0zNX?YlZl;SQF|8dH6hP%gplSzOD@1GzYdu**Y(2gwgE;WvKmMf2;w_LBMa zfAXUFXL7BTz7bFzO1^(3Bx5PjM)RW8J<}R*SHg{kO2*p!RErSi^+eHl+PF^2xZ+0x z%uG&c*p-j2=(RiziYdhU_VZeJV#-tAKd;tb4=UYb8(iK+{vv8yh)b_4Lri6>jnrM6 zW$41hs-IO4u$5@xB#cUTZV*h9%ctf4dU&&5h;gZTT0HLZ+`BbaYFON>_18kM--iHU z5otc8HdhpbcrGvQN9M~qY>Zr91Vp$eDkG#^e%562GsY7){%m2!PqhdcU-+&naFy#M zuOe1qoz_H+yf(T#=`YTh%h#S&!o6C5JqX$W&P}iU^v%F2|53Q^!M88T$l$C;!guAR7=!GF6WG3e+ziRw-$mn zgCl24{P0hHyey6|7hfJn81J8qCroQBAqBCGpNJ)8G>`~3a|u#bDZCg6RARY0#jy6P zeqaQEI~i*i&%91nCF0A6fsxZEUh_sD44HrUj}KJoPpg9l`A`4xGt>2Kueo~dFG67h zCZ@(744Ys4Yj!hn?u=?^H}_$gN1Z%U!*wl0plco#;#t2@LG~$0_akYtk{%>P`nd;&931@6 z-K~fm-2Z}?Elit#@QE@Pp+Da*3EiAur{S^b*AS4vY||I}pGSgEyBlKost=87$(D z{@4A;O5`U~DA)0nkU(DK2{Y2?)2Q_K5R*Saa^a*QE%$J*eW&m+Cqt^aTvp0P`NS{o zntp#6RufWIYz7(*Qu{&cz?i+#(5X~P(?GZh!%G^{q7_s#i1op{&t_*OEvmst_>9Ts zM4-jZJ&rMhh>{W3!DqK$Fi*AoiXXfb-+TXqWlT!iySL9;!-BUC3Cv3}bouQ_e z;l6P32a$1cYoY+6FpK19W@lziHeFf$|J>{6BjrqxnVmM%)6-HcxxK0qTRrRx8guLB zpt<L~b=GW<1fxCAl(6BmdCz1+T$!-$qb<4j^VqnTBL$O{ZQ& z6N!XmN+SvvuW#i`7tB=(o>X;@X!x$=ZCBOu}Qy*%ROT}wQIIz|*Brm2F<2L{mq)cJ23-gO^ zI9Ds7$(AI{^2lJ`+7vLDPx|gF_+47wp%xhN3|zY;Ddk;-ZVX&9W8=f7ke7xR|JZ{O z=>|uYa1%xxX|BtC5n+1jVPN1BGa^P~aF!5yA7N~&X(AkUaCTgpgQ+%vONCY?^3+1ZTAi4~kpXOs$sw8^qV3CiXr zKCO)qudw8~78Ee6y>t3diGw-}*mp+4&Jh+1hhCBE7zrWKYq+%|IRGxTz zSA*(p>1{2~v}i*rQ%lK;b936r3h_Vlbc@;!`G*n?LkofCXPU*naOs4>C7wJme&^@s z%~Ly{QvbuxA4&qx{MNsC&8GEHlL1a0f6dEDg$Eg+9ykX0z5fCOgtrBYnLu_Ye@Dtw zJ`v<5d>qQdnGdiGnFwtraF3|&XW~|}ALgy3m;0N2qm%JJ2*y|2#rxVT-}2HKo4&0z zVTMLOqkX04v-ZQ#(5H2kpMKtVHiXiiK*s>9!Fn*j$z!j2g<{^k_4Xt62c^3jmS})K z-C<%aQl5cu%7X@=VXP2Vt84eDh2we zt(_)UV9r32im||mYfD1~KlcP$wbH#$WFYynA za92Z8v?gl@32A)XXc(AFI{do!{yFFpun)IP>`;$?*=pcwB`)mMK(>XC-5)l;^Y30S zmBT$VSPrL!%G3PjKYibH@1Z>5Xn<;X{rt~Lb45&AEOL-ygd!Hc?aS?>wLzsV`8b2E z+I)b+(1}qKx*y}4{-re`eo5+B?Cxl>0;oCMNEd#fz~oBP1*E#M|xV{+6)Cw5ydk)pcQl{FW5m0($Ud+ZR(4_HTJq=D{@-c~o#IW+v4emW<7 z;BUl;iS#bWkW`pJ;y=CqqsZv!%?KZ63=DptgcReye&feV#6ts;7C&*=2P_ApVbCBf zF(;D=bMB>gyyHi{<{j%l@11+$EicuY(m9ZnG(HVY*pdF1y(5Rtd1udj(^KXUCW9%N zDt}4BjvRW)i{|AfR989bmN*ePmNCNubws zcjfsrlq^=EmlnjW`vLfCT;h1~@I;Q;Jm7|Pu3Y#XQ7*~@fnXZo@>owW(qL`gPRfWj z?B1{Q5BM`#EP7G65BJ)aTVL=9rm0JxUx_;sSdPsK6F^v5 ze0twFJd+Y;V^gPP1)iCx=}+N@IsLlee=F*`hO4Au{Rdz4GNMY(on-NW?)OvY&m~nI{pQWr6cR|Y2D&-jrsXQ;g_?Bq&sH$K<-|j%W zGG~E$WhjSQ)ru7jl*_W2)ZdRsS}_b+;&%DaNPPPB;m6-!v7ATy&v}}MWX_B&aCu_& z14ap8iC@Z=ElSzsx|p8(8CBSMja*(v8U2UP>7KV(OG+Lh9HTu%#Kh!9xtY?zSNsPv zF=?cq8tJSR{eRjdTieXwU`Px=d9qXT{C1JBdF^W{2P&62bf;^yvL!-o1_`HsW6iuE zePB`yp~0IMLMhM7XW#a;kIjfQOLrF+=4z#GB#y0ESoI(!;W2+fjp0^a`eu-ja2B?x zK*Dp@) zQ*BZfOX`;LbnorcG^DlVVb@G}T@o8Eav~tQUqaqBFK)Z%U&iCo`0Pi3&{|Dw)DU-0 z3^lEJA(+{wXM<2S&NXo^=3g!nO+|DlyK%Xgo3MlFfi+*fu)D(o9 z3YoMiWHU-dy{66hxWr*$3UQC#>pwIMs0!8cNJaYP8NWYniZTSUWmqf^VdMA50_E}F z#by->q`9OTqvoM#zM>FJfbxTI7YkA@mTw71?1XIiVtNM`PG00m-nHNw5^YCLO1M|_ z%d@0_XhkYSM-aNi%=?Jsi`)6xSgJr1FeBB|yU*+usYDBV|>a(krhcxR|9x9JYbweoNcH#mnK%}tYPR)|mrAHOJSw6zF zyArpv2UbFsok0;Nu`&$g3*V9im;0TBOPSCzqM@_|!VppEKeaqUbl=*A%RgIkzrq-A zj*JYMTzXc|-pR`~pHBN^!*b##jr-`pf5%Ya@?0!W`mvQqD@{4TN|==_OSlPJZMYgW z;&2SI5=gQr!S-)ag3JAqUI;h$sNa7E+a=x91z|SaFOLJ3EYhDyiG)d?O1~QyDT8op zn8c}u@C}Le#FJDW8W6aOvs8|i!%L0fU+V(Bihzce8+RL>%1oX zEY!Z>Mj`jNqF;Tu|b`(k$18U|vr`c~Uau)kc&& zvBpv3jI$xtq9zrl20`&Rd}!`p5WjmO({ zQHZ&Ov0mnaxrSD-U5Z zgp7N;_nQwsT6spRUYvjFZEtvt@^l2sLuJRc48ii?&aHEK9ycn_1j67<@>oBMP%;oy z%b(go7+^l8diVD2H`lIxqDubQF|h$8!S(Cn7hn^}fYDYcmMLq_tUdSb+izOi?Kr!& zy%hq6;Cl%y%d z@~nh;sZe(RtS72X1Tlk`&(ETyByz3^MN3+!#F8j6}Ew82Tl%2DdCRv^z@hR zquS8A3SToUgJcL0vS12^6uxs!SbCmqSs8-f($g4LiATz#jO=5i%IVl)g2NrSUcB=E z*6mq6J%>HDJET3_LQ*0rhM&AMn?vX->4ul!lVd98#V5eQZkspD+MGC;Dm zUF(8x3Chp@EytU0ep^NW_cVP^pFLS*bjW9bK4AbfKyS|hY$&ZMq=>y|)zms_BPB+N zHjpIY$_d^hW8p|#*Pesk@#AO3rG?S*o>2O z8*-hvf7eVrs6rA)8q#tPCP&roq7m>qLe~a95$pA$x%TNrGdzCJjL1l3VBn&1@95Ay zu@B@W)eUace7!&s(go-VBQ&;8xTEMX zJ7E+R&T2LB);1Fp4r3A_o@iT25~gvIhO{oA|*^7=~RlYPZMpwXu5|2vqASYB&3zJFJA8uysYSI#wZXYz0?)Nd79VA}RxLu&}LgB%0kTbPJHUmym>^ zKKyi8S!yrT(O7juveG`^_pSsO(9RpIzVhpmo+?1%87`%mi@+`sw}!0)FmQFFixAt- zAl!sm<9B7K0qra5;68wopG3+JG%lPXSN@o4BvFtE(?35gynx>(2nl{$){`TPLN@*C zpWkS6ojUn-k#&)t^sE`YIiQ4_Fyj1Vp@I5kIG4$C<{xz~&(87tNl3Of--@u>6qju` zE3B5Z9f>NTq!wMoV&bJ?Tx?o6%swDIu;XX3EVW^009T0yn@ZJxYpZ$T+$-kLp(9GT z30seD0BL8qmoL(1%Xg{wev{A5nmxOplP+Y^3=K6tqza;|ONN0*Uyz~Y(6Uo4%kj-`{<3#{;F4Oid{X5H zH-wkYyjijfsjQDK{jg$wd`ue?1Nfjc{LHl7`P<&nVQ$~Lp?eiChjcK-MxnM2*3_AQN!6Lq0{g|+2)BhAa{Kqnfr_Ua%xBVOaB#p(O+Qe=O&D?O(G65WTdLdZNbOnk zvuZK`lD`UVympB8VcojEXWH&Zv}6c?iGs8o%s}!x0DJrTMfLZag9k0)CX6`JYy`Tx z_M860rwyyQZ@>LF8h+@~EZ?&oBPF=L+Hyh^YOT@b?%=JQrw;b=F}^FSi*TqF)7!91Bayy z^JaR=THzg?GB%eE`Ocl2rjW^)DbWvh>IGm|qraoz4CV1?2H6)Kl!3YwMxJiKI^Pk<8z4o;TU3d2xfG(ii z{y25wbs6c+>-)E`yGKJ^5<-oBr=T?#Z3^wwv}$Nib;&~)Ofx%{bS6&-+fBf?2kFep zC%rl7V$iYj88#g{!mx_e}+`dA#mz6UBXBV|36Q;ebQ@@Hz#NX48Q2}2i=kjmp`2ZYjS(G7L zSZ5Sf!|`LUczmIyTfd~;e6^@;!o&|ht$Xdpk875pv=}sa^Quno+J=u-H4dyIX5xe8 z$&5LA_>>tMxf9xA(BndP*CDTGk3B_e^!|`x>RCNLP9FQ3$H9%y9XOTKv~nB6lr5)#i^6SrvKY*Dj(C*e*ac06@B#TSzk`lE3mCs23D5-=4DohnC>T(h=!4HoXSuKIHA)vtQjK zVh;rmVM5&|MLYiV&(5jTzxRJT&7uA)OEkc(!Bggqcc#?+fBvM|@XO}c27a_|b+S?y zz&sAe?bh>rH3DgQz9n>8n~A)0P*vG6W(n#8j(YPqvE? z5D{3L4FA^B_!wWl^N9q^`G6jT{{8s%u%3m7099GilBD~Up#-LD`Zn*Km;Y0QWjEk3ku%>+0iqg-n3x>y8 z4!0WM(7_kISaXZK|AOi3wGIElk5ZKCf1QZS3H&=D^Li;m665=4gdlzh_?y990GbaBf~$ z$GS8EWq@v<0mkS8?ApS?121}f{J{)>9{DGA#1gb>1-t@kilI2m)B3+u5PK{TlAG(q z0AWEi0LP)*#sIg8BU9nqKg*FhEaFuNaa;y3Oh1 z%kQlzzed64%Vg62U=xQsjn>#}_qc(IXGXTg-{)tA))u))w=V9P^mxs8@a5W~rFroH zB;eR0FO6P&C?r=-zs~2UBZUIjwKcv%L}yoLmvu{SFogANFnmp?2)dt8bcw-w29Tu)7nn#t+=dfd5^3}N`O1Fn#sjxF(p z&*%Kx!UMuKF?nCzoxUbO1#Gw`2u@~w6(+XoL^LL9AByvnCQ|jWM9Q$@)gt3w=$Uv* z8)jEWx9RBEqvz+NHM)HA^Jy6LLAlwqGJ<~aAvtmi7`tBGmp2;$9>fQz(AH^wtL5!E z_j>mIoM;2i#usT9tDGN5KqFxBPfm|%T<#(1ikdzQ=xQETreJDjT(2-3Tg@a^{Tl*d zK33IqWlh{$1tlX;jXO2$ro_OTj!aGuM;-`qosfRt8h?&3{=#XT8@DcqnPG>PS$+xB zWh<&6(Pn>%VdC+x^kO27zZn zTM5x->Ej!f=4P=M!orPPAC)wLUDMuZRqUFdXKv(kA1`Ed*O(;Rd+f|%Sa6yEhGdp; z(*GsQZLA-}{94d8fYpK@LgZI1!^WZ}h!}nebK~IT-!kA^c=7Ay|&OV(c<2um|5CA6hR0VS?qCG0&3nbf z;Fh_Z-1`*)O|C!as2gIp4x;u;;MKo!qnhJMMetp|O7B$*5mxj{3p2ilI`E;UTRU)vgE1XIrOo9sW@2V^Q&wDe_Yto(VY`5gp1`@e zKXj=V$^bMdQ=qP49SCK!h6}bPfIYd|rPNxI2zC$iS=q$Q$TkCPB5aA5tOr|`0iNyH z>ovEe^p`mGyv2ZMBk`O^TUzy%5hI65s745+V?r>UkuE?C#LcP!wyX^R1F#LQVi(|B z{^eaj`8hbG(JnyZC#JU*k2^%!o*ZH)fZUP~{DJzf zl+I0`PHs{L*lgbhhJ`KhlJ%h4*TG+P=n*lk$xf5xij-zgg1WwgYT{C#a})5Gum-*em&#ojrh5?^#BYI z7}#tb2H3yvxHh0Y@xwFs?p<5ei}&_O7h=y&5%B9>TVo3Ks{%bF3Wv_{skP_&cNl`0 zO0em$9XKt-hHYarLd-tfehL40nD{gHn$VN6I617+b-}bqI=h2*8=D!rD>&91*TW## z;?)vw)dM5g8C2~G6BOq7@xg83-|UDa63>cYBhf8&Z|^#=|D?ytU;bgyY#6t#`V z2G!wcfVfD0y(mcIhjl{8HXbjO0g9r|iv>>qt`9Nk2As{Xjm-^ZfEH|k*tQ1PirCfw zTO4WxVgSZs33KP})w&Eij)~)BF-8#EM&QQbJKyo2q4I-p&^zv=%*#qMDx z{PV#-vvavt1GH&iJ)pbT)&P$WS6{At68OD$PAjbj$^aO2#e7;N8v}2p>z-YG`txZ_ z9&JwrKRzJ&P$g7jkV=RolZ*mlCSS~{VTWYby3+W?hl~Q)K)KxoJPB}JfNT8pOvZfu z*2>51(FLdt;64MlOTqQP?j7KsTyA2U0oD=KhJHbm+W>!l$ad$m=^69$Q`MVCZ2%e& zDdvhnS063j3Z+7y6eGj>^dsO zy6q0c@YAcqHUn%jTzc&Vz1}It%-r{GskjUS^7mw_Tut6r+W`IqI@i$gC+vgxd xMc=iEZ3ft+X#TlFN~;A-P>B(?u_a;5{|BNF9Iy5SS|tDg002ovPDHLkV1n6UtgQe5 delta 2131 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 diff --git a/kubejs/assets/grand_expanse/textures/block/high_density_tungsten_block.png b/kubejs/assets/grand_expanse/textures/block/high_density_tungsten_block.png deleted file mode 100644 index 9a9866018a3e4ad9308a8e67479783588697ad94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 707 zcmV;!0zCbRP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0$52zK~y+T9a6t< z(?A%#@9u2JN!lh>rA}3%GBB{S_HW@oU}9otVPa!u0tN;oRw|(&piwI-R27uOv6Bcz zw008Pu^s<7-t~Mw`#!zzyZ7FGwG(}yQfoR3DgUk2lNySt}Hoa>js31>0Yw9Wl} z%aD8%7ZM@gTjlw#b6~%I^Rz09O3|;c!?Y+_$w(;I3!`=F%~nu}txgESr0cYlQe{=X zdhw1Rh*PIyZ#Efm<@u|VzN2bIoB_kvn{032deC>ES4W8f-PPz6XyhUSp1^8HD#le+ z_l}*if;)6I7y^LW>j<^=IWs>Y~Pg(da1k_We%)V3WSq=g&^1A+B$h6ZcMc8;ao7KI(sc z)mS*|_d1Y-6mHqZ&7Y;`2ZkX`OWt>-Gz@f1(WL4teU+O`d75JyMN@i-6?L2W!F pY5lsFG-<66?TbT*g+b~#_J0NNZHVl5ct8LE002ovPDHLkV1f?eLc#z5 diff --git a/kubejs/assets/grand_expanse/textures/item/high_density_tungsten.png b/kubejs/assets/grand_expanse/textures/item/high_density_tungsten.png deleted file mode 100644 index c6a04407c1d2bf71564986dde527ce7d5bd8db6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 659 zcmV;E0&M+>P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0w_sDK~y+T)sjt5 z6Hyd~-#asIghD{lOh1)k(~!~>S*SZH*am79qlqll#D$3~6MumI0!bH!g~miTnn|)K!E+YxorU+Tx^UY-!}Yn{$E`f_!ItVKwVv>g>l6*^WXs zfl9RsRjKp&_ergYR$%nPV9RN2tPh^S5v=AHQLolu&^gf6V@Eo*gk&y?D}h_6RfB*4 zK0lXal6T?+e>`;`n}ubhHlvVr{YYjasMYGQ^f)y*v$2SkOccHP0l3`(G6IfSoc7ZV%%xx5D2CT6Pz|?~e z*sI*cX5Yn-%j|#=z$iyNBtkYF2IvUKZ5@b3euDWf4soNU9jR|6C^ZE) zuARc`*#+dYI}ij>bK&$DOzl*bBb(kvk@gxFA`$t)gf}n4Y-4>3)}x&SkPW#>k^oT@ zA&Cq|YX?kb9Tvg`dW$IL%ZL-$fE%4^OGBdp7neNS%G}H0G|-ouoRPtvqByH^tWtoI(=@9wy|7klhe1~Z|i$JfJ)l7@kIhDu96_X z;Quhdu<4A>d7vm~fk$L90|Vb-5N14{zaj-F806{V7@`rp^lTtsg8~op1wXSb-}i5j zmG1m_oZs8&g}2#(@P7;e=l3xhTT5-?ohu~p&iN+OF`Mowl9rbq)iH8QsGStsIBi); j@T=Q*r!=|mYuLkhxSyTZ!l$NS%G}%0G|+7Ha0dL9i8at=+e^CB}jl9f?Jj`<)3ck(X!T$7jkgm$3 z&7807Wfk_;_;>ZlKML!!bkIL={^x|-GXl51Sw2x?QJCWuEio0bSO>4T*MHW1yJg6F z)Z>#`pYp8a3Vl<%U_CS03)_@Wv!uTieD8ChNS%G}%0G|+7Ag!ybD<&ou78d5>;?maErl6o;U|;|gFF(5jq>ZyA$S?Rm6fgw) zR|tUw3p^r=85sBufiR<}hF1enFvZiwF+?M{w$D-MfC2}zq1T81`gskvUVgbSXOnc= zm2c|xhgQiarX?$!b}pW_arQJN)`vn_(+bL+Ha|C;+;PG76tRD>K9ewX=LL tX=imO1pa51X^+aWy*i=t>N)o}wT$=QvQ|zE`~`9ugQu&X%Q~loCICvXSib-O literal 0 HcmV?d00001 diff --git a/kubejs/assets/tconstruct/lang/en_us.json b/kubejs/assets/tconstruct/lang/en_us.json new file mode 100644 index 0000000..0f65ead --- /dev/null +++ b/kubejs/assets/tconstruct/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "block.tconstruct.seared_basin": "Casting Basin", + "block.tconstruct.seared_table": "Casting Table" +} \ No newline at end of file diff --git a/kubejs/assets/tconstruct/models/block/smeltery/basin.json b/kubejs/assets/tconstruct/models/block/smeltery/basin.json new file mode 100644 index 0000000..1a17a09 --- /dev/null +++ b/kubejs/assets/tconstruct/models/block/smeltery/basin.json @@ -0,0 +1,185 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "tconstruct:block/casting_basin", + "particle": "tconstruct:block/casting_basin" + }, + "elements": [ + { + "name": "Outside", + "from": [0, 2, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 8, 7], "texture": "#0", "cullface": "east"}, + "east": {"uv": [0, 0, 8, 7], "texture": "#0", "cullface": "east"}, + "south": {"uv": [0, 0, 8, 7], "texture": "#0", "cullface": "east"}, + "west": {"uv": [0, 0, 8, 7], "texture": "#0", "cullface": "east"}, + "up": {"uv": [15.5, 15.5, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 8, 8, 16], "texture": "#0"} + } + }, + { + "name": "Inside", + "from": [14, 16, 14], + "to": [2, 4, 2], + "faces": { + "north": {"uv": [15, 6, 9, 0], "texture": "#0"}, + "east": {"uv": [15, 6, 9, 0], "texture": "#0"}, + "south": {"uv": [15, 6, 9, 0], "texture": "#0"}, + "west": {"uv": [15, 6, 9, 0], "texture": "#0"}, + "up": {"uv": [7, 15, 1, 9], "texture": "#0"} + } + }, + { + "name": "Northwest leg", + "from": [0, 0, 0], + "to": [5, 2, 5], + "faces": { + "north": {"uv": [3.5, 7, 6, 8], "texture": "#0", "cullface": "south"}, + "east": {"uv": [4.5, 7, 7, 8], "texture": "#0", "cullface": "south"}, + "south": {"uv": [1, 7, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [2, 7, 4.5, 8], "texture": "#0", "cullface": "south"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [3, 11, 5.5, 13.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "Northeast leg", + "from": [11, 0, 0], + "to": [16, 2, 5], + "faces": { + "north": {"uv": [3.5, 7, 6, 8], "texture": "#0", "cullface": "south"}, + "east": {"uv": [4.5, 7, 7, 8], "texture": "#0", "cullface": "south"}, + "south": {"uv": [1, 7, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [2, 7, 4.5, 8], "texture": "#0", "cullface": "south"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [3, 11, 5.5, 13.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "Southeast leg", + "from": [11, 0, 11], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [3.5, 7, 6, 8], "texture": "#0", "cullface": "south"}, + "east": {"uv": [4.5, 7, 7, 8], "texture": "#0", "cullface": "south"}, + "south": {"uv": [1, 7, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [2, 7, 4.5, 8], "texture": "#0", "cullface": "south"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [3, 11, 5.5, 13.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "Southwest leg", + "from": [0, 0, 11], + "to": [5, 2, 16], + "faces": { + "north": {"uv": [3.5, 7, 6, 8], "texture": "#0", "cullface": "south"}, + "east": {"uv": [4.5, 7, 7, 8], "texture": "#0", "cullface": "south"}, + "south": {"uv": [1, 7, 3.5, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [2, 7, 4.5, 8], "texture": "#0", "cullface": "south"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [3, 11, 5.5, 13.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "North top", + "from": [0, 16, 0], + "to": [16, 16, 2], + "faces": { + "up": {"uv": [0, 8, 8, 9], "texture": "#0"} + } + }, + { + "name": "South top", + "from": [0, 16, 14], + "to": [16, 16, 16], + "faces": { + "up": {"uv": [0, 15, 8, 16], "texture": "#0"} + } + }, + { + "name": "West top", + "from": [0, 16, 2], + "to": [2, 16, 14], + "faces": { + "up": {"uv": [0, 9, 1, 15], "texture": "#0"} + } + }, + { + "name": "East top", + "from": [14, 16, 2], + "to": [16, 16, 14], + "faces": { + "up": {"uv": [7, 9, 8, 15], "texture": "#0"} + } + }, + { + "name": "North side inner", + "from": [9, 13.02, 2.02], + "to": [7, 4.98, -0.02], + "faces": { + "east": {"uv": [4.5, 10, 3.5, 14], "rotation": 180, "texture": "#0"}, + "west": {"uv": [4.5, 10, 3.5, 14], "rotation": 180, "texture": "#0"}, + "up": {"uv": [3.5, 12.5, 4.5, 11.5], "texture": "#0"}, + "down": {"uv": [3.5, 12.5, 4.5, 11.5], "texture": "#0"} + } + }, + { + "name": "South side inner", + "from": [9, 13.02, 16.02], + "to": [7, 4.98, 13.98], + "faces": { + "east": {"uv": [4.5, 10, 3.5, 14], "rotation": 180, "texture": "#0"}, + "west": {"uv": [4.5, 10, 3.5, 14], "rotation": 180, "texture": "#0"}, + "up": {"uv": [3.5, 12.5, 4.5, 11.5], "texture": "#0"}, + "down": {"uv": [3.5, 12.5, 4.5, 11.5], "texture": "#0"} + } + }, + { + "name": "West side inner", + "from": [2.02, 13.02, 9], + "to": [-0.02, 4.98, 7], + "faces": { + "north": {"uv": [4.5, 10, 3.5, 14], "rotation": 180, "texture": "#0"}, + "south": {"uv": [4.5, 10, 3.5, 14], "rotation": 180, "texture": "#0"}, + "up": {"uv": [3.5, 12.5, 4.5, 11.5], "texture": "#0"}, + "down": {"uv": [3.5, 12.5, 4.5, 11.5], "texture": "#0"} + } + }, + { + "name": "East side inner", + "from": [16.02, 13.02, 9], + "to": [13.98, 4.98, 7], + "faces": { + "north": {"uv": [4.5, 10, 3.5, 14], "rotation": 180, "texture": "#0"}, + "south": {"uv": [4.5, 10, 3.5, 14], "rotation": 180, "texture": "#0"}, + "up": {"uv": [3.5, 12.5, 4.5, 11.5], "texture": "#0"}, + "down": {"uv": [3.5, 12.5, 4.5, 11.5], "texture": "#0"} + } + } + ], + "loader": "tconstruct:casting", + "fluid": { + "from": [2.1, 4, 2.1], + "to": [13.9, 15.9, 13.9], + "faces": { + "up": {}, + "north": {}, + "south": {}, + "west": {}, + "east": {} + } + }, + "items": [ + { + "center": [8, 10, 8], + "size": 11.95 + }, + { + "center": [8, 10, 8], + "size": 12 + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tconstruct/models/block/smeltery/table.json b/kubejs/assets/tconstruct/models/block/smeltery/table.json new file mode 100644 index 0000000..7490106 --- /dev/null +++ b/kubejs/assets/tconstruct/models/block/smeltery/table.json @@ -0,0 +1,143 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "tconstruct:block/casting_table", + "particle": "tconstruct:block/casting_table" + }, + "elements": [ + { + "name": "Table outer", + "from": [0, 10, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 8, 3], "texture": "#0", "cullface": "east"}, + "east": {"uv": [0, 0, 8, 3], "texture": "#0", "cullface": "east"}, + "south": {"uv": [0, 0, 8, 3], "texture": "#0", "cullface": "east"}, + "west": {"uv": [0, 0, 8, 3], "texture": "#0", "cullface": "east"}, + "down": {"uv": [0, 8, 8, 16], "texture": "#0"} + } + }, + { + "name": "Table inner", + "from": [15, 16, 15], + "to": [1, 15, 1], + "faces": { + "north": {"uv": [8, 9, 0, 8.5], "texture": "#0", "cullface": "up"}, + "east": {"uv": [8, 9, 0, 8.5], "texture": "#0", "cullface": "up"}, + "south": {"uv": [8, 9, 0, 8.5], "texture": "#0", "cullface": "up"}, + "west": {"uv": [8, 9, 0, 8.5], "texture": "#0", "cullface": "up"}, + "up": {"uv": [7, 15, 1, 9], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + }, + { + "name": "Northwest leg", + "from": [0, 0, 0], + "to": [4, 10, 4], + "faces": { + "north": {"uv": [6, 3, 8, 8], "texture": "#0", "cullface": "west"}, + "east": {"uv": [13.5, 3, 16, 8], "texture": "#0"}, + "south": {"uv": [8, 3, 10.5, 8], "texture": "#0"}, + "west": {"uv": [0, 3, 2, 8], "texture": "#0", "cullface": "east"}, + "down": {"uv": [13.5, 0, 16, 2.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "Northeast leg", + "from": [12, 0, 0], + "to": [16, 10, 4], + "faces": { + "north": {"uv": [0, 3, 2, 8], "texture": "#0", "cullface": "east"}, + "east": {"uv": [6, 3, 8, 8], "texture": "#0", "cullface": "west"}, + "south": {"uv": [13.5, 3, 16, 8], "texture": "#0"}, + "west": {"uv": [8, 3, 10.5, 8], "texture": "#0"}, + "down": {"uv": [13.5, 0, 16, 2.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "Southeast leg", + "from": [12, 0, 12], + "to": [16, 10, 16], + "faces": { + "north": {"uv": [8, 3, 10.5, 8], "texture": "#0"}, + "east": {"uv": [0, 3, 2, 8], "texture": "#0", "cullface": "east"}, + "south": {"uv": [6, 3, 8, 8], "texture": "#0", "cullface": "west"}, + "west": {"uv": [13.5, 3, 16, 8], "texture": "#0"}, + "down": {"uv": [13.5, 0, 16, 2.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "Southwest leg", + "from": [0, 0, 12], + "to": [4, 10, 16], + "faces": { + "north": {"uv": [13.5, 3, 16, 8], "texture": "#0"}, + "east": {"uv": [8, 3, 10.5, 8], "texture": "#0"}, + "south": {"uv": [0, 3, 2, 8], "texture": "#0", "cullface": "east"}, + "west": {"uv": [6, 3, 8, 8], "texture": "#0", "cullface": "west"}, + "down": {"uv": [13.5, 0, 16, 2.5], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "West top edge", + "from": [0, 16, 0], + "to": [1, 16, 16], + "faces": { + "up": {"uv": [0, 8, 0.5, 16], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + }, + { + "name": "East top edge", + "from": [15, 16, 0], + "to": [16, 16, 16], + "faces": { + "up": {"uv": [7.5, 8, 8, 16], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + }, + { + "name": "North top edge", + "from": [1, 16, 0], + "to": [15, 16, 1], + "faces": { + "up": {"uv": [1, 15.5, 7, 16], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + }, + { + "name": "South top edge", + "from": [1, 16, 15], + "to": [15, 16, 16], + "faces": { + "up": {"uv": [0.5, 15.5, 7.5, 16], "texture": "#0", "cullface": "up"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + } + ], + "loader": "tconstruct:casting", + "fluid": { + "from": [1, 15, 1], + "to": [15, 15.9, 15], + "faces": { + "up": {} + } + }, + "items": [ + { + "center": [8, 15.5, 8], + "size": 14, + "x": 270, + "y": 180, + "transform": "fixed" + }, + { + "center": [8, 15.5, 8], + "size": 14.1, + "x": 270, + "y": 180, + "transform": "fixed" + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tconstruct/textures/block/casting_basin.png b/kubejs/assets/tconstruct/textures/block/casting_basin.png new file mode 100644 index 0000000000000000000000000000000000000000..1e1d13a000a12cfa7338d73e29f326998316baea GIT binary patch literal 886 zcmV-+1Bv{JP)4Tx04UFukvT{MK^TQU6Ge%Ng(*ZVwotK95EZeMD2kvUNrZS5?ruyJvYW7* zU}GuR3KkxXS7BqVt%a>12p%A|Hdcx@BI`dJAwh`Xz%U{!AB!tF`Rmi$1X z$VtU(imgn+{JE!kVZ)L=6H~g(HpZD?ifJ?q3apSJPmip&C@xXik5urt`u=Hg8RA;O z6vrr8EOg(G`h(xyx~cxYVp2l{YMwmrtpjSe;A_+KJ`X+b>j;96aABAH*#j7Q7k#s& zweLgII-FgWG-DgiH=yMqr#reY1!V?ODR@1RZ<>YXYY5F3d;8hv_zvRI)#MfI?m=f- zvKK16yRN*qKhOC65%~sLvvQsDCz(6|001*kOjJcrPfuA`SZ85jb#ZZSX=y}6L`g_U zKR!Y*Ff%nYI4dhIIypTuGBz$QF(M)-CnqZa001HvQmp_0015c33b z(uVy1wQCP4Y6TK&waHxZTmrDLEc`7YENd`CB27p}Vu(SiZls)ZjQaEBolz?Bb+lGm zIYbJr0ntKO>lk$n%z#?AZOhU#g<27r111B#NKvoppe}bQtijBJ3=)v!&Ibc2$RM*F z3<6jKW1PV&x}>-=IK?-EI+zTV4D6o|W#CQC89c>g*s>y=L1WsQ7a`qCXjp0{iC8(z zTvs2G*d1&$#PX{3RgN152dXJFO>r#~8D2qP1}W1CloCEg((n z7kt!Y_at1_B?M3t6KsQwzksE^pV*U4`w4_Z`%y9@?*h>2*a@B;VcJi?(A#XC0&W@F zC&hmPt|=Y^RKsJyQ;`pC{toIcfc6jWM*X-fuG=@QmFvrz_K7k6043rlPEu@}@Bjb+ M07*qoM6N<$g5-sJRsaA1 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tconstruct/textures/block/casting_table.png b/kubejs/assets/tconstruct/textures/block/casting_table.png new file mode 100644 index 0000000000000000000000000000000000000000..4b398a470b5dc3a35c4e80fc663d66e70079a68e GIT binary patch literal 760 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik<2Ka=y`uqF4xw(0Hc|}J>r6nY!Cnjd5q~v90=A@@*r=`V2MFj-~`T6;o znpjv_+S=PWd3t!bxVX5xxp{kg2L}a3Mnr^!g!p)S8yFaSxVtAMBt(XWx;nd-78Yu2 z>-qZlgocLd>l>Mvn46nfxw^V~d3pu}1bBOSnHZZ}TG&K{hlhuS>FDU2nOge$`579T zSeRS8IJ>yIxS5$*Dk-U}t7`*YnyaGx2uPWi1o;L3CkrqLM9%F78o^oM5n0T@z;_6Q z8AUa`8i0W`)6>N<#KOOKa%0&o10GlTXwz$Y$I66DC8M1(thso^ZngdWzx=J{gN>8s z9=_)(b9&c_O(_i*cYhE6l=$ak)RSkyY|qsuck)kpe#G*~ZJ85Xdv~60IKO?P4)0H= znY(oa7pyXx>$m?F%fUPM>ZN<#<|#@rYK0zMF0}I4qK+xK37agHKTJ2cypQAFZ;7{0 zPpoI({v>Sq!gZ%_ecJHXa;;%@$ldjEep_dreg2*Q=|MgDch8HTxL#ISkl9tkU{e>b zBeWsH##V3o>QJVz)lY>Yx5cR^?EN<}*X(vK)3)1Z*(&2iI5oQFSKfYC#(CrIEwS_Z z#wrY(r$66Tx}LM5lqKT3@PS{~ZPJ-4PDxGutjKt9_r|LVjA7g!I{w_LQyf{YR%nHU zytNWypZ#y$>)o0)EU?{=+Ad!**~=8{b9-WO>tR=J4>B3l>@?mSXTu>8Y2=jn%f&p3-`x1CN# ws`5Uly0qV`c4K5t{{6`8!vFF$$;yA&>}OY0p40v<2#h%fPgg&ebxsLQ06v3D=l}o! literal 0 HcmV?d00001 diff --git a/kubejs/client_scripts/ponder.js b/kubejs/client_scripts/ponder.js index af67afa..5281f5a 100644 --- a/kubejs/client_scripts/ponder.js +++ b/kubejs/client_scripts/ponder.js @@ -1,20 +1,6 @@ // Create Tags // Can currently not be reloaded Ponder.tags((event) => { - event.createTag( - `${global.packName}:metallurgy`, // ponder tag - "createmetallurgy:foundry_basin", // icon - "Metallurgy", // Title - "Items related to create metallurgy", // Description - [ - // Items in Tag - "createmetallurgy:foundry_basin", // explain basic melting - "createmetallurgy:foundry_top", // explain right click actions - "createmetallurgy:casting_basin", // basic casting - "createmetallurgy:casting_table", // molds - "createmetallurgy:foundry_mixer", - ], - ); event.createTag( `${global.packName}:custommachinery`, global.items.electrolyzer, @@ -27,49 +13,6 @@ Ponder.tags((event) => { // Create scenes // Reload with /kubejs reload client_scripts Ponder.registry((event) => { - event - .create("createmetallurgy:foundry_basin") - .scene( - "create_foundry", - "how to make a foundry", - "foundry_example", - (scene, util) => { - // Show with a fade in - scene.showBasePlate(); - scene.idle(10); - scene.text( - 100, - "The foundry basin functions like the normal basin, but can only hold one item type at a time.", - [2, 1.5, 2], - ); - fadeInOutSection( - scene, - [2, 1, 4], - [0, 0, -2], - Direction.EAST, - 100, - ); - scene.idle(20); - - fadeIn(scene, [2, 1, 2], Direction.DOWN, 10); - fadeIn(scene, [2, 2, 2], Direction.DOWN, 10); - fadeIn(scene, [2, 3, 2], Direction.DOWN, 10); - - scene.text( - 100, - "When placed between a blaze burner and a foundry top, Items inside will be melted.", - [2, 2.5, 2], - ); - scene.idle(100); - fadeIn(scene, [0, 1, 1, 1, 2, 2], Direction.DOWN, 10); - scene.text( - 50, - "Items need to be inserted from the side when a foundry top is used.", - [1, 2.5, 2], - ); - }, - ); - event .create(global.items.electrolyzer) .scene( diff --git a/kubejs/server_scripts/backpacks.js b/kubejs/server_scripts/backpacks.js index d109aef..5889379 100644 --- a/kubejs/server_scripts/backpacks.js +++ b/kubejs/server_scripts/backpacks.js @@ -210,7 +210,7 @@ ServerEvents.recipes((event) => { function FillBrass(output, input) { event.recipes.create.filling(output, [ input, - Fluid.of("createmetallurgy:molten_brass", FluidAmounts.INGOT * 5), + Fluid.of("tconstruct:molten_brass", FluidAmounts.INGOT * 5), ]); } }); diff --git a/kubejs/server_scripts/crafting.js b/kubejs/server_scripts/crafting.js index 9cad813..fb3c7ee 100644 --- a/kubejs/server_scripts/crafting.js +++ b/kubejs/server_scripts/crafting.js @@ -113,28 +113,6 @@ ServerEvents.recipes((event) => { }, ); - // Copper tools - event.shaped(global.items.copper_pickaxe, ["AAA", " B ", " B "], { - A: "#forge:ingots/copper", - B: "minecraft:stick", - }); - event.shaped(global.items.copper_axe, ["AA ", "AB ", " B "], { - A: "#forge:ingots/copper", - B: "minecraft:stick", - }); - event.shaped(global.items.copper_shovel, [" A ", " B ", " B "], { - A: "#forge:ingots/copper", - B: "minecraft:stick", - }); - event.shaped(global.items.copper_sword, [" A ", " A ", " B "], { - A: "#forge:ingots/copper", - B: "minecraft:stick", - }); - event.shaped(global.items.copper_hoe, ["AA ", " B ", " B "], { - A: "#forge:ingots/copper", - B: "minecraft:stick", - }); - // Create sifter Meshes sifterMesh("createsifter:andesite_mesh", "createdeco:andesite_mesh_fence"); sifterMesh("createsifter:zinc_mesh", "createdeco:zinc_mesh_fence"); @@ -149,34 +127,18 @@ ServerEvents.recipes((event) => { .id(mesh); } - // metallurgy + // tinkers construct event - .shaped("createmetallurgy:casting_basin", ["A A", "A A", "AAA"], { + .shaped("tconstruct:seared_basin", ["A A", "A A", "AAA"], { A: "createdeco:cast_iron_ingot", }) - .id("createmetallurgy:casting_basin"); + .id("tconstruct:smeltery/seared/basin"); event - .shaped("createmetallurgy:casting_table", ["AAA", "B B", "B B"], { + .shaped("tconstruct:seared_table", ["AAA", "B B", "B B"], { A: "createdeco:cast_iron_sheet", B: "createdeco:cast_iron_ingot", }) - .id("createmetallurgy:casting_table"); - - event.replaceInput( - [ - { - output: "createmetallurgy:foundry_top", - }, - { - output: "createmetallurgy:foundry_basin", - }, - { - output: "createmetallurgy:glassed_alloyer_top", - }, - ], - "create:andesite_alloy", - "createdeco:cast_iron_ingot", - ); + .id("tconstruct:smeltery/seared/table"); // Electrolyzer event.shaped(global.items.copper_coil_block, ["SSS", "SCS", "SSS"], { @@ -249,7 +211,7 @@ ServerEvents.recipes((event) => { event .shaped("ad_astra:desh_engine", ["SPS", "SPS", "BVB"], { - S: global.items.high_density_tungsten_sheet, + S: global.items.low_density_structure, P: "create:fluid_pipe", B: "thermal:constantan_gear", V: "create:smart_fluid_pipe", @@ -258,7 +220,7 @@ ServerEvents.recipes((event) => { event .shaped("ad_astra:desh_tank", ["SSG", "STP", "SSG"], { - S: global.items.high_density_tungsten_sheet, + S: global.items.low_density_structure, G: "thermal:constantan_gear", T: "create:fluid_tank", P: "create:mechanical_pump", @@ -280,7 +242,7 @@ ServerEvents.recipes((event) => { ], { C: "ad_astra:rocket_nose_cone", - H: global.items.dense_tungsten_hull, + H: global.items.low_density_structure, R: global.items.rocket_hull, A: "createaddition:modular_accumulator", T: "ad_astra:desh_tank", @@ -341,28 +303,6 @@ ServerEvents.recipes((event) => { "ad_astra:steel_plate", "#forge:plates/copper", ); - // Tool Parts - event.shaped(global.items.copper_tool_part, ["R ", " I ", " R"], { - R: "#forge:rods/copper", - I: "#forge:ingots/copper", - }); - event.shaped(global.items.copper_armor_plate, [" S ", "NNN", " S "], { - N: "#forge:nuggets/copper", - S: "#forge:plates/copper", - }); - - // Tool parts for iron tools - event.replaceInput( - { output: "#forge:tools/iron", not: { output: "minecraft:shears" } }, - "minecraft:iron_ingot", - global.items.iron_tool_part, - ); - // Aromor plates for iron armor - event.replaceInput( - { output: "#forge:armor/iron" }, - "minecraft:iron_ingot", - global.items.iron_armor_plate, - ); // oxygen loader event diff --git a/kubejs/server_scripts/create-recipes.js b/kubejs/server_scripts/create-recipes.js index 4a79789..b00dec7 100644 --- a/kubejs/server_scripts/create-recipes.js +++ b/kubejs/server_scripts/create-recipes.js @@ -12,7 +12,7 @@ const tierData = [ affix: "_tier_1", casing: "create:copper_casing", material: "create:copper_sheet", - fluid: "createmetallurgy:molten_copper", + fluid: "tconstruct:molten_copper", RPM: 128, }, //Tier 2 @@ -20,7 +20,7 @@ const tierData = [ affix: "_tier_2", casing: "create:brass_casing", material: "create:brass_sheet", - fluid: "createmetallurgy:molten_brass", + fluid: "tconstruct:molten_brass", RPM: 256, }, //Tier 3 @@ -28,7 +28,7 @@ const tierData = [ affix: "_tier_3", casing: "create:steel_casing" /*TODO need steel casing (create)*/, material: "ad_astra:steel_plate" /*TODO need steel sheet instead*/, - fluid: "createmetallurgy:molten_steel", + fluid: "tconstruct:molten_steel", RPM: 512, }, ]; @@ -64,7 +64,7 @@ ServerEvents.recipes((event) => { event.recipes.create .compacting("createdeco:cast_iron_ingot", [ "minecraft:iron_ingot", - "createmetallurgy:graphite", + "#forge:dusts/coal", ]) .heated() .id("minecraft:compacting/cast_iron_ingot"); @@ -74,13 +74,6 @@ ServerEvents.recipes((event) => { Item.of("create:sturdy_sheet", 4), ]); - // Dense Tungsten hull - event.recipes.create - .compacting(Item.of(global.items.dense_tungsten_hull), [ - Item.of(global.items.high_density_tungsten, 4), - ]) - .heated(); - // early game obsidian dust recipe event.recipes.create.milling( ["create:powdered_obsidian"], @@ -118,20 +111,23 @@ ServerEvents.recipes((event) => { let upperData = tierData[tier]; let lowerData = tierData[tier - 1]; - event.recipes.create.filling(kinetics.shaft + upperData.affix, [ + cast( + kinetics.shaft + upperData.affix, kinetics.shaft + lowerData.affix, - Fluid.of(upperData.fluid, FluidAmounts.INGOT / 2), - ]); - event.recipes.create.filling(kinetics.cogwheel + upperData.affix, [ + upperData.fluid, + FluidAmounts.INGOT / 2, + ); + cast( + kinetics.cogwheel + upperData.affix, kinetics.cogwheel + lowerData.affix, - Fluid.of(upperData.fluid, FluidAmounts.INGOT), - ]); - event.recipes.create.filling( + upperData.fluid, + FluidAmounts.INGOT, + ); + cast( kinetics.large_cogwheel + upperData.affix, - [ - kinetics.large_cogwheel + lowerData.affix, - Fluid.of(upperData.fluid, FluidAmounts.INGOT * 2), - ], + kinetics.large_cogwheel + lowerData.affix, + upperData.fluid, + FluidAmounts.INGOT * 2, ); event.shaped(kinetics.gearbox + upperData.affix, ["WKW", "WCW"], { @@ -148,7 +144,6 @@ ServerEvents.recipes((event) => { C: upperData.casing, }, ); - event.shapeless(kinetics.clutch + upperData.affix, [ kinetics.clutch + lowerData.affix, kinetics.shaft + upperData.affix, @@ -170,6 +165,21 @@ ServerEvents.recipes((event) => { "create:electron_tube", ]); } + function cast(result, input, fluid, amount) { + event.custom({ + type: "tconstruct:casting_table", + cast: { + item: input, + }, + fluid: { + tag: fluid, + amount: amount, + }, + result: result, + cast_consumed: true, + cooling_time: 120, + }); + } // Rolling event.custom({ @@ -200,7 +210,7 @@ ServerEvents.recipes((event) => { ), event.recipes.createFilling(global.items.incomplete_electron_tube, [ global.items.incomplete_electron_tube, - Fluid.of(global.fluids.molten_rose_gold, FluidAmounts.INGOT), + Fluid.of("tconstruct:molten_rose_gold", FluidAmounts.INGOT), ]), ]) .transitionalItem(global.items.incomplete_electron_tube) @@ -230,7 +240,7 @@ ServerEvents.recipes((event) => { .sequenced_assembly(["create:brass_casing"], brass_casing_inter, [ event.recipes.create.filling(brass_casing_inter, [ brass_casing_inter, - Fluid.of("createmetallurgy:molten_brass", FluidAmounts.INGOT), + Fluid.of("tconstruct:molten_brass", FluidAmounts.INGOT), ]), event.recipes.create.pressing( brass_casing_inter, @@ -293,27 +303,6 @@ ServerEvents.recipes((event) => { .transitionalItem(precision_mechanism_inter) .loops(5) .id("create:sequenced_assembly/precision_mechanism"); - event.recipes.create - .sequenced_assembly( - [global.items.high_density_tungsten_sheet], - global.items.high_density_tungsten, - [ - event.recipes.createFilling( - global.items.high_density_tungsten, - [global.items.high_density_tungsten, Fluid.lava(100)], - ), - event.recipes.createPressing( - global.items.high_density_tungsten, - global.items.high_density_tungsten, - ), - event.recipes.createPressing( - global.items.high_density_tungsten, - global.items.high_density_tungsten, - ), - ], - ) - .transitionalItem(global.items.high_density_tungsten) - .loops(1); // Bioefuel event.replaceInput( diff --git a/kubejs/server_scripts/fumo.js b/kubejs/server_scripts/fumo.js index c400d62..e9f9637 100644 --- a/kubejs/server_scripts/fumo.js +++ b/kubejs/server_scripts/fumo.js @@ -15,7 +15,7 @@ ServerEvents.recipes((event) => { ]), event.recipes.create.filling(inter, [ inter, - Fluid.of(global.fluids.molten_rose_gold, FluidAmounts.BUCKET), + Fluid.of("tconstruct:molten_rose_gold", FluidAmounts.BUCKET), ]), event.recipes.create.filling(inter, [ inter, @@ -182,7 +182,7 @@ ServerEvents.recipes((event) => { event.recipes.create.deploying(inter, [inter, "#quark:corundum"]), event.recipes.create.filling(inter, [ inter, - Fluid.of("createmetallurgy:molten_gold", FluidAmounts.BUCKET), + Fluid.of("tconstruct:molten_gold", FluidAmounts.BUCKET), ]), ]) .transitionalItem(inter) @@ -236,7 +236,7 @@ ServerEvents.recipes((event) => { ]), event.recipes.create.filling(inter, [ inter, - Fluid.of("createmetallurgy:molten_gold", FluidAmounts.BUCKET), + Fluid.of("tconstruct:molten_gold", FluidAmounts.BUCKET), ]), ]) .transitionalItem(inter) diff --git a/kubejs/server_scripts/item-tags.js b/kubejs/server_scripts/item-tags.js index 36f3180..9d608aa 100644 --- a/kubejs/server_scripts/item-tags.js +++ b/kubejs/server_scripts/item-tags.js @@ -10,21 +10,6 @@ ServerEvents.tags("item", (event) => { event.add("forge:nuggets", "createdeco:cast_iron_nugget"); event.add("forge:plates", "createdeco:cast_iron_sheet"); - // Fix Wolframite/Tungsten Tags - //TODO clean this up... when more stuff like this needs to be done. - event.add( - "forge:raw_materials/tungsten", - "createmetallurgy:raw_wolframite", - ); - event.add( - "forge:crushed_raw_materials/tungsten", - "createmetallurgy:crushed_raw_wolframite", - ); - event.add( - "forge:crushed_raw_materials/tungsten", - "createmetallurgy:crushed_raw_wolframite", - ); - // rosin is a alternative to slimeballs // not a replacement for the block though. event.add("forge:slimeballs", "thermal:rosin"); @@ -42,7 +27,11 @@ ServerEvents.tags("item", (event) => { forgeCategory(global.items.bronze_rod, "rods", "bronze"); forgeCategory(global.items.rose_gold_ingot, "ingots", "rose_gold"); - forgeCategory(global.items.high_density_tungsten, "ingots", "high_density_tungsten") + forgeCategory( + global.items.high_density_tungsten, + "ingots", + "high_density_tungsten", + ); // Create crushed raw materials event @@ -56,23 +45,6 @@ ServerEvents.tags("item", (event) => { .getObjectIds() .forEach((item) => forgeCategory(item, "dirty_dusts")); - // Metallurgy dirty dusts - Ingredient.of(/^createmetallurgy:dirty/).itemIds.forEach((item) => { - let material = item.split("_").slice(-2).reverse().pop(); - if (material === "wolframite") { - material = "tungsten"; - } - forgeCategory(item, "dirty_dusts", material); - }); - // Get all metallurgy dusts that are non dirty and fix their tags - Ingredient.of(/^createmetallurgy:[^_]+_dust/).itemIds.forEach((item) => { - let material = item.split("_")[0].split(":").pop(); - if (material === "wolframite") { - material = "tungsten"; - } - forgeCategory(item, "dusts", material); - }); - function forgeCategory(item, category, material) { material = typeof material !== "undefined" diff --git a/kubejs/server_scripts/metallurgy.js b/kubejs/server_scripts/metallurgy.js deleted file mode 100644 index 56b5746..0000000 --- a/kubejs/server_scripts/metallurgy.js +++ /dev/null @@ -1,205 +0,0 @@ -ServerEvents.recipes((event) => { - event.custom({ - type: "createmetallurgy:melting", - ingredients: [ - { fluid: "thermal:sap", amount: FluidAmounts.NUGGET * 2 }, - ], - processingTime: 120, - results: [{ fluid: "thermal:syrup", amount: FluidAmounts.NUGGET }], - heatRequirement: "heated", - }); - - // Cast Iron to make all types of molds/casts. - for (const [name, obj] of Object.entries(global.config.casting.table)) { - castMold( - Item.of(obj.mold), - Ingredient.of(`#${obj.resultTag}`), - global.fluids.molten_cast_iron, - FluidAmounts.INGOT, - 80, - ); - } - - // Adds melting and casting to the meltable materials - global.config.melting.materials.forEach((material) => { - castFluid(material.name, material.fluid); - global.config.melting.items.forEach((item) => { - const tag = item.tag.concat(material.name); - if (Item.of(`#${tag}`).empty) { - return; - } - melting( - tag, - material.fluid, - item.fluidAmount, - material.heatRequirement, - ); - }); - }); - - // Alloying - // early game alloys can be mixed as well - mixAndAlloy( - global.fluids.molten_rose_gold, - "createmetallurgy:molten_gold", - "createmetallurgy:molten_copper", - 40, - ); - mixAndAlloy( - global.fluids.molten_bronze, - global.fluids.molten_tin, - "createmetallurgy:molten_copper", - 40, - ); - - //alloy mixer only - alloy( - "createmetallurgy:molten_brass", - ["createmetallurgy:molten_copper", "createmetallurgy:molten_zinc"], - 40, - "heated", - ); - alloy( - global.fluids.molten_invar, - [global.fluids.molten_nickel, "createmetallurgy:molten_iron"], - 40, - "heated", - ); - alloy( - global.fluids.molten_constantan, - [global.fluids.molten_nickel, "createmetallurgy:molten_copper"], - 40, - "heated", - ); - alloy( - global.fluids.molten_electrum, - [global.fluids.molten_silver, "createmetallurgy:molten_gold"], - 40, - "heated", - ); - alloy( - global.fluids.molten_dense_tungsten, - [ - "createmetallurgy:molten_tungsten", - global.fluids.molten_nickel, - "createmetallurgy:molten_iron", - ], - 60, - "heated", - ); - - // Helper Functions - function melting(inputTag, fluid, fluidAmount, heatRequirement) { - // Resolve optional parameters - fluidAmount = - typeof fluidAmount !== "undefined" - ? fluidAmount - : global.config.melting.amount; - heatRequirement = - typeof heatRequirement !== "undefined" - ? heatRequirement - : global.config.melting.heatRequirement; - // Get processing Time from FluidAmount - const processingTime = Math.max( - global.config.melting.minTime, - fluidAmount * global.config.melting.time, - ); - event.custom({ - type: "createmetallurgy:melting", - // Might change later - ingredients: [{ tag: inputTag }], - processingTime: processingTime, - results: [ - { - fluid: fluid, - amount: fluidAmount, - }, - ], - heatRequirement: heatRequirement, - }); - } - - function castFluid(material, fluid) { - for (const [name, obj] of Object.entries(global.config.casting.table)) { - castMold( - AlmostUnified.getPreferredItemForTag( - `${obj.resultTag}/${material}`, - ), - { item: obj.mold }, - fluid, - obj.amount, - obj.time, - ); - } - castBasin( - AlmostUnified.getPreferredItemForTag( - `forge:storage_blocks/${material}`, - ), - fluid, - ); - } - - function castMold(item, mold, fluid, fluidAmount, time) { - if (Item.of(item).isEmpty()) { - return; - } - event.custom({ - type: "createmetallurgy:casting_in_table", - ingredients: [ - mold, - { - fluid: fluid, - amount: fluidAmount, - }, - ], - processingTime: time, - results: [item], - }); - } - function castBasin(item, fluid) { - if (Item.of(item).isEmpty()) { - return; - } - event.custom({ - type: "createmetallurgy:casting_in_basin", - ingredients: [ - { - fluid: fluid, - amount: FluidAmounts.METAL_BLOCK, - }, - ], - processingTime: 150, - results: [item], - }); - } - - function alloy(output, fluids, processingTime, heatRequirement) { - const fluidIngredients = fluids.reduce((result, fluid) => { - result.push({ fluid: fluid, amount: FluidAmounts.NUGGET }); - return result; - }, []); - - event.custom({ - type: "createmetallurgy:alloying", - ingredients: fluidIngredients, - processingTime: processingTime, - results: [ - { - fluid: output, - amount: FluidAmounts.NUGGET * fluidIngredients.length, - }, - ], - heatRequirement: heatRequirement, - }); - } - - function mixAndAlloy(output, fluid1, fluid2, processingTime) { - alloy(output, [fluid1, fluid2], processingTime, "heated"); - event.recipes.create - .mixing(Fluid.of(output, FluidAmounts.NUGGET), [ - Fluid.of(fluid1, FluidAmounts.NUGGET), - Fluid.of(fluid2, FluidAmounts.NUGGET), - ]) - .heated(); - } -}); diff --git a/kubejs/server_scripts/removals.js b/kubejs/server_scripts/removals.js index a8aabda..38697b6 100644 --- a/kubejs/server_scripts/removals.js +++ b/kubejs/server_scripts/removals.js @@ -20,15 +20,6 @@ ServerEvents.recipes((event) => { { output: "create:brass_casing" }, { output: "create:railway_casing" }, - // Create Metallurgy - // Remove existing metallurgy smelting recipe - // It uses superheated blazeburners and we don't want that - { type: "createmetallurgy:melting" }, - { type: "createmetallurgy:casting_in_basin" }, - { type: "createmetallurgy:casting_in_table" }, - { type: "createmetallurgy:alloying" }, - { output: "#forge:graphite_molds" }, - // Create mechanical extruder { id: "create_mechanical_extruder:mechanical_extruder" }, { id: "create_mechanical_extruder:extruding/stone" }, @@ -44,7 +35,12 @@ ServerEvents.recipes((event) => { { id: "ad_astra:conversion/oxygen_from_water" }, // Thermal - { output: "#forge:gears", not: { output: "#forge:gears/copper" } }, + { + output: "#forge:gears", + not: { + type: "tconstruct:casting_table", + }, + }, { output: "#forge:ingots", input: "minecraft:fire_charge" }, ]); diff --git a/kubejs/server_scripts/tconstruct.js b/kubejs/server_scripts/tconstruct.js new file mode 100644 index 0000000..3847c81 --- /dev/null +++ b/kubejs/server_scripts/tconstruct.js @@ -0,0 +1,103 @@ +ServerEvents.recipes((event) => { + // Alloying + // early game alloys can be mixed as well + + mix( + "tconstruct:molten_rose_gold", + ["tconstruct:molten_gold", "tconstruct:molten_copper"] + ); + mix( + "tconstruct:molten_bronze", + ["tconstruct:molten_tin", "tconstruct:molten_copper"] + ); + + //Andesite + melt(global.items.andesite_compound, + global.fluids.andesite_mixture, FluidAmounts.INGOT, + 20, 500); + melt("create:andesite_alloy", + global.fluids.andesite_mixture, FluidAmounts.INGOT, + 20, 500); + cast_type(global.fluids.andesite_mixture, FluidAmounts.INGOT, + "create:andesite_alloy", global.casts.ingot, 10); + + function alloy(output, fluids) { + const fluidIngredients = fluids.reduce((result, fluid) => { + result.push({ fluid: fluid, amount: FluidAmounts.NUGGET }); + return result; + }, []); + + event.custom({ + type: "tconstruct:alloy", + inputs: fluidIngredients, + result: { + fluid: output, + amount: FluidAmounts.INGOT * fluidIngredients.length, + }, + temperature: 700, + }); + } + + function cast(fluid, amount, output, catalyst, cooling_ticks, consume, basin) { + event.custom({ + type: "tconstruct:casting_" + basin ? "basin" : "table", + cast: { item: catalyst }, + cast_consumed: consume, + cooling_time: cooling_ticks, + fluid: { amount: amount, fluid: fluid }, + result: output, + }); + } + + function cast_type(fluid, amount, output, type, cooling_ticks) { + event.custom({ + type: "tconstruct:casting_table", + cast: { tag: "tconstruct:casts/multi_use/" + type }, + cast_consumed: false, + cooling_time: cooling_ticks, + fluid: { amount: amount, fluid: fluid }, + result: output, + }); + event.custom({ + type: "tconstruct:casting_table", + cast: { tag: "tconstruct:casts/single_use/" + type }, + cast_consumed: true, + cooling_time: cooling_ticks, + fluid: { amount: amount, fluid: fluid }, + result: output, + }); + } + + function pour(fluid, amount, output, cooling_ticks, consume, basin) { + event.custom({ + type: "tconstruct:casting_" + basin ? "basin" : "table", + cast_consumed: consume, + cooling_time: cooling_ticks, + fluid: { amount: amount, fluid: fluid }, + result: output, + }); + } + + //temperature guide: + // lava = 1000°C + // blazing blood = 1500°C + function melt(item, output, amount, ticks, temperature) { + event.custom({ + type: "tconstruct:melting", + ingredient: { item: item }, + result: { amount: amount, fluid: output }, + temperature: temperature, + time: ticks + }) + } + + function mix(output, ingredients) { + let ingMix = []; + ingredients.forEach(i => { + ingMix.push({ fluid: i, amount : 10 }); + }) + event.recipes.create + .mixing(Fluid.of(output, FluidAmounts.NUGGET), ingMix) + .heated(); + } +}); diff --git a/kubejs/startup_scripts/blocks.js b/kubejs/startup_scripts/blocks.js index 96a7119..5f3cd3c 100644 --- a/kubejs/startup_scripts/blocks.js +++ b/kubejs/startup_scripts/blocks.js @@ -17,14 +17,6 @@ StartupEvents.registry("block", (event) => { .tagBlock("mineable/pickaxe") .tagBlock("minecraft:needs_iron_tool"); - event - .create(global.items.dense_tungsten_hull) - .soundType("metal") - .hardness(7) - .resistance(10) - .requiresTool(true) - .tagBlock("mineable/pickaxe") - .tagBlock("minecraft:needs_iron_tool"); // Electorlyzer is a custom machinery block. event.create(global.items.electrolyzer, "custommachinery"); }); diff --git a/kubejs/startup_scripts/config.js b/kubejs/startup_scripts/config.js index c24621f..233e7ac 100644 --- a/kubejs/startup_scripts/config.js +++ b/kubejs/startup_scripts/config.js @@ -5,27 +5,12 @@ global.items = { andesite_compound: null, rocket_hull: null, incomplete_electron_tube: null, - copper_pickaxe: null, - copper_axe: null, - copper_shovel: null, - copper_sword: null, - copper_hoe: null, - tool_part_mold: null, - armor_plate_mold: null, - gear_mold: null, - copper_tool_part: null, - copper_armor_plate: null, - iron_tool_part: null, - iron_armor_plate: null, bronze_rod: null, copper_coil_block: null, electrolyzer: null, sturdy_hull: null, - dense_tungsten_hull: null, fumo_base: null, - rose_gold_ingot: null, - high_density_tungsten: null, - high_density_tungsten_sheet: null, + low_density_structure: null, }; defineNames(global.items); @@ -33,18 +18,7 @@ defineNames(global.items); // Fluids beginning with molten will hava the lava tag. global.fluids = { andesite_mixture: null, - molten_tin: null, - molten_nickel: null, - molten_desh: null, - molten_silver: null, - molten_lead: null, - molten_rose_gold: null, - molten_bronze: null, molten_cast_iron: null, - molten_invar: null, - molten_constantan: null, - molten_electrum: null, - molten_dense_tungsten: null, }; // define names from keys defineNames(global.fluids); @@ -60,36 +34,9 @@ global.config = { blasting_nuggets: 6, }, melting: { - amount: FluidAmounts.INGOT, - heatRequirement: "heated", // Default heat should be heated not blazing. - time: 0.4, // time per millibucket - minTime: 20, // shortest melting time. - // materials that can be melted - // Can also have optional heatRequirement - // TODO ADD melting time to materials. materials: [ { name: "andesite_alloy", fluid: global.fluids.andesite_mixture }, - { name: "iron", fluid: "createmetallurgy:molten_iron" }, - { name: "copper", fluid: "createmetallurgy:molten_copper" }, - { name: "gold", fluid: "createmetallurgy:molten_gold" }, - { name: "zinc", fluid: "createmetallurgy:molten_zinc" }, - { name: "tin", fluid: global.fluids.molten_tin }, - { name: "rose_gold", fluid: global.fluids.molten_rose_gold }, - { name: "steel", fluid: "createmetallurgy:molten_steel" }, - { name: "tungsten", fluid: "createmetallurgy:molten_tungsten" }, - { name: "brass", fluid: "createmetallurgy:molten_brass" }, - { name: "nickel", fluid: global.fluids.molten_nickel }, - { name: "silver", fluid: global.fluids.molten_silver }, - { name: "lead", fluid: global.fluids.molten_lead }, - { name: "bronze", fluid: global.fluids.molten_bronze }, { name: "cast_iron", fluid: global.fluids.molten_cast_iron }, - { name: "invar", fluid: global.fluids.molten_invar }, - { name: "constantan", fluid: global.fluids.molten_constantan }, - { name: "electrum", fluid: global.fluids.molten_electrum }, - { - name: "high_density_tungsten", - fluid: global.fluids.molten_dense_tungsten, - }, ], // types of items that can be melted of above materials // nuggets defaults to 9 @@ -97,8 +44,6 @@ global.config = { { tag: "forge:ingots/" }, { tag: "forge:plates/" }, { tag: "forge:gears/" }, - { tag: "forge:tool_parts/" }, - { tag: "forge:armor_plates/" }, { tag: "forge:raw_materials/" }, { tag: "forge:crushed_raw_materials/" }, { tag: "forge:dusts/" }, @@ -115,50 +60,21 @@ global.config = { }, ], }, - casting: { - table: { - ingot: { - mold: "createmetallurgy:graphite_ingot_mold", - resultTag: "forge:ingots", - amount: FluidAmounts.INGOT, - time: 80, - }, - sheet: { - mold: "createmetallurgy:graphite_plate_mold", - resultTag: "forge:plates", - amount: FluidAmounts.INGOT, - time: 80, - }, - nugget: { - mold: "createmetallurgy:graphite_nugget_mold", - resultTag: "forge:nuggets", - amount: FluidAmounts.NUGGET, - time: 20, - }, - tool_part: { - mold: global.items.tool_part_mold, - resultTag: "forge:tool_parts", - amount: FluidAmounts.INGOT * 2, - time: 80, - }, - armor_plate: { - mold: global.items.armor_plate_mold, - resultTag: "forge:armor_plates", - amount: FluidAmounts.INGOT * 2, - time: 80, - }, - gear: { - mold: global.items.gear_mold, - resultTag: "forge:gears", - amount: FluidAmounts.INGOT * 4, - time: 80, - }, - }, - }, // compressed blocks to keep from create compression compressed: ["cobblestone", "andesite"], }; +global.casts = { + ingot: "ingot", + nugget: "nugget", + gem: "gem", + rod: "rod", + plate: "plate", + gear: "gear", + coin: "coin", + wire: "wire", +}; + function defineNames(object) { Object.keys(object).forEach((key) => { object[key] = `${global.packName}:${key}`; diff --git a/kubejs/startup_scripts/fluids.js b/kubejs/startup_scripts/fluids.js index 525f6df..29a86c1 100644 --- a/kubejs/startup_scripts/fluids.js +++ b/kubejs/startup_scripts/fluids.js @@ -3,18 +3,7 @@ StartupEvents.registry("fluid", (event) => { event.create(global.fluids.andesite_mixture).thinTexture(0x808582); // Molten stuff - molten_metal(global.fluids.molten_tin, 0x7ea0b5); - molten_metal(global.fluids.molten_nickel, 0xbdac78); - molten_metal(global.fluids.molten_desh, 0xd68d4d); - molten_metal(global.fluids.molten_silver, 0xb4c0db); - molten_metal(global.fluids.molten_lead, 0x312d43); - molten_metal(global.fluids.molten_rose_gold, 0xf4af94); - molten_metal(global.fluids.molten_bronze, 0xe59831); molten_metal(global.fluids.molten_cast_iron, 0x313131); - molten_metal(global.fluids.molten_invar, 0x567473); - molten_metal(global.fluids.molten_constantan, 0xb6883e); - molten_metal(global.fluids.molten_electrum, 0xe7e68c); - molten_metal(global.fluids.molten_dense_tungsten, 0x9ba35c); function molten_metal(fluid, color) { event diff --git a/kubejs/startup_scripts/items.js b/kubejs/startup_scripts/items.js index 4fd8dff..a6a8720 100644 --- a/kubejs/startup_scripts/items.js +++ b/kubejs/startup_scripts/items.js @@ -4,26 +4,5 @@ StartupEvents.registry("item", (event) => { event.create(global.items.rocket_hull); event.create(global.items.incomplete_electron_tube); event.create(global.items.fumo_base); - event.create(global.items.high_density_tungsten); - event.create(global.items.high_density_tungsten_sheet); - - event - .create(global.items.rose_gold_ingot) - .texture("tinkers_construct:item/rose_gold_ingot"); - - // created in same order as tools are ordered in rei - event.create(global.items.copper_sword, "sword").tier("copper"); - event.create(global.items.copper_shovel, "shovel").tier("copper"); - event.create(global.items.copper_pickaxe, "pickaxe").tier("copper"); - event.create(global.items.copper_axe, "axe").tier("copper"); - event.create(global.items.copper_hoe, "hoe").tier("copper"); - - event.create(global.items.tool_part_mold); - event.create(global.items.armor_plate_mold); - event.create(global.items.gear_mold); - event.create(global.items.copper_tool_part); - event.create(global.items.copper_armor_plate); - event.create(global.items.iron_tool_part); - event.create(global.items.iron_armor_plate); event.create(global.items.bronze_rod); }); diff --git a/kubejs/startup_scripts/tool-tiers.js b/kubejs/startup_scripts/tool-tiers.js deleted file mode 100644 index c24b6dd..0000000 --- a/kubejs/startup_scripts/tool-tiers.js +++ /dev/null @@ -1,10 +0,0 @@ -ItemEvents.toolTierRegistry((event) => { - event.add("copper", (tier) => { - tier.uses = 200; - tier.speed = 5; - tier.attackDamageBonus = 1.5; - tier.level = 1; - tier.enchantmentValue = 9; - tier.repairIngredient = "#forge:ingots/copper"; - }); -}); diff --git a/kubejs/startup_scripts/world-gen.js b/kubejs/startup_scripts/world-gen.js index 712df11..0f6a848 100644 --- a/kubejs/startup_scripts/world-gen.js +++ b/kubejs/startup_scripts/world-gen.js @@ -1,18 +1,17 @@ WorldgenEvents.add((event) => { // Moon - event.addOre((ore) => { - ore.id = global.packName + ":wolframite_ore_moon"; - //ore.biomes = "ad_astra:lunar_wastelands"; // should not be needed due to target - ore.addTarget( - "#ad_astra:moon_ore_replaceables", - "createmetallurgy:wolframite_ore", - ); - ore.count([10, 30]).squared().triangleHeight(-30, 85); - }); event.addOre((ore) => { ore.id = global.packName + ":nickel_ore_moon"; - //ore.biomes = "ad_astra:lunar_wastelands"; // should not be needed due to target ore.addTarget("#ad_astra:moon_ore_replaceables", "thermal:nickel_ore"); - ore.count([25, 40]).squared().triangleHeight(0, 85); + ore.count([20, 45]).squared().triangleHeight(40, 85); + ore.size = 6; + ore.chance = 1.1; + }); + event.addOre((ore) => { + ore.id = global.packName + ":silver_ore_moon"; + ore.addTarget("#ad_astra:moon_ore_replaceables", "thermal:silver_ore"); + ore.count([10, 30]).squared().triangleHeight(20, 60); + ore.size = 4; + ore.chance = 1.2; }); }); diff --git a/mods/building-gadgets.pw.toml b/mods/building-gadgets.pw.toml index d1754f9..d3b5129 100644 --- a/mods/building-gadgets.pw.toml +++ b/mods/building-gadgets.pw.toml @@ -1,13 +1,13 @@ name = "Building Gadgets" -filename = "buildinggadgets-3.16.2-build.22+mc1.19.2.jar" +filename = "buildinggadgets-3.16.3-build.26+mc1.19.2.jar" side = "both" [download] hash-format = "sha1" -hash = "0da354356b963214d6da8d574623a4de2e171571" +hash = "8c399bcb8c4d42e1d7c2c7d63977140dc6d1ab33" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4413103 +file-id = 5358157 project-id = 298187 diff --git a/mods/chat-heads.pw.toml b/mods/chat-heads.pw.toml index 3215349..9a56d15 100644 --- a/mods/chat-heads.pw.toml +++ b/mods/chat-heads.pw.toml @@ -1,13 +1,13 @@ name = "Chat Heads" -filename = "chat_heads-0.10.31-forge-1.19.2.jar" +filename = "chat_heads-0.12.3-forge-1.19.2.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/Wb5oqrBJ/versions/AjXuuRyv/chat_heads-0.10.31-forge-1.19.2.jar" +url = "https://cdn.modrinth.com/data/Wb5oqrBJ/versions/XBdVDv5q/chat_heads-0.12.3-forge-1.19.2.jar" hash-format = "sha1" -hash = "39cf5337d40fbe48bfa74b7e8ca185a8a11cc9fe" +hash = "04169fa2df1f7be62b0a648a83a69cca177498a3" [update] [update.modrinth] mod-id = "Wb5oqrBJ" -version = "AjXuuRyv" +version = "XBdVDv5q" diff --git a/mods/corpse.pw.toml b/mods/corpse.pw.toml index 31cd1d5..172de22 100644 --- a/mods/corpse.pw.toml +++ b/mods/corpse.pw.toml @@ -1,13 +1,13 @@ name = "Corpse" -filename = "corpse-forge-1.19.2-1.0.10.jar" +filename = "corpse-forge-1.19.2-1.0.12.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/WrpuIfhw/versions/l9iOZ1Ke/corpse-forge-1.19.2-1.0.10.jar" +url = "https://cdn.modrinth.com/data/WrpuIfhw/versions/L9BPDxPe/corpse-forge-1.19.2-1.0.12.jar" hash-format = "sha1" -hash = "5be3b35a8494e5a31a0e7218b43b72424fdc3e73" +hash = "ea6902fc90e4ea6d4854cf662ce1c1f5f6df984c" [update] [update.modrinth] mod-id = "WrpuIfhw" -version = "l9iOZ1Ke" +version = "L9BPDxPe" diff --git a/mods/create-compression.pw.toml b/mods/create-compression.pw.toml index 6d1c2f3..8014f07 100644 --- a/mods/create-compression.pw.toml +++ b/mods/create-compression.pw.toml @@ -1,13 +1,13 @@ name = "Create Compression" -filename = "CreateCompression-1.19.2-1.7.0.jar" +filename = "CreateCompression-1.19.2-1.8.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/bgEPzFnZ/versions/4xx4kT9W/CreateCompression-1.19.2-1.7.0.jar" +url = "https://cdn.modrinth.com/data/bgEPzFnZ/versions/HMzH7Ebs/CreateCompression-1.19.2-1.8.1.jar" hash-format = "sha1" -hash = "52df63410dcd15d10b69613ffd6d5b52c7990c87" +hash = "4c412760d2ac0b10a277caa2d972b653f6497250" [update] [update.modrinth] mod-id = "bgEPzFnZ" -version = "4xx4kT9W" +version = "HMzH7Ebs" diff --git a/mods/create-enchantment-industry.pw.toml b/mods/create-enchantment-industry.pw.toml index 5a0c737..f1208bc 100644 --- a/mods/create-enchantment-industry.pw.toml +++ b/mods/create-enchantment-industry.pw.toml @@ -1,13 +1,13 @@ name = "Create Enchantment Industry" -filename = "create_enchantment_industry-1.19.2-for-create-0.5.1.f-1.2.8.jar" +filename = "create_enchantment_industry-1.19.2-for-create-0.5.1.f-1.2.9.e.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/JWGBpFUP/versions/28n7KncC/create_enchantment_industry-1.19.2-for-create-0.5.1.f-1.2.8.jar" +url = "https://cdn.modrinth.com/data/JWGBpFUP/versions/KA5Gf4rg/create_enchantment_industry-1.19.2-for-create-0.5.1.f-1.2.9.e.jar" hash-format = "sha1" -hash = "28a84e06908c2a7082bff5c977619eba0a832fea" +hash = "453fa207e15819e1fb33548b55df1aa5d0309a8e" [update] [update.modrinth] mod-id = "JWGBpFUP" -version = "28n7KncC" +version = "KA5Gf4rg" diff --git a/mods/create-metallurgy.pw.toml b/mods/create-metallurgy.pw.toml deleted file mode 100644 index 980b2fc..0000000 --- a/mods/create-metallurgy.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Create Metallurgy" -filename = "createmetallurgy-0.0.1-1.19.2.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/Soft45xC/versions/p35Dpm0W/createmetallurgy-0.0.1-1.19.2.jar" -hash-format = "sha1" -hash = "b67eb2eff0fddb02164e58c67590fc4e5a346c31" - -[update] -[update.modrinth] -mod-id = "Soft45xC" -version = "p35Dpm0W" diff --git a/mods/create-power-loader.pw.toml b/mods/create-power-loader.pw.toml index 6752134..1536b96 100644 --- a/mods/create-power-loader.pw.toml +++ b/mods/create-power-loader.pw.toml @@ -1,13 +1,13 @@ name = "Create: Power Loader" -filename = "create_power_loader-1.4.0-mc1.19.2.jar" +filename = "create_power_loader-1.5.0-mc1.19.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/wPQ6GgFE/versions/bQrAXwhQ/create_power_loader-1.4.0-mc1.19.2.jar" +url = "https://cdn.modrinth.com/data/wPQ6GgFE/versions/GuYzoHQC/create_power_loader-1.5.0-mc1.19.2.jar" hash-format = "sha1" -hash = "b4a11a18b0168869e146a87391e2431b3fa3adf4" +hash = "fcfeb02c272441076feff0c53ce916777124aacb" [update] [update.modrinth] mod-id = "wPQ6GgFE" -version = "bQrAXwhQ" +version = "GuYzoHQC" diff --git a/mods/cupboard.pw.toml b/mods/cupboard.pw.toml index 251617f..3513711 100644 --- a/mods/cupboard.pw.toml +++ b/mods/cupboard.pw.toml @@ -1,13 +1,13 @@ name = "Cupboard" -filename = "cupboard-1.19.2-2.3.jar" +filename = "cupboard-1.19.2-2.6.jar" side = "both" [download] hash-format = "sha1" -hash = "248f6130bd5a483f248884e11961a29e89a55bd8" +hash = "15ecda890cf08bcef7e4e6976d521a2bb8584a2e" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 5063778 +file-id = 5170313 project-id = 326652 diff --git a/mods/curios.pw.toml b/mods/curios.pw.toml index af54690..129b34a 100644 --- a/mods/curios.pw.toml +++ b/mods/curios.pw.toml @@ -1,13 +1,13 @@ name = "Curios API" -filename = "curios-forge-1.19.2-5.1.6.1.jar" +filename = "curios-forge-1.19.2-5.1.6.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/vvuO3ImH/versions/U8r7nIbi/curios-forge-1.19.2-5.1.6.1.jar" +url = "https://cdn.modrinth.com/data/vvuO3ImH/versions/29pH8hdz/curios-forge-1.19.2-5.1.6.2.jar" hash-format = "sha1" -hash = "eb2eac0ccd2c029f25e41d1fb3aedd720e112994" +hash = "d7f384ec1cf23c5fa665d810bcf43659aa7e8b32" [update] [update.modrinth] mod-id = "vvuO3ImH" -version = "U8r7nIbi" +version = "29pH8hdz" diff --git a/mods/custom-machinery-create.pw.toml b/mods/custom-machinery-create.pw.toml index f5a02f6..2e6a975 100644 --- a/mods/custom-machinery-create.pw.toml +++ b/mods/custom-machinery-create.pw.toml @@ -1,13 +1,13 @@ name = "Custom Machinery Create" -filename = "CustomMachineryCreate-forge-1.19.2-1.1.1.jar" +filename = "CustomMachineryCreate-forge-1.19.2-1.1.3.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/NHh2cWu8/versions/Be3dj6FF/CustomMachineryCreate-forge-1.19.2-1.1.1.jar" +url = "https://cdn.modrinth.com/data/NHh2cWu8/versions/U69S9IUl/CustomMachineryCreate-forge-1.19.2-1.1.3.jar" hash-format = "sha1" -hash = "c012bd6d32466650cf3f07115130aa4759ae1dde" +hash = "96fd457ecd5b06cf9d972b53ac7759b87e80553c" [update] [update.modrinth] mod-id = "NHh2cWu8" -version = "Be3dj6FF" +version = "U69S9IUl" diff --git a/mods/custom-machinery.pw.toml b/mods/custom-machinery.pw.toml index 217d43b..69dbea3 100644 --- a/mods/custom-machinery.pw.toml +++ b/mods/custom-machinery.pw.toml @@ -1,13 +1,13 @@ name = "Custom Machinery" -filename = "CustomMachinery-forge-1.19.2-0.9.12.jar" +filename = "CustomMachinery-forge-1.19.2-0.9.21.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/OrB5XFtI/versions/KGTV90x1/CustomMachinery-forge-1.19.2-0.9.12.jar" +url = "https://cdn.modrinth.com/data/OrB5XFtI/versions/PTxtHIuZ/CustomMachinery-forge-1.19.2-0.9.21.jar" hash-format = "sha1" -hash = "6188ffa0c7d28a26876fd48dd076aa1df636832b" +hash = "aceffcde8a263338cb2acafb7ca35264a41835bf" [update] [update.modrinth] mod-id = "OrB5XFtI" -version = "KGTV90x1" +version = "PTxtHIuZ" diff --git a/mods/cyclops-core.pw.toml b/mods/cyclops-core.pw.toml index 697e5fa..f24b66e 100644 --- a/mods/cyclops-core.pw.toml +++ b/mods/cyclops-core.pw.toml @@ -1,13 +1,13 @@ name = "Cyclops Core" -filename = "CyclopsCore-1.19.2-1.19.0.jar" +filename = "CyclopsCore-1.19.2-1.19.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/Z9DM0LJ4/versions/K0dv2tHW/CyclopsCore-1.19.2-1.19.0.jar" +url = "https://cdn.modrinth.com/data/Z9DM0LJ4/versions/1mhKvEuW/CyclopsCore-1.19.2-1.19.1.jar" hash-format = "sha1" -hash = "2f975222891779d21b68dbff343fdcada6bc8633" +hash = "1b71e7ab77282ea62a7d4093f5f531fd2b7327f4" [update] [update.modrinth] mod-id = "Z9DM0LJ4" -version = "K0dv2tHW" +version = "1mhKvEuW" diff --git a/mods/embeddium.pw.toml b/mods/embeddium.pw.toml index 5e8a518..496ee61 100644 --- a/mods/embeddium.pw.toml +++ b/mods/embeddium.pw.toml @@ -1,13 +1,13 @@ name = "Embeddium" -filename = "embeddium-0.3.5+mc1.19.2.jar" +filename = "embeddium-0.3.18+mc1.19.2.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/sk9rgfiA/versions/z5mT3cUf/embeddium-0.3.5%2Bmc1.19.2.jar" +url = "https://cdn.modrinth.com/data/sk9rgfiA/versions/jfqlwYJ5/embeddium-0.3.18%2Bmc1.19.2.jar" hash-format = "sha1" -hash = "280e5a4ef34e6a094330c2dd512c59754da3ee16" +hash = "35e37ece5f0dd3058a4f4d82596839a5165400d1" [update] [update.modrinth] mod-id = "sk9rgfiA" -version = "z5mT3cUf" +version = "jfqlwYJ5" diff --git a/mods/entity-model-features.pw.toml b/mods/entity-model-features.pw.toml index 5f163cd..25483c3 100644 --- a/mods/entity-model-features.pw.toml +++ b/mods/entity-model-features.pw.toml @@ -1,13 +1,13 @@ name = "[EMF] Entity Model Features" -filename = "entity_model_features_forge_1.19.2-1.2.3.jar" +filename = "entity_model_features_forge_1.19.2-2.0.2.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/4I1XuqiY/versions/4ZslB2Hx/entity_model_features_forge_1.19.2-1.2.3.jar" +url = "https://cdn.modrinth.com/data/4I1XuqiY/versions/sZcSLicd/entity_model_features_forge_1.19.2-2.0.2.jar" hash-format = "sha1" -hash = "d337c2c9c5ef57dc85aef2bf1d2f95b47e3e3ff8" +hash = "a72335fc4ddfefce5ffa0f716d8e05aa585a1024" [update] [update.modrinth] mod-id = "4I1XuqiY" -version = "4ZslB2Hx" +version = "sZcSLicd" diff --git a/mods/entitytexturefeatures.pw.toml b/mods/entitytexturefeatures.pw.toml index 1acb2e2..6e58b29 100644 --- a/mods/entitytexturefeatures.pw.toml +++ b/mods/entitytexturefeatures.pw.toml @@ -1,13 +1,13 @@ name = "[ETF] Entity Texture Features" -filename = "entity_texture_features_forge_1.19.2-5.2.3.jar" +filename = "entity_texture_features_forge_1.19.2-6.0.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/BVzZfTc1/versions/5mF9Ab6l/entity_texture_features_forge_1.19.2-5.2.3.jar" +url = "https://cdn.modrinth.com/data/BVzZfTc1/versions/NjD64J4h/entity_texture_features_forge_1.19.2-6.0.1.jar" hash-format = "sha1" -hash = "ea875925e50a8371db869d6b6e9164a6b43a5d66" +hash = "44e8627ca88b291f3e30ead4ee0f33ad59138ac7" [update] [update.modrinth] mod-id = "BVzZfTc1" -version = "5mF9Ab6l" +version = "NjD64J4h" diff --git a/mods/ftb-chunks-forge.pw.toml b/mods/ftb-chunks-forge.pw.toml index 47e8ee7..81577d1 100644 --- a/mods/ftb-chunks-forge.pw.toml +++ b/mods/ftb-chunks-forge.pw.toml @@ -1,13 +1,13 @@ name = "FTB Chunks (Forge)" -filename = "ftb-chunks-forge-1902.4.4-build.326.jar" +filename = "ftb-chunks-forge-1902.4.6-build.360.jar" side = "both" [download] hash-format = "sha1" -hash = "4bfea837262e8862526896c86c4fac779c7d1d80" +hash = "812ef69d81e4249dbf589c3a0e50d0a09e9a5d65" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 5001266 +file-id = 5417874 project-id = 314906 diff --git a/mods/ftb-quests-forge.pw.toml b/mods/ftb-quests-forge.pw.toml index 9a1f241..8a51516 100644 --- a/mods/ftb-quests-forge.pw.toml +++ b/mods/ftb-quests-forge.pw.toml @@ -1,13 +1,13 @@ name = "FTB Quests (Forge)" -filename = "ftb-quests-forge-1902.5.8-build.345.jar" +filename = "ftb-quests-forge-1902.5.9-build.399.jar" side = "both" [download] hash-format = "sha1" -hash = "fc11b0a00bfa6d54c378add9f34f6df9d282c1b9" +hash = "a43d948ff29d77e9f68e758c108d25d6589edc5c" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 5060506 +file-id = 5417957 project-id = 289412 diff --git a/mods/ftb-xmod-compat.pw.toml b/mods/ftb-xmod-compat.pw.toml index e90a4a4..ee180e7 100644 --- a/mods/ftb-xmod-compat.pw.toml +++ b/mods/ftb-xmod-compat.pw.toml @@ -1,13 +1,13 @@ name = "FTB XMod Compat" -filename = "ftb-xmod-compat-forge-1.2.3.jar" +filename = "ftb-xmod-compat-forge-1.2.4.jar" side = "both" [download] hash-format = "sha1" -hash = "a058e7693509bc61e68bf3b6e3b97922fcd73972" +hash = "a3afc5feb1597a332a631f117f33aea8068e6611" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4857341 +file-id = 5327224 project-id = 889915 diff --git a/mods/in-control.pw.toml b/mods/in-control.pw.toml index 236e4f6..0f5f48e 100644 --- a/mods/in-control.pw.toml +++ b/mods/in-control.pw.toml @@ -1,13 +1,13 @@ name = "In Control!" -filename = "incontrol-1.19-7.1.12.jar" +filename = "incontrol-1.19-7.1.15.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/KpICtuVx/versions/7S0SwqCr/incontrol-1.19-7.1.12.jar" +url = "https://cdn.modrinth.com/data/KpICtuVx/versions/8980HvJa/incontrol-1.19-7.1.15.jar" hash-format = "sha1" -hash = "19838e3ac3d1a1f4d62592bedf3d1a8022f81e47" +hash = "c5695ed7058a679fa1bdcb45ea016a88dca60222" [update] [update.modrinth] mod-id = "KpICtuVx" -version = "7S0SwqCr" +version = "8980HvJa" diff --git a/mods/item-obliterator.pw.toml b/mods/item-obliterator.pw.toml index 6454d21..f7a8154 100644 --- a/mods/item-obliterator.pw.toml +++ b/mods/item-obliterator.pw.toml @@ -1,13 +1,13 @@ name = "Item Obliterator" -filename = "Item_Obliterator-FORGE-MC1.19.2-1.7.0.jar" +filename = "Item-Obliterator-Forge-1.19.2-2.2.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/3ESR84kR/versions/3Da2NymJ/Item_Obliterator-FORGE-MC1.19.2-1.7.0.jar" +url = "https://cdn.modrinth.com/data/3ESR84kR/versions/7wB98NiB/Item-Obliterator-Forge-1.19.2-2.2.1.jar" hash-format = "sha1" -hash = "ff88076d5bcf40bad7a1bd8d1429c4f8f79be93f" +hash = "afb3589590be38f112193de3019364d283772f50" [update] [update.modrinth] mod-id = "3ESR84kR" -version = "3Da2NymJ" +version = "7wB98NiB" diff --git a/mods/journeymap.pw.toml b/mods/journeymap.pw.toml index 122e313..efa75e6 100644 --- a/mods/journeymap.pw.toml +++ b/mods/journeymap.pw.toml @@ -1,13 +1,13 @@ name = "JourneyMap" -filename = "journeymap-1.19.2-5.9.7-forge.jar" +filename = "journeymap-1.19.2-5.9.8-forge.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/lfHFW1mp/versions/WEHaD7ed/journeymap-1.19.2-5.9.7-forge.jar" +url = "https://cdn.modrinth.com/data/lfHFW1mp/versions/aSblGSXj/journeymap-1.19.2-5.9.8-forge.jar" hash-format = "sha1" -hash = "147a82cb24b2ce67ba44be33f66d259ca88365ca" +hash = "3ec70f290666ad87a6e9571d9aba53d89caf23a8" [update] [update.modrinth] mod-id = "lfHFW1mp" -version = "WEHaD7ed" +version = "aSblGSXj" diff --git a/mods/kubejs.pw.toml b/mods/kubejs.pw.toml index 0cba122..02accf4 100644 --- a/mods/kubejs.pw.toml +++ b/mods/kubejs.pw.toml @@ -1,13 +1,13 @@ name = "KubeJS" -filename = "kubejs-forge-1902.6.2-build.63.jar" +filename = "kubejs-forge-1902.6.2-build.73.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/umyGl7zF/versions/XwkVpW1I/kubejs-forge-1902.6.2-build.63.jar" +url = "https://cdn.modrinth.com/data/umyGl7zF/versions/ByN6240z/kubejs-forge-1902.6.2-build.73.jar" hash-format = "sha1" -hash = "1e58ceb6f84b27897b4d9fbfabfbe7593bf9eda0" +hash = "7977da0e43c0aafbcdfdb3dbcb06d2987a5f33af" [update] [update.modrinth] mod-id = "umyGl7zF" -version = "XwkVpW1I" +version = "ByN6240z" diff --git a/mods/lootr.pw.toml b/mods/lootr.pw.toml index e10b07c..5de1be2 100644 --- a/mods/lootr.pw.toml +++ b/mods/lootr.pw.toml @@ -1,13 +1,13 @@ name = "Lootr" -filename = "lootr-1.19-0.4.25.67.jar" +filename = "lootr-forge-1.19-0.4.26.69.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/EltpO5cN/versions/WgGe8bIQ/lootr-1.19-0.4.25.67.jar" +url = "https://cdn.modrinth.com/data/EltpO5cN/versions/xtOKEujd/lootr-forge-1.19-0.4.26.69.jar" hash-format = "sha1" -hash = "aae14d952b6d336534151569221835dca61b07f6" +hash = "53ed8817d184b042014b2203c9bb611c49f8ea2c" [update] [update.modrinth] mod-id = "EltpO5cN" -version = "WgGe8bIQ" +version = "xtOKEujd" diff --git a/mods/mantle.pw.toml b/mods/mantle.pw.toml new file mode 100644 index 0000000..419321a --- /dev/null +++ b/mods/mantle.pw.toml @@ -0,0 +1,13 @@ +name = "Mantle" +filename = "Mantle-1.19.2-1.10.36.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/Cg6Uc79H/versions/AliG8wlL/Mantle-1.19.2-1.10.36.jar" +hash-format = "sha1" +hash = "0b524965a8bbfbddfce7638c8fd37a6406ff15da" + +[update] +[update.modrinth] +mod-id = "Cg6Uc79H" +version = "AliG8wlL" diff --git a/mods/modelfix.pw.toml b/mods/modelfix.pw.toml index 6dcec9d..2daccb6 100644 --- a/mods/modelfix.pw.toml +++ b/mods/modelfix.pw.toml @@ -1,13 +1,13 @@ name = "Model Gap Fix" -filename = "modelfix-1.8.jar" +filename = "modelfix-1.4-universal.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/QdG47OkI/versions/EglYgeMq/modelfix-1.8.jar" +url = "https://cdn.modrinth.com/data/QdG47OkI/versions/vJ00juj2/modelfix-1.4-universal.jar" hash-format = "sha1" -hash = "ef1882c6244ffb09fed6251b647dec1ffebdca4f" +hash = "56bf1f862266c3aef4b2f546b0f25b6c18d2571d" [update] [update.modrinth] mod-id = "QdG47OkI" -version = "EglYgeMq" +version = "vJ00juj2" diff --git a/mods/modernfix.pw.toml b/mods/modernfix.pw.toml index 62b03a0..b4d5858 100644 --- a/mods/modernfix.pw.toml +++ b/mods/modernfix.pw.toml @@ -1,13 +1,13 @@ name = "ModernFix" -filename = "modernfix-forge-5.13.0+mc1.19.2.jar" +filename = "modernfix-forge-5.18.0+mc1.19.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/nmDcB62a/versions/YPwzjK2W/modernfix-forge-5.13.0%2Bmc1.19.2.jar" +url = "https://cdn.modrinth.com/data/nmDcB62a/versions/i0vWRI7P/modernfix-forge-5.18.0%2Bmc1.19.2.jar" hash-format = "sha1" -hash = "8a17fd82271e5b94b089c75f5683215b44fdee14" +hash = "a8d1887cbc6ea5168df89326fdd5ccfd4c19cf6d" [update] [update.modrinth] mod-id = "nmDcB62a" -version = "YPwzjK2W" +version = "i0vWRI7P" diff --git a/mods/no-mo-portals.pw.toml b/mods/no-mo-portals.pw.toml index 0e2422d..4cb04e8 100644 --- a/mods/no-mo-portals.pw.toml +++ b/mods/no-mo-portals.pw.toml @@ -1,13 +1,13 @@ name = "NoMo' Portals" -filename = "nomoportals-1.19.2-3.3.jar" +filename = "nomoportals-1.19.2-3.4.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/shr3jwQg/versions/LbT7BjSE/nomoportals-1.19.2-3.3.jar" +url = "https://cdn.modrinth.com/data/shr3jwQg/versions/H3Jw5B7o/nomoportals-1.19.2-3.4.jar" hash-format = "sha1" -hash = "5c204bd6d5a88857a5bb7cb38a5dea46375b2af8" +hash = "25993223745f74afb6137cda9a4e836d2a63e5ad" [update] [update.modrinth] mod-id = "shr3jwQg" -version = "LbT7BjSE" +version = "H3Jw5B7o" diff --git a/mods/ping-wheel.pw.toml b/mods/ping-wheel.pw.toml index 3f50feb..e321ba2 100644 --- a/mods/ping-wheel.pw.toml +++ b/mods/ping-wheel.pw.toml @@ -1,13 +1,13 @@ name = "Ping Wheel" -filename = "Ping-Wheel-1.7.1-forge-1.19.2.jar" +filename = "Ping-Wheel-1.9.0-forge-1.19.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/QQXAdCzh/versions/Rt7wVCcP/Ping-Wheel-1.7.1-forge-1.19.2.jar" +url = "https://cdn.modrinth.com/data/QQXAdCzh/versions/Z5W4uor7/Ping-Wheel-1.9.0-forge-1.19.2.jar" hash-format = "sha1" -hash = "f72c665fe27481a30a0cdfd69bf03206e3b9375c" +hash = "c953c87bba67a2825eab9654dabbce81f20b2f2c" [update] [update.modrinth] mod-id = "QQXAdCzh" -version = "Rt7wVCcP" +version = "Z5W4uor7" diff --git a/mods/placebo.pw.toml b/mods/placebo.pw.toml index 8179de0..dba036b 100644 --- a/mods/placebo.pw.toml +++ b/mods/placebo.pw.toml @@ -1,13 +1,13 @@ name = "Placebo" -filename = "Placebo-1.19.2-7.3.5.jar" +filename = "Placebo-1.19.2-7.4.0.jar" side = "both" [download] hash-format = "sha1" -hash = "9a9854c83a9e41414714db64a94e3a1976926b66" +hash = "f65fa172eeb65d37194941df98bd31f405aaed53" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 5086263 +file-id = 5180198 project-id = 283644 diff --git a/mods/polymorph.pw.toml b/mods/polymorph.pw.toml index d17fa78..ada80bc 100644 --- a/mods/polymorph.pw.toml +++ b/mods/polymorph.pw.toml @@ -1,13 +1,13 @@ name = "Polymorph" -filename = "polymorph-forge-0.46.5+1.19.2.jar" +filename = "polymorph-forge-0.46.6+1.19.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/tagwiZkJ/versions/pJZr4yc3/polymorph-forge-0.46.5%2B1.19.2.jar" +url = "https://cdn.modrinth.com/data/tagwiZkJ/versions/6tFcWl5d/polymorph-forge-0.46.6%2B1.19.2.jar" hash-format = "sha1" -hash = "11385112621a467c1c948823530e74dbd0471b74" +hash = "80a182ed8a832c4df04620cedb3b8fda2757223c" [update] [update.modrinth] mod-id = "tagwiZkJ" -version = "pJZr4yc3" +version = "6tFcWl5d" diff --git a/mods/rechiseled.pw.toml b/mods/rechiseled.pw.toml index a72a26c..a5987a3 100644 --- a/mods/rechiseled.pw.toml +++ b/mods/rechiseled.pw.toml @@ -1,13 +1,13 @@ name = "Rechiseled" -filename = "rechiseled-1.1.5c-forge-mc1.19.2.jar" +filename = "rechiseled-1.1.6-forge-mc1.19.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/B0g2vT6l/versions/MHninPVS/rechiseled-1.1.5c-forge-mc1.19.2.jar" +url = "https://cdn.modrinth.com/data/B0g2vT6l/versions/MqJJHr9Y/rechiseled-1.1.6-forge-mc1.19.2.jar" hash-format = "sha1" -hash = "45743b120c3f6b858b146025337ca374e1223702" +hash = "d87ba1d9c17cbaf68a5d39f011421b4025134141" [update] [update.modrinth] mod-id = "B0g2vT6l" -version = "MHninPVS" +version = "MqJJHr9Y" diff --git a/mods/redstonepen.pw.toml b/mods/redstonepen.pw.toml index abf214c..d37af5b 100644 --- a/mods/redstonepen.pw.toml +++ b/mods/redstonepen.pw.toml @@ -1,13 +1,13 @@ name = "Redstone Pen" -filename = "redstonepen-1.19.2-forge-1.2.19.jar" +filename = "redstonepen-1.19.2-forge-1.2.32.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/DwE83ioX/versions/N6jVCv4R/redstonepen-1.19.2-forge-1.2.19.jar" +url = "https://cdn.modrinth.com/data/DwE83ioX/versions/hxRxVDub/redstonepen-1.19.2-forge-1.2.32.jar" hash-format = "sha1" -hash = "3de1dbe3d1db8049af3c15a92f79216ff15077d7" +hash = "0816517f71eda0dd4cd0d8e86ed5b26d37f3e27b" [update] [update.modrinth] mod-id = "DwE83ioX" -version = "N6jVCv4R" +version = "hxRxVDub" diff --git a/mods/rei.pw.toml b/mods/rei.pw.toml index 5c250ef..0084d4d 100644 --- a/mods/rei.pw.toml +++ b/mods/rei.pw.toml @@ -1,13 +1,13 @@ name = "Roughly Enough Items (REI)" -filename = "RoughlyEnoughItems-9.1.682-forge.jar" +filename = "RoughlyEnoughItems-9.2.724-forge.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/nfn13YXA/versions/hMNvzww7/RoughlyEnoughItems-9.1.682-forge.jar" +url = "https://cdn.modrinth.com/data/nfn13YXA/versions/Y39kFUSr/RoughlyEnoughItems-9.2.724-forge.jar" hash-format = "sha1" -hash = "c093c37e0f1bb29e105138e7ae56f52c59f2007f" +hash = "5cf9c76740fc6a155fa9b84b7d68bd2697658606" [update] [update.modrinth] mod-id = "nfn13YXA" -version = "hMNvzww7" +version = "Y39kFUSr" diff --git a/mods/saturn.pw.toml b/mods/saturn.pw.toml index 354494b..56a787c 100644 --- a/mods/saturn.pw.toml +++ b/mods/saturn.pw.toml @@ -1,13 +1,13 @@ name = "Saturn" -filename = "saturn-mc1.19.2-0.1.3.jar" +filename = "saturn-mc1.19.2-0.1.4.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/2eT495vq/versions/xNIsLaWp/saturn-mc1.19.2-0.1.3.jar" +url = "https://cdn.modrinth.com/data/2eT495vq/versions/np1EcSVx/saturn-mc1.19.2-0.1.4.jar" hash-format = "sha1" -hash = "b29ca863c9e89405b535d4f5bfe8c099a78f3610" +hash = "053ff233cf7a3d25f38237c01b6617ef2e719eb5" [update] [update.modrinth] mod-id = "2eT495vq" -version = "xNIsLaWp" +version = "np1EcSVx" diff --git a/mods/sophisticated-backpacks.pw.toml b/mods/sophisticated-backpacks.pw.toml index 323a2b9..07d7602 100644 --- a/mods/sophisticated-backpacks.pw.toml +++ b/mods/sophisticated-backpacks.pw.toml @@ -1,13 +1,13 @@ name = "Sophisticated Backpacks" -filename = "sophisticatedbackpacks-1.19.2-3.20.1.1013.jar" +filename = "sophisticatedbackpacks-1.19.2-3.20.2.1035.jar" side = "both" [download] hash-format = "sha1" -hash = "1e65f32ea0248fc8e86bd1cb71ec2db3aac7429b" +hash = "ac5fe5f2146c6074e29fe859e5d755ef712e85e7" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 5102999 +file-id = 5194759 project-id = 422301 diff --git a/mods/sophisticated-core.pw.toml b/mods/sophisticated-core.pw.toml index ce1b7ed..eaa765d 100644 --- a/mods/sophisticated-core.pw.toml +++ b/mods/sophisticated-core.pw.toml @@ -1,13 +1,13 @@ name = "Sophisticated Core" -filename = "sophisticatedcore-1.19.2-0.6.2.552.jar" +filename = "sophisticatedcore-1.19.2-0.6.4.605.jar" side = "both" [download] hash-format = "sha1" -hash = "a26b4ca3f7e53ebcd0b830275bbe9a696e518e1e" +hash = "08b6366c6acb6958c518a98728761316d99e95b9" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 5102974 +file-id = 5296313 project-id = 618298 diff --git a/mods/suggestion-tweaker.pw.toml b/mods/suggestion-tweaker.pw.toml index 2a99826..2047eea 100644 --- a/mods/suggestion-tweaker.pw.toml +++ b/mods/suggestion-tweaker.pw.toml @@ -1,13 +1,13 @@ name = "Suggestion Tweaker" -filename = "suggestion-tweaker-1.19.1-1.5.1-forge.jar" +filename = "suggestion-tweaker-1.19.1-1.5.2-forge.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/MBLj38R0/versions/qq5DMRU2/suggestion-tweaker-1.19.1-1.5.1-forge.jar" +url = "https://cdn.modrinth.com/data/MBLj38R0/versions/A4Yuj9M3/suggestion-tweaker-1.19.1-1.5.2-forge.jar" hash-format = "sha1" -hash = "4ffcdb600e32cdf933fb6c86eb6a1d42cf569a98" +hash = "82dd4f5b5175f1d71a65267bc64e97a60ec4fe0b" [update] [update.modrinth] mod-id = "MBLj38R0" -version = "qq5DMRU2" +version = "A4Yuj9M3" diff --git a/mods/tinkers-construct.pw.toml b/mods/tinkers-construct.pw.toml new file mode 100644 index 0000000..8049214 --- /dev/null +++ b/mods/tinkers-construct.pw.toml @@ -0,0 +1,13 @@ +name = "Tinkers' Construct" +filename = "TConstruct-1.19.2-3.8.3.39.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/rxIIYO6c/versions/KpNAIJ7D/TConstruct-1.19.2-3.8.3.39.jar" +hash-format = "sha1" +hash = "c1fea054078536e0f2bd941e23ee991a4e24f1d9" + +[update] +[update.modrinth] +mod-id = "rxIIYO6c" +version = "KpNAIJ7D" diff --git a/mods/toms-storage.pw.toml b/mods/toms-storage.pw.toml index f4c10c5..3e0f2e6 100644 --- a/mods/toms-storage.pw.toml +++ b/mods/toms-storage.pw.toml @@ -1,13 +1,13 @@ name = "Tom's Simple Storage Mod" -filename = "toms_storage-1.19-1.5.9.jar" +filename = "toms_storage-1.19-1.5.11.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/XZNI4Cpy/versions/yQi6tsiF/toms_storage-1.19-1.5.9.jar" +url = "https://cdn.modrinth.com/data/XZNI4Cpy/versions/Xoa4RYRL/toms_storage-1.19-1.5.11.jar" hash-format = "sha1" -hash = "3bf3a7d3edb3ee0e87dc4637678ff6cc3b9c70b9" +hash = "15bcd9a63ef48012a8c5319cb4b4a720c7c7619b" [update] [update.modrinth] mod-id = "XZNI4Cpy" -version = "yQi6tsiF" +version = "Xoa4RYRL" diff --git a/mods/zume.pw.toml b/mods/zume.pw.toml index 4c25dc9..66cbd2a 100644 --- a/mods/zume.pw.toml +++ b/mods/zume.pw.toml @@ -1,13 +1,13 @@ name = "Zume" -filename = "zume-0.15.1.jar" +filename = "zume-1.0.0.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/o6qsdrrQ/versions/qiJNpFPA/zume-0.15.1.jar" +url = "https://cdn.modrinth.com/data/o6qsdrrQ/versions/EDf05717/zume-1.0.0.jar" hash-format = "sha1" -hash = "0b68676d4e8b099c37b928daf97bddfa7c43c04d" +hash = "715ddabe93038089d553a0c73bb0868186e9173c" [update] [update.modrinth] mod-id = "o6qsdrrQ" -version = "qiJNpFPA" +version = "EDf05717" diff --git a/resourcepacks/fancy-crops.pw.toml b/resourcepacks/fancy-crops.pw.toml index 856face..7457c02 100644 --- a/resourcepacks/fancy-crops.pw.toml +++ b/resourcepacks/fancy-crops.pw.toml @@ -1,13 +1,13 @@ name = "Fancy Crops" -filename = "Fancy Crops v1.0 pf5-22.zip" +filename = "Fancy Crops v1.0 pf5-33.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/UGEVQ6t9/versions/WPYEdaAN/Fancy%20Crops%20v1.0%20pf5-22.zip" +url = "https://cdn.modrinth.com/data/UGEVQ6t9/versions/W8nAhed5/Fancy%20Crops%20v1.0%20pf5-33.zip" hash-format = "sha1" -hash = "bc9dee0b2c972b3ce4e4b3196b8a23a8ec905c0c" +hash = "ffc0d461fc3db478d468372dee2e384e0ae65a44" [update] [update.modrinth] mod-id = "UGEVQ6t9" -version = "WPYEdaAN" +version = "W8nAhed5" diff --git a/resourcepacks/toms-create-storage.pw.toml b/resourcepacks/toms-create-storage.pw.toml index a934fd9..180e676 100644 --- a/resourcepacks/toms-create-storage.pw.toml +++ b/resourcepacks/toms-create-storage.pw.toml @@ -1,13 +1,13 @@ name = "Tom's Create Storage" -filename = "Create+Simple+Storage+2.1.zip" +filename = "Create+Simple+Storage+Solid+GUI 1.1.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/xGCng9FL/versions/xZXjTODa/Create%2BSimple%2BStorage%2B2.1.zip" +url = "https://cdn.modrinth.com/data/xGCng9FL/versions/hlDyUi8g/Create%2BSimple%2BStorage%2BSolid%2BGUI%201.1.zip" hash-format = "sha1" -hash = "9aeba68908b086b8eb74a731b0c4b34795799b88" +hash = "54758db47d54d544908d136942d63f7e37bb8935" [update] [update.modrinth] mod-id = "xGCng9FL" -version = "xZXjTODa" +version = "hlDyUi8g"