diff --git a/flake.lock b/flake.lock index cd28615..97d7914 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1710408871, - "narHash": "sha256-YpSGYZR96I8g5OK/Fdm0O4+mHLen6YPA1cPanqqNqT0=", + "lastModified": 1719931832, + "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd5ddf2c6bfafff031edf80221e1ee94e86ca10a", + "rev": "0aeab749216e4c073cece5d34bc01b79e717c3e0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2aed73f..3e18ac1 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ devShells = eachSystem (system: let pkgs = import nixpkgs { inherit system; }; in { default = pkgs.mkShell { - buildInputs = with pkgs; [ packwiz ]; + buildInputs = with pkgs; [ self.packages.${system}.packwiz-wrapper nix-update ]; }; }); packages = eachSystem (system: let pkgs = import nixpkgs { inherit system; }; diff --git a/index.toml b/index.toml index 3103b21..070e1a7 100644 --- a/index.toml +++ b/index.toml @@ -145,11 +145,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" @@ -157,12 +152,12 @@ metafile = true [[files]] file = "mods/chat-heads.pw.toml" -hash = "56a4d9f9b47a65b3508192e519163ff73c712354d3ff907938f2593d18ea166e" +hash = "dc7a1dd927927788de75b4ec7bf29b40d0d4704a13788bdfcba5d5b243d0eaa1" metafile = true [[files]] file = "mods/cit-resewn.pw.toml" -hash = "44e2cc695c040b7bbca462165099fa3c56a98aa8f01104bb067dc850b65f6d02" +hash = "2cf2d6c7683cbaa8d4d91374d5a92e6166176aefe5e0d7a0a2714c9321f8add0" metafile = true [[files]] @@ -177,7 +172,7 @@ metafile = true [[files]] file = "mods/continuity.pw.toml" -hash = "bb7b31de1f5c7941aff59030d59168a5971e8c47884bcd8905637836ff97ce46" +hash = "acbde04e67f2f0970a6b81e3c818a5f8ed3eceab4f3a04330d80c70c24d03afe" metafile = true [[files]] @@ -187,12 +182,12 @@ metafile = true [[files]] file = "mods/distanthorizons.pw.toml" -hash = "fe79cc78adf75a5aa3f32b2ac61a141ee7a4db1baebf628bee058a9c4381b255" +hash = "f6317dc039dd9efe5ef1c7b225c7a0f9a52f4ebd93a4b27726916369135f3059" metafile = true [[files]] file = "mods/dynamic-fps.pw.toml" -hash = "5d08ee5a9dad38ed87772d437d7e1779fecc0baa4a0e6d33b324bce9908c60ea" +hash = "fa2b28c7304509b8d95f8917fd34029c2149961bb1696c40fae5b5f504c7cd53" metafile = true [[files]] @@ -202,17 +197,17 @@ 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 = "b4d08a3dddc2daf3771527f7ce940bf04f0dd96389d55e2194861d0b258fd373" +hash = "a685dc41c1361b3bf5b77533826a1216534e1c689fee371c002e9e9fcccdf712" metafile = true [[files]] @@ -227,17 +222,17 @@ metafile = true [[files]] file = "mods/entity-model-features.pw.toml" -hash = "e8b644e3f024030e5477aeb6716cb1b9a0c920abec81d2674a5054c25cf631c3" +hash = "3532700b41c5b82a0b57b140d0eb2e6f36728c575901b077b39cacac5a4322c8" metafile = true [[files]] file = "mods/entityculling.pw.toml" -hash = "33f865a014f3acf2c1f2c452bfe7ba1a864acad178322a6eab3759c7e63c9654" +hash = "9f499eff7ddb9eeab719f19808cbcf41f2b77d06ebf946f157cf7b5f52f64e70" metafile = true [[files]] file = "mods/entitytexturefeatures.pw.toml" -hash = "4acc71ef74d7bde9aa8a15932d1005d74efdc78d6c373553084d98dc332fd8c9" +hash = "0dc604455e2d5f4e82e3527aab59cc199f060c776a90b9571fe36bcbb61f28b4" metafile = true [[files]] @@ -252,7 +247,7 @@ metafile = true [[files]] file = "mods/fallingleaves.pw.toml" -hash = "0c4c20d601b15dbc85c275732d9efe9369597503c7d6caa9a7fee217f67073e7" +hash = "948e8a5d65ede4a8612a2f476d7b3b0f2fe00436ab3b8dd73829d4bdcf0cdf22" metafile = true [[files]] @@ -272,27 +267,27 @@ metafile = true [[files]] file = "mods/indium.pw.toml" -hash = "e416b18eebf514dea2014cf5c7fd3ee8493934a0b4e937509f15172ad271fde2" +hash = "31278d67704a56eb32d93c240e4bfd9822e1ab6047ee14d752953dd0c24dca95" metafile = true [[files]] file = "mods/inventory-profiles-next.pw.toml" -hash = "dd8dadd99d99c0535beb51accbb85be19bd2d26944c2836f816f9709f51bb59d" +hash = "c9f4a8f985932269b8c9159c320929f81216f7197c2909c24c1498346f371b32" metafile = true [[files]] file = "mods/iris.pw.toml" -hash = "eb0d9a1475b609eb82f26d0440846d52034c1aef8fcc21ee1cc327dc52648f7d" +hash = "aac37788ac1acd537a8b5b32fc2489cddf8034f196f7f38c0755837764b4f01d" metafile = true [[files]] file = "mods/itemswapper.pw.toml" -hash = "a87a5e7a9a1234525c9b2d5259e061317c35e0c863c2b061a2e6d2826c05f152" +hash = "c9196744dab42a9d4292fa409c64bbda856018cf97b0ca2850a9d8c1995dce24" metafile = true [[files]] file = "mods/jei.pw.toml" -hash = "e9c1efd327adb9305b8ae56daf65cfee0d43b05b933b6c98518c53005b835fbb" +hash = "6bbbc46c585f36fa78a8a1dacc8dd228a34cbe7418bba5661bd4a8a44c252cea" metafile = true [[files]] @@ -307,12 +302,12 @@ metafile = true [[files]] file = "mods/language-reload.pw.toml" -hash = "43986085a6a74e456999737d6f3b68f35bacc0d71aa9ee780e8dc143afd181b1" +hash = "863c7625ed377ba905368ec8cb50a29d2ad23c833b50d7808f933aecbe1bcad4" metafile = true [[files]] file = "mods/libipn.pw.toml" -hash = "6332607e5399b318c9b39b14a9c6e36428cd52dd96b65f592fff9eb15117fc3f" +hash = "3de6db38b0870f8bc8c61b2698d4b64ac1610b9066536be1b22b3a8257ab73fe" metafile = true [[files]] @@ -362,7 +357,7 @@ metafile = true [[files]] file = "mods/mouse-tweaks.pw.toml" -hash = "669008dbd2508a67f8c409096cf2357de450f26a69494289e5852045ade7d358" +hash = "9ecf3bd4cd96af63bb04063f74b8a13cea46a77bfce670b4408417f8d0d293e0" metafile = true [[files]] @@ -382,7 +377,7 @@ metafile = true [[files]] file = "mods/presence-footsteps.pw.toml" -hash = "938b135f37da76c099b14ba0f381a8515a0a28de62445caff9b2de94737e8894" +hash = "35f2b7d27291e3a313c986137b70b7675bc32b3d0097e0940c7e23b0cf62b92e" metafile = true [[files]] @@ -397,12 +392,12 @@ metafile = true [[files]] file = "mods/qsl.pw.toml" -hash = "5a6df3930d69602402cd13bf860195ac44680e2d4556e8d1254ae730fcb4b0f9" +hash = "c94b68658f3158a44d5e95a606aa08628cd2b80a50fe45d26d5679205a77e4d1" metafile = true [[files]] file = "mods/quilt-loading-screen.pw.toml" -hash = "0431d2fbc92b56108c48fc955caafbefcafeb69bc9773c5413daa89af5d87966" +hash = "e08fdeed1d56d03938bc66e2f34fefe5df150afb6e8ec4d318f354d6413ec0ba" metafile = true [[files]] @@ -427,7 +422,7 @@ metafile = true [[files]] file = "mods/sodium.pw.toml" -hash = "cd49906a91e2ff1c11acba79192d609c232f2f73d82cc6a646e7338c8e76aa8a" +hash = "245530bdbb5c4127a1286f3722778d71e478194a8dcee89388c8fd247b4a57da" metafile = true [[files]] @@ -447,27 +442,27 @@ metafile = true [[files]] file = "mods/where-is-it.pw.toml" -hash = "ff1c86dfe9b625dd38cd6165e8f876dd9878eb9cecd383f0353b00052eacf966" +hash = "c4ffad2aebeba13e732a9ce853120e3313d404a216a4046aa52333f361d3feeb" metafile = true [[files]] file = "mods/wthit.pw.toml" -hash = "2b0f9478abd56ae48db0f0881581615b489d283ba91bd145c3a4f0a03f5f69ba" +hash = "fc721bd93f9b250912bfba398601d111cd158fdf5e40129c107cc28fef3f5fa5" metafile = true [[files]] file = "mods/xaeros-minimap.pw.toml" -hash = "5e0a45bf42bc911f15e06431df58dcfaeb21bbf07bd33d6800d39141c2bd71bb" +hash = "5cefed621171d22a3c902aa92ce8fff2aa09410963668664651adf66f635013b" metafile = true [[files]] file = "mods/xaeros-world-map.pw.toml" -hash = "528685d69966f72bfc2eab53caf66f4fa95cdd7dd8f33445a3867af73824f705" +hash = "a564179c06682ce17b454caf8dcb82e72c49b3eb8a6d74b5ea115aab2681635e" metafile = true [[files]] file = "mods/yacl.pw.toml" -hash = "10eead85b57a4646c27aceed0597cca489cd4ae5e4436bb69f9b1b428325ef89" +hash = "e012c2d48d8c2ef08e8a77a83476db46a81f9a5ee3aa90e5c57e2af508bd9089" metafile = true [[files]] @@ -482,7 +477,7 @@ metafile = true [[files]] file = "resourcepacks/enhanced-boss-bars.pw.toml" -hash = "591bda29ea000a2ab9003782f1aa395773e5b8f292d1b7b4c5db4888b1d7de74" +hash = "5211c59a355673aa4a07698533778901324b5d352177ea324d48c849c6aa1593" metafile = true [[files]] @@ -490,29 +485,54 @@ file = "resourcepacks/vanillatweaks.pw.toml" hash = "2ada98e4a07f325283f285b9ac397636df3414e2b578d3f6e4d55ed00904f23d" metafile = true +[[files]] +file = "shaderpacks/bloop-shaders.pw.toml" +hash = "51e2fddbf447e85e0aeeb15808c9f9515da33dba2745a6d15465263688f33aab" +metafile = true + [[files]] file = "shaderpacks/bsl-shaders.pw.toml" -hash = "68b79902d98bc38e4705b621dcc54321e35742f696b462070d457cf7156d7921" +hash = "41fbddad14b67a342e35eb7d2c96cfb555014c0f9c0e1e2866a3d2516a33c971" metafile = true [[files]] file = "shaderpacks/complementary-reimagined.pw.toml" -hash = "93cc3c55259d0adef692cb4dda0ec348dab9f99b66b39e67f365ab5a1f070da2" +hash = "79f3766c282f1d3c5bd671f8c9f7bac5128b941557ca7668542b533e035c090b" metafile = true [[files]] file = "shaderpacks/complementary-shaders-v4.pw.toml" -hash = "c3b7d6c27249a7727712d1a884e40e3837d692de32d357d747fcabdded23d649" +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 = "be1fb8f1fd4f15a004605328969b397f245f2505de8b5bb8c78aa56a4e1fd483" +hash = "5821f960ab766cc441934d39998677b224c9e1c6efb965af2d1fa7f8eab73f58" +metafile = true + +[[files]] +file = "shaderpacks/pixel-perfect.pw.toml" +hash = "103a0e3143e9dc41d99be6a00646356108b1efb0dd27c90b97bf9d4c16afdbbd" +metafile = true + +[[files]] +file = "shaderpacks/psx-shader.pw.toml" +hash = "0a360a375249cb4221e62a4459073e31f5a43e213abcbe71526f5b373f258a74" metafile = true [[files]] file = "shaderpacks/rethinking-voxels.pw.toml" -hash = "a3428a3954ff0029d90c7184047d81c7f2091ac679e500aace22290c32010472" +hash = "5a858b73cd053d094cc4e7894fa32219872dcf572604e6aa1f1e7ac2680d9bd2" +metafile = true + +[[files]] +file = "shaderpacks/shrimple.pw.toml" +hash = "5278e03c761883c72be4f3afb5c06119e2cfc333ed80a1608734d922e070619f" metafile = true [[files]] 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 3560e13..ba17e11 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-fabric-1.20.jar" +filename = "chat_heads-0.12.6-fabric-1.20.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/Wb5oqrBJ/versions/68f3pu0P/chat_heads-0.10.31-fabric-1.20.jar" +url = "https://cdn.modrinth.com/data/Wb5oqrBJ/versions/E3eEb6PU/chat_heads-0.12.6-fabric-1.20.jar" hash-format = "sha1" -hash = "7eca61a04adf62afce0ad9d279fffbabcd90792c" +hash = "4ffbd82ff5d603157d4507e0543055a9ee6d7036" [update] [update.modrinth] mod-id = "Wb5oqrBJ" -version = "68f3pu0P" +version = "E3eEb6PU" 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/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 index 4378455..fb303c8 100644 --- a/mods/distanthorizons.pw.toml +++ b/mods/distanthorizons.pw.toml @@ -1,13 +1,13 @@ name = "Distant Horizons" -filename = "DistantHorizons-2.0.1-a-1.20.1.jar" +filename = "DistantHorizons-2.1.2-a-1.20.1-forge-fabric.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/uCdwusMi/versions/fAVxiMK6/DistantHorizons-2.0.1-a-1.20.1.jar" +url = "https://cdn.modrinth.com/data/uCdwusMi/versions/OwcStAhe/DistantHorizons-2.1.2-a-1.20.1-forge-fabric.jar" hash-format = "sha1" -hash = "b42adab2ec0a2919db552a7acbe71196eb6e183c" +hash = "56117d011bc5892dea3921676d0c981d66ed83ed" [update] [update.modrinth] mod-id = "uCdwusMi" -version = "fAVxiMK6" +version = "OwcStAhe" diff --git a/mods/dynamic-fps.pw.toml b/mods/dynamic-fps.pw.toml index 0e1d6de..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.4.2+minecraft-1.20.4-quilt.jar" +filename = "dynamic-fps-3.6.0+minecraft-1.20.0-quilt.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/LQ3K71Q1/versions/AEjABoYz/dynamic-fps-3.4.2%2Bminecraft-1.20.4-quilt.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 = "890172a0e6fbd4c336611d46b4c0fc7b5602a1f0" +hash = "6c20da90c2a2a998fe56b32d84f6b93d74142a36" [update] [update.modrinth] mod-id = "LQ3K71Q1" -version = "AEjABoYz" +version = "zVtEuiz1" 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 831ac44..cbf5e96 100644 --- a/mods/emi.pw.toml +++ b/mods/emi.pw.toml @@ -1,13 +1,13 @@ name = "EMI" -filename = "emi-1.1.3+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/UTsNvm4s/emi-1.1.3%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 = "daa68ad9a8ac73be16b88b3015573d096d2a844f" +hash = "863db56afaa62d3f7edf992df493e1bbf360c00c" [update] [update.modrinth] mod-id = "fRiHVvU7" -version = "UTsNvm4s" +version = "8KtEM1az" diff --git a/mods/entity-model-features.pw.toml b/mods/entity-model-features.pw.toml index 45eafba..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-1.3.jar" +filename = "entity_model_features_fabric_1.20.1-2.1.3.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/4I1XuqiY/versions/dVfrkFFQ/entity_model_features_fabric_1.20.1-1.3.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 = "2b911c43fc30c7a40974a6250b80b12cac8dc94f" +hash = "e5c7c4a0b5cb645945dfa1ef332984d04ba77363" [update] [update.modrinth] mod-id = "4I1XuqiY" -version = "dVfrkFFQ" +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 2609d7f..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.1-5.2.3.jar" +filename = "entity_texture_features_fabric_1.20.1-6.1.3.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/BVzZfTc1/versions/YnTygVlO/entity_texture_features_fabric_1.20.1-5.2.3.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 = "4886f68e007b8501b59af21755d9a8f6683157fa" +hash = "ab8907e55f6474fbba2de022a87ffb29fa14a64c" [update] [update.modrinth] mod-id = "BVzZfTc1" -version = "YnTygVlO" +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/indium.pw.toml b/mods/indium.pw.toml index dfdd708..a2efb94 100644 --- a/mods/indium.pw.toml +++ b/mods/indium.pw.toml @@ -1,13 +1,13 @@ name = "Indium" -filename = "indium-1.0.30+mc1.20.4.jar" +filename = "indium-1.0.34+mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/Orvt0mRa/versions/Aouse6P7/indium-1.0.30%2Bmc1.20.4.jar" +url = "https://cdn.modrinth.com/data/Orvt0mRa/versions/gofbpynL/indium-1.0.34%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "b24233f29c0ce4802c61ea8998e01e6e4580ae60" +hash = "a2de9ba15f155b09626995ad58b0e23803b05fe6" [update] [update.modrinth] mod-id = "Orvt0mRa" -version = "Aouse6P7" +version = "gofbpynL" diff --git a/mods/inventory-profiles-next.pw.toml b/mods/inventory-profiles-next.pw.toml index 2fc92c1..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.9.jar" +filename = "InventoryProfilesNext-fabric-1.20-1.10.10.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/O7RBXm3n/versions/MYaRwBOZ/InventoryProfilesNext-fabric-1.20-1.10.9.jar" +url = "https://cdn.modrinth.com/data/O7RBXm3n/versions/vYitK6Zf/InventoryProfilesNext-fabric-1.20-1.10.10.jar" hash-format = "sha1" -hash = "296cf5f19ed9bca1ac8202699e9acb7b6cb8c954" +hash = "10f1bdc53f23261078b0754b5d7976d85f739497" [update] [update.modrinth] mod-id = "O7RBXm3n" -version = "MYaRwBOZ" +version = "vYitK6Zf" diff --git a/mods/iris.pw.toml b/mods/iris.pw.toml index 8d3b831..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.17.jar" +filename = "iris-1.7.2+mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/YL57xq9U/versions/JHbrO6Zq/iris-mc1.20.1-1.6.17.jar" +url = "https://cdn.modrinth.com/data/YL57xq9U/versions/1CMVXDHo/iris-1.7.2%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "daaa0a952273301117d3dc42bde68c6f1f60b318" +hash = "4841b993d37c0944ca6f7a02809364e561a6acc3" [update] [update.modrinth] mod-id = "YL57xq9U" -version = "JHbrO6Zq" +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 646d663..f1ee0ca 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.3.0.4.jar" +filename = "jei-1.20.1-fabric-15.3.0.8.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/NsbSea5x/jei-1.20.1-fabric-15.3.0.4.jar" +url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/MtHhjBC2/jei-1.20.1-fabric-15.3.0.8.jar" hash-format = "sha1" -hash = "d5e29fead4928513444b6005968fb6a6aa6aa8e8" +hash = "883008503c38e4f3dddd16001a497cddc141a574" [update] [update.modrinth] mod-id = "u6dRKJwZ" -version = "NsbSea5x" +version = "MtHhjBC2" diff --git a/mods/language-reload.pw.toml b/mods/language-reload.pw.toml index 6147348..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.10+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/EbPl4WIQ/language-reload-1.5.10%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 = "a9c19d4a7d45f410784be3d385c2ea0b521e2814" +hash = "02fdfa8eab9fb261c0681d86d1d91b3a2fe16cb6" [update] [update.modrinth] mod-id = "uLbm7CG6" -version = "EbPl4WIQ" +version = "kO9nUBoX" diff --git a/mods/libipn.pw.toml b/mods/libipn.pw.toml index 1bb4603..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.1.jar" +filename = "libIPN-fabric-1.20-4.0.2.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/onSQdWhM/versions/n7RHn1mT/libIPN-fabric-1.20-4.0.1.jar" +url = "https://cdn.modrinth.com/data/onSQdWhM/versions/Uygzs3iI/libIPN-fabric-1.20-4.0.2.jar" hash-format = "sha1" -hash = "55e42623a065a7f7e9cef0e70c4d20d351740aa8" +hash = "c8c4d93037efb226b6bd3264e33df4c010cb111b" [update] [update.modrinth] mod-id = "onSQdWhM" -version = "n7RHn1mT" +version = "Uygzs3iI" 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/presence-footsteps.pw.toml b/mods/presence-footsteps.pw.toml index 2f1983b..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.2.jar" +filename = "PresenceFootsteps-1.9.4+1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/rcTfTZr3/versions/KAmTaDGR/PresenceFootsteps-1.9.2.jar" +url = "https://cdn.modrinth.com/data/rcTfTZr3/versions/LjDXTyEn/PresenceFootsteps-1.9.4%2B1.20.1.jar" hash-format = "sha1" -hash = "f28b48e77d3e31b899b5dcddbc16b6b33c5fbf53" +hash = "f4b446c7153bf6dbe41b7f3325686e3dd630dff1" [update] [update.modrinth] mod-id = "rcTfTZr3" -version = "KAmTaDGR" +version = "LjDXTyEn" diff --git a/mods/qsl.pw.toml b/mods/qsl.pw.toml index 497c864..8b20ba5 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.5.0_qsl-6.1.2_fapi-0.91.0_mc-1.20.1.jar" +filename = "qfapi-7.5.0_qsl-6.1.2_fapi-0.92.2_mc-1.20.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/qvIfYCYJ/versions/qAYOU2Af/qfapi-7.5.0_qsl-6.1.2_fapi-0.91.0_mc-1.20.1.jar" +url = "https://cdn.modrinth.com/data/qvIfYCYJ/versions/Gydw2vxY/qfapi-7.5.0_qsl-6.1.2_fapi-0.92.2_mc-1.20.1.jar" hash-format = "sha1" -hash = "23296bd979dd1fbc6ccf84103f9bcc713029ef85" +hash = "24b33e47b5980eefc63b0aff350347144cf9bfa4" [update] [update.modrinth] mod-id = "qvIfYCYJ" -version = "qAYOU2Af" +version = "Gydw2vxY" 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/sodium.pw.toml b/mods/sodium.pw.toml index 60d9b84..778bf4b 100644 --- a/mods/sodium.pw.toml +++ b/mods/sodium.pw.toml @@ -1,13 +1,13 @@ name = "Sodium" -filename = "sodium-fabric-0.5.8+mc1.20.1.jar" +filename = "sodium-fabric-0.5.11+mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/AANobbMI/versions/mhZtY2lR/sodium-fabric-0.5.8%2Bmc1.20.1.jar" +url = "https://cdn.modrinth.com/data/AANobbMI/versions/ygf8cVZg/sodium-fabric-0.5.11%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "bdd6b8ac84b46ae56a3bbb761ce430c48e42e00d" +hash = "c4293c1483f3b39c1c6c4c69143e8bb2c6e53daf" [update] [update.modrinth] mod-id = "AANobbMI" -version = "mhZtY2lR" +version = "ygf8cVZg" diff --git a/mods/where-is-it.pw.toml b/mods/where-is-it.pw.toml index 5bd1885..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.3.4+1.20.1.jar" +filename = "whereisit-2.4.3+1.20.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/FCTyEqkn/versions/o551CUUa/whereisit-2.3.4%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 = "cc72a1cf0127606e5a56669bb88f29105ba5e139" +hash = "a91bbd91cd770861883ee7e3ccf110a21368d395" [update] [update.modrinth] mod-id = "FCTyEqkn" -version = "o551CUUa" +version = "QMO5B1AE" diff --git a/mods/wthit.pw.toml b/mods/wthit.pw.toml index d542f9b..a91d8c0 100644 --- a/mods/wthit.pw.toml +++ b/mods/wthit.pw.toml @@ -1,13 +1,13 @@ name = "WTHIT" -filename = "wthit-quilt-8.8.0.jar" +filename = "wthit-quilt-8.13.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/6AQIaxuO/versions/I0DzRv3h/wthit-quilt-8.8.0.jar" +url = "https://cdn.modrinth.com/data/6AQIaxuO/versions/4Jamol2R/wthit-quilt-8.13.2.jar" hash-format = "sha1" -hash = "4bc0a08b12d394d6a9894d47b9e542153c6c9c5a" +hash = "b3b0105ac3dd6d8774fde26b48a1bf40ff6ce4cb" [update] [update.modrinth] mod-id = "6AQIaxuO" -version = "I0DzRv3h" +version = "4Jamol2R" diff --git a/mods/xaeros-minimap.pw.toml b/mods/xaeros-minimap.pw.toml index 6fb3caa..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.9.7_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/rbY8QUIj/Xaeros_Minimap_23.9.7_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 = "15b16b9bd9de172128029aa1318fb24cfa515ec9" +hash = "396401316ddde6e7712f5d6122d4d491c4d5cd2c" [update] [update.modrinth] mod-id = "1bokaNcj" -version = "rbY8QUIj" +version = "WQEX096d" diff --git a/mods/xaeros-world-map.pw.toml b/mods/xaeros-world-map.pw.toml index f82cfd0..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.37.8_Fabric_1.20.jar" +filename = "XaerosWorldMap_1.38.8_Fabric_1.20.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/NcUtCpym/versions/RR2qcEow/XaerosWorldMap_1.37.8_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 = "da26e28068b1086da1dbfa88e8a3220dd06c913c" +hash = "51b20efcb6c70057c98a42b2d3591fb6e84f2299" [update] [update.modrinth] mod-id = "NcUtCpym" -version = "RR2qcEow" +version = "szULGs3b" diff --git a/mods/yacl.pw.toml b/mods/yacl.pw.toml index 8b97572..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.2+1.20.jar" +filename = "YetAnotherConfigLib-3.5.0+1.20.1-fabric.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/1eAoo2KR/versions/DretS191/yet-another-config-lib-fabric-3.2.2%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 = "ad0b96eddc7961e799b154251305a4ffd1cdad9a" +hash = "48005e145f5423ff9446ac6fe3d1cb122f977a00" [update] [update.modrinth] mod-id = "1eAoo2KR" -version = "DretS191" +version = "gQuF6HNa" diff --git a/nix/packages/default.nix b/nix/packages/default.nix index a61c610..4f69f6d 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -3,4 +3,5 @@ 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 index 978cff9..e926091 100644 --- a/nix/packages/shaders.nix +++ b/nix/packages/shaders.nix @@ -1,10 +1,17 @@ -{ stdenvNoCC, fetchFromGitHub, zip }: +{ stdenvNoCC, + lib, + fetchFromGitHub, + zip, + nix-update-script, }: let makeShaderPackage = { name, src, + branch ? null, }: stdenvNoCC.mkDerivation { - inherit name src; + pname = name; + inherit src; + version = src.rev; phases = [ "installPhase" ]; buildInputs = [ zip ]; installPhase = '' @@ -12,11 +19,16 @@ let 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"; diff --git a/pack.toml b/pack.toml index 7990669..302ee6d 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "4eb66613041365401eadf57f2fd64738ef30aa0cc1eaa908019370744b893049" +hash = "eadd468b121fd0dd143181dcf5584cba16be52f4a8b7039e66c9ad69fff07ce3" [versions] minecraft = "1.20.1" diff --git a/resourcepacks/enhanced-boss-bars.pw.toml b/resourcepacks/enhanced-boss-bars.pw.toml index 52e52e0..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 = "[1.4] Enhanced Boss Bars.zip" +filename = "[1.4.1] Enhanced Boss Bars.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/U5SedJ9S/versions/LnccFGNV/%5B1.4%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 = "065d6a8870764299cca7ba1310748510b437e318" +hash = "3dfe3e45e973179d924b7ff462aae5a1a36c2c6d" [update] [update.modrinth] mod-id = "U5SedJ9S" -version = "LnccFGNV" +version = "3fjpw8Kj" diff --git a/shaderpacks/bloop-shaders.pw.toml b/shaderpacks/bloop-shaders.pw.toml new file mode 100644 index 0000000..7700811 --- /dev/null +++ b/shaderpacks/bloop-shaders.pw.toml @@ -0,0 +1,13 @@ +name = "Bloop Shaders" +filename = "Bloop-1.2.3.zip" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/Q6RQF9Oa/versions/dYH7ovzG/Bloop-1.2.3.zip" +hash-format = "sha1" +hash = "398a564800679c4c986d03d20f24601beb5781f2" + +[update] +[update.modrinth] +mod-id = "Q6RQF9Oa" +version = "dYH7ovzG" diff --git a/shaderpacks/bsl-shaders.pw.toml b/shaderpacks/bsl-shaders.pw.toml index 534dda6..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.08.zip" +filename = "BSL_v8.2.09.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/Q1vvjJYV/versions/EHvkeTVo/BSL_v8.2.08.zip" +url = "https://cdn.modrinth.com/data/Q1vvjJYV/versions/c6RfHyKW/BSL_v8.2.09.zip" hash-format = "sha1" -hash = "5c10ed196eb5bb5b2b36685803775b2ae72eb378" +hash = "cd92bf706a1347a2d2943b14391ffbe1233415bc" [update] [update.modrinth] mod-id = "Q1vvjJYV" -version = "EHvkeTVo" +version = "c6RfHyKW" diff --git a/shaderpacks/complementary-reimagined.pw.toml b/shaderpacks/complementary-reimagined.pw.toml index 8def4a6..983d07e 100644 --- a/shaderpacks/complementary-reimagined.pw.toml +++ b/shaderpacks/complementary-reimagined.pw.toml @@ -1,13 +1,13 @@ name = "Complementary Reimagined" -filename = "ComplementaryReimagined_r5.1.1.zip" +filename = "ComplementaryReimagined_r5.2.2.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/HVnmMxH1/versions/D5fox3fg/ComplementaryReimagined_r5.1.1.zip" +url = "https://cdn.modrinth.com/data/HVnmMxH1/versions/pAOQ9Amz/ComplementaryReimagined_r5.2.2.zip" hash-format = "sha1" -hash = "8738d99d8a78b7e7ea71b5c15a3432bc04eba715" +hash = "07cd8165acf24ec8ddada03f60729537687dd435" [update] [update.modrinth] mod-id = "HVnmMxH1" -version = "D5fox3fg" +version = "pAOQ9Amz" diff --git a/shaderpacks/complementary-shaders-v4.pw.toml b/shaderpacks/complementary-shaders-v4.pw.toml index 5e0c3a2..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.1.1.zip" +filename = "ComplementaryUnbound_r5.2.2.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/R6NEzAwj/versions/MCqlWur4/ComplementaryUnbound_r5.1.1.zip" +url = "https://cdn.modrinth.com/data/R6NEzAwj/versions/RMaZ3tSJ/ComplementaryUnbound_r5.2.2.zip" hash-format = "sha1" -hash = "65c7ef20fef4b5b03aa44afccbfdfdd82574c193" +hash = "f0c0cbd2059b7a464b9e0f061ddfa6f0980849e1" [update] [update.modrinth] mod-id = "R6NEzAwj" -version = "MCqlWur4" +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 827f401..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.9c.zip" +filename = "MakeUp-UltraFast-8.9f.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/izsIPI7a/versions/zVo7ADI6/MakeUp-UltraFast-8.9c.zip" +url = "https://cdn.modrinth.com/data/izsIPI7a/versions/V8u6ZaM2/MakeUp-UltraFast-8.9f.zip" hash-format = "sha1" -hash = "2ee721d69aa089618408389d947317ce69faae12" +hash = "f8d660df8f70c0f65c8410c97fdfa1ec90f4c727" [update] [update.modrinth] mod-id = "izsIPI7a" -version = "zVo7ADI6" +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..da3adeb --- /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/weJerS57/PSX_Shader.zip" +hash-format = "sha1" +hash = "6f3086d05a50a701a7cd60f32d5485b1348bfe91" + +[update] +[update.modrinth] +mod-id = "5FTpbyBl" +version = "weJerS57" diff --git a/shaderpacks/rethinking-voxels.pw.toml b/shaderpacks/rethinking-voxels.pw.toml index 8b7191c..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_beta2.zip" +filename = "rethinking-voxels_r0.1-beta4-fix2.zip" side = "client" [download] -url = "https://cdn.modrinth.com/data/kmwfVOoi/versions/kxINFUyA/rethinking-voxels_r0.1_beta2.zip" +url = "https://cdn.modrinth.com/data/kmwfVOoi/versions/is3rS8JL/rethinking-voxels_r0.1-beta4-fix2.zip" hash-format = "sha1" -hash = "d72d79ba8525ffbe18acc10e07b38b4ea800c51d" +hash = "209ffc56ab73d1fce3b99ff57768ddb2bae01c07" [update] [update.modrinth] mod-id = "kmwfVOoi" -version = "kxINFUyA" +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"