Merge branch 'JEFFREY-2' into 'JEFFREY-2'

Correct URLS, sys.exit

See merge request 1F335/modpackman!10

3 files changed, 31 insertions, 19 deletions

diff --git a/mods.txt b/mods.txt
index 34e1b4c..e719688 100644
--- a/mods.txt
+++ b/mods.txt
@@ -8,7 +8,7 @@ chisel-and-bits.jar https://www.curseforge.com/minecraft/mc-mods/chisels-bits
 chisel.jar https://www.curseforge.com/minecraft/mc-mods/chisel
 dynamictrees.jar https://www.curseforge.com/minecraft/mc-mods/dynamictrees
 dynamictreestraverse.jar https://f-1.karel.pw/dttraverse-1.4.1e.jar
-traverse.jar https://www.curseforge.com/minecraft/mc-mods/traverse-legacy-continued
+traverse.jar https://media.forgecdn.net/files/2613/657/Traverse-1.12.2-1.6.0-69.jar
 roots.jar https://www.curseforge.com/minecraft/mc-mods/roots
 ae2.jar https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2
 gravestones.jar https://www.curseforge.com/minecraft/mc-mods/gravestone-mod
@@ -18,4 +18,10 @@ harvestcraft.jar https://www.curseforge.com/minecraft/mc-mods/pams-harvestcraft
 akashictome.jar https://www.curseforge.com/minecraft/mc-mods/akashic-tome
 railcraft.jar https://www.curseforge.com/minecraft/mc-mods/railcraft
 optifine.jar https://karel.pw/optifine-1.12.2.jar
+autoreglib.jar https://media.forgecdn.net/files/2746/11/AutoRegLib-1.3-32.jar
+ctm.jar https://www.curseforge.com/minecraft/mc-mods/ctm
+codechickenlib.jar https://www.curseforge.com/minecraft/mc-mods/codechicken-lib-1-8
+mysticallib.jar https://media.forgecdn.net/files/2817/910/mysticallib-1.12.2-1.4.0.jar
+patchouli.jar https://media.forgecdn.net/files/2731/963/Patchouli-1.0-20.jar
+mysticalworld.jar https://media.forgecdn.net/files/2838/234/mysticalworld-1.12.2-1.6.1.jar
 ###botania???
diff --git a/update.py b/update.py
index a7d3ab2..4f3f1ab 100755
--- a/update.py
+++ b/update.py
@@ -174,7 +174,7 @@ def firefox():
         from selenium.webdriver import Firefox
     except:
         print("Applying updates requires the `selenium` package")
