Merge branch '1.20_plus' into 1.20_modded

# Conflicts:
#	pack.toml

index.toml

@@ -1336,10 +1336,6 @@ hash = "ddefc636d2494006640d7a0164a986172b00285da20e82b0e265f31ead045091"
 file = "mods/Origins-1.20.1-1.10.0.jar"
 hash = "01675e2b3732782f5bfbc08a211f739c8123b269bb9f40d36ac56d9fbc90ae3d"
 
-[[files]]
-file = "mods/PresenceFootsteps-1.10.0-beta.0.7+4a6ab4e.jar"
-hash = "9a841fc49a9f22e3575977368d561ec851221512099a154845c549cce371db8b"
-
 [[files]]
 file = "mods/aileron.pw.toml"
 hash = "92c0c8ce733ad75ae5a207b20786dd7c712d90e9d0d5a390a5cbc00bf1cdf3bb"
@@ -1362,7 +1358,7 @@ metafile = true
 
 [[files]]
 file = "mods/antique-atlas-4.pw.toml"
-hash = "bd2ab4c0d8bd0b4d9ed194108578262303ec442864b51b5e3a1990555b043063"
+hash = "404b5b5b0f1b53a8a807c2095fa6a8680cc6fa60ca689f0e34a1f02daf779aae"
 metafile = true
 
 [[files]]
@@ -1452,7 +1448,7 @@ metafile = true
 
 [[files]]
 file = "mods/chalk.pw.toml"
-hash = "bd2cab029b39f8a64e4f4b0d0b3c5b9bb6b6482e174af890be4f278cd502edc8"
+hash = "6813cfc18a8812f00b3f6a7c5d01a02828b109d8c394f2c1b01bd5960c241120"
 metafile = true
 
 [[files]]
@@ -1620,7 +1616,7 @@ metafile = true
 
 [[files]]
 file = "mods/fallingleaves.pw.toml"
-hash = "9912c3485adbc87f85505e519287518bf4b5b72a941008070a0e6ddc18c40fbf"
+hash = "eac1a56fa3de852de28a0fcad1410f1af63ecd360cfe92425b01807daecfa2ff"
 metafile = true
 
 [[files]]
@@ -1695,7 +1691,7 @@ metafile = true
 
 [[files]]
 file = "mods/inventory-tabs.pw.toml"
-hash = "a1d845e1c18c0653951ba9ccd6e9eb8d106017761fb39e3a6ab90e5b0bc220e3"
+hash = "9e388b2bae9ea1bd25ef9334beaa05821ea37424297dc1447e54d4d45dc31ee9"
 metafile = true
 
 [[files]]
@@ -1824,7 +1820,7 @@ metafile = true
 
 [[files]]
 file = "mods/noisium.pw.toml"
-hash = "708c3992f04530d2366b570ad6503b97881d039f2d79530c861b8f276b2ec591"
+hash = "c60be719d5ede034bcc81d79fdec100b8d07c09a270ac01f571cf516840a263b"
 metafile = true
 
 [[files]]
@@ -1882,6 +1878,11 @@ file = "mods/portable-crafting.pw.toml"
 hash = "a70c806bb9940bbc664982b89b4562aceadfa654e293a9ba62b14d4e57b6385d"
 metafile = true
 
+[[files]]
+file = "mods/presence-footsteps.pw.toml"
+hash = "74058d27cf4f2eaa273b7e3e7068e573a196d12116d2290c9088cdb5895c3aa8"
+metafile = true
+
 [[files]]
 file = "mods/projectsavethepets.pw.toml"
 hash = "b5e409cdc2335214907e1649a6a5fface19ac0350ec94811073126fb82d5ea0a"

mods/antique-atlas-4.pw.toml

@@ -1,13 +1,13 @@
 name = "Antique Atlas 4"
-filename = "antique-atlas-2.2.0+1.20.jar"
+filename = "antique-atlas-2.4.0+1.20.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/Y5Ve4Ui4/versions/hQJUfNG8/antique-atlas-2.2.0%2B1.20.jar"
+url = "https://cdn.modrinth.com/data/Y5Ve4Ui4/versions/UBb2Texi/antique-atlas-2.4.0%2B1.20.jar"
 hash-format = "sha1"
-hash = "e342036b76687b3fdefbd0c3d6ad9616eb2a7f00"
+hash = "c649a845ce1e49af43781417557597830571db4e"
 
 [update]
 [update.modrinth]
 mod-id = "Y5Ve4Ui4"
