80 changed files with 198 additions and 1179 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,8 +11,8 @@
 ## Ignore Modpack Updater Script loose files
 .technic
 *.zip
-*.mrpack

 ## Add your modded folders/files to ignore here
+.minecraft/mods/
 .minecraft/packwiz-installer.jar
 .minecraft/packwiz.json
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@ -1,7 +0,0 @@
-FROM gitpod/workspace-go
-
-RUN sudo apt-get -q update && \
-    sudo apt install p7zip-full make && \
-    sudo apt install -yq openjdk-17-jdk
-
-RUN sudo update-java-alternatives --set java-1.17.0-openjdk-amd64
--- a/.gitpod.yml
+++ b/.gitpod.yml
@ -1,5 +0,0 @@
-image:
-  file: .gitpod.Dockerfile
-
-tasks:
- command: make update-packwiz
--- a/.minecraft/bin/version.json
+++ b/.minecraft/bin/version.json
@ -0,0 +1,55 @@
+{
+  "id": "1.18.1",
+  "inheritsFrom": "1.18.1",
+  "releaseTime": "2022-02-25T18:25:26+0000",
+  "time": "2022-02-25T18:25:26+0000",
+  "type": "release",
+  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
+  "libraries": [
+    {
+      "name": "net.fabricmc:tiny-mappings-parser:0.3.0+build.17",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "net.fabricmc:sponge-mixin:0.11.2+mixin.0.8.5",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "net.fabricmc:tiny-remapper:0.8.1",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "net.fabricmc:access-widener:2.1.0",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "org.ow2.asm:asm:9.2",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "org.ow2.asm:asm-analysis:9.2",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "org.ow2.asm:asm-commons:9.2",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "org.ow2.asm:asm-tree:9.2",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "org.ow2.asm:asm-util:9.2",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "net.fabricmc:intermediary:1.18.1",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "net.fabricmc:fabric-loader:0.13.3",
+      "url": "https://maven.fabricmc.net/"
+    }
+  ],
+  "mainClass": "net.fabricmc.loader.impl.launch.knot.KnotClient"
+}
--- a/.minecraft/index.toml
+++ b/.minecraft/index.toml
@ -1,291 +0,0 @@
-hash-format = "sha256"
-
-[[files]]
-file = "mods/abyssal-depths.pw.toml"
-hash = "87005bafb1855e4c3929842d81a202346d3f1bcf309dd52f093e44b35ce9edc8"
-metafile = true
-
-[[files]]
-file = "mods/aether-lost-content.pw.toml"
-hash = "b38e7720ae213db1850e645e55c470b0d10f7000b07cc8bed87953bf28454c52"
-metafile = true
-
-[[files]]
-file = "mods/albedo.pw.toml"
-hash = "d8601c42224ae2c6b11183d779dc5852644741155ce6ca1ea3a3e2b10bcca874"
-metafile = true
-
-[[files]]
-file = "mods/antique-atlas.pw.toml"
-hash = "6303fa1a2c9ba98acd32a225211819339dfb0263332ff15f13268b77a6a9cabb"
-metafile = true
-
-[[files]]
-file = "mods/aquaculture.pw.toml"
-hash = "66e34a1e0bfd3a9ee39b1f58b1af494b843fa22979a28207f397e4710547b9d2"
-metafile = true
-
-[[files]]
-file = "mods/armory-expansion.pw.toml"
-hash = "2abf7659b47aaaecbd591b3d74fe29002a2c2ba7b8abb1d15ddb3b2fcdbd97c9"
-metafile = true
-
-[[files]]
-file = "mods/autoreglib.pw.toml"
-hash = "45b89fead492935701ce8092eb3920bce39d824629bd87458eae218aba41d258"
-metafile = true
-
-[[files]]
-file = "mods/basic-nether-ores.pw.toml"
-hash = "8b612919e7be2ab549cfb75a9403927127d9981b85e8bb06cc6ca20771fcde44"
-metafile = true
-
-[[files]]
-file = "mods/baubles.pw.toml"
-hash = "2cc5f913400c0dfe460173edd1e5d9475a09774caf228f41c3e39eba252a7a19"
-metafile = true
-
-[[files]]
-file = "mods/betternether.pw.toml"
-hash = "5b4f4320ab870550f1e2155f0e0eaf1f7cf64000881838bd0e34adda979ffd7b"
-metafile = true
-
-[[files]]
-file = "mods/biomes-o-plenty.pw.toml"
-hash = "a6f2a5c57e847e8a587ca95caf23fff6d91aff86828d764496143a35a30773ed"
-metafile = true
-
-[[files]]
-file = "mods/blockcraftery.pw.toml"
-hash = "e2f14e48f0d4b8de42d67ba71c65c2b50e0e5ee9c823f825087c9bd5da11d5b4"
-metafile = true
-
-[[files]]
-file = "mods/born-in-a-barn.pw.toml"
-hash = "36c91e63beab5d3c889c036135ffcf0fb701cb79c71aa34ccd73833876173d92"
-metafile = true
-
-[[files]]
-file = "mods/buildcraft.pw.toml"
-hash = "bf615adaabcb307b15814a8b4ac9f2dcbda46dc983f3c8e958432b2ed133b37a"
-metafile = true
-
-[[files]]
-file = "mods/cc-tweaked.pw.toml"
-hash = "46dcc28562b736d102a6c71bfcefa4ea146b132f3effef5536c5e0e995a71496"
-metafile = true
-
-[[files]]
-file = "mods/chameleon.pw.toml"
-hash = "305815006195c0647af38ea5d8c03cd6c652c77bf975e3e967b754bc3b9ac569"
-metafile = true
-
-[[files]]
-file = "mods/chisel.pw.toml"
-hash = "5a5219bd45d091fa505a4c98e9282fa721f5228af3a91fe56939c6f347abc285"
-metafile = true
-
-[[files]]
-file = "mods/chisels-bits.pw.toml"
-hash = "ebb08e770587df2f24474edcedde20842993ab136cb458cd99ceda650e4b9acf"
-metafile = true
-
-[[files]]
-file = "mods/constructs-armory.pw.toml"
-hash = "29da2f11889d325de6b9d702f7e9813fab7b48d0ecf1b5cf4a95dca438867519"
-metafile = true
-
-[[files]]
-file = "mods/controlling.pw.toml"
-hash = "e8d1cfc13226f6633ebd7fef08e6818471969453778bb4d7e99c8ca09250831a"
-metafile = true
-
-[[files]]
-file = "mods/corpse.pw.toml"
-hash = "d147d561c5b715ba9528cc507fa1f85bfeef89f4da260c1c301f80e0033f0b73"
-metafile = true
-
-[[files]]
-file = "mods/ctm.pw.toml"
-hash = "430820ab4fc97024a7c5c188555c57e6fa22f33fe3d5f98d2a75254a0bd07633"
-metafile = true
-
-[[files]]
-file = "mods/decocraft.pw.toml"
-hash = "9bfe94e3bfc1a392eca371400b4dc82cd24d5bd9c05fa137116690b3e3c1a639"
-metafile = true
-
-[[files]]
-file = "mods/dynamic-surroundings.pw.toml"
-hash = "2d482b40072462ca65ca75ac3e475137d2c9871bb3fe678484b759b55f0d85cc"
-metafile = true
-
-[[files]]
-file = "mods/electroblobs-wizardry.pw.toml"
-hash = "908605daeb0f023e543d28ccfe38db5d1449452af179572711a58f5119b0b1fe"
-metafile = true
-
-[[files]]
-file = "mods/ender-io.pw.toml"
-hash = "cde76f6a6996baea5268266faa3d2bf93aba1e61f2e85c1811c383087bb20457"
-metafile = true
-
-[[files]]
-file = "mods/endercore.pw.toml"
-hash = "d56f22049555a71eb22c72d4a07fdc520af07da3cbb0eeb0283bcef87c370a71"
-metafile = true
-
-[[files]]
-file = "mods/essential.pw.toml"
-hash = "8654e72c9290a19b606a45c9caaf3d104229b28c1023d2307c1b8f7a92819363"
-metafile = true
-
-[[files]]
-file = "mods/extra-utilities.pw.toml"
-hash = "751db9d136970e9b4744ce00eea1937644f10710173c82dfde06b373748e5a57"
-metafile = true
-
-[[files]]
-file = "mods/foamfix-optimization-mod.pw.toml"
-hash = "49231a7e4c1f8b01846415b4035b43cdf35a5d457d9393c3223878b357eca439"
-metafile = true
-
-[[files]]
-file = "mods/hwyla.pw.toml"
-hash = "b15f02099402261c19fb5419ce908d195987cae2163e9b0b6bc9dfbdc9c40bbe"
-metafile = true
-
-[[files]]
-file = "mods/iron-chests.pw.toml"
-hash = "f5e51601becf4c9f8878530d40cd2ecf232e89e5d9fae6218959a15eee12417d"
-metafile = true
-
-[[files]]
-file = "mods/jade.pw.toml"
-hash = "444c9ed4f70cc87dab29246de73ee03c069ed3dbb13967d2576ad8b96bd1e504"
-metafile = true
-
-[[files]]
-file = "mods/jei.pw.toml"
-hash = "a39db085d980dcf786ea711276308ab7a0ef8424da5c3fb258389b78b6ef4023"
-metafile = true
-
-[[files]]
-file = "mods/mantle.pw.toml"
-hash = "3b5ef81c27805786f2b7e53d12bbb5a7a9ec8eacf8c005dd3f657f731480796a"
-metafile = true
-
-[[files]]
-file = "mods/mysticallib.pw.toml"
-hash = "815710af54eb77994c123853e9e665bfc5b4ee325e870c54259a7f9a59fcf21a"
-metafile = true
-
-[[files]]
-file = "mods/oreberries.pw.toml"
-hash = "24b61bc846fd7f214cddfd811623cfe60b3b9eb3f1320a2491b406b2da370bf4"
-metafile = true
-
-[[files]]
-file = "mods/pams-clay-spawn.pw.toml"
-hash = "c071671ad3b48a24db030c7e9125ba441e36a0c07f660ca32de54f23aa3949fe"
-metafile = true
-
-[[files]]
-file = "mods/pams-get-all-the-seeds.pw.toml"
-hash = "e7c8254fbfb92ff12e7da7f972d0afe61909e6b8844b97117d4f512bee096ad1"
-metafile = true
-
-[[files]]
-file = "mods/pams-harvestcraft.pw.toml"
-hash = "58e364c18441b784d48f1bda8e4717dd93efd03eba136e454a90504690dfad93"
-metafile = true
-
-[[files]]
-file = "mods/plethora-peripherals.pw.toml"
-hash = "e0625670634c7616fcb0f4ee6d1dcaeadb143ae3af4178b88c48d09ad564ac3f"
-metafile = true
-
-[[files]]
-file = "mods/project-74246.pw.toml"
-hash = "311ba86f06a73e9d821d9ca3cb992983357dc9596584e53c7f9d549bc7be2ef4"
-metafile = true
-
-[[files]]
-file = "mods/projecte.pw.toml"
-hash = "4d0eefd58ee00bebee6d4b4309c819ede0cab0368d66e614a4bcbc2dc97ef829"
-metafile = true
-
-[[files]]
-file = "mods/ptrlib.pw.toml"
-hash = "b4a05a52e66b8801b103553129b214da4f36a1e3f03b2628f72f3804a6bc1445"
-metafile = true
-
-[[files]]
-file = "mods/quark-oddities.pw.toml"
-hash = "9ab2d2f7a009920ff0c75575d0e3f2cdd1aa765c70ff37e9bf5efabde7aed918"
-metafile = true
-
-[[files]]
-file = "mods/quark.pw.toml"
-hash = "2e9648786a8cf14889eeac19283e7b534be2195d8c6f8de292d0af4071802f31"
-metafile = true
-
-[[files]]
-file = "mods/randomtweaks.pw.toml"
-hash = "bff691af416c451674e300f0bdaf89b1d7450aa7ad275421ce7f50fd65463438"
-metafile = true
-
-[[files]]
-file = "mods/recurrent-complex.pw.toml"
-hash = "ce01d4656863609ccf22371607decdbad41b4d9eb08b210ccd2003e83e313da7"
-metafile = true
-
-[[files]]
-file = "mods/simple-storage-network.pw.toml"
-hash = "62814a10c80fd9da818a3586a4df9604614e176390eb45a53c1adfc25037afe3"
-metafile = true
-
-[[files]]
-file = "mods/storage-drawers.pw.toml"
-hash = "c7cc5deb2c40eab1824622a0d48a15e2aab18d967a935c8f4c0c5fc5fe80fa86"
-metafile = true
-
-[[files]]
-file = "mods/tinker-i-o.pw.toml"
-hash = "3ebfb177520cb474749cfb08a0d7c3c02f7c464416573b8d40bea2b5c83508dc"
-metafile = true
-
-[[files]]
-file = "mods/tinkers-construct.pw.toml"
-hash = "3e6cb5fcf2c9c4254ca778c8fc61b4d05e895c111c2a98fb6c0b2bc44922e3f2"
-metafile = true
-
-[[files]]
-file = "mods/tinkers-jei.pw.toml"
-hash = "583e16d43279e1392b17be30bc4e72294e908e9f96c9b0d59b3ecbd510f505ec"
-metafile = true
-
-[[files]]
-file = "mods/tinkers-tool-leveling.pw.toml"
-hash = "7ae6b403a7e1f09b7b707d1c7153a5f0e85308e34ffc4a58a4de906ef880a061"
-metafile = true
-
-[[files]]
-file = "mods/tool-belt.pw.toml"
-hash = "1a483c0d403f54b329e06061fa7b4e7cbc5b33d1506bf9c25a5681851e60d9e7"
-metafile = true
-
-[[files]]
-file = "mods/travelers-backpack.pw.toml"
-hash = "9bd71ae6ab0afca4caa69a4d24897154d1557ea45a41c3673d40f8bf545608ba"
-metafile = true
-
-[[files]]
-file = "mods/unidict.pw.toml"
-hash = "b7efcef0724d49de5e486cf957b8600c4df388a64575c7fd99d5a0a20499e22d"
-metafile = true
-
-[[files]]
-file = "mods/waystones.pw.toml"
-hash = "0af91e64926856848449b73fcd31a7fe37c1756fdb905ccbb97cd603218275f9"
-metafile = true
--- a/.minecraft/modpack.icon.png
+++ b/.minecraft/modpack.icon.png
--- a/.minecraft/mods/abyssal-depths.pw.toml
+++ b/.minecraft/mods/abyssal-depths.pw.toml
@ -1,13 +0,0 @@
-name = "Abyssal Depths"
-filename = "AbyssalDepths-1.12.2-0.3.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "23fbb355d0375e0547ce3eb1e44d0d59ff67bf8b"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3217391
-project-id = 360647
--- a/.minecraft/mods/aether-lost-content.pw.toml
+++ b/.minecraft/mods/aether-lost-content.pw.toml
@ -1,13 +0,0 @@
-name = "Aether: Lost Content"
-filename = "lost-aether-content-1.12.2-1.0.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "7afd5c89092db20080f5e11a3cbae0511bdabbb9"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3038185
-project-id = 318602
--- a/.minecraft/mods/albedo.pw.toml
+++ b/.minecraft/mods/albedo.pw.toml
@ -1,13 +0,0 @@
-name = "Albedo"
-filename = "albedo-1.12.2-1.1.0.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "49c52948dd67279722518e8084a14a80efd02e76"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2714505
-project-id = 275300
--- a/.minecraft/mods/antique-atlas.pw.toml
+++ b/.minecraft/mods/antique-atlas.pw.toml
@ -1,13 +0,0 @@
-name = "Antique Atlas"
-filename = "antiqueatlas-1.12.2-4.6.3.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "9531e665ad5d5aa7a84890147dddb6eaf86a5752"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2823030
-project-id = 227795
--- a/.minecraft/mods/aquaculture.pw.toml
+++ b/.minecraft/mods/aquaculture.pw.toml
@ -1,13 +0,0 @@
-name = "Aquaculture 2"
-filename = "Aquaculture-1.12.2-1.6.8.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "9db4558bc156fbcd201625c6ccb0df52fec52c0f"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2659258
-project-id = 60028
--- a/.minecraft/mods/armory-expansion.pw.toml
+++ b/.minecraft/mods/armory-expansion.pw.toml
@ -1,13 +0,0 @@
-name = "Armory Expansion"
-filename = "armoryexpansion-1.4.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "01ee6e9bd36ddc29a12ea75ac72848089d5c3098"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2925154
-project-id = 293602
--- a/.minecraft/mods/autoreglib.pw.toml
+++ b/.minecraft/mods/autoreglib.pw.toml
@ -1,13 +0,0 @@
-name = "AutoRegLib"
-filename = "AutoRegLib-1.3-32.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "267269ca7f1a71fb3bb35bdb8e61702a4da6263e"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2746011
-project-id = 250363
--- a/.minecraft/mods/basic-nether-ores.pw.toml
+++ b/.minecraft/mods/basic-nether-ores.pw.toml
@ -1,13 +0,0 @@
-name = "Basic Nether Ores [Forge/Fabric]"
-filename = "BasicNetherOres-1.12.2-1.0.5.0.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "52d699a36880185c939434cf35617441bb4314af"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2989956
-project-id = 289647
--- a/.minecraft/mods/baubles.pw.toml
+++ b/.minecraft/mods/baubles.pw.toml
@ -1,13 +0,0 @@
-name = "Baubles"
-filename = "Baubles-1.12-1.5.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "cb13fcfb18a9cb0cbd825fd5fe8d813c77368549"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2518667
-project-id = 227083
--- a/.minecraft/mods/betternether.pw.toml
+++ b/.minecraft/mods/betternether.pw.toml
@ -1,13 +0,0 @@
-name = "BetterNether"
-filename = "betternether-0.1.8.6.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "f82a17a9a32bd65579f5414a5162fb8fedf4b73d"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2859893
-project-id = 311377
--- a/.minecraft/mods/biomes-o-plenty.pw.toml
+++ b/.minecraft/mods/biomes-o-plenty.pw.toml
@ -1,13 +0,0 @@
-name = "Biomes O' Plenty"
-filename = "BiomesOPlenty-1.12.2-7.0.1.2445-universal.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "13c1e58ffec2a550b9698e25cda93b8d155007b0"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3558882
-project-id = 220318
--- a/.minecraft/mods/blockcraftery.pw.toml
+++ b/.minecraft/mods/blockcraftery.pw.toml
@ -1,13 +0,0 @@
-name = "Blockcraftery"
-filename = "blockcraftery-1.12.2-1.3.1.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "5962fc2af3644f010e6510829244cb55ab097eda"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2716712
-project-id = 278882
--- a/.minecraft/mods/born-in-a-barn.pw.toml
+++ b/.minecraft/mods/born-in-a-barn.pw.toml
@ -1,13 +0,0 @@
-name = "Born in a Barn"
-filename = "Born In A Barn V1.8-1.12-1.1.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "e2bbf025258815b316f2e8598199f6bd22668405"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2641661
-project-id = 285789
--- a/.minecraft/mods/buildcraft.pw.toml
+++ b/.minecraft/mods/buildcraft.pw.toml
@ -1,13 +0,0 @@
-name = "Buildcraft"
-filename = "buildcraft-all-7.99.24.8.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "46c7bcb2c81f4786a84f951e7204277c967deb96"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3204475
-project-id = 61811
--- a/.minecraft/mods/cc-tweaked.pw.toml
+++ b/.minecraft/mods/cc-tweaked.pw.toml
@ -1,13 +0,0 @@
-name = "CC: Tweaked"
-filename = "cc-tweaked-1.12.2-1.89.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "f35510b6117ef0e69211440e6c7a64be7eb28590"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2992872
-project-id = 282001
--- a/.minecraft/mods/chameleon.pw.toml
+++ b/.minecraft/mods/chameleon.pw.toml
@ -1,13 +0,0 @@
-name = "Chameleon"
-filename = "Chameleon-1.12-4.1.3.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "5ed3dd5fd1ebded57bfe525b4ece11232bd14e5e"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2450900
-project-id = 230497
--- a/.minecraft/mods/chisel.pw.toml
+++ b/.minecraft/mods/chisel.pw.toml
@ -1,13 +0,0 @@
-name = "Chisel"
-filename = "Chisel-MC1.12.2-1.0.2.45.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "d378cee9195841ea78bb9800f543d718ef2c60ef"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2915375
-project-id = 235279
--- a/.minecraft/mods/chisels-bits.pw.toml
+++ b/.minecraft/mods/chisels-bits.pw.toml
@ -1,13 +0,0 @@
-name = "Chisels & Bits - For Forge"
-filename = "chiselsandbits-14.33.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "0e6f159254e6899651087e5b1464bac91698d1d3"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2720655
-project-id = 231095
--- a/.minecraft/mods/constructs-armory.pw.toml
+++ b/.minecraft/mods/constructs-armory.pw.toml
@ -1,13 +0,0 @@
-name = "Construct's Armory"
-filename = "conarm-1.12.2-1.2.5.10.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "373e8f6f56605d7eacb5d7d2f4e1ffea5e6d844b"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3174535
-project-id = 287683
--- a/.minecraft/mods/controlling.pw.toml
+++ b/.minecraft/mods/controlling.pw.toml
@ -1,13 +0,0 @@
-name = "Controlling"
-filename = "Controlling-3.0.10.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "151671af56599d39ef5ca41bf9bda3584b6818e1"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3025548
-project-id = 250398
--- a/.minecraft/mods/corpse.pw.toml
+++ b/.minecraft/mods/corpse.pw.toml
@ -1,13 +0,0 @@
-name = "Corpse"
-filename = "corpse-1.12.2-1.0.8.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "e367bec5785091dc9c928c1a95672a4774b0f0fd"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3010808
-project-id = 316582
--- a/.minecraft/mods/ctm.pw.toml
+++ b/.minecraft/mods/ctm.pw.toml
@ -1,13 +0,0 @@
-name = "ConnectedTexturesMod"
-filename = "CTM-MC1.12.2-1.0.2.31.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "892e0788531269bfa2f356e4e12825e19d4e5412"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2915363
-project-id = 267602
--- a/.minecraft/mods/decocraft.pw.toml
+++ b/.minecraft/mods/decocraft.pw.toml
@ -1,13 +0,0 @@
-name = "Decocraft"
-filename = "Decocraft-2.6.3.7_1.12.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "e226ed02e3181aca765a52cee7bad8865d93815b"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3347832
-project-id = 79616
--- a/.minecraft/mods/dynamic-surroundings.pw.toml
+++ b/.minecraft/mods/dynamic-surroundings.pw.toml
@ -1,13 +0,0 @@
-name = "Dynamic Surroundings"
-filename = "DynamicSurroundings-1.12.2-3.6.3.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "62fc23aa49ba392f4bbeb14ff0aae276ff3a27f4"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3497269
-project-id = 238891
--- a/.minecraft/mods/electroblobs-wizardry.pw.toml
+++ b/.minecraft/mods/electroblobs-wizardry.pw.toml
@ -1,13 +0,0 @@
-name = "Electroblob's Wizardry"
-filename = "ElectroblobsWizardry-4.3.8.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "03b410a90f1d62f7d0d931402bf2466ce89b57b9"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3864785
-project-id = 265642
--- a/.minecraft/mods/ender-io.pw.toml
+++ b/.minecraft/mods/ender-io.pw.toml
@ -1,13 +0,0 @@
-name = "Ender IO"
-filename = "EnderIO-1.12.2-5.3.70.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "55e25a5332c3dc5898f6a08a971dc21990c8eb96"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3328811
-project-id = 64578
--- a/.minecraft/mods/endercore.pw.toml
+++ b/.minecraft/mods/endercore.pw.toml
@ -1,13 +0,0 @@
-name = "EnderCore"
-filename = "EnderCore-1.12.2-0.5.76.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "a61fda64cfb0e3852690678fbd7375a1ea982884"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2972849
-project-id = 231868
--- a/.minecraft/mods/essential.pw.toml
+++ b/.minecraft/mods/essential.pw.toml
@ -1,13 +0,0 @@
-name = "ESSENTIAL Mod"
-filename = "Essential-forge_1-12-2.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/k2ZPuTBm/versions/1.0.0/Essential-forge_1-12-2.jar"
-hash-format = "sha1"
-hash = "d1340b53e674fffb0bc26a15ac2cad3f9cb4614e"
-
-[update]
-[update.modrinth]
-mod-id = "k2ZPuTBm"
-version = "X6SeDlUa"
--- a/.minecraft/mods/extra-utilities.pw.toml
+++ b/.minecraft/mods/extra-utilities.pw.toml
@ -1,13 +0,0 @@
-name = "Extra Utilities"
-filename = "extrautils2-1.12-1.9.9.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "9f9a217b23626cb338cf229054ed490d913610dc"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2678374
-project-id = 225561
--- a/.minecraft/mods/foamfix-optimization-mod.pw.toml
+++ b/.minecraft/mods/foamfix-optimization-mod.pw.toml
@ -1,13 +0,0 @@
-name = "FoamFix"
-filename = "foamfix-0.10.11-1.12.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "6df0efeff2486f284ea76fe1b6e2c0831cde004a"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3137883
-project-id = 278494
--- a/.minecraft/mods/hwyla.pw.toml
+++ b/.minecraft/mods/hwyla.pw.toml
@ -1,13 +0,0 @@
-name = "Hwyla"
-filename = "Hwyla-1.8.26-B41_1.12.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "7280d5c0dab42436549bcefc63ff64a1049e5501"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2568751
-project-id = 253449
--- a/.minecraft/mods/iron-chests.pw.toml
+++ b/.minecraft/mods/iron-chests.pw.toml
@ -1,13 +0,0 @@
-name = "Iron Chests"
-filename = "ironchest-1.12.2-7.0.72.847.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "adc4c785a484c5d5a4ab9a29e1937faeed4312dd"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2747935
-project-id = 228756
--- a/.minecraft/mods/jade.pw.toml
+++ b/.minecraft/mods/jade.pw.toml
@ -1,13 +0,0 @@
-name = "Jade 🔍"
-filename = "Jade-0.1.0.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "6876a7399c604169d7acb06d441743eaac5dd615"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2735905
-project-id = 324717
--- a/.minecraft/mods/jei.pw.toml
+++ b/.minecraft/mods/jei.pw.toml
@ -1,13 +0,0 @@
-name = "Just Enough Items (JEI)"
-filename = "jei_1.12.2-4.16.1.302.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "3e88d2896ca868c3cedb65e117ad3a1b82488fa8"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3043174
-project-id = 238222
--- a/.minecraft/mods/mantle.pw.toml
+++ b/.minecraft/mods/mantle.pw.toml
@ -1,13 +0,0 @@
-name = "Mantle"
-filename = "Mantle-1.12-1.3.3.55.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "a1e5d5c197dae3e92637cafb8cd996185191165b"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2713386
-project-id = 74924
--- a/.minecraft/mods/mysticallib.pw.toml
+++ b/.minecraft/mods/mysticallib.pw.toml
@ -1,13 +0,0 @@
-name = "MysticalLib"
-filename = "mysticallib-1.12.2-1.13.0.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "015d2d3768a3937e64af8bd93b59436603ad790d"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3483816
-project-id = 277064
--- a/.minecraft/mods/oreberries.pw.toml
+++ b/.minecraft/mods/oreberries.pw.toml
@ -1,13 +0,0 @@
-name = "Oreberries"
-filename = "oreberries-1.12.x-0.5.0.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "5bbdc17c1fffa5f62e58aa54034ca9f5dd8bde5c"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2578045
-project-id = 275408
--- a/.minecraft/mods/pams-clay-spawn.pw.toml
+++ b/.minecraft/mods/pams-clay-spawn.pw.toml
@ -1,13 +0,0 @@
-name = "Pam's Clay Spawn"
-filename = "Pam's ClaySpawn 1.12a.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "11026a055555dfda3bd08790b0bc74a7be59f4b8"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2445432
-project-id = 221913
--- a/.minecraft/mods/pams-get-all-the-seeds.pw.toml
+++ b/.minecraft/mods/pams-get-all-the-seeds.pw.toml
@ -1,13 +0,0 @@
-name = "Pam's Get All the Seeds!"
-filename = "Pam's Get all the Seeds! 1.12a.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "eadb88f471fe8b2d64cdb9d791d431c89674c8e9"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2445431
-project-id = 221914
--- a/.minecraft/mods/pams-harvestcraft.pw.toml
+++ b/.minecraft/mods/pams-harvestcraft.pw.toml
@ -1,13 +0,0 @@
-name = "Pam's HarvestCraft"
-filename = "Pam's HarvestCraft 1.12.2zg.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "a064b434253305424755943dd66f389855ade953"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2904825
-project-id = 221857
--- a/.minecraft/mods/plethora-peripherals.pw.toml
+++ b/.minecraft/mods/plethora-peripherals.pw.toml
@ -1,13 +0,0 @@
-name = "Plethora Peripherals"
-filename = "plethora-1.12.2-1.2.3.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "9d6854afb23e6c5646c6b644db0309adf04a20d8"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2858569
-project-id = 248425
--- a/.minecraft/mods/project-74246.pw.toml
+++ b/.minecraft/mods/project-74246.pw.toml
@ -1,13 +0,0 @@
-name = "Doomlike Dungeons"
-filename = "DoomlikeDungeons-1.14.11-MC1.12.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "7d01ba8706dddb96f407846c9bd52aafbc4b5b0c"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3636153
-project-id = 74246
--- a/.minecraft/mods/projecte.pw.toml
+++ b/.minecraft/mods/projecte.pw.toml
@ -1,13 +0,0 @@
-name = "ProjectE"
-filename = "ProjectE-1.12.2-PE1.4.1.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "f10e63fc3c4bf4d34acbfe06a180152dd5d29df1"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2702991
-project-id = 226410
--- a/.minecraft/mods/ptrlib.pw.toml
+++ b/.minecraft/mods/ptrlib.pw.toml
@ -1,13 +0,0 @@
-name = "PTRLib"
-filename = "PTRLib-1.0.5.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "c33ddf5660c2a1c39537bd6552b2cdd73b654e18"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3346568
-project-id = 291499
--- a/.minecraft/mods/quark-oddities.pw.toml
+++ b/.minecraft/mods/quark-oddities.pw.toml
@ -1,13 +0,0 @@
-name = "Quark Oddities"
-filename = "QuarkOddities-1.12.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "f2ba40e084e31a00e1a93c44dd01d07384bd1fcd"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2604798
-project-id = 301051
--- a/.minecraft/mods/quark.pw.toml
+++ b/.minecraft/mods/quark.pw.toml
@ -1,13 +0,0 @@
-name = "Quark"
-filename = "Quark-r1.6-179.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "35521fd8911b6ef893afbfe7d0d5d04962b3360d"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2924091
-project-id = 243121
--- a/.minecraft/mods/randomtweaks.pw.toml
+++ b/.minecraft/mods/randomtweaks.pw.toml
@ -1,13 +0,0 @@
-name = "RandomTweaks"
-filename = "randomtweaks-1.12.2-2.8.3.1.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "e5d2502bf33a670b17908e9f6b650fd0daa07cb5"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3204340
-project-id = 258205
--- a/.minecraft/mods/recurrent-complex.pw.toml
+++ b/.minecraft/mods/recurrent-complex.pw.toml
@ -1,13 +0,0 @@
-name = "Recurrent Complex"
-filename = "RecurrentComplex-1.4.8.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "b9dff4716409bd622b4fc160f2446a124da5c3a2"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2689602
-project-id = 223150
--- a/.minecraft/mods/simple-storage-network.pw.toml
+++ b/.minecraft/mods/simple-storage-network.pw.toml
@ -1,13 +0,0 @@
-name = "Simple Storage Network"
-filename = "SimpleStorageNetwork-1.12.2-1.8.3.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "e7253db37d5c4254031ba30bce72222a121ba0e4"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3655827
-project-id = 268495
--- a/.minecraft/mods/storage-drawers.pw.toml
+++ b/.minecraft/mods/storage-drawers.pw.toml
@ -1,13 +0,0 @@
-name = "Storage Drawers"
-filename = "StorageDrawers-1.12.2-5.4.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "c3f370ed6c158726061211334cbb72fd53f30364"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2952606
-project-id = 223852
--- a/.minecraft/mods/tinker-i-o.pw.toml
+++ b/.minecraft/mods/tinker-i-o.pw.toml
@ -1,13 +0,0 @@
-name = "Tinker I/O"
-filename = "tinker_io-1.12.2-rw2.8.3.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "6fe015e930d57f3c9b4c41731f6464d55a198f72"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3102626
-project-id = 229503
--- a/.minecraft/mods/tinkers-construct.pw.toml
+++ b/.minecraft/mods/tinkers-construct.pw.toml
@ -1,13 +0,0 @@
-name = "Tinkers Construct"
-filename = "TConstruct-1.12.2-2.13.0.183.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "e37e1f05ad0eaf567497ce655bc877dc1778bd0f"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2902483
-project-id = 74072
--- a/.minecraft/mods/tinkers-jei.pw.toml
+++ b/.minecraft/mods/tinkers-jei.pw.toml
@ -1,13 +0,0 @@
-name = "Tinker's JEI"
-filename = "tinkersjei-1.2.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "0ee37cbd099fd3693f1f45673ba498ce7e3a3849"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2701203
-project-id = 291786
--- a/.minecraft/mods/tinkers-tool-leveling.pw.toml
+++ b/.minecraft/mods/tinkers-tool-leveling.pw.toml
@ -1,13 +0,0 @@
-name = "Tinkers' Tool Leveling"
-filename = "TinkerToolLeveling-1.12.2-1.1.0.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "69705dd5de7c9cd54f6fdb8198b959f93b7d1400"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2630860
-project-id = 250957
--- a/.minecraft/mods/tool-belt.pw.toml
+++ b/.minecraft/mods/tool-belt.pw.toml
@ -1,13 +0,0 @@
-name = "Tool Belt"
-filename = "ToolBelt-1.12.2-1.9.14.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "6a9078c5d0f9e92a9f66ded407cba4b48dadbdf8"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3459767
-project-id = 260262
--- a/.minecraft/mods/travelers-backpack.pw.toml
+++ b/.minecraft/mods/travelers-backpack.pw.toml
@ -1,13 +0,0 @@
-name = "Traveler's Backpack"
-filename = "TravelersBackpack-1.12.2-1.0.35.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "5c9157582cc081f0d3b4090f3a2dbc5cfbe70cc6"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3150850
-project-id = 321117
--- a/.minecraft/mods/unidict.pw.toml
+++ b/.minecraft/mods/unidict.pw.toml
@ -1,13 +0,0 @@
-name = "UniDict"
-filename = "UniDict-1.12.2-3.0.10.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "2b72e49682aca50fa55522c5080f2ba20173c565"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 3553627
-project-id = 244258
--- a/.minecraft/mods/waystones.pw.toml
+++ b/.minecraft/mods/waystones.pw.toml
@ -1,13 +0,0 @@
-name = "Waystones"
-filename = "Waystones_1.12.2-4.1.0.jar"
-side = "both"
-
-[download]
-hash-format = "sha1"
-hash = "877a5cd3ed8e3f29e900b74c8c5400ee6e43c3bf"
-mode = "metadata:curseforge"
-
-[update]
-[update.curseforge]
-file-id = 2859589
-project-id = 245755
--- a/.minecraft/pack.toml
+++ b/.minecraft/pack.toml
@ -1,13 +0,0 @@
-name = "Vivecraft"
-author = "Merith.TK, Daedreus"
-version = "1.0.0"
-pack-format = "packwiz:1.1.0"
-
-[index]
-file = "index.toml"
-hash-format = "sha256"
-hash = "8c4c1ce06065afd23714437c13027e12b8614819e80e5b7a14775ca4da39cdc4"
-
-[versions]
-forge = "14.23.5.2859"
-minecraft = "1.12.2"
--- a/.minecraft/packwiz-installer-bootstrap.jar
+++ b/.minecraft/packwiz-installer-bootstrap.jar
--- a/.packignore
+++ b/.packignore
--- a/24
+++ b/24
@ -1,24 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <https://unlicense.org>
--- a/39
+++ b/39
@ -17,29 +17,28 @@ default:
 	
 curseforge:
 	@echo "Making Curseforge pack"
