Merge branch 'JEFFREY' into 'JEFFREY'

Fixes /dank/null and updates other stuff

See merge request 1F335/modpackman!9

2 files changed, 3 insertions, 96 deletions

diff --git a/mods.txt b/mods.txt
index 6e2397b..0f826b4 100644
--- a/mods.txt
+++ b/mods.txt
@@ -73,7 +73,8 @@ yabba.jar https://minecraft.curseforge.com/projects/yabba/files/latest
 wanionlib.jar https://minecraft.curseforge.com/projects/wanionlib/files/latest
 unidict.jar https://minecraft.curseforge.com/projects/unidict/files/latest
 reauth.jar https://minecraft.curseforge.com/projects/reauth/files/latest
-danknull.jar https://minecraft.curseforge.com/projects/dank-null/files/latest
+#Latest danknull is bad. 1.4.43 until further notice.
+danknull.jar https://minecraft.curseforge.com/projects/dank-null/files/2624277/download
 psi.jar https://minecraft.curseforge.com/projects/psi/files/latest
 thaumic-jei.jar https://minecraft.curseforge.com/projects/thaumic-jei/files/latest
 quark.jar https://minecraft.curseforge.com/projects/quark/files/latest
diff --git a/version.txt b/version.txt
index f165693..f9d1860 100644
--- a/version.txt
+++ b/version.txt
@@ -1,96 +1,2 @@
 # Format: <jarname> <hex digested sha1> <direct download url>
