Fixed conflicts with main branch

Changed develop reference to main for identity fix jar before push
Made pre commit check for main
2026-05-08 12:06:03 -04:00 · 2026-01-21 12:08:03 -05:00 · 2026-01-21 12:05:56 -05:00 · 2026-01-21 12:02:23 -05:00 · 2025-12-25 12:58:09 -06:00 · 2025-12-07 05:11:08 -06:00
3 changed files with 6 additions and 2 deletions
--- a/index.toml
+++ b/index.toml
@@ -1354,6 +1354,10 @@ file = "mods/zoomify.pw.toml"
 hash = "e74c7b29a9776fa6d00a39ee71e18445c9b273570351a4b891a35b277feaca30"
 metafile = true
 [[files]]
 file = "pack.toml.orig"
 hash = "d05658e448b4e0507456f80ad19828860d820b008d8808690fe6b8a5473e9c85"
 [[files]]
 file = "resourcepacks/RegalityResourcePack.zip"
 hash = "e6c280dd735849461880dc5ed3bded687c839302375d8f0edc790a5d5d5bd5ac"
--- a/mods/identity-fix.pw.toml
+++ b/mods/identity-fix.pw.toml
@@ -3,7 +3,7 @@ filename = "identity-2.9.2-1.20.1-fabric.jar"
 side = "both"
 [download]
-url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/develop/compileFromSourceMods/identity-2.9.2-1.20.1-fabric.jar"
+url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/main/compileFromSourceMods/identity-2.9.2-1.20.1-fabric.jar"
 hash-format = "sha256"
 hash = "cee7e71666d1a59ef046ea90d0f9df0d8b5a9c65f9169e4dc52b1ba7bc7d85de"
--- a/pack.toml
+++ b/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "3411be55f33f36c0ee21bca2bfdda7605c07817380297825a3995b8b637bfcdd"
+hash = "a280ecc0d8205ed1e69cc984273488133fa325dd28c7036bbcf9b824cd3822b9"
 [versions]
 fabric = "0.17.3"
Author	SHA1	Message	Date
Jordan Adams	1f9f77456f	Fixed conflicts with main branch	2026-05-08 12:06:03 -04:00
Jordan Adams	ec5d04ae9d	Changed develop reference to main for identity fix jar before push	2026-01-21 12:08:03 -05:00
Jordan Adams	7e7e475705	Made pre commit check for main	2026-01-21 12:05:56 -05:00
Jordan Adams	479e79c16f	Merge remote-tracking branch 'origin/develop'	2026-01-21 12:02:23 -05:00
cubicxp	fe0ab1f38c	Merge pull request 'Identity Fix... Bugfix' (#36 ) from develop into main Reviewed-on: #36	2025-12-25 12:58:09 -06:00
cubicxp	387df5afbe	Merge pull request 'Hephaestus Bugfix' (#35 ) from develop into main Reviewed-on: #35	2025-12-07 05:11:08 -06:00