-	packwiz curseforge export --pack-file .minecraft/pack.toml -o ../vivecraft-curseforge.zip
-	7z d ../vivecraft-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 ../vivecraft-modrinth.zip
-	7z d ../vivecraft-modrinth.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml  overrides/index.toml	
+	@-mkdir ../modpack-curseforge
+	packwiz curseforge export --mods-folder packwiz-data/mods/ --pack-file packwiz-data/pack.toml
+	cp -r .minecraft overrides
+	7z a *.zip overrides 
+	rm -rf overrides
+	mv *.zip ../modpack-curseforge/

 multimc:
 	@echo "Making MultiMC pack"
-	7z d ../vivecraft-multimc.zip ./* -r
-	7z d ../vivecraft-multimc.zip ./.minecraft -r
-	7z a ../vivecraft-multimc.zip ./* -r
-	7z a ../vivecraft-multimc.zip ./.minecraft -r
-	7z d ../vivecraft-multimc.zip ./.minecraft/mods ./.minecraft/pack.toml ./.minecraft/index.toml -r
+	7z d ../modpack-multimc.zip ./* -r
+	7z d ../modpack-multimc.zip ./.* -r
+	7z a ../modpack-multimc.zip ./* -r
+	7z a ../modpack-multimc.zip ./.minecraft -r

-clean:
+technic:
+	@echo "Making Technic pack"
 	-rm -rf .technic
-	-git gc --aggressive --prune
+	-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/packwiz-data/pack.toml && cd ..
+	-rm -rf .technic/packwiz*
+	7z d ../modpack-technic.zip ./* -r
+	7z a ../modpack-technic.zip ./.technic/* -r

-all: curseforge modrinth multimc technic clean
-
-update-packwiz:
-	go install github.com/packwiz/packwiz@latest
-	clear
-	@echo "Packwiz has been Updated"
+all: curseforge multimc technic
--- a/README.md
+++ b/README.md
@ -1,2 +1,26 @@
-## ViveCraft
-This is an personal vivecraft modpack, made like this to make sharing not an headache
+## Update Pack Template
+This is a template modpack makers can use to easily release their modpack onto multiple platforms.
+currently this template only supports 
+- Windows
+	- Technic
+	- MultiMC
+
+### How to use this?
+- Modpack Makers
+	- Well first your going to need to install `busybox`, `git`, `go` `7zip`, and `make` on your computer, I personally reccomend getting all of these through [Scoop](https://scoop.sh/)
+	- After installing scoop, just run
+		- `scoop install busybox git go make 7zip`
+		- after you run the previous command, run
+			- `go install github.com/packwiz/packwiz@latest`
+		- and everything should be there, 
+	- I reccomend using VSCode to manage your modpack as you have a full visual editor and git manager built in.
+	- to add mods, run `packwiz <curseforge or modrinth> install <modid>`
+		- for sodium from curseforge, `packwiz cf install sodium`
+	- to make a release, run `make multimc` or `make technic`
+
+	- Dont forget to make a git repo for your modpack, I reccomend using [GitLab](https://gitlab.com) due to its free Large File Support.
+		- or a place to host the packwiz-data folder!
+
+- Modpack Users
+	- MultiMC
+		- Use Java 17, MC 1.16.5 runs just fine on forge AND fabric on java 17
--- a/instance.cfg
+++ b/instance.cfg
@ -1,11 +1,5 @@
 InstanceType=OneSix
-JvmArgs=-XX:+UseParallelGC -XX:ParallelGCThreads=3 -XX:MaxGCPauseMillis=3 -Xmn256M -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
-MaxMemAlloc=4096
-MinMemAlloc=4096
-OverrideJavaArgs=true
-OverrideMemory=true
-PermGen=128
-iconKey=bee
-name=ViveCraft
-PreLaunchCommand="$INST_JAVA" -jar packwiz-installer-bootstrap.jar https://git.merith.xyz/modpacks/vivecraft/raw/branch/main/.minecraft/pack.toml
-notes=
+iconKey=modpack.icon
+name=Modpack Template
+OverrideCommands=true
+PreLaunchCommand=$INST_JAVA -jar packwiz-installer-bootstrap.jar https://gitlab.com/Merith-TK/modpack-template/-/raw/packwiz/packwiz-data/pack.toml
--- a/libraries/OptiFine-1.12.2_HD_U_F5_LIB.jar
+++ b/libraries/OptiFine-1.12.2_HD_U_F5_LIB.jar
--- a/libraries/minecrift-1.12.2-jrbudda-11-r6.jar
+++ b/libraries/minecrift-1.12.2-jrbudda-11-r6.jar
--- a/mmc-pack.json
+++ b/mmc-pack.json
@ -1,42 +1,51 @@
 {
    "components": [
        {
-            "cachedName": "LWJGL 2",
-            "cachedVersion": "2.9.4-nightly-20150209",
+            "cachedName": "LWJGL 3",
+            "cachedVersion": "3.2.2",
            "cachedVolatile": true,
            "dependencyOnly": true,
-            "uid": "org.lwjgl",
-            "version": "2.9.4-nightly-20150209"
+            "uid": "org.lwjgl3",
+            "version": "3.2.2"
        },
        {
            "cachedName": "Minecraft",
            "cachedRequires": [
                {
-                    "suggests": "2.9.4-nightly-20150209",
-                    "uid": "org.lwjgl"
+                    "equals": "3.2.2",
+                    "suggests": "3.2.2",
+                    "uid": "org.lwjgl3"
                }
            ],
-            "cachedVersion": "1.12.2",
+            "cachedVersion": "1.18.1",
            "important": true,
            "uid": "net.minecraft",
-            "version": "1.12.2"
+            "version": "1.18.1"
        },
        {
-            "cachedName": "Forge",
+            "cachedName": "Intermediary Mappings",
            "cachedRequires": [
                {
-                    "equals": "1.12.2",
+                    "equals": "1.18.1",
                    "uid": "net.minecraft"
                }
            ],
-            "cachedVersion": "14.23.5.2859",
-            "uid": "net.minecraftforge",
-            "version": "14.23.5.2859"
+            "cachedVersion": "1.18.1",
+            "cachedVolatile": true,
+            "dependencyOnly": true,
+            "uid": "net.fabricmc.intermediary",
+            "version": "1.18.1"
        },
        {
-            "cachedName": "Vivecraft",
-            "cachedVersion": "4",
-            "uid": "vivecraft"
+            "cachedName": "Fabric Loader",
+            "cachedRequires": [
+                {
+                    "uid": "net.fabricmc.intermediary"
+                }
+            ],
+            "cachedVersion": "0.13.3",
+            "uid": "net.fabricmc.fabric-loader",
+            "version": "0.13.3"
        }
    ],
    "formatVersion": 1
--- a/packwiz-data/index.toml
+++ b/packwiz-data/index.toml
@ -0,0 +1,16 @@
+hash-format = "sha256"
+
+[[files]]
+file = "mods/lithium.toml"
+hash = "5a5c6174eda3db8594761efaf64308c44702b3f2a25957b0c35825b0109a1ef0"
+metafile = true
+
+[[files]]
+file = "mods/phosphor.toml"
+hash = "1fbb24b0b382c6d21bd2fed103e564bfe5f3e5ee10e6686faafd0164f07bf8da"
+metafile = true
+
+[[files]]
+file = "mods/sodium.toml"
+hash = "4aba93a705eb2c6300818297bc1d85329b9b085392810dbf15c79b5e3dd6d0ef"
+metafile = true
--- a/packwiz-data/mods/lithium.toml
+++ b/packwiz-data/mods/lithium.toml
@ -0,0 +1,13 @@
+name = "Lithium (Fabric)"
+filename = "lithium-fabric-mc1.18.1-0.7.8.jar"
+side = "both"
+
+[download]
+url = "https://edge.forgecdn.net/files/3659/182/lithium-fabric-mc1.18.1-0.7.8.jar"
+hash-format = "sha1"
+hash = "8b7cd216fee54b9acc261005cae5acbc856b1933"
+
+[update]
+[update.curseforge]
+file-id = 3659182
+project-id = 360438
--- a/packwiz-data/mods/phosphor.toml
+++ b/packwiz-data/mods/phosphor.toml
@ -0,0 +1,13 @@
+name = "Phosphor (Fabric)"
+filename = "phosphor-fabric-mc1.18.x-0.8.1.jar"
+side = "both"
+
+[download]
+url = "https://edge.forgecdn.net/files/3573/395/phosphor-fabric-mc1.18.x-0.8.1.jar"
+hash-format = "sha1"
+hash = "9b826d21b9cd999853a57c76b0c47ee4d9161dc9"
+
+[update]
+[update.curseforge]
+file-id = 3573395
+project-id = 372124
--- a/packwiz-data/mods/sodium.toml
+++ b/packwiz-data/mods/sodium.toml
@ -0,0 +1,13 @@
+name = "Sodium"
+filename = "sodium-fabric-mc1.18.1-0.4.0-alpha6+build.14.jar"
+side = "both"
+
+[download]
+url = "https://edge.forgecdn.net/files/3605/309/sodium-fabric-mc1.18.1-0.4.0-alpha6+build.14.jar"
+hash-format = "sha1"
+hash = "795d4c12bffdb1b21eed5ff87c07ce5ca3c0dcbf"
+
+[update]
+[update.curseforge]
+file-id = 3605309
+project-id = 394468
--- a/packwiz-data/pack.toml
+++ b/packwiz-data/pack.toml
@ -0,0 +1,13 @@
+name = "Modpack Template"
+author = "Merith.TK"
+version = "1.0.0"
+pack-format = "packwiz:1.0.0"
+
+[index]
+file = "index.toml"
+hash-format = "sha256"
+hash = "966ec7345bb3c3de690051089956c93804081fbcb5b6e2484304f14c266bd397"
+
+[versions]
+fabric = "0.13.3"
+minecraft = "1.18.1"
--- a/patches/vivecraft.json
+++ b/patches/vivecraft.json
@ -1,36 +0,0 @@
-{
-  "uid": "vivecraft",
-  "releaseTime": "1979-06-01T00:00:00-05:00",
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "libraries": [
-    {
-      "name": "com.mtbs3d:minecrift:1.12.2-jrbudda-11-r6",
-      "MMC-hint": "local"
-    },
-    {
-      "name": "org.json:json:20140107",
-      "url": "http://vivecraft.org/jar/"
-    },
-    {
-      "name": "com.sun:jna:4.2.1",
-      "url": "http://vivecraft.org/jar/"
-    },
-    {
-      "name": "org.ow2.asm:asm-all:5.2",
-      "url": "http://files.minecraftforge.net/maven/"
-    },
-    {"name": "net.minecraft:launchwrapper:1.12"},
-    {
-      "name": "optifine:OptiFine:1.12.2_HD_U_F5_LIB",
-      "MMC-hint": "local"
-    }
-  ],
-  "name": "Vivecraft",
-  "+tweakers": [
-    "org.vivecraft.tweaker.MinecriftForgeTweaker",
-    "net.minecraftforge.fml.common.launcher.FMLTweaker",
-    "optifine.OptiFineForgeTweaker"
-  ],
-  "time": "1979-06-01T00:00:00-05:00",
-  "version": "4"
-}