Merge branch 'trunk' into server

# Conflicts: # pack.toml
ModFest · Jul 25, 2023 · 28f583a · 28f583a
2 parents 8458b20 + 72fa633
commit 28f583a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/index.toml b/index.toml
@@ -1322,6 +1322,14 @@ hash = "a85349d36b76255bc03adac0a26a76514ffad31ec30aa8f0017814dc4bd7f813"
 file = "resources/datapacks/tsmithing_bc23/pack.mcmeta"
 hash = "843fc4374b0720da3d3ee8f628eb042c5b430b914099bc98be2462bf33b74761"
 
+[[files]]
+file = "resources/resourcepacks/modfemogg.zip"
+hash = "2fe4a7bc0a19d80dc016fe5c7f4d38a84df5182cd5d94f012c2d3844274c0c12"
+
+[[files]]
+file = "resources/resourcepacks/pridemogg.zip"
+hash = "bab2a39422a26cccebaf36cccd0caaef5f4fb2eaf9968c95c66def0ef5fc04b0"
+
 [[files]]
 file = "resources/resourcepacks/twemogg.zip"
 hash = "6360f624e8afc063bc33604a60bfdc2f5c5382308ab84f62cb2a371b1359a289"
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 = "77ba30f54c5608f9e1dd836098362b8f86d78335bbf23cd13834c965166d5879"
+hash = "2e045ef0090f60a30af9b6bf03ffa659f2c30503fb4bbb292ff1b56a7acf006e"
 
 [versions]
 minecraft = "1.20.1"

diff --git a/resources/resourcepacks/modfemogg.zip b/resources/resourcepacks/modfemogg.zip
diff --git a/resources/resourcepacks/pridemogg.zip b/resources/resourcepacks/pridemogg.zip