diff --git a/.gitignore b/.gitignore index 5c0358a..bca65f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ *.mrpack -result diff --git a/flake.nix b/flake.nix index 26a66ef..cd3e47f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,21 +1,11 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flakelight.url = "github:nix-community/flakelight"; }; outputs = { flakelight, ... }@inputs: flakelight ./. { inherit inputs; - package = pkgs: pkgs.writeShellApplication { - name = "epic-cobblemon-serve"; - - runtimeInputs = [pkgs.packwiz]; - - text = '' - cd ${./.} - packwiz serve "$@" - ''; - }; devShell.packages = pkgs: with pkgs; [ packwiz ]; }; } diff --git a/index.toml b/index.toml index 653929d..b9e42f9 100644 --- a/index.toml +++ b/index.toml @@ -756,7 +756,7 @@ metafile = true [[files]] file = "mods/bookshelf-lib.pw.toml" -hash = "0b775ba140d7797e2456b8b09c7162f6a81de22abb7feb2e8437847cefd86d0a" +hash = "22bc3769946f8306099321a56954d28fd5cdcd983860bbe3950c84dbe3b95db2" metafile = true [[files]] @@ -829,11 +829,6 @@ file = "mods/cobblemon-capture-xp.pw.toml" hash = "c48b5f8a4bd794dfe1ac97a4245616aa63376743980b8cfc4b82f646ba1d56d8" metafile = true -[[files]] -file = "mods/cobblemon-counter.pw.toml" -hash = "5d512fabc2c8a37f06f1dfac21e99157aee56023e0af329095792b7eea676308" -metafile = true - [[files]] file = "mods/cobblemon-legendary-structures.pw.toml" hash = "f94003c8ed9f325625d6d98e0ac7eb643ecf0a2826fea919cf8f5db936f57c87" @@ -869,11 +864,6 @@ file = "mods/cobblemon-tim-core.pw.toml" hash = "e85b6ea7b89a3b65b50a3eb414896ff3de6f7ff6d1e6f7e7979e30b19ae443dd" metafile = true -[[files]] -file = "mods/cobblemon-unchained.pw.toml" -hash = "625dece6fd04e674e0a8cba7d95d4cae21b8e291122016f8a6814ae66a35b732" -metafile = true - [[files]] file = "mods/cobblemon.pw.toml" hash = "d0d21c8cd26fc4ddcdd03893e4b7ad5e1d1a4701a272f002f2932f9686770a6e" diff --git a/mods/bookshelf-lib.pw.toml b/mods/bookshelf-lib.pw.toml index 2d2f0a2..a288c6e 100644 --- a/mods/bookshelf-lib.pw.toml +++ b/mods/bookshelf-lib.pw.toml @@ -1,13 +1,13 @@ name = "Bookshelf" -filename = "bookshelf-fabric-1.21.1-21.1.80.jar" +filename = "bookshelf-fabric-1.21.1-21.1.79.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/uy4Cnpcm/versions/eRd8PTb9/bookshelf-fabric-1.21.1-21.1.80.jar" +url = "https://cdn.modrinth.com/data/uy4Cnpcm/versions/xMGvkIzs/bookshelf-fabric-1.21.1-21.1.79.jar" hash-format = "sha512" -hash = "d1fdae5a6f1c772efb1fd12764d7711c4cc34d3045da1af7412cad1168c8a514843cb8d89ce5f8056b095e5074e508a32627502d97b6cc2b569434d7160b13d6" +hash = "c677631d1c47f08da7700ad5ec2613b90e188a09918a01c99c338e9c8f920b9c375073799d99e61d53a71d32788e76b4cc12f839ca4b815ac6d1290cf416c20f" [update] [update.modrinth] mod-id = "uy4Cnpcm" -version = "eRd8PTb9" +version = "xMGvkIzs" diff --git a/mods/cobblemon-counter.pw.toml b/mods/cobblemon-counter.pw.toml deleted file mode 100644 index dacfabc..0000000 --- a/mods/cobblemon-counter.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Cobblemon Counter" -filename = "counter-fabric-1.7.1-1.8.1.jar" -side = "both" - -[download] -url = "https://cdn.modrinth.com/data/rj8uLYP4/versions/2Nil2M9k/counter-fabric-1.7.1-1.8.1.jar" -hash-format = "sha512" -hash = "49a18ce32fac54b3e7b2615b0d75e1774552b8cc605d4f05a51a4f63e61ed7ff12af2e204b8db4dc0ef2f90ac1f87897204e0f7e2a7eed0f8167d509f7fe1770" - -[update] -[update.modrinth] -mod-id = "rj8uLYP4" -version = "2Nil2M9k" diff --git a/mods/cobblemon-unchained.pw.toml b/mods/cobblemon-unchained.pw.toml deleted file mode 100644 index 0f0a33f..0000000 --- a/mods/cobblemon-unchained.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Cobblemon Unchained" -filename = "unchained-fabric-1.7.1-1.7.1.jar" -side = "server" - -[download] -url = "https://cdn.modrinth.com/data/wh0wnzrT/versions/hRkOU329/unchained-fabric-1.7.1-1.7.1.jar" -hash-format = "sha512" -hash = "6546250884dd6e2ecc9802eabbc4b0a0cf0b227b6f77e55464d71141e92a02cb9b75ee7cce31bbdff9433af237a606d3583db262d15e513a15ccd513ca57fe37" - -[update] -[update.modrinth] -mod-id = "wh0wnzrT" -version = "hRkOU329" diff --git a/pack.toml b/pack.toml index b67860f..48f1091 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 = "242694f1f2e4f600e3e31be9aa54b790bf35e6082203e9575795e1d7c32df566" +hash = "85cd4ad10e82ac94b8eeeaa1140da3a34001bc4bcc7a74633b7c2a4207b7a697" [versions] fabric = "0.18.2"