Merge remote-tracking branch 'cubicxp/main' into develop

Re-align git histories
Update 1.0.21-2
2024-11-13 00:24:41 -05:00 · 2024-11-13 00:21:22 -05:00 · 2024-11-13 00:18:52 -05:00 · 2024-11-12 19:51:19 -05:00
3 changed files with 3 additions and 4 deletions
--- a/index.toml
+++ b/index.toml
@@ -542,7 +542,7 @@ metafile = true

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

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

 [download]
-# CHANGE TO MAIN BRANCH BEFORE MERGE JORDAAANNNNN
-url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/develop/compileFromSourceMods/gravestones-v1.15.jar"
+url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/main/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 = "eb9fa2fb77799b2c20b267278bd35c6882f305bf5b290ecf0d836ca4ce356975"
+hash = "6c97738ab62c4719283e63f73abeb48d9a029388aa638e6aaf851565c427fd2f"

 [versions]
 fabric = "0.16.9"
Author	SHA1	Message	Date
JordanPlayz158	49919dbad0	Merge remote-tracking branch 'cubicxp/main' into develop Re-align git histories	2024-11-13 00:24:41 -05:00
JordanPlayz158	e5c0824f0c	Update 1.0.21-2	2024-11-13 00:21:22 -05:00
JordanPlayz158	2d75ecf72a	Update 1.0.21-1	2024-11-13 00:18:52 -05:00
JordanPlayz158	bcbe988a34	Changed Branch of Gravestones to Main to prepare for merge	2024-11-12 19:51:19 -05:00