Merge branch 'test'

client/index.toml

@@ -888,14 +888,14 @@ hash = "91e1af65cceb78bab064ffb7a9e715938869fbbd9823772d2e3eb8f39ed6082c"
 file = "mods/Clumps-forge-1.20.1-12.0.0.4.jar"
 hash = "8af01712c0dc32cebaff31795ca6d223fddff2ea9b1f5efbd9c3a586a0dacbc0"
 
-[[files]]
-file = "mods/Cobblemon-forge-1.4.1+1.20.1.jar.disabled"
-hash = "843d860dacff95957796055d2f9f1c5f6e9bbd7194b36332c03d63bd86f18f81"
-
 [[files]]
 file = "mods/Cobblemon-forge-1.5.0+1.20.1.jar"
 hash = "a57bb0f6ea2d8b0266a6711d13068620db62da46ae29eb1f7fe566978cd4f21f"
 
+[[files]]
+file = "mods/CobblemonTrainers-forge-1.1.3+1.5.0-rc3.jar"
+hash = "bb024e9bd8c2a12aad8f0c253a5a033457bd005cf07f52f1bd8ba17746e1b969"
+
 [[files]]
 file = "mods/CraftPresence-2.3.9+1.20.1.jar"
 hash = "b44a0f8e3361077b4c6782176a67cbead137f37d682cc523a13b98f094b0487e"
@@ -944,6 +944,14 @@ hash = "c80706b2c4a229d773146bf4f92f2625b881144aa35aef48508a42110d15d026"
 file = "mods/IronsRecipeAdditions_1.20.1_modversion_1.8.jar"
 hash = "6f6b06b464a5f084103e5d31a23f4016991149ad334f95ac914f3d0d879c75b2"
 
+[[files]]
+file = "mods/Jade-1.20.1-forge-11.9.2.jar"
+hash = "60b2109b0edc3e66280ef72f33743f35b6eaf1ec5533f6604ee5684bdc6262f5"
+
+[[files]]
+file = "mods/JadeAddons-1.20.1-forge-5.2.2.jar"
+hash = "61d42955a82ccd411a8270ebb00f061afdd6157e0c322af67f9d3a8a833b6de0"
+
 [[files]]
 file = "mods/LongerChatHistory-1.3-Forge.jar"
 hash = "a7a19296d23bf01c2263d25ffc489cc4db2b6f49268781b47b5f788ab3700aa8"
@@ -1002,7 +1010,7 @@ hash = "4ea3933ee2a9ffed5b739bbbf8a8c974737fd59cb6517c61c54b3eae9465ff54"
 
 [[files]]
 file = "mods/balm-forge-1.20.1-7.2.2.jar"
-hash = "6f4029cafb0b7f1bc4810af9237c8973dde05bdce30852625d72a40feaa1b71e"
+hash = "d4cf32e6df112be22a5af233626d0053a257a589fa21c3f5e0fb922070287646"
 
 [[files]]
 file = "mods/betterarcheology-1.1.9-1.20.1.jar"
@@ -1036,6 +1044,10 @@ hash = "244ab1c22de6b1ef8e61bdf13508de5927fceeff44277bee06e4539c537f487f"
 file = "mods/cloth-config-11.1.118-forge.jar"
 hash = "e825f1a61685182d61093d682c0bfcbe53f726b42297e7dcf1a5f1e1a1b0557f"
 
+[[files]]
+file = "mods/cobblemonintegrations-1.20.1-1.0.5.jar"
+hash = "8c219e59079700f6e04be24f231b7506a44be1b75efc53f32574de22b5233357"
+
 [[files]]
 file = "mods/collective-1.20.1-7.57.jar"
 hash = "682f75ae18c7d06465d5d38559cee1a1d621c052324954a6dacfb96e22f478be"
@@ -1279,3 +1291,11 @@ hash = "d055465c58b8832dbfba0123b74d3e7b666cc259e6e6b8054fe63af4d9209bae"
 [[files]]
 file = "mods/waveycapes-forge-1.4.6-mc1.20.1.jar"
 hash = "e0fcd729de80b743c3b2a9fafd32fe075932422eb1477e15a1e2cc738f2f7dfb"
+
+[[files]]
+file = "mods/waystones-forge-1.20-14.1.3.jar"
+hash = "5d45326ea2d0dd6b3d19e1c3884166971e8e42a65ff704edf2e554a34cfeb75b"
+
+[[files]]
+file = "mods/xaeros_waystones_compability-1.0.jar"
+hash = "df3159e8db3220e39f7714d808430ba12b16e88140bf2f7a4be6ac2333b03e09"

