Merge branch '1.20' into 1.20_plus

# Conflicts: # index.toml # pack.toml
sisby-folk · Apr 2, 2024 · a70258c · a70258c
2 parents cfe0f0e + cfb878c
commit a70258c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 19 deletions.
diff --git a/index.toml b/index.toml
@@ -1092,6 +1092,10 @@ 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"
@@ -1625,11 +1629,6 @@ file = "mods/portable-crafting.pw.toml"
 hash = "a70c806bb9940bbc664982b89b4562aceadfa654e293a9ba62b14d4e57b6385d"
 metafile = true
 
-[[files]]
-file = "mods/presence-footsteps.pw.toml"
-hash = "938b135f37da76c099b14ba0f381a8515a0a28de62445caff9b2de94737e8894"
-metafile = true
-
 [[files]]
 file = "mods/projectsavethepets.pw.toml"
 hash = "b5e409cdc2335214907e1649a6a5fface19ac0350ec94811073126fb82d5ea0a"

diff --git a/mods/PresenceFootsteps-1.10.0-beta.0.7+4a6ab4e.jar b/mods/PresenceFootsteps-1.10.0-beta.0.7+4a6ab4e.jar
diff --git a/mods/presence-footsteps.pw.toml b/mods/presence-footsteps.pw.toml
diff --git a/pack.toml b/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "c5a5a1dec676b57e00bf7753184870f20654908832abc94f9f4ae7196e839f55"
+hash = "66894868f28489845bf1cbd9f98c0a171593840a436c39dd2ce7c433b8ce2d07"
 
 [versions]
 minecraft = "1.20.1"