diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index 920ec13..7dae2b2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,7 @@ # Exclude exported Modrinth modpacks *.mrpack + +# nix +result +.direnv diff --git a/.packwizignore b/.packwizignore index 7593727..818b18e 100644 --- a/.packwizignore +++ b/.packwizignore @@ -3,3 +3,9 @@ README.md README-modrinth.md COPYING.txt release-notes.sh +result +flake.nix +flake.lock +.envrc +.direnv/ +nix/ diff --git a/config/yosbr/config/DistantHorizons.toml b/config/yosbr/config/DistantHorizons.toml new file mode 100644 index 0000000..6929372 --- /dev/null +++ b/config/yosbr/config/DistantHorizons.toml @@ -0,0 +1,3 @@ +[client.advanced.autoUpdater] +# disable auto updater, it should be updated with the modpack +enableAutoUpdater = false diff --git a/config/yosbr/shaderpacks/ComplementaryReimagined_r5.0.1.zip.txt b/config/yosbr/shaderpacks/ComplementaryReimagined_r5.2.2.zip.txt similarity index 100% rename from config/yosbr/shaderpacks/ComplementaryReimagined_r5.0.1.zip.txt rename to config/yosbr/shaderpacks/ComplementaryReimagined_r5.2.2.zip.txt diff --git a/config/yosbr/shaderpacks/ComplementaryUnbound_r5.0.1.zip.txt b/config/yosbr/shaderpacks/ComplementaryUnbound_r5.2.2.zip.txt similarity index 100% rename from config/yosbr/shaderpacks/ComplementaryUnbound_r5.0.1.zip.txt rename to config/yosbr/shaderpacks/ComplementaryUnbound_r5.2.2.zip.txt diff --git a/config/yosbr/shaderpacks/rethinking-voxels_r0.1_alpha9b.zip.txt b/config/yosbr/shaderpacks/rethinking-voxels_r0.1-beta4-fix2.zip.txt similarity index 100% rename from config/yosbr/shaderpacks/rethinking-voxels_r0.1_alpha9b.zip.txt rename to config/yosbr/shaderpacks/rethinking-voxels_r0.1-beta4-fix2.zip.txt diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..05e838e --- /dev/null +++ b/flake.lock @@ -0,0 +1,41 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1720571246, + "narHash": "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "16e401f01842c5bb2499e78c1fe227f939c0c474", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs", + "systems": "systems" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..3e18ac1 --- /dev/null +++ b/flake.nix @@ -0,0 +1,16 @@ +{ + inputs.systems.url = "github:nix-systems/default"; + outputs = { self, systems, nixpkgs }: let + lib = nixpkgs.lib; + eachSystem = lib.genAttrs (import systems); + in { + devShells = eachSystem (system: let pkgs = import nixpkgs { inherit system; }; + in { + default = pkgs.mkShell { + buildInputs = with pkgs; [ self.packages.${system}.packwiz-wrapper nix-update ]; + }; + }); + packages = eachSystem (system: let pkgs = import nixpkgs { inherit system; }; + in pkgs.callPackages ./nix/packages { }); + }; +} diff --git a/index.toml b/index.toml index c100d4c..2f4022e 100644 --- a/index.toml +++ b/index.toml @@ -1,5 +1,9 @@ hash-format = "sha256" +[[files]] +file = "config/yosbr/config/DistantHorizons.toml" +hash = "3a6ae31c255079774a688c1542858660ef4c81ec328d074ea008e0a96bbeceeb" + [[files]] file = "config/yosbr/config/MouseTweaks.cfg" hash = "5c6f2a474736301aa66e13b9fe3bb9044cef658bae57e6b3507785554743a75c" @@ -73,15 +77,15 @@ file = "config/yosbr/options.txt" hash = "14303032dc114706dd212b473599d7c504cd1ec59ad3023e4214eab7859ed7ef" [[files]] -file = "config/yosbr/shaderpacks/ComplementaryReimagined_r5.0.1.zip.txt" +file = "config/yosbr/shaderpacks/ComplementaryReimagined_r5.2.2.zip.txt" hash = "f4aaafa7cda512e478ea8942387ebbb0662bbb20b6e0c916c341c373e33a2a50" [[files]] -file = "config/yosbr/shaderpacks/ComplementaryUnbound_r5.0.1.zip.txt" +file = "config/yosbr/shaderpacks/ComplementaryUnbound_r5.2.2.zip.txt" hash = "6f5bf766cebabca0bcfa339eeb119956c48c40eba03c5aa39d7685eab67c56b5" [[files]] -file = "config/yosbr/shaderpacks/rethinking-voxels_r0.1_alpha9b.zip.txt" +file = "config/yosbr/shaderpacks/rethinking-voxels_r0.1-beta4-fix2.zip.txt" hash = "6e7b02f11cb6feb7f08d1088d042518d1a04cb6b71a7b2b109cf997173510e3c" [[files]] @@ -119,7 +123,7 @@ metafile = true [[files]] file = "mods/architectury-api.pw.toml" -hash = "a243675bc757485925b293932ee289b9fbcfb3b75bd3ba74eca7603f191cedad" +hash = "0cbcd58c49decc0ecbccd330fcc8326e3b8769e22e1740e229f09541acf3df7f" metafile = true [[files]] @@ -164,7 +168,7 @@ metafile = true [[files]] file = "mods/betterf3.pw.toml" -hash = "ba31b113733abc813e36738bdc8104fad628232d29907f66f48cf8c45299de9f" +hash = "5e3ee3550327d6b3545abc363325056c9fc09fb4d48a841e32da2da54c7f74c9" metafile = true [[files]] @@ -202,11 +206,6 @@ file = "mods/carpet-extra.pw.toml" hash = "5aa266498f131bf7b9d764d608b6416f36555c228110c0d5126bcd7c8bec9f9c" metafile = true -[[files]] -file = "mods/carpet-fixes.pw.toml" -hash = "d7c6555b666ff113894f6dd6dba7e6cc95c041542d06a39fd6f67421341711b9" -metafile = true - [[files]] file = "mods/carpet.pw.toml" hash = "095a93b4f0b4e2b8fadf8359bc145cbdd83be3c5bf23432e9a5f4e54d60de5b4" @@ -224,12 +223,12 @@ metafile = true [[files]] file = "mods/chat-heads.pw.toml" -hash = "0159525d452d7e755045223330b3bfc0a3df5491c4a83beee9f00af0b68b8758" +hash = "d98d2523d28442bcc9aa0a40e28e74ca8eabf9cc8652995e2572f2da7eef98ce" metafile = true [[files]] file = "mods/cit-resewn.pw.toml" -hash = "44e2cc695c040b7bbca462165099fa3c56a98aa8f01104bb067dc850b65f6d02" +hash = "2cf2d6c7683cbaa8d4d91374d5a92e6166176aefe5e0d7a0a2714c9321f8add0" metafile = true [[files]] @@ -239,7 +238,7 @@ metafile = true [[files]] file = "mods/cloth-config.pw.toml" -hash = "b6348f94ec939f563285dc96683e61da8fc17ab2f2897be2751fa24789513691" +hash = "a89dfcc985612a275975d4823a24fc3dceb244bacb2e8f81bd459283bf1b9fe9" metafile = true [[files]] @@ -249,7 +248,7 @@ metafile = true [[files]] file = "mods/continuity.pw.toml" -hash = "bb7b31de1f5c7941aff59030d59168a5971e8c47884bcd8905637836ff97ce46" +hash = "acbde04e67f2f0970a6b81e3c818a5f8ed3eceab4f3a04330d80c70c24d03afe" metafile = true [[files]] @@ -307,6 +306,11 @@ file = "mods/cull-less-leaves.pw.toml" hash = "39eb9db990032d949909f079ada415ffda18b372ec5d9b23ab95652d88474131" metafile = true +[[files]] +file = "mods/distanthorizons.pw.toml" +hash = "f6317dc039dd9efe5ef1c7b225c7a0f9a52f4ebd93a4b27726916369135f3059" +metafile = true + [[files]] file = "mods/double-doors.pw.toml" hash = "c02a955a040a1ecdfdbe9573ffd0c5a252c51560871f068becbcfd713b386b16" @@ -314,12 +318,12 @@ metafile = true [[files]] file = "mods/dynamic-fps.pw.toml" -hash = "6e6ee1bf66d6977728d3bf5404338c87a0a4ad5260833efcd912aaaca776cf8f" +hash = "fa2b28c7304509b8d95f8917fd34029c2149961bb1696c40fae5b5f504c7cd53" metafile = true [[files]] file = "mods/dynamiccrosshair.pw.toml" -hash = "9bdd24aca5f45e5179b9796da6731ba0b0cdbcdda5ae2b06f77d4e48b9a8839a" +hash = "d543ff3e5a5620ccf586716b6ea41d6ddb2b088bfae71c2c3f832d7ac17d0f7c" metafile = true [[files]] @@ -329,42 +333,42 @@ metafile = true [[files]] file = "mods/e4mc.pw.toml" -hash = "7685618d499e7cf9e0296dab7b06dd8520019c1d3c147ffab5d3da9ea7791549" +hash = "d9e8561b7696944a1647af52d7260fabb244b45b30f4b3656dc3630cecfb03e2" metafile = true [[files]] file = "mods/emi-loot.pw.toml" -hash = "8766521465c1cc6b57199a24008be030eabfd417c0ba7eb6c91f26c2f6ffa70a" +hash = "6ed9dba064110665c3dcf26be139c68b290ef0079e8aece1d2aced9484ebf85b" metafile = true [[files]] file = "mods/emi.pw.toml" -hash = "61d4f489d43922fb32e1868ddce2129ecfaddb40e42029908d41142057a28f89" +hash = "a685dc41c1361b3bf5b77533826a1216534e1c689fee371c002e9e9fcccdf712" metafile = true [[files]] file = "mods/emiffect.pw.toml" -hash = "6395441f751bc9aca4cd024df876b9f7abbfc53d8911f5264c5c36eabbb21c82" +hash = "2ad35d1b513308d702e9fe45f3c711d63dd1abb8fcbbb40d9a1d7c37d4d5d367" metafile = true [[files]] file = "mods/emitrades.pw.toml" -hash = "4c59088a2cb975f60347da57d72bb1069b65452c6a7b92af8facec6e1bed9409" +hash = "a55d562fcd6be9796e8cc162b83b5745efd83254fae44bf5a4d85d0fe6c97fcb" metafile = true [[files]] file = "mods/entity-model-features.pw.toml" -hash = "ceabdf57ccfdf9aefc04e6f3bc10e06d6a3320037a0ff60f5990501c9a5d6302" +hash = "3532700b41c5b82a0b57b140d0eb2e6f36728c575901b077b39cacac5a4322c8" metafile = true [[files]] file = "mods/entityculling.pw.toml" -hash = "33f865a014f3acf2c1f2c452bfe7ba1a864acad178322a6eab3759c7e63c9654" +hash = "9f499eff7ddb9eeab719f19808cbcf41f2b77d06ebf946f157cf7b5f52f64e70" metafile = true [[files]] file = "mods/entitytexturefeatures.pw.toml" -hash = "9fdc94bdc879ee8e5a0dc7eccb9370ee85c90c2491f1e6b38c56cc95d900fd53" +hash = "0dc604455e2d5f4e82e3527aab59cc199f060c776a90b9571fe36bcbb61f28b4" metafile = true [[files]] @@ -384,7 +388,7 @@ metafile = true [[files]] file = "mods/fallingleaves.pw.toml" -hash = "0c4c20d601b15dbc85c275732d9efe9369597503c7d6caa9a7fee217f67073e7" +hash = "948e8a5d65ede4a8612a2f476d7b3b0f2fe00436ab3b8dd73829d4bdcf0cdf22" metafile = true [[files]] @@ -404,12 +408,12 @@ metafile = true [[files]] file = "mods/ferrite-core.pw.toml" -hash = "03e174cf691b52da20bd973b955fae6f3720d3d2120f9d6cc1de5fdf3180013c" +hash = "39a6a39433b1b104bfafafcd60a8171f866daa2ebefffd64df822d0e69288e3a" metafile = true [[files]] file = "mods/figura.pw.toml" -hash = "aa43a98f14e208dc78b89f25d351a72f28cbf63762ec9e7199e345b820b4dc69" +hash = "75ffe202cd8947bbbb748a46bcd9d1cfb55d34a2fc95909b3001ac8433625fb7" metafile = true [[files]] @@ -444,12 +448,12 @@ metafile = true [[files]] file = "mods/indium.pw.toml" -hash = "0c5e71addef34c8dcd1c81dfc2ad851a3e274b9d8d3a7d388e1113d4139bf8d8" +hash = "31278d67704a56eb32d93c240e4bfd9822e1ab6047ee14d752953dd0c24dca95" metafile = true [[files]] file = "mods/inventory-profiles-next.pw.toml" -hash = "33c89073f71a972da05cfee8c8b00eec1549e406222b0abab659e38b42797820" +hash = "c9f4a8f985932269b8c9159c320929f81216f7197c2909c24c1498346f371b32" metafile = true [[files]] @@ -459,12 +463,12 @@ metafile = true [[files]] file = "mods/iris.pw.toml" -hash = "87ea5bf588ed195eaee3bcbd2432b5671692a203b25b688ffcbfeea6d2cea775" +hash = "aac37788ac1acd537a8b5b32fc2489cddf8034f196f7f38c0755837764b4f01d" metafile = true [[files]] file = "mods/itemswapper.pw.toml" -hash = "a87a5e7a9a1234525c9b2d5259e061317c35e0c863c2b061a2e6d2826c05f152" +hash = "c9196744dab42a9d4292fa409c64bbda856018cf97b0ca2850a9d8c1995dce24" metafile = true [[files]] @@ -474,7 +478,7 @@ metafile = true [[files]] file = "mods/jei.pw.toml" -hash = "3851cfa6f95cac87314de473dd4179271c8dab6c639652dc83ac688169c00124" +hash = "619848a450aa105fa925ccd488b3c6c2f23bdde6e824281bf7d96429f3745ba3" metafile = true [[files]] @@ -494,12 +498,12 @@ metafile = true [[files]] file = "mods/language-reload.pw.toml" -hash = "cd9e975f57957445016f58556136ed293ad29919ac5735aaa587d5c5c251aac0" +hash = "863c7625ed377ba905368ec8cb50a29d2ad23c833b50d7808f933aecbe1bcad4" metafile = true [[files]] file = "mods/libipn.pw.toml" -hash = "8547edbdc700238255794cdbb3b142d2bdb9f17a65b36ac1ce3c92e1aa942c3d" +hash = "3de6db38b0870f8bc8c61b2698d4b64ac1610b9066536be1b22b3a8257ab73fe" metafile = true [[files]] @@ -524,7 +528,7 @@ metafile = true [[files]] file = "mods/midnightcontrols.pw.toml" -hash = "5f6bbdeff1476501410b0e6f304a3d37183d9774bd1b182c20ffd186bb140ba2" +hash = "96aa6aa1291191030918c56a6342f1ca6902cbbcf2cb6ba2762b0bcc1d81fa65" metafile = true [[files]] @@ -554,17 +558,17 @@ metafile = true [[files]] file = "mods/morechathistory.pw.toml" -hash = "d1558ff187abe468110fef11eee834aa3c03df732e706ac16e221425b538da4d" +hash = "d2cf752938bcc2e83b8389fc1c6fc0557eb6a8b721fd33733b89f1a09fb535e5" metafile = true [[files]] file = "mods/mouse-tweaks.pw.toml" -hash = "669008dbd2508a67f8c409096cf2357de450f26a69494289e5852045ade7d358" +hash = "9ecf3bd4cd96af63bb04063f74b8a13cea46a77bfce670b4408417f8d0d293e0" metafile = true [[files]] file = "mods/nmuk.pw.toml" -hash = "c5c79054c0fe0b73e75f871f003fef87ed3be204cabd77c5df6cf6bb149f379c" +hash = "bf90fb21fcd2f9ea1f8b6b9abdd489e3fa56cb706602ea37741234630efd56ad" metafile = true [[files]] @@ -579,7 +583,7 @@ metafile = true [[files]] file = "mods/optigui.pw.toml" -hash = "0806fafc99d2bc0d3caf9bbf726367ee3e1a56788a6254b58b45567980dce7f1" +hash = "2440a2e6d0ade6bc4ca8d3677b59312734dd22106fc6fc5cbac5c24b0ba2ff05" metafile = true [[files]] @@ -589,7 +593,7 @@ metafile = true [[files]] file = "mods/presence-footsteps.pw.toml" -hash = "5027329d763899c40db5e3f389cfb2262d61d0037668c331db0cec1491c585d8" +hash = "35f2b7d27291e3a313c986137b70b7675bc32b3d0097e0940c7e23b0cf62b92e" metafile = true [[files]] @@ -604,22 +608,22 @@ metafile = true [[files]] file = "mods/qsl.pw.toml" -hash = "db2669fd5202942c0d0514c797c198506470e149542ac9d65e33e04f1a01db23" +hash = "9e9da779b67e9a944da81e921ff76c3388dfe9a475a3ff4f597b27af814cd28a" metafile = true [[files]] file = "mods/quilt-loading-screen.pw.toml" -hash = "0431d2fbc92b56108c48fc955caafbefcafeb69bc9773c5413daa89af5d87966" +hash = "e08fdeed1d56d03938bc66e2f34fefe5df150afb6e8ec4d318f354d6413ec0ba" metafile = true [[files]] file = "mods/reeses-sodium-options.pw.toml" -hash = "44b0a2294e1693230308e53b529d671a0303e94b623ba2c2650cdf5760a5a335" +hash = "0f9916dcded3aac68d56113e9617bbe3db5ec9036bd9bba784bc40a961b0c9f0" metafile = true [[files]] file = "mods/replaymod.pw.toml" -hash = "9e7c1e6cf3b81dce5a77bf5c95ed9d8e9b936b932aeadb1255245234230ced16" +hash = "abe780854e2485a6a50ca3e6eead7a63a5be1f08c920c093ee9fd8fbf62d3596" metafile = true [[files]] @@ -654,12 +658,12 @@ metafile = true [[files]] file = "mods/sodium-extra.pw.toml" -hash = "4e691c86059e755a026b8cae8cf0c66396dc39bf47b6c71980589101803ecd36" +hash = "5379b1da9fa50def37ede26e66dd963de3ce6f8576cd60a6b117998e09a5597c" metafile = true [[files]] file = "mods/sodium.pw.toml" -hash = "9a927c3e0830ba32e1b8a2e543597781724462595b8cce58f676962b442bb52b" +hash = "245530bdbb5c4127a1286f3722778d71e478194a8dcee89388c8fd247b4a57da" metafile = true [[files]] @@ -709,27 +713,27 @@ metafile = true [[files]] file = "mods/where-is-it.pw.toml" -hash = "c19f0bf43ceb5415585dcec715a63d1430b563067e33cf9194850d18d5bf7265" +hash = "c4ffad2aebeba13e732a9ce853120e3313d404a216a4046aa52333f361d3feeb" metafile = true [[files]] file = "mods/wthit.pw.toml" -hash = "874a680170fbf36204ee1c4e57650b6a28b15d10a32163964850aaccc9a7457a" +hash = "fc721bd93f9b250912bfba398601d111cd158fdf5e40129c107cc28fef3f5fa5" metafile = true [[files]] file = "mods/xaeros-minimap.pw.toml" -hash = "bc0ca9370e45f2a1e6e76f8bb9cf556121dd46b513b7ac796758e3ebe69880ec" +hash = "5cefed621171d22a3c902aa92ce8fff2aa09410963668664651adf66f635013b" metafile = true [[files]] file = "mods/xaeros-world-map.pw.toml" -hash = "3da4278dce5b43b0e0288cea2f86b342aa231b4188d23f3462481afd6d50b197" +hash = "a564179c06682ce17b454caf8dcb82e72c49b3eb8a6d74b5ea115aab2681635e" metafile = true [[files]] file = "mods/yacl.pw.toml" -hash = "9f8a007f79fc9d88ea537a9c3c2db347cc88a3adb84d39d17f12a5921e0291bf" +hash = "e012c2d48d8c2ef08e8a77a83476db46a81f9a5ee3aa90e5c57e2af508bd9089" metafile = true [[files]] @@ -799,7 +803,7 @@ metafile = true [[files]] file = "resourcepacks/enhanced-boss-bars.pw.toml" -hash = "b61a47d866f7b3fb65e744e7e12a615a8b4c562101cb1456f155e4d80e385866" +hash = "5211c59a355673aa4a07698533778901324b5d352177ea324d48c849c6aa1593" metafile = true [[files]] @@ -807,29 +811,54 @@ file = "resourcepacks/itemswapper-create.pw.toml" hash = "01c07cf7bbb1ff47816d3450079263669e545294783d2c635b6a72344cbf2d18" metafile = true +[[files]] +file = "shaderpacks/bloop-shaders.pw.toml" +hash = "6f094f3e2b57dc3e56e838898c2f4beb19cd4f9c38339f3742402c7e6be2304a" +metafile = true + [[files]] file = "shaderpacks/bsl-shaders.pw.toml" -hash = "b32427d80bba69d74dec8e9a44476ab543f564580879d8ca9c8e40543ccc0363" +hash = "41fbddad14b67a342e35eb7d2c96cfb555014c0f9c0e1e2866a3d2516a33c971" metafile = true [[files]] file = "shaderpacks/complementary-reimagined.pw.toml" -hash = "e51d06862a5c8191182f4fd7d9870313533afdcacdca3130cb37f8f5fc7bf635" +hash = "79f3766c282f1d3c5bd671f8c9f7bac5128b941557ca7668542b533e035c090b" metafile = true [[files]] file = "shaderpacks/complementary-shaders-v4.pw.toml" -hash = "356650c70469f8597be3f7a99067ad397202bd091336218b588ebf0bb4856e51" +hash = "c77c87c64c38307c6b0c40619f428199ba89278b6fa0c28e4beeda74a933d2f0" +metafile = true + +[[files]] +file = "shaderpacks/hysteria-shaders.pw.toml" +hash = "6e0f8d3902604c0a0ec68a7c755149795bef9ee373038ad2837032b6f8f9b004" metafile = true [[files]] file = "shaderpacks/makeup-ultra-fast-shaders.pw.toml" -hash = "4ecce78a3eb36339c1071fd366392c5590baf6ff1eeb396b6c5a3a7ce77b1834" +hash = "5821f960ab766cc441934d39998677b224c9e1c6efb965af2d1fa7f8eab73f58" +metafile = true + +[[files]] +file = "shaderpacks/pixel-perfect.pw.toml" +hash = "103a0e3143e9dc41d99be6a00646356108b1efb0dd27c90b97bf9d4c16afdbbd" +metafile = true + +[[files]] +file = "shaderpacks/psx-shader.pw.toml" +hash = "0f495b21c96c1756c7d641226b2f369213a461badbb72d60833e97e27273788e" metafile = true [[files]] file = "shaderpacks/rethinking-voxels.pw.toml" -hash = "1c66dab8ed5239ab02c6778fef2c72aea8bdf18f94408bd13a2b90aefefec9b2" +hash = "5a858b73cd053d094cc4e7894fa32219872dcf572604e6aa1f1e7ac2680d9bd2" +metafile = true + +[[files]] +file = "shaderpacks/shrimple.pw.toml" +hash = "5278e03c761883c72be4f3afb5c06119e2cfc333ed80a1608734d922e070619f" metafile = true [[files]] diff --git a/mods/architectury-api.pw.toml b/mods/architectury-api.pw.toml index 7dadcdd..4efa352 100644 --- a/mods/architectury-api.pw.toml +++ b/mods/architectury-api.pw.toml @@ -1,13 +1,13 @@ name = "Architectury API" -filename = "architectury-9.1.12-fabric.jar" +filename = "architectury-9.2.14-fabric.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/lhGA9TYQ/versions/Sbew3kXe/architectury-9.1.12-fabric.jar" +url = "https://cdn.modrinth.com/data/lhGA9TYQ/versions/WbL7MStR/architectury-9.2.14-fabric.jar" hash-format = "sha1" -hash = "add0fffa445ee2959b0898484732704a15156553" +hash = "4fa65e32dbf63a871a30fe8ec6fbff9a4b8d007d" [update] [update.modrinth] mod-id = "lhGA9TYQ" -version = "Sbew3kXe" +version = "WbL7MStR" diff --git a/mods/betterf3.pw.toml b/mods/betterf3.pw.toml index 6e51f90..ebe3705 100644 --- a/mods/betterf3.pw.toml +++ b/mods/betterf3.pw.toml @@ -1,13 +1,13 @@ name = "BetterF3" -filename = "BetterF3-7.0.1-Fabric-1.20.1.jar" +filename = "BetterF3-7.0.2-Fabric-1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/8shC1gFX/versions/FtJ0KSLo/BetterF3-7.0.1-Fabric-1.20.1.jar" +url = "https://cdn.modrinth.com/data/8shC1gFX/versions/7WkFnw9F/BetterF3-7.0.2-Fabric-1.20.1.jar" hash-format = "sha1" -hash = "106b8b7bdc698b8ced09c28ec089697dfbfbca1b" +hash = "ed0383ed8c68e1d1cbfc61267afee028d8a4d7fe" [update] [update.modrinth] mod-id = "8shC1gFX" -version = "FtJ0KSLo" +version = "7WkFnw9F" diff --git a/mods/carpet-fixes.pw.toml b/mods/carpet-fixes.pw.toml deleted file mode 100644 index ebcacee..0000000 --- a/mods/carpet-fixes.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Carpet-Fixes" -filename = "carpet-fixes-1.20-1.16.1.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/7Jaxgqip/versions/NBCnBGZj/carpet-fixes-1.20-1.16.1.jar" -hash-format = "sha1" -hash = "0e4f0f766ffbb059f8992e63987975f111e45780" - -[update] -[update.modrinth] -mod-id = "7Jaxgqip" -version = "NBCnBGZj" diff --git a/mods/chat-heads.pw.toml b/mods/chat-heads.pw.toml index ee1fae1..f6492a2 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.22-fabric-1.20.jar" +filename = "chat_heads-0.12.7-fabric-1.20.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/Wb5oqrBJ/versions/gzgdiHby/chat_heads-0.10.22-fabric-1.20.jar" +url = "https://cdn.modrinth.com/data/Wb5oqrBJ/versions/8150qC1W/chat_heads-0.12.7-fabric-1.20.jar" hash-format = "sha1" -hash = "9a591c62cfbff2ed7ff314ae8b6dd83f4ce4613b" +hash = "42749d7c0cd0ef67109bf17bf4946a4ae571c0d6" [update] [update.modrinth] mod-id = "Wb5oqrBJ" -version = "gzgdiHby" +version = "8150qC1W" diff --git a/mods/cit-resewn.pw.toml b/mods/cit-resewn.pw.toml index 577379e..04d546c 100644 --- a/mods/cit-resewn.pw.toml +++ b/mods/cit-resewn.pw.toml @@ -1,13 +1,13 @@ name = "CIT Resewn" -filename = "CITResewn-1.1.3+1.20.jar" +filename = "citresewn-1.1.5+1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/otVJckYQ/versions/c7Lo4vij/CITResewn-1.1.3%2B1.20.jar" +url = "https://cdn.modrinth.com/data/otVJckYQ/versions/8uQeAHwk/citresewn-1.1.5%2B1.20.1.jar" hash-format = "sha1" -hash = "53f036ebe51d7d97afaf44d541775c92c4470dad" +hash = "80d5b5b7bd73a1af7e3ea2c3a770efd7043d399e" [update] [update.modrinth] mod-id = "otVJckYQ" -version = "c7Lo4vij" +version = "8uQeAHwk" diff --git a/mods/cloth-config.pw.toml b/mods/cloth-config.pw.toml index 06a50a5..6d9c873 100644 --- a/mods/cloth-config.pw.toml +++ b/mods/cloth-config.pw.toml @@ -1,13 +1,13 @@ name = "Cloth Config API" -filename = "cloth-config-11.1.106-fabric.jar" +filename = "cloth-config-11.1.118-fabric.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/9s6osm5g/versions/s7VTKfLA/cloth-config-11.1.106-fabric.jar" +url = "https://cdn.modrinth.com/data/9s6osm5g/versions/J3FLptsi/cloth-config-11.1.118-fabric.jar" hash-format = "sha1" -hash = "a05e176326365f2b8e377a35be52a5671491bcfd" +hash = "f669f899d707b9e9acf1c239b0ae6b2c8be95361" [update] [update.modrinth] mod-id = "9s6osm5g" -version = "s7VTKfLA" +version = "J3FLptsi" diff --git a/mods/continuity.pw.toml b/mods/continuity.pw.toml index e41bef2..ff92c38 100644 --- a/mods/continuity.pw.toml +++ b/mods/continuity.pw.toml @@ -1,13 +1,13 @@ name = "Continuity" -filename = "continuity-3.0.0-beta.4+1.20.1.jar" +filename = "continuity-3.0.0-beta.5+1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/1IjD5062/versions/Z9FJWLMt/continuity-3.0.0-beta.4%2B1.20.1.jar" +url = "https://cdn.modrinth.com/data/1IjD5062/versions/84Zs6tNo/continuity-3.0.0-beta.5%2B1.20.1.jar" hash-format = "sha1" -hash = "b662fd625ba1f06c6e4958eac373856047d0d2a9" +hash = "15ad75d51f567c69308b91223454bacfd2eda7a5" [update] [update.modrinth] mod-id = "1IjD5062" -version = "Z9FJWLMt" +version = "84Zs6tNo" diff --git a/mods/distanthorizons.pw.toml b/mods/distanthorizons.pw.toml new file mode 100644 index 0000000..fb303c8 --- /dev/null +++ b/mods/distanthorizons.pw.toml @@ -0,0 +1,13 @@ +name = "Distant Horizons" +filename = "DistantHorizons-2.1.2-a-1.20.1-forge-fabric.jar" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/uCdwusMi/versions/OwcStAhe/DistantHorizons-2.1.2-a-1.20.1-forge-fabric.jar" +hash-format = "sha1" +hash = "56117d011bc5892dea3921676d0c981d66ed83ed" + +[update] +[update.modrinth] +mod-id = "uCdwusMi" +version = "OwcStAhe" diff --git a/mods/dynamic-fps.pw.toml b/mods/dynamic-fps.pw.toml index 62968a3..d6c0536 100644 --- a/mods/dynamic-fps.pw.toml +++ b/mods/dynamic-fps.pw.toml @@ -1,13 +1,13 @@ name = "Dynamic FPS" -filename = "dynamic-fps-3.2.1+minecraft-1.20.0.jar" +filename = "dynamic-fps-3.6.0+minecraft-1.20.0-quilt.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/LQ3K71Q1/versions/MJxmQ042/dynamic-fps-3.2.1%2Bminecraft-1.20.0.jar" +url = "https://cdn.modrinth.com/data/LQ3K71Q1/versions/zVtEuiz1/dynamic-fps-3.6.0%2Bminecraft-1.20.0-quilt.jar" hash-format = "sha1" -hash = "d4edd1828b1595eca7be0d36d1cc45b189a17a6e" +hash = "6c20da90c2a2a998fe56b32d84f6b93d74142a36" [update] [update.modrinth] mod-id = "LQ3K71Q1" -version = "MJxmQ042" +version = "zVtEuiz1" diff --git a/mods/dynamiccrosshair.pw.toml b/mods/dynamiccrosshair.pw.toml index 3a8581d..cb44020 100644 --- a/mods/dynamiccrosshair.pw.toml +++ b/mods/dynamiccrosshair.pw.toml @@ -1,13 +1,13 @@ name = "Dynamic Crosshair" -filename = "dynamiccrosshair-7.3+1.20-fabric.jar" +filename = "dynamiccrosshair-7.4.4+1.20-fabric.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/ZcR9weSm/versions/YZEVRL4i/dynamiccrosshair-7.3%2B1.20-fabric.jar" +url = "https://cdn.modrinth.com/data/ZcR9weSm/versions/9TBX0qkD/dynamiccrosshair-7.4.4%2B1.20-fabric.jar" hash-format = "sha1" -hash = "614bdac176b54d8d1c197534b0da45957a747614" +hash = "99b63cd2478966710cf2e19568dcde7b14a86201" [update] [update.modrinth] mod-id = "ZcR9weSm" -version = "YZEVRL4i" +version = "9TBX0qkD" diff --git a/mods/e4mc.pw.toml b/mods/e4mc.pw.toml index 569c75e..aa17b3d 100644 --- a/mods/e4mc.pw.toml +++ b/mods/e4mc.pw.toml @@ -1,13 +1,13 @@ name = "e4mc" -filename = "e4mc-4.0.1+1.19.4-fabric.jar" +filename = "e4mc_minecraft-5.0.0-fabric.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/qANg5Jrr/versions/vVFlVRt7/e4mc-4.0.1%2B1.19.4-fabric.jar" +url = "https://cdn.modrinth.com/data/qANg5Jrr/versions/bvr50NJe/e4mc_minecraft-5.0.0-fabric.jar" hash-format = "sha1" -hash = "458253f15e3c5bb0d5354f42f3eedc5b1a71472c" +hash = "41f45402c2af136a8654688f23931d6ecde18f3c" [update] [update.modrinth] mod-id = "qANg5Jrr" -version = "vVFlVRt7" +version = "bvr50NJe" diff --git a/mods/emi-loot.pw.toml b/mods/emi-loot.pw.toml index 518d793..aa9e958 100644 --- a/mods/emi-loot.pw.toml +++ b/mods/emi-loot.pw.toml @@ -1,13 +1,13 @@ name = "EMI Loot" -filename = "emi_loot-0.6.5+1.20.1.jar" +filename = "emi_loot-0.6.6+1.20.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/qbbO7Jns/versions/7fjkgVEh/emi_loot-0.6.5%2B1.20.1.jar" +url = "https://cdn.modrinth.com/data/qbbO7Jns/versions/lwhMjJHL/emi_loot-0.6.6%2B1.20.1.jar" hash-format = "sha1" -hash = "e6398e3aef04cbe96273e9174601953ab48f5191" +hash = "1ecb08d3a45f000e835e9214eb6bae282bd8fdb0" [update] [update.modrinth] mod-id = "qbbO7Jns" -version = "7fjkgVEh" +version = "lwhMjJHL" diff --git a/mods/emi.pw.toml b/mods/emi.pw.toml index 3d16a31..cbf5e96 100644 --- a/mods/emi.pw.toml +++ b/mods/emi.pw.toml @@ -1,13 +1,13 @@ name = "EMI" -filename = "emi-1.0.23+1.20.1+fabric.jar" +filename = "emi-1.1.10+1.20.1+fabric.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/fRiHVvU7/versions/HlfhF7AQ/emi-1.0.23%2B1.20.1%2Bfabric.jar" +url = "https://cdn.modrinth.com/data/fRiHVvU7/versions/8KtEM1az/emi-1.1.10%2B1.20.1%2Bfabric.jar" hash-format = "sha1" -hash = "199e6f30d68aac02bde11ac20e5c119fa15c6669" +hash = "863db56afaa62d3f7edf992df493e1bbf360c00c" [update] [update.modrinth] mod-id = "fRiHVvU7" -version = "HlfhF7AQ" +version = "8KtEM1az" diff --git a/mods/emiffect.pw.toml b/mods/emiffect.pw.toml index ef9310b..4cf8526 100644 --- a/mods/emiffect.pw.toml +++ b/mods/emiffect.pw.toml @@ -1,13 +1,13 @@ name = "EMIffect" -filename = "emiffect-fabric-1.1.1+mc1.20.1.jar" +filename = "emiffect-fabric-1.1.2+mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/705gWllI/versions/snwqJj9A/emiffect-fabric-1.1.1%2Bmc1.20.1.jar" +url = "https://cdn.modrinth.com/data/705gWllI/versions/BslzSzGd/emiffect-fabric-1.1.2%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "01bdb198a9877a3c3fdb5e3f1d5dc2d63a8e2c9e" +hash = "8a63f92080a05eeb53547ec76be615c5576ef901" [update] [update.modrinth] mod-id = "705gWllI" -version = "snwqJj9A" +version = "BslzSzGd" diff --git a/mods/emitrades.pw.toml b/mods/emitrades.pw.toml index e6c551e..490fc7d 100644 --- a/mods/emitrades.pw.toml +++ b/mods/emitrades.pw.toml @@ -1,13 +1,13 @@ name = "EMI Trades" -filename = "emitrades-fabric-1.2.0+mc1.20.1.jar" +filename = "emitrades-fabric-1.2.1+mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/j2HhbEE7/versions/hlcZDRJ1/emitrades-fabric-1.2.0%2Bmc1.20.1.jar" +url = "https://cdn.modrinth.com/data/j2HhbEE7/versions/kWMqVWTm/emitrades-fabric-1.2.1%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "880671a5d55859627eb91f5938ff8d81b9cb24ad" +hash = "72b51627c09e539e9f6194fc5aad862ff5f09461" [update] [update.modrinth] mod-id = "j2HhbEE7" -version = "hlcZDRJ1" +version = "kWMqVWTm" diff --git a/mods/entity-model-features.pw.toml b/mods/entity-model-features.pw.toml index f0456d1..8e58f0e 100644 --- a/mods/entity-model-features.pw.toml +++ b/mods/entity-model-features.pw.toml @@ -1,13 +1,13 @@ name = "Entity Model Features [CEM]" -filename = "entity_model_features_fabric_1.20-1.0.2.jar" +filename = "entity_model_features_fabric_1.20.1-2.1.3.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/4I1XuqiY/versions/zO7oFMiv/entity_model_features_fabric_1.20-1.0.2.jar" +url = "https://cdn.modrinth.com/data/4I1XuqiY/versions/f3RkrLlq/entity_model_features_fabric_1.20.1-2.1.3.jar" hash-format = "sha1" -hash = "87147ac0b539ccb0f409a1eaa4914846b513db67" +hash = "e5c7c4a0b5cb645945dfa1ef332984d04ba77363" [update] [update.modrinth] mod-id = "4I1XuqiY" -version = "zO7oFMiv" +version = "f3RkrLlq" diff --git a/mods/entityculling.pw.toml b/mods/entityculling.pw.toml index 60c042e..486c72e 100644 --- a/mods/entityculling.pw.toml +++ b/mods/entityculling.pw.toml @@ -1,13 +1,13 @@ name = "Entity Culling" -filename = "entityculling-fabric-1.6.2-mc1.20.1.jar" +filename = "entityculling-fabric-1.6.6-mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/NNAgCjsB/versions/BDwHAdWc/entityculling-fabric-1.6.2-mc1.20.1.jar" +url = "https://cdn.modrinth.com/data/NNAgCjsB/versions/F3RXDl1W/entityculling-fabric-1.6.6-mc1.20.1.jar" hash-format = "sha1" -hash = "8e4be2bb9703deddb3d3d212c812cdc1f9de072b" +hash = "d6894508d74e5f01fb525b5b89d20ac4e54257b6" [update] [update.modrinth] mod-id = "NNAgCjsB" -version = "BDwHAdWc" +version = "F3RXDl1W" diff --git a/mods/entitytexturefeatures.pw.toml b/mods/entitytexturefeatures.pw.toml index 9343871..f55830b 100644 --- a/mods/entitytexturefeatures.pw.toml +++ b/mods/entitytexturefeatures.pw.toml @@ -1,13 +1,13 @@ name = "Entity Texture Features" -filename = "entity_texture_features_fabric_1.20-4.5.1.jar" +filename = "entity_texture_features_fabric_1.20.1-6.1.3.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/BVzZfTc1/versions/UPenaMj3/entity_texture_features_fabric_1.20-4.5.1.jar" +url = "https://cdn.modrinth.com/data/BVzZfTc1/versions/fqFnWIXs/entity_texture_features_fabric_1.20.1-6.1.3.jar" hash-format = "sha1" -hash = "19d45b9054a2854ced2e50f45765d76b47a2a4ba" +hash = "ab8907e55f6474fbba2de022a87ffb29fa14a64c" [update] [update.modrinth] mod-id = "BVzZfTc1" -version = "UPenaMj3" +version = "fqFnWIXs" diff --git a/mods/fallingleaves.pw.toml b/mods/fallingleaves.pw.toml index 5ced3d4..e958469 100644 --- a/mods/fallingleaves.pw.toml +++ b/mods/fallingleaves.pw.toml @@ -1,13 +1,13 @@ name = "Falling Leaves" -filename = "fallingleaves-1.15.4+1.20.1.jar" +filename = "fallingleaves-1.15.6+1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/WhbRG4iK/versions/KpvXCE2X/fallingleaves-1.15.4%2B1.20.1.jar" +url = "https://cdn.modrinth.com/data/WhbRG4iK/versions/flPXaySR/fallingleaves-1.15.6%2B1.20.1.jar" hash-format = "sha1" -hash = "5101bd05c678a874c1fa40c3363d1c127f7074d5" +hash = "9950aaea2a33b1cfc972e881c533384e3bb0a0fb" [update] [update.modrinth] mod-id = "WhbRG4iK" -version = "KpvXCE2X" +version = "flPXaySR" diff --git a/mods/ferrite-core.pw.toml b/mods/ferrite-core.pw.toml index c352b44..2b83cf6 100644 --- a/mods/ferrite-core.pw.toml +++ b/mods/ferrite-core.pw.toml @@ -1,13 +1,13 @@ name = "FerriteCore" -filename = "ferritecore-6.0.0-fabric.jar" +filename = "ferritecore-6.0.1-fabric.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/uXXizFIs/versions/FCnCG6PS/ferritecore-6.0.0-fabric.jar" +url = "https://cdn.modrinth.com/data/uXXizFIs/versions/unerR5MN/ferritecore-6.0.1-fabric.jar" hash-format = "sha1" -hash = "5a57ea73c3c7c0cc300d69611a9cad93baf8e9ab" +hash = "8fa3b84fc5860dbc30fdf8cced02af68dffcf3fa" [update] [update.modrinth] mod-id = "uXXizFIs" -version = "FCnCG6PS" +version = "unerR5MN" diff --git a/mods/figura.pw.toml b/mods/figura.pw.toml index c3b6086..eaf5e5f 100644 --- a/mods/figura.pw.toml +++ b/mods/figura.pw.toml @@ -1,8 +1,13 @@ name = "Figura" -filename = "figura-0.1.3-pre2-1.20.1-fabric-mc.jar" +filename = "figura-0.1.4+1.20.1-fabric-mc.jar" side = "client" [download] -url = "https://b2.nullbite.com/file/nullbite-personal/figura-0.1.3-pre2-1.20.1-fabric-mc.jar" -hash-format = "sha256" -hash = "7818989968e5ca28feb450cc1a3c8d24ab48b2a87c11d0721de46aa3a362200c" +url = "https://cdn.modrinth.com/data/s9gIPDom/versions/DhHrk371/figura-0.1.4%2B1.20.1-fabric-mc.jar" +hash-format = "sha1" +hash = "260b9cae1dc1087d3007e644e2b43f4d2634914d" + +[update] +[update.modrinth] +mod-id = "s9gIPDom" +version = "DhHrk371" diff --git a/mods/indium.pw.toml b/mods/indium.pw.toml index 9b84aae..a2efb94 100644 --- a/mods/indium.pw.toml +++ b/mods/indium.pw.toml @@ -1,13 +1,13 @@ name = "Indium" -filename = "indium-1.0.27+mc1.20.1.jar" +filename = "indium-1.0.34+mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/Orvt0mRa/versions/Lue6O9z9/indium-1.0.27%2Bmc1.20.1.jar" +url = "https://cdn.modrinth.com/data/Orvt0mRa/versions/gofbpynL/indium-1.0.34%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "8c8e6b96243155b41f2f9d29d5940ee895bcb141" +hash = "a2de9ba15f155b09626995ad58b0e23803b05fe6" [update] [update.modrinth] mod-id = "Orvt0mRa" -version = "Lue6O9z9" +version = "gofbpynL" diff --git a/mods/inventory-profiles-next.pw.toml b/mods/inventory-profiles-next.pw.toml index 6432a3c..3b18803 100644 --- a/mods/inventory-profiles-next.pw.toml +++ b/mods/inventory-profiles-next.pw.toml @@ -1,13 +1,13 @@ name = "Inventory Profiles Next" -filename = "InventoryProfilesNext-fabric-1.20-1.10.7.jar" +filename = "InventoryProfilesNext-fabric-1.20-1.10.10.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/O7RBXm3n/versions/OJWSzNQ9/InventoryProfilesNext-fabric-1.20-1.10.7.jar" +url = "https://cdn.modrinth.com/data/O7RBXm3n/versions/vYitK6Zf/InventoryProfilesNext-fabric-1.20-1.10.10.jar" hash-format = "sha1" -hash = "bc82d5e44975e4ec6dac091409c55fde566c275a" +hash = "10f1bdc53f23261078b0754b5d7976d85f739497" [update] [update.modrinth] mod-id = "O7RBXm3n" -version = "OJWSzNQ9" +version = "vYitK6Zf" diff --git a/mods/iris.pw.toml b/mods/iris.pw.toml index 5c1f381..63e8130 100644 --- a/mods/iris.pw.toml +++ b/mods/iris.pw.toml @@ -1,13 +1,13 @@ name = "Iris Shaders" -filename = "iris-mc1.20.1-1.6.10.jar" +filename = "iris-1.7.2+mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/YL57xq9U/versions/DsjYuGMO/iris-mc1.20.1-1.6.10.jar" +url = "https://cdn.modrinth.com/data/YL57xq9U/versions/1CMVXDHo/iris-1.7.2%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "338d922ec28c8ccd24e2387de29f53987145485a" +hash = "4841b993d37c0944ca6f7a02809364e561a6acc3" [update] [update.modrinth] mod-id = "YL57xq9U" -version = "DsjYuGMO" +version = "1CMVXDHo" diff --git a/mods/itemswapper.pw.toml b/mods/itemswapper.pw.toml index 32f987a..1f15688 100644 --- a/mods/itemswapper.pw.toml +++ b/mods/itemswapper.pw.toml @@ -1,13 +1,13 @@ name = "ItemSwapper" -filename = "itemswapper-fabric-0.5.3-mc1.20.1.jar" +filename = "itemswapper-fabric-0.7.0-mc1.20.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/RPOSBQgq/versions/NEBVxulw/itemswapper-fabric-0.5.3-mc1.20.1.jar" +url = "https://cdn.modrinth.com/data/RPOSBQgq/versions/gUBexK3m/itemswapper-fabric-0.7.0-mc1.20.1.jar" hash-format = "sha1" -hash = "ca3d145c48936b3eab92f5ab9bf64befe5ed15ec" +hash = "5b79dbd2776fff2c30f817913e186968e0fbde18" [update] [update.modrinth] mod-id = "RPOSBQgq" -version = "NEBVxulw" +version = "gUBexK3m" diff --git a/mods/jei.pw.toml b/mods/jei.pw.toml index abbc5ed..9ebd6bd 100644 --- a/mods/jei.pw.toml +++ b/mods/jei.pw.toml @@ -1,13 +1,13 @@ name = "Just Enough Items" -filename = "jei-1.20.1-fabric-15.2.0.27.jar" +filename = "jei-1.20.1-fabric-15.4.0.9.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/lIRFslED/jei-1.20.1-fabric-15.2.0.27.jar" +url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/8JrjT4dR/jei-1.20.1-fabric-15.4.0.9.jar" hash-format = "sha1" -hash = "c39352c9790d589a0ec7adcccd220e3388ca1296" +hash = "f85b8ffc04c6dc4d46fcbb2be64702f12af9617a" [update] [update.modrinth] mod-id = "u6dRKJwZ" -version = "lIRFslED" +version = "8JrjT4dR" diff --git a/mods/language-reload.pw.toml b/mods/language-reload.pw.toml index a0d028e..0431817 100644 --- a/mods/language-reload.pw.toml +++ b/mods/language-reload.pw.toml @@ -1,13 +1,13 @@ name = "Language Reload" -filename = "language-reload-1.5.9+1.20.1.jar" +filename = "language-reload-1.6.1+1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/uLbm7CG6/versions/Oyc76oFa/language-reload-1.5.9%2B1.20.1.jar" +url = "https://cdn.modrinth.com/data/uLbm7CG6/versions/kO9nUBoX/language-reload-1.6.1%2B1.20.1.jar" hash-format = "sha1" -hash = "d647d82cbae0d16132cb8e96b472640397e68dda" +hash = "02fdfa8eab9fb261c0681d86d1d91b3a2fe16cb6" [update] [update.modrinth] mod-id = "uLbm7CG6" -version = "Oyc76oFa" +version = "kO9nUBoX" diff --git a/mods/libipn.pw.toml b/mods/libipn.pw.toml index 99ebf0c..f9bb26b 100644 --- a/mods/libipn.pw.toml +++ b/mods/libipn.pw.toml @@ -1,13 +1,13 @@ name = "libIPN" -filename = "libIPN-fabric-1.20-4.0.0.jar" +filename = "libIPN-fabric-1.20-4.0.2.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/onSQdWhM/versions/2erlupYB/libIPN-fabric-1.20-4.0.0.jar" +url = "https://cdn.modrinth.com/data/onSQdWhM/versions/Uygzs3iI/libIPN-fabric-1.20-4.0.2.jar" hash-format = "sha1" -hash = "72a2389d2a2ad8f8a3f3c36f1593d106f5f38c83" +hash = "c8c4d93037efb226b6bd3264e33df4c010cb111b" [update] [update.modrinth] mod-id = "onSQdWhM" -version = "2erlupYB" +version = "Uygzs3iI" diff --git a/mods/midnightcontrols.pw.toml b/mods/midnightcontrols.pw.toml index 06a8e82..95bc512 100644 --- a/mods/midnightcontrols.pw.toml +++ b/mods/midnightcontrols.pw.toml @@ -1,13 +1,13 @@ name = "MidnightControls" -filename = "midnightcontrols-1.8.2+1.20.jar" +filename = "midnightcontrols-1.9.4+1.20.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/bXX9h73M/versions/Ek4mkpRw/midnightcontrols-1.8.2%2B1.20.jar" +url = "https://cdn.modrinth.com/data/bXX9h73M/versions/xHOdr9un/midnightcontrols-1.9.4%2B1.20.jar" hash-format = "sha1" -hash = "12ca313a138705adad5200a7edc216f233ecb24b" +hash = "9c88a6d8c043db3b1cbf7301432080636ef3ee9d" [update] [update.modrinth] mod-id = "bXX9h73M" -version = "Ek4mkpRw" +version = "xHOdr9un" diff --git a/mods/morechathistory.pw.toml b/mods/morechathistory.pw.toml index 185bf1a..8f120ef 100644 --- a/mods/morechathistory.pw.toml +++ b/mods/morechathistory.pw.toml @@ -1,13 +1,13 @@ name = "MoreChatHistory" -filename = "morechathistory-1.19.1-1.1.1.jar" +filename = "morechathistory-1.3.0.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/8qkXwOnk/versions/mc1.19.1-1.1.1/morechathistory-1.19.1-1.1.1.jar" +url = "https://cdn.modrinth.com/data/8qkXwOnk/versions/PLfxrDkh/morechathistory-1.3.0.jar" hash-format = "sha1" -hash = "b23419da24f1c7ae16c6e77e992a38491cccf2c8" +hash = "346cce5cb5d89e676d8ed0dca05522369063b3c3" [update] [update.modrinth] mod-id = "8qkXwOnk" -version = "b1apT2G2" +version = "PLfxrDkh" diff --git a/mods/mouse-tweaks.pw.toml b/mods/mouse-tweaks.pw.toml index ce259b4..8051c31 100644 --- a/mods/mouse-tweaks.pw.toml +++ b/mods/mouse-tweaks.pw.toml @@ -1,13 +1,13 @@ name = "Mouse Tweaks" -filename = "MouseTweaks-fabric-mc1.20-2.25.jar" +filename = "MouseTweaks-fabric-mc1.20-2.26.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/aC3cM3Vq/versions/m0Dd8Cjy/MouseTweaks-fabric-mc1.20-2.25.jar" +url = "https://cdn.modrinth.com/data/aC3cM3Vq/versions/mjuG4AYd/MouseTweaks-fabric-mc1.20-2.26.jar" hash-format = "sha1" -hash = "21ae6dd81324543e77c10bbb2b928320d71b6750" +hash = "6a6b977e671b1ab625e740fc70fb5300c21bb841" [update] [update.modrinth] mod-id = "aC3cM3Vq" -version = "m0Dd8Cjy" +version = "mjuG4AYd" diff --git a/mods/nmuk.pw.toml b/mods/nmuk.pw.toml index 6df4ca6..3b66c68 100644 --- a/mods/nmuk.pw.toml +++ b/mods/nmuk.pw.toml @@ -1,13 +1,13 @@ name = "No More Useless Keys - NMUK" -filename = "nmuk-1.1.0+mc1.20.1.jar" +filename = "nmuk-1.1.1+mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/YCcdA1Lp/versions/Skc8LGrP/nmuk-1.1.0%2Bmc1.20.1.jar" +url = "https://cdn.modrinth.com/data/YCcdA1Lp/versions/wX0qDRqE/nmuk-1.1.1%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "671a20ee5ae80dc979d2028fbc9a227d5e6e19fd" +hash = "df246e99b615da7236a14c6f07054cd44f6ca9b2" [update] [update.modrinth] mod-id = "YCcdA1Lp" -version = "Skc8LGrP" +version = "wX0qDRqE" diff --git a/mods/optigui.pw.toml b/mods/optigui.pw.toml index 2e5689e..508f6c5 100644 --- a/mods/optigui.pw.toml +++ b/mods/optigui.pw.toml @@ -1,13 +1,13 @@ name = "OptiGUI" -filename = "optigui-2.2.0-alpha.1.jar" +filename = "optigui-2.1.7.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/JuksLGBQ/versions/noPVqZnY/optigui-2.2.0-alpha.1.jar" +url = "https://cdn.modrinth.com/data/JuksLGBQ/versions/xpfegZsE/optigui-2.1.7.jar" hash-format = "sha1" -hash = "cdda9fbe0683eb62b2d911672b018c079ad74d7e" +hash = "47040b4c65b6381ca61bc3af61fee4df279b5eec" [update] [update.modrinth] mod-id = "JuksLGBQ" -version = "noPVqZnY" +version = "xpfegZsE" diff --git a/mods/presence-footsteps.pw.toml b/mods/presence-footsteps.pw.toml index 5c25473..42b1b1c 100644 --- a/mods/presence-footsteps.pw.toml +++ b/mods/presence-footsteps.pw.toml @@ -1,13 +1,13 @@ name = "Presence Footsteps" -filename = "PresenceFootsteps-1.9.0.jar" +filename = "PresenceFootsteps-1.9.4+1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/rcTfTZr3/versions/FMF3yzCR/PresenceFootsteps-1.9.0.jar" +url = "https://cdn.modrinth.com/data/rcTfTZr3/versions/LjDXTyEn/PresenceFootsteps-1.9.4%2B1.20.1.jar" hash-format = "sha1" -hash = "e5ea35c6c326e6f5e6fe2a8af7cbc6a955515dbc" +hash = "f4b446c7153bf6dbe41b7f3325686e3dd630dff1" [update] [update.modrinth] mod-id = "rcTfTZr3" -version = "FMF3yzCR" +version = "LjDXTyEn" diff --git a/mods/qsl.pw.toml b/mods/qsl.pw.toml index d3bbfbd..b152daf 100644 --- a/mods/qsl.pw.toml +++ b/mods/qsl.pw.toml @@ -1,13 +1,13 @@ name = "Quilted Fabric API (QFAPI) / Quilt Standard Libraries (QSL)" -filename = "qfapi-7.4.0_qsl-6.1.2_fapi-0.90.0_mc-1.20.1.jar" +filename = "qfapi-7.6.0_qsl-6.2.0_fapi-0.92.2_mc-1.20.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/qvIfYCYJ/versions/GjvWb8WQ/qfapi-7.4.0_qsl-6.1.2_fapi-0.90.0_mc-1.20.1.jar" +url = "https://cdn.modrinth.com/data/qvIfYCYJ/versions/zEhzQDsY/qfapi-7.6.0_qsl-6.2.0_fapi-0.92.2_mc-1.20.1.jar" hash-format = "sha1" -hash = "d52456c799cc2534331f9cc71532e43c5f886554" +hash = "7cf55b386c622364e348518d345d014ec51ccad5" [update] [update.modrinth] mod-id = "qvIfYCYJ" -version = "GjvWb8WQ" +version = "zEhzQDsY" diff --git a/mods/quilt-loading-screen.pw.toml b/mods/quilt-loading-screen.pw.toml index 6154d0d..6c5f704 100644 --- a/mods/quilt-loading-screen.pw.toml +++ b/mods/quilt-loading-screen.pw.toml @@ -1,13 +1,13 @@ name = "Quilt Loading Screen" -filename = "quilt_loading_screen-6.0.0+1.20.1.jar" +filename = "quilt_loading_screen-6.1.0+1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/VPU6VYVP/versions/ZxKclDRW/quilt_loading_screen-6.0.0%2B1.20.1.jar" +url = "https://cdn.modrinth.com/data/VPU6VYVP/versions/CxbdfZp6/quilt_loading_screen-6.1.0%2B1.20.1.jar" hash-format = "sha1" -hash = "b257e89ff9bb3cf2cad5ffd6de781722f37f02ee" +hash = "95ad28ba01e197aa24a1510eb947653eae56109e" [update] [update.modrinth] mod-id = "VPU6VYVP" -version = "ZxKclDRW" +version = "CxbdfZp6" diff --git a/mods/reeses-sodium-options.pw.toml b/mods/reeses-sodium-options.pw.toml index 2eb7fde..4d5d58a 100644 --- a/mods/reeses-sodium-options.pw.toml +++ b/mods/reeses-sodium-options.pw.toml @@ -1,13 +1,13 @@ name = "Reese's Sodium Options" -filename = "reeses_sodium_options-1.6.5+mc1.20.1-build.95.jar" +filename = "reeses_sodium_options-1.7.2+mc1.20.1-build.101.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/Bh37bMuy/versions/hCsMUZLa/reeses_sodium_options-1.6.5%2Bmc1.20.1-build.95.jar" +url = "https://cdn.modrinth.com/data/Bh37bMuy/versions/Rc9pkPug/reeses_sodium_options-1.7.2%2Bmc1.20.1-build.101.jar" hash-format = "sha1" -hash = "49c68b22b9b4db4e1d3eaa3bdb6fdedd1faeba29" +hash = "206f1b01b99ac3df99ddd84ed96b466a8700412d" [update] [update.modrinth] mod-id = "Bh37bMuy" -version = "hCsMUZLa" +version = "Rc9pkPug" diff --git a/mods/replaymod.pw.toml b/mods/replaymod.pw.toml index 7c6b74b..ce1723f 100644 --- a/mods/replaymod.pw.toml +++ b/mods/replaymod.pw.toml @@ -1,13 +1,13 @@ name = "ReplayMod" -filename = "replaymod-1.20.1-2.6.13.jar" +filename = "replaymod-1.20.1-2.6.17.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/Nv2fQJo5/versions/akFkhrL8/replaymod-1.20.1-2.6.13.jar" +url = "https://cdn.modrinth.com/data/Nv2fQJo5/versions/nsLkChBp/replaymod-1.20.1-2.6.17.jar" hash-format = "sha1" -hash = "a7d1cf1041c1b869dbe25d98abe81138ef634936" +hash = "ad7a2172b8151264589780f4cabd0662780c1b6d" [update] [update.modrinth] mod-id = "Nv2fQJo5" -version = "akFkhrL8" +version = "nsLkChBp" diff --git a/mods/sodium-extra.pw.toml b/mods/sodium-extra.pw.toml index d867b89..5c4e174 100644 --- a/mods/sodium-extra.pw.toml +++ b/mods/sodium-extra.pw.toml @@ -1,13 +1,13 @@ name = "Sodium Extra" -filename = "sodium-extra-0.5.1+mc1.20.1-build.112.jar" +filename = "sodium-extra-0.5.4+mc1.20.1-build.115.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/PtjYWJkn/versions/80a0J5Cn/sodium-extra-0.5.1%2Bmc1.20.1-build.112.jar" +url = "https://cdn.modrinth.com/data/PtjYWJkn/versions/I7ggF6B5/sodium-extra-0.5.4%2Bmc1.20.1-build.115.jar" hash-format = "sha1" -hash = "74b6dce1ede645ffdecf1185fa05701cef68840d" +hash = "890864a6ab5d77d57d8d757bcc31f5379b5a11b1" [update] [update.modrinth] mod-id = "PtjYWJkn" -version = "80a0J5Cn" +version = "I7ggF6B5" diff --git a/mods/sodium.pw.toml b/mods/sodium.pw.toml index c85899e..778bf4b 100644 --- a/mods/sodium.pw.toml +++ b/mods/sodium.pw.toml @@ -1,13 +1,13 @@ name = "Sodium" -filename = "sodium-fabric-mc1.20.1-0.5.3.jar" +filename = "sodium-fabric-0.5.11+mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/AANobbMI/versions/4OZL6q9h/sodium-fabric-mc1.20.1-0.5.3.jar" +url = "https://cdn.modrinth.com/data/AANobbMI/versions/ygf8cVZg/sodium-fabric-0.5.11%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "74784e6deb72e8cdb4e3788ac3a3cfd88fc77acf" +hash = "c4293c1483f3b39c1c6c4c69143e8bb2c6e53daf" [update] [update.modrinth] mod-id = "AANobbMI" -version = "4OZL6q9h" +version = "ygf8cVZg" diff --git a/mods/where-is-it.pw.toml b/mods/where-is-it.pw.toml index 1b50e0a..3e92950 100644 --- a/mods/where-is-it.pw.toml +++ b/mods/where-is-it.pw.toml @@ -1,13 +1,13 @@ name = "Where Is It" -filename = "whereisit-2.0.24+1.20.1.jar" +filename = "whereisit-2.4.3+1.20.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/FCTyEqkn/versions/E3rNBZFj/whereisit-2.0.24%2B1.20.1.jar" +url = "https://cdn.modrinth.com/data/FCTyEqkn/versions/QMO5B1AE/whereisit-2.4.3%2B1.20.1.jar" hash-format = "sha1" -hash = "1f1ed7da4534e1772749c769ca049d943766dce5" +hash = "a91bbd91cd770861883ee7e3ccf110a21368d395" [update] [update.modrinth] mod-id = "FCTyEqkn" -version = "E3rNBZFj" +version = "QMO5B1AE" diff --git a/mods/wthit.pw.toml b/mods/wthit.pw.toml index b08a98e..a91d8c0 100644 --- a/mods/wthit.pw.toml +++ b/mods/wthit.pw.toml @@ -1,13 +1,13 @@ name = "WTHIT" -filename = "wthit-quilt-8.4.0.jar" +filename = "wthit-quilt-8.13.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/6AQIaxuO/versions/SbNRrrGr/wthit-quilt-8.4.0.jar" +url = "https://cdn.modrinth.com/data/6AQIaxuO/versions/4Jamol2R/wthit-quilt-8.13.2.jar" hash-format = "sha1" -hash = "855744538b4cc0ba72b7d5126a7047d2148297fa" +hash = "b3b0105ac3dd6d8774fde26b48a1bf40ff6ce4cb" [update] [update.modrinth] mod-id = "6AQIaxuO" -version = "SbNRrrGr" +version = "4Jamol2R" diff --git a/mods/xaeros-minimap.pw.toml b/mods/xaeros-minimap.pw.toml index 236db7a..0900d5b 100644 --- a/mods/xaeros-minimap.pw.toml +++ b/mods/xaeros-minimap.pw.toml @@ -1,13 +1,13 @@ name = "Xaero's Minimap" -filename = "Xaeros_Minimap_23.8.2_Fabric_1.20.jar" +filename = "Xaeros_Minimap_24.2.0_Fabric_1.20.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/1bokaNcj/versions/iztrg4XH/Xaeros_Minimap_23.8.2_Fabric_1.20.jar" +url = "https://cdn.modrinth.com/data/1bokaNcj/versions/WQEX096d/Xaeros_Minimap_24.2.0_Fabric_1.20.jar" hash-format = "sha1" -hash = "5eb5c11901bdedbcf69cf8beac754644dfc9c123" +hash = "396401316ddde6e7712f5d6122d4d491c4d5cd2c" [update] [update.modrinth] mod-id = "1bokaNcj" -version = "iztrg4XH" +version = "WQEX096d" diff --git a/mods/xaeros-world-map.pw.toml b/mods/xaeros-world-map.pw.toml index dbd563b..d40d854 100644 --- a/mods/xaeros-world-map.pw.toml +++ b/mods/xaeros-world-map.pw.toml @@ -1,13 +1,13 @@ name = "Xaero's World Map" -filename = "XaerosWorldMap_1.34.1_Fabric_1.20.jar" +filename = "XaerosWorldMap_1.38.8_Fabric_1.20.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/NcUtCpym/versions/L8OA3xGI/XaerosWorldMap_1.34.1_Fabric_1.20.jar" +url = "https://cdn.modrinth.com/data/NcUtCpym/versions/szULGs3b/XaerosWorldMap_1.38.8_Fabric_1.20.jar" hash-format = "sha1" -hash = "8a455f2e872bfca4726f84e71286d5d8f2f9cef9" +hash = "51b20efcb6c70057c98a42b2d3591fb6e84f2299" [update] [update.modrinth] mod-id = "NcUtCpym" -version = "L8OA3xGI" +version = "szULGs3b" diff --git a/mods/yacl.pw.toml b/mods/yacl.pw.toml index 0c67ac1..34b26ed 100644 --- a/mods/yacl.pw.toml +++ b/mods/yacl.pw.toml @@ -1,13 +1,13 @@ name = "YetAnotherConfigLib" -filename = "yet-another-config-lib-fabric-3.2.1+1.20.jar" +filename = "YetAnotherConfigLib-3.5.0+1.20.1-fabric.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/1eAoo2KR/versions/3hsIB5yP/yet-another-config-lib-fabric-3.2.1%2B1.20.jar" +url = "https://cdn.modrinth.com/data/1eAoo2KR/versions/gQuF6HNa/YetAnotherConfigLib-3.5.0%2B1.20.1-fabric.jar" hash-format = "sha1" -hash = "68ed6a69b22da12916cec79043011110e93ae900" +hash = "48005e145f5423ff9446ac6fe3d1cb122f977a00" [update] [update.modrinth] mod-id = "1eAoo2KR" -version = "3hsIB5yP" +version = "gQuF6HNa" diff --git a/nix/packages/default.nix b/nix/packages/default.nix new file mode 100644 index 0000000..4f69f6d --- /dev/null +++ b/nix/packages/default.nix @@ -0,0 +1,7 @@ +{ callPackage }: +let + shaders = callPackage ./shaders.nix {}; +in { + inherit (shaders) bliss-dh complementary-reimagined-dh rethinking-voxels-dh; + packwiz-wrapper = callPackage ./packwiz-wrapper { }; +} diff --git a/nix/packages/packwiz-wrapper/default.nix b/nix/packages/packwiz-wrapper/default.nix new file mode 100644 index 0000000..e9fd3c9 --- /dev/null +++ b/nix/packages/packwiz-wrapper/default.nix @@ -0,0 +1,25 @@ +{ lib, + stdenvNoCC, + python3, + makeWrapper, + packwiz }: +let + wrappedPath = lib.makeBinPath [ packwiz ]; +in stdenvNoCC.mkDerivation { + pname = "packwiz-wrapper"; + version = "0.0.0"; + buildInputs = [ + python3 + makeWrapper + packwiz + ]; + + src = ./.; + + installPhase = '' + install -Dm555 packwiz-wrapper.py $out/libexec/packwiz-wrapper.py + mkdir -p $out/bin + makeShellWrapper $out/libexec/packwiz-wrapper.py $out/bin/packwiz \ + --prefix PATH : "${wrappedPath}" + ''; +} diff --git a/nix/packages/packwiz-wrapper/packwiz-wrapper.py b/nix/packages/packwiz-wrapper/packwiz-wrapper.py new file mode 100755 index 0000000..84cf194 --- /dev/null +++ b/nix/packages/packwiz-wrapper/packwiz-wrapper.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 +import sys, os +from pathlib import Path + +# Returns a parent path with pack.toml, or None if it can't be found +def search_recursive(dir: str | os.PathLike) -> Path | None: + dir = Path(dir) + pack = dir / "pack.toml" + + if pack.is_file(): + return dir + + # If we've made it to / without finding it, return None + if dir.samefile("/"): + return None + + # Otherwise, recurse + return search_recursive(dir / "..") + +def search(dir: str | os.PathLike) -> Path: + new_dir = search_recursive(dir) + if new_dir is not None: + return new_dir + else: + return Path(dir) + +def main(): + args = ["packwiz"] + sys.argv[1:] + os.chdir(search(".")) + os.execvp("packwiz", args) + + +if __name__ == "__main__": + main() diff --git a/nix/packages/shaders.nix b/nix/packages/shaders.nix new file mode 100644 index 0000000..e926091 --- /dev/null +++ b/nix/packages/shaders.nix @@ -0,0 +1,59 @@ +{ stdenvNoCC, + lib, + fetchFromGitHub, + zip, + nix-update-script, }: +let + makeShaderPackage = { + name, + src, + branch ? null, + }: stdenvNoCC.mkDerivation { + pname = name; + inherit src; + version = src.rev; + phases = [ "installPhase" ]; + buildInputs = [ zip ]; + installPhase = '' + cd "$src" + mkdir -p "$out" + zip -r "$out/${name}.zip" . + ''; + passthru.updateScript = nix-update-script { + # this doesn't work for some reason; don't use --use-update-script for now + extraArgs = lib.optional (!(builtins.isNull branch)) "--version=branch=${branch}"; + }; + }; +in +{ + bliss-dh = makeShaderPackage { + name = "Bliss-DH"; + branch = "main"; + src = fetchFromGitHub { + owner = "X0nk"; + repo = "Bliss-Shader"; + rev = "1cd49fe249db4cfeb102283fdc068e9cc1549e3e"; + hash = "sha256-0R+aebM2Cztkdj4020CUTr9ABwFyG9nEu7Op0K9k6+w="; + }; + }; + + complementary-reimagined-dh = makeShaderPackage { + name = "ComplementaryReimagined-DH"; + src = fetchFromGitHub { + owner = "Steveplays28"; + repo = "ComplementaryReimagined"; + rev = "c5cb31757c27550ae30b9c462fe3ed1993b39d9d"; + hash = "sha256-1HOscJ8afNC7t4yiobJBJgom7pDpwZPdA3B3EILlyWY="; + }; + }; + + rethinking-voxels-dh = makeShaderPackage { + name = "RethinkingVoxels-DH"; + src = fetchFromGitHub { + owner = "Steveplays28"; + repo = "ComplementaryReimagined"; + rev = "343915b7b18e1d83187fae1ea1f14eac90d4d09d"; + hash = "sha256-Hu+JeINQC09OS1WY1kpagoRH5Awnp4YhacWusQgRsqc="; + }; + }; +} diff --git a/pack.toml b/pack.toml index 9f94680..0ddd89a 100644 --- a/pack.toml +++ b/pack.toml @@ -6,11 +6,11 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "c92eb72da5e220bfa997223e3bd4a36afed1c4d22f49e47cbfac4fe4c31afaaf" +hash = "c81a5ac8cb1a4d3003b1225e486cb76f124829a6d9c6d434447002f7b9bf891a" [versions] minecraft = "1.20.1" -quilt = "0.21.0" +quilt = "0.26.1-beta.1" [options] acceptable-game-versions = ["1.20"] diff --git a/resourcepacks/enhanced-boss-bars.pw.toml b/resourcepacks/enhanced-boss-bars.pw.toml index f0391da..58d7466 100644 --- a/resourcepacks/enhanced-boss-bars.pw.toml +++ b/resourcepacks/enhanced-boss-bars.pw.toml @@ -1,13 +1,13 @@ name = "Enhanced Boss Bars" -filename = "enhanced-boss-bars.zip" +filename = "[1.4.1] Enhanced Boss Bars.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/U5SedJ9S/versions/UeydEnnB/%5B1.3%5D%20Enhanced%20Boss%20Bars.zip" +url = "https://cdn.modrinth.com/data/U5SedJ9S/versions/3fjpw8Kj/%5B1.4.1%5D%20Enhanced%20Boss%20Bars.zip" hash-format = "sha1" -hash = "5e51da85f73b436671ecd7a37b5f07c2263cdbfc" +hash = "3dfe3e45e973179d924b7ff462aae5a1a36c2c6d" [update] [update.modrinth] mod-id = "U5SedJ9S" -version = "UeydEnnB" +version = "3fjpw8Kj" diff --git a/shaderpacks/bloop-shaders.pw.toml b/shaderpacks/bloop-shaders.pw.toml new file mode 100644 index 0000000..d1388b4 --- /dev/null +++ b/shaderpacks/bloop-shaders.pw.toml @@ -0,0 +1,13 @@ +name = "Bloop Shaders" +filename = "Bloop-1.3.0.zip" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/Q6RQF9Oa/versions/pEcwrRnB/Bloop-1.3.0.zip" +hash-format = "sha1" +hash = "e7d2c96c44358b5c2997e66ad547737c3d8cf5c5" + +[update] +[update.modrinth] +mod-id = "Q6RQF9Oa" +version = "pEcwrRnB" diff --git a/shaderpacks/bsl-shaders.pw.toml b/shaderpacks/bsl-shaders.pw.toml index b09ec8f..be0d3a5 100644 --- a/shaderpacks/bsl-shaders.pw.toml +++ b/shaderpacks/bsl-shaders.pw.toml @@ -1,13 +1,13 @@ name = "BSL Shaders" -filename = "BSL_v8.2.06.zip" +filename = "BSL_v8.2.09.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/Q1vvjJYV/versions/s5emiqLD/BSL_v8.2.06.zip" +url = "https://cdn.modrinth.com/data/Q1vvjJYV/versions/c6RfHyKW/BSL_v8.2.09.zip" hash-format = "sha1" -hash = "ff2bc075e53fe277cf463fc467776abff9d32d52" +hash = "cd92bf706a1347a2d2943b14391ffbe1233415bc" [update] [update.modrinth] mod-id = "Q1vvjJYV" -version = "s5emiqLD" +version = "c6RfHyKW" diff --git a/shaderpacks/complementary-reimagined.pw.toml b/shaderpacks/complementary-reimagined.pw.toml index 3161128..983d07e 100644 --- a/shaderpacks/complementary-reimagined.pw.toml +++ b/shaderpacks/complementary-reimagined.pw.toml @@ -1,13 +1,13 @@ name = "Complementary Reimagined" -filename = "ComplementaryReimagined_r5.0.1.zip" +filename = "ComplementaryReimagined_r5.2.2.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/HVnmMxH1/versions/NKGyBgjH/ComplementaryReimagined_r5.0.1.zip" +url = "https://cdn.modrinth.com/data/HVnmMxH1/versions/pAOQ9Amz/ComplementaryReimagined_r5.2.2.zip" hash-format = "sha1" -hash = "4879d9bbb16ff50ebb75b4b3e11b4093b76ae20d" +hash = "07cd8165acf24ec8ddada03f60729537687dd435" [update] [update.modrinth] mod-id = "HVnmMxH1" -version = "NKGyBgjH" +version = "pAOQ9Amz" diff --git a/shaderpacks/complementary-shaders-v4.pw.toml b/shaderpacks/complementary-shaders-v4.pw.toml index 3432ca3..fee731c 100644 --- a/shaderpacks/complementary-shaders-v4.pw.toml +++ b/shaderpacks/complementary-shaders-v4.pw.toml @@ -1,13 +1,13 @@ name = "Complementary Shaders v4" -filename = "ComplementaryUnbound_r5.0.1.zip" +filename = "ComplementaryUnbound_r5.2.2.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/R6NEzAwj/versions/JHN3K1Ng/ComplementaryUnbound_r5.0.1.zip" +url = "https://cdn.modrinth.com/data/R6NEzAwj/versions/RMaZ3tSJ/ComplementaryUnbound_r5.2.2.zip" hash-format = "sha1" -hash = "52c599c7d23cf6c27cef0946e6bcaa248f59f5df" +hash = "f0c0cbd2059b7a464b9e0f061ddfa6f0980849e1" [update] [update.modrinth] mod-id = "R6NEzAwj" -version = "JHN3K1Ng" +version = "RMaZ3tSJ" diff --git a/shaderpacks/hysteria-shaders.pw.toml b/shaderpacks/hysteria-shaders.pw.toml new file mode 100644 index 0000000..837e3b2 --- /dev/null +++ b/shaderpacks/hysteria-shaders.pw.toml @@ -0,0 +1,13 @@ +name = "Hysteria Shaders" +filename = "Hysteria-Shaders-Universal-v1.1.0.zip" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/iHC8BZn4/versions/s9yjAgG6/Hysteria-Shaders-Universal-v1.1.0.zip" +hash-format = "sha1" +hash = "18c4eb444309c8052164028deb9ed54f85c23902" + +[update] +[update.modrinth] +mod-id = "iHC8BZn4" +version = "s9yjAgG6" diff --git a/shaderpacks/makeup-ultra-fast-shaders.pw.toml b/shaderpacks/makeup-ultra-fast-shaders.pw.toml index 11792b5..15d375f 100644 --- a/shaderpacks/makeup-ultra-fast-shaders.pw.toml +++ b/shaderpacks/makeup-ultra-fast-shaders.pw.toml @@ -1,13 +1,13 @@ name = "MakeUp - Ultra Fast" -filename = "MakeUp-UltraFast-8.8.g.zip" +filename = "MakeUp-UltraFast-8.9f.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/izsIPI7a/versions/p567E3yc/MakeUp-UltraFast-8.8.g.zip" +url = "https://cdn.modrinth.com/data/izsIPI7a/versions/V8u6ZaM2/MakeUp-UltraFast-8.9f.zip" hash-format = "sha1" -hash = "3650d0b41eb8bfc2d9210a34de6a15c58cd99115" +hash = "f8d660df8f70c0f65c8410c97fdfa1ec90f4c727" [update] [update.modrinth] mod-id = "izsIPI7a" -version = "p567E3yc" +version = "V8u6ZaM2" diff --git a/shaderpacks/pixel-perfect.pw.toml b/shaderpacks/pixel-perfect.pw.toml new file mode 100644 index 0000000..3aed88f --- /dev/null +++ b/shaderpacks/pixel-perfect.pw.toml @@ -0,0 +1,13 @@ +name = "Pixel Perfect" +filename = "Pixel-Perfect-1-5-0.zip" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/D5k8BTVz/versions/qwUpiwSm/Pixel-Perfect-1-5-0.zip" +hash-format = "sha1" +hash = "82f960fc56af78794343ba2de24a5912d65f7226" + +[update] +[update.modrinth] +mod-id = "D5k8BTVz" +version = "qwUpiwSm" diff --git a/shaderpacks/psx-shader.pw.toml b/shaderpacks/psx-shader.pw.toml new file mode 100644 index 0000000..9425008 --- /dev/null +++ b/shaderpacks/psx-shader.pw.toml @@ -0,0 +1,13 @@ +name = "PSX Shader" +filename = "PSX_Shader.zip" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/5FTpbyBl/versions/Fv6lzIBy/PSX_Shader.zip" +hash-format = "sha1" +hash = "e2ae74d8c57c22efd350e52d5ad5f98fe9cfb849" + +[update] +[update.modrinth] +mod-id = "5FTpbyBl" +version = "Fv6lzIBy" diff --git a/shaderpacks/rethinking-voxels.pw.toml b/shaderpacks/rethinking-voxels.pw.toml index 87c1808..1407922 100644 --- a/shaderpacks/rethinking-voxels.pw.toml +++ b/shaderpacks/rethinking-voxels.pw.toml @@ -1,13 +1,13 @@ name = "Rethinking Voxels" -filename = "rethinking-voxels_r0.1_alpha9b.zip" +filename = "rethinking-voxels_r0.1-beta4-fix2.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/kmwfVOoi/versions/AWtumMpy/rethinking-voxels_r0.1_alpha9b.zip" +url = "https://cdn.modrinth.com/data/kmwfVOoi/versions/is3rS8JL/rethinking-voxels_r0.1-beta4-fix2.zip" hash-format = "sha1" -hash = "a5792779800410fe1f41329d277981ef4b30806e" +hash = "209ffc56ab73d1fce3b99ff57768ddb2bae01c07" [update] [update.modrinth] mod-id = "kmwfVOoi" -version = "AWtumMpy" +version = "is3rS8JL" diff --git a/shaderpacks/shrimple.pw.toml b/shaderpacks/shrimple.pw.toml new file mode 100644 index 0000000..f68be0d --- /dev/null +++ b/shaderpacks/shrimple.pw.toml @@ -0,0 +1,13 @@ +name = "Shrimple" +filename = "Shrimple_v0.11.zip" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/BS9T99lD/versions/AnhOHG4D/Shrimple_v0.11.zip" +hash-format = "sha1" +hash = "b817e9a10da43b462e2ad1556197c3323ad3be74" + +[update] +[update.modrinth] +mod-id = "BS9T99lD" +version = "AnhOHG4D"