client/pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "47ade5a5b68fec3a3b8d5c7391514b644c5f924cc9a9f3c0aa1d6a6d26e95c3e"
+hash = "a743ad463213438fbe3a6a944aedfaa2086d47ed6a2af88bf73e03ec7b86295b"
 
 [versions]
 forge = "47.2.17"

server/index.toml

@@ -896,6 +896,10 @@ hash = "843d860dacff95957796055d2f9f1c5f6e9bbd7194b36332c03d63bd86f18f81"
 file = "mods/Cobblemon-forge-1.5.0+1.20.1.jar"
 hash = "a57bb0f6ea2d8b0266a6711d13068620db62da46ae29eb1f7fe566978cd4f21f"
 
+[[files]]
+file = "mods/CobblemonTrainers-forge-1.1.3+1.5.0-rc3.jar"
+hash = "bb024e9bd8c2a12aad8f0c253a5a033457bd005cf07f52f1bd8ba17746e1b969"
+
 [[files]]
 file = "mods/CraftPresence-2.3.9+1.20.1.jar"
 hash = "b44a0f8e3361077b4c6782176a67cbead137f37d682cc523a13b98f094b0487e"
@@ -944,6 +948,14 @@ hash = "c80706b2c4a229d773146bf4f92f2625b881144aa35aef48508a42110d15d026"
 file = "mods/IronsRecipeAdditions_1.20.1_modversion_1.8.jar"
 hash = "6f6b06b464a5f084103e5d31a23f4016991149ad334f95ac914f3d0d879c75b2"
 
+[[files]]
+file = "mods/Jade-1.20.1-forge-11.9.2.jar"
+hash = "60b2109b0edc3e66280ef72f33743f35b6eaf1ec5533f6604ee5684bdc6262f5"
+
+[[files]]
+file = "mods/JadeAddons-1.20.1-forge-5.2.2.jar"
+hash = "61d42955a82ccd411a8270ebb00f061afdd6157e0c322af67f9d3a8a833b6de0"
+
 [[files]]
 file = "mods/LongerChatHistory-1.3-Forge.jar"
 hash = "a7a19296d23bf01c2263d25ffc489cc4db2b6f49268781b47b5f788ab3700aa8"
@@ -1002,7 +1014,7 @@ hash = "4ea3933ee2a9ffed5b739bbbf8a8c974737fd59cb6517c61c54b3eae9465ff54"
 
 [[files]]
 file = "mods/balm-forge-1.20.1-7.2.2.jar"
-hash = "6f4029cafb0b7f1bc4810af9237c8973dde05bdce30852625d72a40feaa1b71e"
+hash = "d4cf32e6df112be22a5af233626d0053a257a589fa21c3f5e0fb922070287646"
 
 [[files]]
 file = "mods/betterarcheology-1.1.9-1.20.1.jar"
@@ -1036,6 +1048,10 @@ hash = "244ab1c22de6b1ef8e61bdf13508de5927fceeff44277bee06e4539c537f487f"
 file = "mods/cloth-config-11.1.118-forge.jar"
 hash = "e825f1a61685182d61093d682c0bfcbe53f726b42297e7dcf1a5f1e1a1b0557f"
 
+[[files]]
+file = "mods/cobblemonintegrations-1.20.1-1.0.5.jar"
+hash = "8c219e59079700f6e04be24f231b7506a44be1b75efc53f32574de22b5233357"
+
 [[files]]
 file = "mods/collective-1.20.1-7.57.jar"
 hash = "682f75ae18c7d06465d5d38559cee1a1d621c052324954a6dacfb96e22f478be"
@@ -1276,6 +1292,14 @@ hash = "d055465c58b8832dbfba0123b74d3e7b666cc259e6e6b8054fe63af4d9209bae"
 file = "mods/waveycapes-forge-1.4.6-mc1.20.1.jar"
 hash = "e0fcd729de80b743c3b2a9fafd32fe075932422eb1477e15a1e2cc738f2f7dfb"
 
+[[files]]
+file = "mods/waystones-forge-1.20-14.1.3.jar"
+hash = "5d45326ea2d0dd6b3d19e1c3884166971e8e42a65ff704edf2e554a34cfeb75b"
+
+[[files]]
+file = "mods/xaeros_waystones_compability-1.0.jar"
+hash = "df3159e8db3220e39f7714d808430ba12b16e88140bf2f7a4be6ac2333b03e09"
+
 [[files]]
 file = "run.bat"
 hash = "4dbdc7dc841f763148a2734f14782adbaccd912be82743fe7b38516ec1c76388"

server/pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "a0e178cf31d3da5daef717fd6dbfcea0aa1300acb933e78887130ee7f2d02420"
+hash = "10218c6fe00359000b7edf1b8b76dc862dfd81ea4b8d1c9892383bb63f3f2b5f"
 
 [versions]
 forge = "47.2.17"