-        os.exit(0)
+        sys.exit(0)
     return Firefox()
 
 COMMAND_MAP = {
diff --git a/version.txt b/version.txt
index 6d4a0df..af4aa00 100644
--- a/version.txt
+++ b/version.txt
@@ -1,20 +1,26 @@
 # Format: <jarname> <hex digested sha1> <direct download url>
-#VERSION 2
-baubles.jar d839a442cfcbb9af6b9002a94cd9edb8c5b87c4b https://media.forgecdn.net/files/2518/667/
-jei.jar e4aa519dc2e345ec89f2d9547048f52abbdf7fa8 https://media.forgecdn.net/files/2803/400/
-psi.jar 87c4a9b9e8a7cfcfaaf714f767547cf4dc3cf7a0 https://media.forgecdn.net/files/2724/967/
-opencomputers.jar 122b65b3a4ac9328e9c22a654ed7f4b2e90a280f https://media.forgecdn.net/files/2828/357/
-chisel-and-bits.jar ba70a909e87ad16628cff717add43bc3d620b3f6 https://media.forgecdn.net/files/2720/655/
-chisel.jar cbbcdbafd5efca229dfedf9051021b5cc2296b46 https://media.forgecdn.net/files/2813/538/
-dynamictrees.jar 20f9677ee4bbf75006079fb478b4b6f5d15cd6ca https://media.forgecdn.net/files/2822/231/
+#VERSION 6
+baubles.jar cb13fcfb18a9cb0cbd825fd5fe8d813c77368549 https://media.forgecdn.net/files/2518/667/Baubles-1.12-1.5.2.jar
+jei.jar b7ce5f00e9709e08e81c597dc2d7336f58b7fe8e https://media.forgecdn.net/files/2803/400/jei_1.12.2-4.15.0.291.jar
+psi.jar f8a0d27b42d639101b39632d2a309dd7a45f0593 https://media.forgecdn.net/files/2724/967/Psi-r1.1-77.jar
+opencomputers.jar 8eff5dc6b00a50b13ad6f3e6a838049bbf8306f8 https://media.forgecdn.net/files/2828/357/OpenComputers-MC1.12.2-1.7.5.192.jar
+chisel-and-bits.jar 0e6f159254e6899651087e5b1464bac91698d1d3 https://media.forgecdn.net/files/2720/655/chiselsandbits-14.33.jar
+chisel.jar d9a74dde6aafade73328dbf45bf7ec8aca30e038 https://media.forgecdn.net/files/2813/538/Chisel-MC1.12.2-1.0.1.44.jar
+dynamictrees.jar 835d7e360839e59186aa72b73ab5d592a68e0b0a https://media.forgecdn.net/files/2822/231/DynamicTrees-1.12.2-0.9.6.jar
 dynamictreestraverse.jar 19c1e2e6b9c6ee4a9a93b8b50969be7bb6e13011 https://f-1.karel.pw/dttraverse-1.4.1e.jar
-traverse.jar 769bcb33f6b38a019f2cbea056232ea66e8fd948 https://media.forgecdn.net/files/2838/890/
-roots.jar d3cc461019743f29df3f2ad221518e2938e643d3 https://media.forgecdn.net/files/2823/796/
-ae2.jar e9df8f6160af2a8d09e0ac3ca95ec59129fe0f9f https://media.forgecdn.net/files/2747/63/
-gravestones.jar 3edf0eefab8064fc0863f6827279ffd6acbf8493 https://media.forgecdn.net/files/2744/766/
-enderstorage.jar de6fdbda00664a6d6938be2e8c19bbca0c07d69a https://media.forgecdn.net/files/2755/787/
-waila.jar 8ba680778e4b7948ff621681ffa73f0aaecf02ab https://media.forgecdn.net/files/2836/455/
-harvestcraft.jar 785e1d5896a19a83b1dd21a6c803a4484cf78edf https://media.forgecdn.net/files/2771/840/
-akashictome.jar 6c311587947440163392fff0ae77bb226c6706bb https://media.forgecdn.net/files/2648/656/
-railcraft.jar 31ba6748e4155fb207c657e37b37e276fe40451f https://media.forgecdn.net/files/2687/757/
+traverse.jar b16aaff09a6e77ba193e42f88f5d5bb8a85e063a https://media.forgecdn.net/files/2613/657/Traverse-1.12.2-1.6.0-69.jar
+roots.jar 460607c3841d22fa6a43af779401fe20109aada4 https://media.forgecdn.net/files/2823/796/Roots-1.12.2-3.0.21.jar
+ae2.jar e5c3c11eafc5daf73652a2dabe855e3759caa8b5 https://media.forgecdn.net/files/2747/63/appliedenergistics2-rv6-stable-7.jar
+gravestones.jar b2cc9a25054fd6878ba242a6080a2866140bbeb0 https://media.forgecdn.net/files/2744/766/gravestone-1.10.3.jar
+enderstorage.jar 7a872baf72b1da038704056a0cf7bbcc40bfa4d6 https://media.forgecdn.net/files/2755/787/EnderStorage-1.12.2-2.4.6.137-universal.jar
+waila.jar a0aae051e8c351a5afa75905c4d76026aa775e25 https://media.forgecdn.net/files/2836/455/Hwyla-fabric-1.15-pre4-1.9.19-70.jar
+harvestcraft.jar ffeb8369801e898c8a1598b37d124c251f40ba93 https://media.forgecdn.net/files/2771/840/Pam's%20HarvestCraft%201.12.2zf.jar
+akashictome.jar b11bf9d93f4bd7a2eeb8cfe49c1b30ce1a2f5a37 https://media.forgecdn.net/files/2648/656/AkashicTome-1.2-12.jar
+railcraft.jar ea2085a509b816bb9a3cdd79f2f44175b588737a https://media.forgecdn.net/files/2687/757/railcraft-12.0.0.jar
 optifine.jar e805d4be5c2a3343488c573145606e90bb13816d https://karel.pw/optifine-1.12.2.jar
+autoreglib.jar 267269ca7f1a71fb3bb35bdb8e61702a4da6263e https://media.forgecdn.net/files/2746/11/AutoRegLib-1.3-32.jar
+ctm.jar d9133571636ec2c4c590dd69ac41ef813c63a8ab https://media.forgecdn.net/files/2832/564/CTM-MC1.12.2-1.0.1.30.jar
+codechickenlib.jar b6a7e3b889c354216059a3bfad298e30a1e46a2d https://media.forgecdn.net/files/2779/848/CodeChickenLib-1.12.2-3.2.3.358-universal.jar
+mysticallib.jar 9c2f7162195abb22becaacc0cbc557471eff1c8e https://media.forgecdn.net/files/2817/910/mysticallib-1.12.2-1.4.0.jar
+patchouli.jar 9804876a655365926757eda750189cd97b5bad69 https://media.forgecdn.net/files/2731/963/Patchouli-1.0-20.jar
+mysticalworld.jar 43dc67caef3bff6fd4ecae0b2bde8e12a5ba4cf7 https://media.forgecdn.net/files/2838/234/mysticalworld-1.12.2-1.6.1.jar