Removed leftover pack.toml.orig

Fixed conflicts with main branch
Merge remote-tracking branch 'origin/main' into develop
2026-05-08 12:07:22 -04:00 · 2026-05-08 12:06:03 -04:00 · 2026-05-08 12:03:01 -04:00 · 2026-05-08 11:54:21 -04:00 · 2026-01-21 12:08:03 -05:00 · 2026-01-21 12:05:56 -05:00
8 changed files with 40 additions and 14 deletions
--- a/compileFromSourceMods/identity-2.9.2-1.20.1-fabric.jar
+++ b/compileFromSourceMods/identity-2.9.2-1.20.1-fabric.jar
--- a/index.toml
+++ b/index.toml
@@ -599,6 +599,11 @@ file = "mods/free-cam.pw.toml"
 hash = "9da647b442bfea2aa6eee6389daf65d02136c5be868cdbe95934beadcb70ca5d"
 metafile = true

+[[files]]
+file = "mods/gabous-libs.pw.toml"
+hash = "cd3bd6447e18001c49c8baedcae101ece6770dd7406c8fb7eb0944129a321aea"
+metafile = true
+
 [[files]]
 file = "mods/geckolib.pw.toml"
 hash = "2321bdba8aed2b99d75de3fc2116bc28c1a1d671292bde0e4af4a3be2dee0dfe"
@@ -666,7 +671,7 @@ metafile = true

 [[files]]
 file = "mods/identity-fix.pw.toml"
-hash = "6101bb45825253f4e6165af89bb3473bfffac2932c8a0de9302f79d3a87a48c2"
+hash = "ca48ffa6cf758af88e0f2870db60b58be05cb75291f8d9271edb6ceb3bb584cf"
 metafile = true

 [[files]]
@@ -1081,7 +1086,7 @@ metafile = true

 [[files]]
 file = "mods/rei.pw.toml"
-hash = "18a0101fd3a508d143509cb734a9a9337baba11eef40117334ae775211949b70"
+hash = "f5008e1627b041a8303d2a1aaee70fb698e9ef988609fd9ab2caad5bebdfe1ca"
 metafile = true

 [[files]]
@@ -1116,12 +1121,12 @@ metafile = true

 [[files]]
 file = "mods/roughly-enough-professions-rep.pw.toml"
-hash = "18db5b6b6319e6e0546f384d7b1cdf06cde17591ec8b69768d187491115cfc20"
+hash = "87aff3b9cea365708072be952d63f76589b992edd0e7bd998d410ed4a89f382c"
 metafile = true

 [[files]]
 file = "mods/roughly-searchable.pw.toml"
-hash = "f541ac190aaa5f681e1b21d8eca5a6a259afeed22ccc76e43b0e8e3d4957978b"
+hash = "d16b567a0ffc0d2c77cd7a2d843529764af670f5c683bcac3689cbd0613ac42b"
 metafile = true

 [[files]]
--- a/mods/gabous-libs.pw.toml
+++ b/mods/gabous-libs.pw.toml
@@ -0,0 +1,13 @@
+name = "Gabou's Libs"
+filename = "gabou-libs-fabric-1.6.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/N8aGZtvj/versions/zZuALjsZ/untitled1-fabric-1.6.jar"
+hash-format = "sha512"
+hash = "0ed953a55b3d3ac109dcd60e8ec19f5bfdb599019b1f6a2b6bf2b8cd01ac6c22d185b3c04745dca2c2c0d3bd5425d78a6ad4dff797250ac29f30a89395f33426"
+
+[update]
+[update.modrinth]
+mod-id = "N8aGZtvj"
+version = "zZuALjsZ"
--- a/mods/identity-fix.pw.toml
+++ b/mods/identity-fix.pw.toml
@@ -3,11 +3,7 @@ filename = "identity-2.9.2-1.20.1-fabric.jar"
 side = "both"

 [download]
