From 158b1fe27f54bef8015303318aeadd40ece036d4 Mon Sep 17 00:00:00 2001
From: Merith <merith.tk@gmail.com>
Date: Thu, 23 Feb 2023 06:30:29 +0000
Subject: [PATCH] fix some build configs

---
 .gitignore           | 2 ++
 .minecraft/pack.toml | 4 ++--
 Makefile             | 7 +++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb6b8be..fcd1b37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,9 @@
 
 ## Ignore Modpack Updater Script loose files
 .technic
+.build
 *.zip
+*.mrpack
 !.minecraft/.packwizignore
 
 ## Add your modded folders/files to ignore here
diff --git a/.minecraft/pack.toml b/.minecraft/pack.toml
index c153a4f..ae0fa4e 100644
--- a/.minecraft/pack.toml
+++ b/.minecraft/pack.toml
@@ -1,6 +1,6 @@
 name = "Vanillia Minecraft"
-author = "Daedreus"
-version = "1.2.1"
+author = "Merith.TK, Daedreus"
+version = "1.3.0"
 pack-format = "packwiz:1.1.0"
 
 [index]
diff --git a/Makefile b/Makefile
index 7e38989..32126e9 100644
--- a/Makefile
+++ b/Makefile
@@ -18,13 +18,13 @@ default:
 curseforge:
 	-mkdir .build
 	@echo "Making Curseforge pack"
-	packwiz curseforge export --pack-file .minecraft/pack.toml -o .build/vanillia-curseforge.zip
+	packwiz curseforge export --pack-file .minecraft/pack.toml -o .build/
 	7z d .build/vanillia-curseforge.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml  overrides/index.toml	
 
 modrinth:
 	-mkdir .build
 	@echo "Making Modrinth pack"
-	packwiz modrinth export --pack-file .minecraft/pack.toml -o .build/vanillia-modrinth.zip
+	packwiz modrinth export --pack-file .minecraft/pack.toml
 	7z d .build/vanillia-modrinth.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml  overrides/index.toml	
 
 multimc:
@@ -42,14 +42,13 @@ technic:
 	-rm -rf .technic
 	-cp -r .minecraft .technic
 	cp vanillia_icon.png .technic/icon.png
-	cd .technic && java -jar ../.minecraft/packwiz-installer-bootstrap.jar https://gitlab.com/Merith-TK/vanillia-modpack/-/raw/main/.minecraft/pack.toml && cd ..
+	cd .technic && java -jar ../.minecraft/packwiz-installer-bootstrap.jar ../.minecraft/pack.toml && cd ..
 	-rm -rf .technic/packwiz* .technic/index.toml .technic/pack.toml .technic/mods/*.toml
 	7z d .build/vanillia-technic.zip ./* ./.* -r
 	7z a .build/vanillia-technic.zip ./.technic/* -r
 
 clean:
 	-rm -rf .technic
-	-rm -rf .build
 	-git gc --aggressive --prune
 
 all: curseforge modrinth multimc technic clean