-version = "hQJUfNG8"
+version = "UBb2Texi"

mods/chalk.pw.toml

@@ -1,13 +1,13 @@
 name = "Chalk (Fabric)"
-filename = "chalk-2.2.0.jar"
+filename = "chalk-2.2.4.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/OrtjXTCH/versions/jWMVQdZu/chalk-2.2.0.jar"
+url = "https://cdn.modrinth.com/data/OrtjXTCH/versions/AnIA4EcY/chalk-2.2.4.jar"
 hash-format = "sha1"
-hash = "492ea2c22b8833ac0361ac5eb8f750e988f867cb"
+hash = "75068edb5c3af352e520e2707f82a833d707d80a"
 
 [update]
 [update.modrinth]
 mod-id = "OrtjXTCH"
-version = "jWMVQdZu"
+version = "AnIA4EcY"

mods/fallingleaves.pw.toml

@@ -1,13 +1,13 @@
 name = "Falling Leaves"
-filename = "fallingleaves-1.15.5+1.20.1.jar"
+updatefilename = "fallingleaves-1.15.6+1.20.1.jar"
 side = "client"
 
 [download]
-url = "https://cdn.modrinth.com/data/WhbRG4iK/versions/PNG0Dp43/fallingleaves-1.15.5%2B1.20.1.jar"
+url = "https://cdn.modrinth.com/data/WhbRG4iK/versions/flPXaySR/fallingleaves-1.15.6%2B1.20.1.jar"
 hash-format = "sha1"
-hash = "147ef536b167f71e9fecdf9eb41ecdcb57695790"
+hash = "9950aaea2a33b1cfc972e881c533384e3bb0a0fb"
 
 [update]
 [update.modrinth]
 mod-id = "WhbRG4iK"
-version = "PNG0Dp43"
+version = "flPXaySR"

mods/inventory-tabs.pw.toml

@@ -1,13 +1,13 @@
 name = "Inventory Tabs"
-filename = "inventory-tabs-1.2.0+1.20.jar"
+filename = "inventory-tabs-1.3.1+1.20.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/VD1aynYU/versions/8tuNrxis/inventory-tabs-1.2.0%2B1.20.jar"
+url = "https://cdn.modrinth.com/data/VD1aynYU/versions/ytAgho7M/inventory-tabs-1.3.1%2B1.20.jar"
 hash-format = "sha1"
-hash = "8506f4831264d71b0861af1031656b5eabbb3cea"
+hash = "282ba317db0873a5c1bf82e614a116404684ccd7"
 
 [update]
 [update.modrinth]
 mod-id = "VD1aynYU"
-version = "8tuNrxis"
+version = "ytAgho7M"

mods/noisium.pw.toml

@@ -1,13 +1,13 @@
 name = "Noisium"
-filename = "noisium-1.0.2+mc1.20.x.jar"
+filename = "noisium-merged-2.0.1+mc1.20.x.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/KuNKN7d2/versions/7p5BqRHp/noisium-1.0.2%2Bmc1.20.x.jar"
+url = "https://cdn.modrinth.com/data/KuNKN7d2/versions/AfjBJbK1/noisium-merged-2.0.1%2Bmc1.20.x.jar"
 hash-format = "sha1"
-hash = "509c144a11659c638267fe5090fe5923c019f7d7"
+hash = "1f51eb9613a49ee421d839ccb7c9f004b534dcaf"
 
 [update]
 [update.modrinth]
 mod-id = "KuNKN7d2"
-version = "7p5BqRHp"
+version = "AfjBJbK1"

mods/presence-footsteps.pw.toml

@@ -0,0 +1,13 @@
+name = "Presence Footsteps"
+filename = "PresenceFootsteps-1.9.3.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/rcTfTZr3/versions/HwGHderf/PresenceFootsteps-1.9.3.jar"
+hash-format = "sha1"
+hash = "2ec15bb87cb4d31e030664bad4b1589c9580786a"
+
+[update]
+[update.modrinth]
+mod-id = "rcTfTZr3"
+version = "HwGHderf"

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "3ec041ceeac7146afaf3ea2e33b952221aea254d824e7fd4832e3db7c365a586"
+hash = "73fedb2d18712ba4b7a796782bc91b369e942d42905aaba0317fde84e79c1741"
 
 [versions]
 minecraft = "1.20.1"