-#VERSION 9
-thaumcraft.jar fe0899048f1796df04e9727bbf1898df30492a00 https://media.forgecdn.net/files/2629/23/Thaumcraft-1.12.2-6.1.BETA26.jar
-baubles.jar cb13fcfb18a9cb0cbd825fd5fe8d813c77368549 https://media.forgecdn.net/files/2518/667/Baubles-1.12-1.5.2.jar
-opencomputers.jar 2adf6df70e98329984110ac488f7d9343412f692 https://media.forgecdn.net/files/2670/112/OpenComputers-MC1.12.2-1.7.4.153.jar
-twilightforest.jar 418e55d39800696341d888dd9f407daee3748276 https://media.forgecdn.net/files/2618/264/twilightforest-1.12.2-3.8.689-universal.jar
-connectedtextures.jar 03be3e20dacf6b52abcee09436b2d06c06f2add0 https://media.forgecdn.net/files/2642/375/CTM-MC1.12.2-0.3.3.22.jar
-traverse.jar b16aaff09a6e77ba193e42f88f5d5bb8a85e063a https://media.forgecdn.net/files/2613/657/Traverse-1.12.2-1.6.0-69.jar
-actuallyadditions.jar b55acbc4ee8b4cd713989ed618860befcba965fa https://media.forgecdn.net/files/2669/943/ActuallyAdditions-1.12.2-r145.jar
-advancedrocketry.jar 0588022099ac100e850c83d9ea05731db7aa8ffe https://media.forgecdn.net/files/2670/717/AdvancedRocketry-1.12.2-1.5.0-128-universal.jar
-ae2.jar e5b66725610e84b35faac0514e49f9ee4b5beeb9 https://media.forgecdn.net/files/2652/453/appliedenergistics2-rv6-stable-6.jar
-ae2stuff.jar 8edee35416790dca35f39911c3b0aaf4d6609a73 https://media.forgecdn.net/files/2491/32/ae2stuff-0.7.0.4-mc1.12.2.jar
-ae2wtl.jar d2b5d9b62f75d2d39d2633d90dc34b77f6ebc575 https://media.forgecdn.net/files/2653/753/AE2WTLib-1.12.2-1.0.6.jar
-applecore.jar ce90bcae2b4e5f472b5c9abb53fdbcb21f57f963 https://media.forgecdn.net/files/2605/923/AppleCore-mc1.12.2-3.1.4.jar
-appleskin.jar 23162a97cab0adb4be2fc6d3937c613929d1d5c7 https://media.forgecdn.net/files/2496/585/AppleSkin-mc1.12-1.0.9.jar
-bdlib.jar 96d4142448fe2fd1245caa4dcfde3cf73a00132d https://media.forgecdn.net/files/2518/31/bdlib-1.14.3.12-mc1.12.2.jar
-betterbuilderwands.jar b90b6fdb6efd15cb376303da90a6632534e642ff https://media.forgecdn.net/files/2443/194/BetterBuildersWands-1.12-0.11.1.245%2B69d0d70.jar
-chisel.jar 1dda45074e17128451b3c8f66172bfaddf84f443 https://media.forgecdn.net/files/2619/468/Chisel-MC1.12.2-0.2.1.35.jar
-libvulpes.jar 0455c735b99f956cd1c7e6d8657e6db46944d4ea https://media.forgecdn.net/files/2667/509/LibVulpes-1.12.2-0.4.0-51-universal.jar
-p455w0rdlib.jar 3e0327dd61dc3afe4e644d4ffbdb2cce79ae64f9 https://media.forgecdn.net/files/2651/697/p455w0rdslib-1.12.2-2.0.36.jar
-mysticallib.jar ddcb690b39e4d7af4e347caeae12d60d794ee088 https://media.forgecdn.net/files/2633/662/mysticallib-1.12.2-1.0.0.jar
-immersiveengineering.jar 7f3c3691f690d05e7d1d41df20e63b773f4af03e https://media.forgecdn.net/files/2652/289/ImmersiveEngineering-0.12-88.jar
-pamharvestcraft.jar 51703c410819bbad8e3a2888736a96e61eda64ff https://media.forgecdn.net/files/2650/315/Pam%27s+HarvestCraft+1.12.2zb.jar
-deepresonance.jar e32fe98d4717fa9d8c1600f536867c6ecc7c2fa7 https://media.forgecdn.net/files/2660/570/deepresonance-1.12-1.7.5.jar
-jei.jar 05ca370d265e94ef5986fe13462d1c3504254869 https://media.forgecdn.net/files/2640/458/jei_1.12.2-4.13.1.225.jar
-waystones.jar 165afce33cc88a3807b68683ffff280fb3a50b8e https://media.forgecdn.net/files/2624/701/Waystones_1.12.2-4.0.67.jar
-eleccore.jar 22dc926da7aa010ebb9a272ff6f9291e99de2851 https://media.forgecdn.net/files/2510/914/ElecCore-1.12.2-1.8.434.jar
-mcjtylib.jar 31518995d8f0ca33bb6f4592ec1856fe75c6f0b8 https://media.forgecdn.net/files/2660/396/mcjtylib-1.12-3.1.1.jar
-dynamictrees.jar 861853bb834b72542ae6a10faf20ce9d6bf62316 https://media.forgecdn.net/files/2658/681/DynamicTrees-1.12.2-0.9.4.jar
-natura.jar 21cd6a7a981362ad9dc0cc972e94fe7115e49ff1 https://media.forgecdn.net/files/2658/980/natura-1.12.2-4.3.2.66.jar
-tconstruct.jar 6e170614d5459f5d40571f069e18cd4afedeb8e1 https://media.forgecdn.net/files/2662/253/TConstruct-1.12.2-2.12.0.115.jar
-mantle.jar bb23a99220319ebd1e6452e7a7e973aca6b286b3 https://media.forgecdn.net/files/2630/843/Mantle-1.12-1.3.3.39.jar
-treecapitator.jar 45b4d5b191dc3e6ac57b2fe59538c8d71eb8bf50 https://media.forgecdn.net/files/2443/661/Treecapitator-1.12-at_0.9a.jar
-ironchests.jar 5b40d393fb4bd744701a7ee3e958d3fa4a33ce93 https://media.forgecdn.net/files/2662/915/ironchest-1.12.2-7.0.56.840.jar
-ironbackpacks.jar 50758105dabe8f0d4c6e311e14ad2c1f5673d2cd https://media.forgecdn.net/files/2564/573/IronBackpacks-1.12.2-3.0.8-12.jar
-hwyla.jar 7280d5c0dab42436549bcefc63ff64a1049e5501 https://media.forgecdn.net/files/2568/751/Hwyla-1.8.26-B41_1.12.2.jar
-dynamictrees-traverse-compat.jar 19c1e2e6b9c6ee4a9a93b8b50969be7bb6e13011 https://f-1.karel.pw/dttraverse-1.4.1e.jar
-dynamictrees-thaum-compat.jar 806cc392ba48b866291d6971f48b2172e96124fa https://media.forgecdn.net/files/2650/353/DynamicTreesTC-1.12.2-1.4.1e.jar
-dynamictrees-pams-compat.jar 2e429e9705cb49afb72e2650001d003fd755ce42 https://media.forgecdn.net/files/2656/685/DynamicTreesPHC-1.12.2-1.4.2.jar
-enderstorage.jar 4b44e4b5d4aa7887e2f0969acc9cf7b83c8c81f5 https://media.forgecdn.net/files/2594/243/EnderStorage-1.12.2-2.4.5.135-universal.jar
-chickenchunks.jar 22646ea2acdad735b5e82d8b80e4e40ec27aa62b https://media.forgecdn.net/files/2594/241/ChickenChunks-1.12.2-2.4.1.73-universal.jar
-morpheus.jar c948341a1b2243d4f8081c4db2cd727c2c4a7ed0 https://media.forgecdn.net/files/2664/449/Morpheus-1.12.2-3.5.106.jar
-codechickenlib.jar 1ead040eeee13c474d448f976363778e2918a7d0 https://media.forgecdn.net/files/2618/630/CodeChickenLib-1.12.2-3.2.2.353-universal.jar
-extra-utilities.jar 97dc3ffecc5cb15135b371b176081bd5579f9121 https://media.forgecdn.net/files/2632/255/extrautils2-1.12-1.9.8.jar
-openblocks.jar 37b11b0726d9ed5d93acb7dfea1b68fff5d3dfe0 https://media.forgecdn.net/files/2620/52/OpenBlocks-1.12.2-1.8.jar
-openmodslib.jar cf3e1f2af2a63af6907b10d12c6fdb9a818403f4 https://media.forgecdn.net/files/2623/7/OpenModsLib-1.12.2-0.12.1.jar
-draconic-evolution.jar e79ca83d1f54e1294d26701025e72589817929c8 https://media.forgecdn.net/files/2649/660/Draconic-Evolution-1.12.2-2.3.18.329-universal.jar
-bibliocraft.jar 74d9f70c5fead2c17054953fae26af8d9fb7fd84 https://media.forgecdn.net/files/2574/880/BiblioCraft%5bv2.4.5%5d%5bMC1.12.2%5d.jar
-akashic-tome.jar b11bf9d93f4bd7a2eeb8cfe49c1b30ce1a2f5a37 https://media.forgecdn.net/files/2648/656/AkashicTome-1.2-12.jar
-diet-hoppers.jar 2aea3d9a64551cefe0a1b6f5c5edf57959796b66 https://media.forgecdn.net/files/2482/543/diethopper-1.1.jar
-gravestones.jar a73d2b03b28258e9a26dc79d958d48f592e7581b https://media.forgecdn.net/files/2524/880/gravestone-1.10.1.jar
-foamfix.jar 69a9086f2084d3cbc3a410ee64369d719a212330 https://media.forgecdn.net/files/2638/380/foamfix-0.10.3-1.12.2.jar
-autoreglib.jar 4811b5df37fafdf6d4df6db5fe9ef71081e4b5ee https://media.forgecdn.net/files/2652/766/AutoRegLib-1.3-24.jar
-inventory-tweaks.jar 6e00827d1a009da39fa6db5afd2a3d6b024abfe9 https://media.forgecdn.net/files/2482/481/InventoryTweaks-1.63.jar
-cyclops-core.jar bbd4a15cdd08ef65fa69dec85fdcb047fb800661 https://media.forgecdn.net/files/2670/747/CyclopsCore-1.12.2-1.0.3.jar
-common-capabilities.jar 030f268eef2731e0aca4fd8a2521ec99d00f93fd https://media.forgecdn.net/files/2670/778/CommonCapabilities-1.12.2-2.0.2.jar
-integrated-dynamics.jar fdd3a3c7d1a99713e280a7268c5d0c5524d3febd https://media.forgecdn.net/files/2670/757/IntegratedDynamics-1.12.2-1.0.4.jar
-integrated-tunnels.jar 3fdb9ac2e55a809aa8858da0861b6d0722cce117 https://media.forgecdn.net/files/2665/608/IntegratedTunnels-1.12.2-1.6.2.jar
-integrated-crafting.jar b761c9d700146f83a69baa431ebcd075bfd57992 https://media.forgecdn.net/files/2670/767/IntegratedCrafting-1.12.2-1.0.2.jar
-jer.jar b42563003baf61d8e5eb1c24b59cf21988ff4616 https://media.forgecdn.net/files/2497/186/JustEnoughResources-1.12.2-0.8.5.27.jar
-roots.jar 994c1cc8e79d027c4232533984bb89225b89eb50 https://media.forgecdn.net/files/2510/836/roots-2-0.104.jar
-lightlevel.jar 38de949c94ac06b2fce94e642b729568ce7788af https://media.forgecdn.net/files/2563/430/LLOverlayReloaded-1.1.6-mc1.12.2.jar
-morph-o-tool.jar 55a363ccd8e0614229991cd1f6bf831eaf874ff7 https://media.forgecdn.net/files/2658/176/Morph-o-Tool-1.2-21.jar
-botania.jar d14becd0f2e5d8ab7d22579ada8426c22a6629a1 https://media.forgecdn.net/files/2668/710/Botania+r1.10-359.jar
-storage-drawers.jar 7a5ad491379a53cd45eced598c2ece3155bffb51 https://media.forgecdn.net/files/2642/386/StorageDrawers-1.12.2-5.3.8.jar
-chameleon.jar 5ed3dd5fd1ebded57bfe525b4ece11232bd14e5e https://media.forgecdn.net/files/2450/900/Chameleon-1.12-4.1.3.jar
-xnet.jar dc64dd5c444acf1365c6e036fc29f694571a264f https://media.forgecdn.net/files/2660/172/xnet-1.12-1.7.6.jar
-yabba.jar aabe49218ae686f33607016f2f49bb0d4f63771c https://media.forgecdn.net/files/2668/499/YABBA-1.1.2.40.jar
-wanionlib.jar bbee84cafbbc72b24ee987fda668b3ee48ced74a https://media.forgecdn.net/files/2651/482/WanionLib-1.12.2-2.2.jar
-unidict.jar 3708fce1adc2c90e2b488402eeffcc6ca6e7d533 https://media.forgecdn.net/files/2652/588/UniDict-1.12.2-2.9.2.jar
-reauth.jar be3dedc6a808f13828373176d653d2e0bb629eeb https://media.forgecdn.net/files/2560/638/reauth-3.6.0.jar
-danknull.jar 92c5681634aa373bbb19ab8329dd11a119d98d83 https://media.forgecdn.net/files/2659/0/DankNull-1.12-1.4.46.jar
-psi.jar 8b84d21c2013fffc42ad99d7ccf98a9c01e8b71b https://media.forgecdn.net/files/2661/975/Psi-r1.1-70.jar
-thaumic-jei.jar ea147ca1fb8a83c5094a383ededf0296460ef83f https://media.forgecdn.net/files/2637/182/ThaumicJEI-1.12.2-1.5.5-23.jar
-quark.jar 1bf41a7696d7692ef7f4042fed50e3f7440685e4 https://media.forgecdn.net/files/2663/450/Quark-r1.5-145.jar
-ftblib.jar bc8b1ff5e384e72bf0b02bbd941620d5840c62f0 https://media.forgecdn.net/files/2670/449/FTBLib-5.4.1.84.jar
-redstone-flux.jar ed67a4ce69c8831b7536b2623a857fefc8257e62 https://media.forgecdn.net/files/2623/90/RedstoneFlux-1.12-2.1.0.6-universal.jar
-brandonscore.jar 9c263bdff2aa545ac9e7dc53e36c45e980c6da8e https://media.forgecdn.net/files/2649/656/BrandonsCore-1.12.2-2.4.9.195-universal.jar
-nowither.jar ce2dab31ee8c732cda6fdd67289da1189e9fbcb1 https://media.forgecdn.net/files/2638/317/badwithernocookiereloaded-1.12.2-3.3.16.jar
-optifine.jar e805d4be5c2a3343488c573145606e90bb13816d https://karel.pw/optifine-1.12.2.jar
-mrtjpcore.jar c9012fa49e8eb9150085b00395b3bf99cb0a2972 https://media.forgecdn.net/files/2572/409/MrTJPCore-1.12.2-2.1.3.35-universal.jar
-project-red-base.jar 89744b1a82275d12cd9cf95014544c0f79ba7467 https://media.forgecdn.net/files/2572/423/ProjectRed-1.12.2-4.9.1.92-Base.jar
-project-red-integration.jar 851f7fdfaa8a545cbee59c61455a949049e12075 https://media.forgecdn.net/files/2572/427/ProjectRed-1.12.2-4.9.1.92-integration.jar
-project-red-fabrication.jar 9464935114c3f37df63f68a66c7569ef8ada96b9 https://media.forgecdn.net/files/2572/424/ProjectRed-1.12.2-4.9.1.92-fabrication.jar
-project-red-mechanical.jar 6d491aeddba2c5c22596ecb65b3d5621edf419d8 https://media.forgecdn.net/files/2572/422/ProjectRed-1.12.2-4.9.1.92-mechanical.jar
-project-red-lighting.jar 6d70251b422ef2033bf97df6443025f97706ea43 https://media.forgecdn.net/files/2572/426/ProjectRed-1.12.2-4.9.1.92-lighting.jar
-project-red-world.jar 334d4d68ef71f6aedb0fc5855dc672f7b6ac2aec https://media.forgecdn.net/files/2572/421/ProjectRed-1.12.2-4.9.1.92-world.jar
-project-red-compat.jar bcfa9a8198b6a0f14bb8a79df5d94a3d5aea9666 https://media.forgecdn.net/files/2572/420/ProjectRed-1.12.2-4.9.1.92-compat.jar
-fmp-cbe.jar 4fe28a1be2e3ae7b4b919ca5c0a3385b204c6b95 https://media.forgecdn.net/files/2661/99/ForgeMultipart-1.12.2-2.6.1.81-universal.jar
-uppers.jar 1c7e77d0e2f6667680e861c8c7cfac740b2c3f01 https://media.forgecdn.net/files/2558/337/Uppers-0.0.6.jar
-redstone-gauges-and-switches.jar e066187f2f1c1f2694a820f524add6b664ab9b3d https://media.forgecdn.net/files/2663/533/rsgauges-1.12.2-1.1.1.jar
-redstone-plus-plus.jar 7886830fc77de06666b32f093affb096e707110d https://media.forgecdn.net/files/2476/145/Redstone%2B%2B+ver1.2d.jar
-torch-levers.jar b2808d7fd4b1d39a4ec34436b73f16a0c174e5e0 https://media.forgecdn.net/files/2528/552/TorchLever-1.0.jar
-plated.jar 5b61c98f688c919efeec239f819cc94a00c18942 https://media.forgecdn.net/files/2602/81/Plated-0.1.0.jar
-sign-button.jar 637582a457ccc2b0146b9ed614ab67d4bfc27137 https://media.forgecdn.net/files/2495/528/SignButton-1.12.2-1.0.1.jar
-floodlights.jar 9491bc75f00e09b2f6b45016a42a143acc774cfa https://media.forgecdn.net/files/2669/151/FloodLights-1.12.2-1.3.2-14.jar
+#VERSION 10