-url = "https://cdn.modrinth.com/data/u8V1OwVf/versions/o2TQdEkW/identity-2.9.2-1.20.1-fabric.jar"
-hash-format = "sha1"
-hash = "54fe0b3d16bfa00178c4da1eb3a04f14e502518f"
+url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/develop/compileFromSourceMods/identity-2.9.2-1.20.1-fabric.jar"
+hash-format = "sha256"
+hash = "cee7e71666d1a59ef046ea90d0f9df0d8b5a9c65f9169e4dc52b1ba7bc7d85de"

-[update]
-[update.modrinth]
-mod-id = "u8V1OwVf"
-version = "o2TQdEkW"
--- a/mods/rei.pw.toml
+++ b/mods/rei.pw.toml
@@ -2,6 +2,10 @@ name = "Roughly Enough Items (REI)"
 filename = "RoughlyEnoughItems-12.1.785-fabric.jar"
 side = "both"

+[option]
+optional = true
+default = true
+
 [download]
 url = "https://cdn.modrinth.com/data/nfn13YXA/versions/nYcMSS03/RoughlyEnoughItems-12.1.785-fabric.jar"
 hash-format = "sha1"
--- a/mods/roughly-enough-professions-rep.pw.toml
+++ b/mods/roughly-enough-professions-rep.pw.toml
@@ -2,6 +2,10 @@ name = "Roughly Enough Professions (REP)"
 filename = "RoughlyEnoughProfessions-fabric-1.20.1-2.0.2.jar"
 side = "client"

+[option]
+optional = true
+default = true
+
 [download]
 url = "https://cdn.modrinth.com/data/V8XJ8f5f/versions/ybcBEXlZ/RoughlyEnoughProfessions-fabric-1.20.1-2.0.2.jar"
 hash-format = "sha1"
--- a/mods/roughly-searchable.pw.toml
+++ b/mods/roughly-searchable.pw.toml
@@ -2,6 +2,10 @@ name = "Roughly Searchable"
 filename = "roughly-searchable-2.6.0+1.20.1.jar"
 side = "client"

+[option]
+optional = true
+default = true
+
 [download]
 url = "https://cdn.modrinth.com/data/njGhQ4fN/versions/NrzGdIx2/roughly-searchable-2.6.0%2B1.20.1.jar"
 hash-format = "sha1"
--- a/pack.toml
+++ b/pack.toml
@@ -1,15 +1,15 @@
 name = "Regality SMP"
 author = "JordanPlayz158"
-version = "1.0.25"
+version = "1.1.0"
 pack-format = "packwiz:1.1.0"

 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "3ce52e3e587858327085d24b542c87026a550391d80fab67987a9584c6411015"
+hash = "3411be55f33f36c0ee21bca2bfdda7605c07817380297825a3995b8b637bfcdd"

 [versions]
-fabric = "0.17.2"
+fabric = "0.17.3"
 minecraft = "1.20.1"

 [options]
Author	SHA1	Message	Date
Jordan Adams	a6a7b34924	Removed leftover pack.toml.orig	2026-05-08 12:07:22 -04:00
Jordan Adams	1f9f77456f	Fixed conflicts with main branch	2026-05-08 12:06:03 -04:00
Jordan Adams	5b1f43b757	Merge remote-tracking branch 'origin/main' into develop	2026-05-08 12:03:01 -04:00
Jordan Adams	7ea2aacdf2	Made REI, Roughly Enough Professions, and Roughly Searchable optional mods	2026-05-08 11:54:21 -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
Jordan Adams	b5d3aef614	Added hotfix to identity fix to ensure it does not interfere with others mods abilities to set flight ability (such as Hex Casting's flight spell)	2026-01-21 11:44:21 -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
Jordan Adams	55398c23e2	Updated Fabric Loader version from 0.17.2 -> 0.17.3 as Gabou's Libs requires >=0.17.3	2025-12-25 13:50:05 -05:00
Jordan Adams	e514016548	Added Gabou's Libs, new needed dependency for Identity Fix	2025-12-25 13:47:40 -05:00