Update 1.0.21

Resolved merge conflict
Updated Regality Resource Pack
2024-11-13 00:07:43 -05:00 · 2024-11-13 00:06:05 -05:00 · 2024-11-01 13:28:42 -04:00 · 2024-08-31 18:56:32 -05:00
4 changed files with 5 additions and 4 deletions
--- a/index.toml
+++ b/index.toml
@@ -542,7 +542,7 @@ metafile = true

 [[files]]
 file = "mods/gravestones.pw.toml"
-hash = "6c4eef3aaba1707c26526f8f832f0f7d2b00745092ea313704636ddee9b0d538"
+hash = "4796247d2484e92958ce0722eb485b910a0ec5321f8a8d54cd183534a4d8374f"
 metafile = true

 [[files]]
@@ -1182,7 +1182,7 @@ metafile = true

 [[files]]
 file = "resourcepacks/RegalityResourcePack.zip"
-hash = "7c627985b33d5d4458a4532b53a4bfc0e78f69ebb0614e178d7cddbc7714c999"
+hash = "76b0c9ff09ff1eaca3b6f9089aaed6d417a578506733172a8559d43b6c653e22"

 [[files]]
 file = "scripts/recipes.zs"
--- a/mods/gravestones.pw.toml
+++ b/mods/gravestones.pw.toml
@@ -3,6 +3,7 @@ filename = "gravestones-v1.15.jar"
 side = "both"

 [download]
-url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/main/compileFromSourceMods/gravestones-v1.15.jar"
+# CHANGE TO MAIN BRANCH BEFORE MERGE JORDAAANNNNN
+url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/develop/compileFromSourceMods/gravestones-v1.15.jar"
 hash-format = "sha256"
 hash = "5763e8bb74f5e388c5025d2cc88dafd877fdc30bcc9d5267a558939669a7cb74"
--- a/pack.toml
+++ b/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "9cbb25716799379aa7bf2e5c7705de049a95cb7b50fd142fdbf6b6157374063b"
+hash = "eb9fa2fb77799b2c20b267278bd35c6882f305bf5b290ecf0d836ca4ce356975"

 [versions]
 fabric = "0.16.9"
--- a/resourcepacks/RegalityResourcePack.zip
+++ b/resourcepacks/RegalityResourcePack.zip
Author	SHA1	Message	Date
JordanPlayz158	eda2bf8941	Update 1.0.21	2024-11-13 00:07:43 -05:00
JordanPlayz158	d62a8a60a0	Resolved merge conflict	2024-11-13 00:06:05 -05:00
JordanPlayz158	adef3c091f	Updated Regality Resource Pack	2024-11-01 13:28:42 -04:00
cubicxp	47003d7904	Merge pull request 'BCLib/Axe Fix' (#4 ) from develop into main Reviewed-on: #4	2024-08-31 18:56:32 -05:00