From 9f7d80ee0631e46bafec6d73b809da5dd88eae43 Mon Sep 17 00:00:00 2001 From: Merith-TK Date: Fri, 12 Aug 2022 10:15:36 -0700 Subject: [PATCH] touch up makefile --- Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index bfbfd21..0ca796e 100644 --- a/Makefile +++ b/Makefile @@ -17,22 +17,22 @@ default: curseforge: @echo "Making Curseforge pack" - packwiz curseforge export --pack-file .minecraft/pack.toml -o ../modpack-curseforge.zip - 7z d ../modpack-curseforge.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml overrides/index.toml + packwiz curseforge export --pack-file .minecraft/pack.toml -o ../ultron-curseforge.zip + 7z d ../ultron-curseforge.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml overrides/index.toml modrinth: @echo "Making Modrinth pack" - packwiz modrinth export --pack-file .minecraft/pack.toml -o ../modpack-modrinth.zip - 7z d ../modpack-modrinth.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml overrides/index.toml + packwiz modrinth export --pack-file .minecraft/pack.toml -o ../ultron-modrinth.zip + 7z d ../ultron-modrinth.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml overrides/index.toml multimc: @echo "Making MultiMC pack" cp .minecraft/kubejs/config/packicon.png ./packicon.png - 7z d ../modpack-multimc.zip ./* -r - 7z d ../modpack-multimc.zip ./.minecraft -r - 7z a ../modpack-multimc.zip ./* -r - 7z a ../modpack-multimc.zip ./.minecraft -r - 7z d ../modpack-multimc.zip ./.minecraft/mods ./.minecraft/pack.toml ./.minecraft/index.toml -r + 7z d ../ultron-mc.zip ./* -r + 7z d ../ultron-mc.zip ./.minecraft -r + 7z a ../ultron-mc.zip ./* -r + 7z a ../ultron-mc.zip ./.minecraft -r + 7z d ../ultron-mc.zip ./.minecraft/mods ./.minecraft/pack.toml ./.minecraft/index.toml -r rm ./packicon.png technic: @@ -40,10 +40,10 @@ technic: -rm -rf .technic -cp -r .minecraft .technic mv .technic/modpack.icon.png .technic/icon.png - cd .technic && java -jar packwiz-installer-bootstrap.jar https://gitlab.com/Merith-TK/modpack-template/-/raw/main/.minecraft/pack.toml && cd .. + cd .technic && java -jar packwiz-installer-bootstrap.jar https://git.merith.xyz/modpacks/ultron/raw/branch/main/.minecraft/pack.toml && cd .. -rm -rf .technic/packwiz* - 7z d ../modpack-technic.zip ./* -r - 7z a ../modpack-technic.zip ./.technic/* -r + 7z d ../ultron-technic.zip ./* -r + 7z a ../ultron-technic.zip ./.technic/* -r clean: -rm -rf .technic