Skip to content

Commit

Permalink
Merge branch 'trunk' into server
Browse files Browse the repository at this point in the history
# Conflicts:
#	pack.toml
  • Loading branch information
sisby-folk committed Jul 28, 2023
2 parents 299d18d + 8485544 commit 9e4306a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion index.toml
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ metafile = true

[[files]]
file = "mods/moue-milkshakes.pw.toml"
hash = "cae164ad0caded095bd0a27acce60026f27695f6546336ba2e02f31c92bb6e62"
hash = "24378a29aba9f3e6ed1cce7fce617a8ed864b82ee64829692087b05c28469777"
metafile = true

[[files]]
Expand Down
8 changes: 4 additions & 4 deletions mods/moue-milkshakes.pw.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name = "Moue Milkshakes"
filename = "moue_milkshakes+mc1.20.1-1.2.1+build.18.jar"
filename = "moue_milkshakes+mc1.20.1-1.2.2+build.19.jar"
side = "both"

[download]
url = "https://cdn.modrinth.com/data/N2F89jG0/versions/mfjVhtBY/moue_milkshakes%2Bmc1.20.1-1.2.1%2Bbuild.18.jar"
url = "https://cdn.modrinth.com/data/N2F89jG0/versions/whQT0VLa/moue_milkshakes%2Bmc1.20.1-1.2.2%2Bbuild.19.jar"
hash-format = "sha1"
hash = "7b44b9457b628949cc1c73d3ffc8ecbfef57e183"
hash = "d016e4e2e928922471156c2c0a8de2bea3ee2cd0"

[update]
[update.modrinth]
mod-id = "N2F89jG0"
version = "mfjVhtBY"
version = "whQT0VLa"
2 changes: 1 addition & 1 deletion pack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "934aa49e00a0f019df176f2e93738099a23d3e8f855a2de1031b376978a7e151"
hash = "3cdabe4eb4ab823dcdb533ed40cfd2409487852b6462dcb5990a9ee5131d418a"

[versions]
minecraft = "1.20.1"
Expand Down

0 comments on commit 9e4306a

Please sign in to comment.