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
17 changed files with 125 additions and 32 deletions
--- a/compileFromSourceMods/Hephaestus-1.20.1-3.6.4.DEV.73436fcbf.jar
+++ b/compileFromSourceMods/Hephaestus-1.20.1-3.6.4.DEV.73436fcbf.jar
--- a/compileFromSourceMods/identity-2.9.2-1.20.1-fabric.jar
+++ b/compileFromSourceMods/identity-2.9.2-1.20.1-fabric.jar
--- a/compileFromSourceMods/puffish_skills_origins-0.1.0-1.20.1-fabric.jar
+++ b/compileFromSourceMods/puffish_skills_origins-0.1.0-1.20.1-fabric.jar
--- a/index.toml
+++ b/index.toml
@@ -29,6 +29,11 @@ file = "mods/affinity.pw.toml"
 hash = "e78758ad08871c1ddd1a8358ad937092b0e6afa5b237d2920fbf76e69d78fb32"
 metafile = true

+[[files]]
+file = "mods/alloy-forgery.pw.toml"
+hash = "6fbfd9a00b617f2205c9b7739240201809eba8754093f5321aeb241f6ef6e1b4"
+metafile = true
+
 [[files]]
 file = "mods/almanac.pw.toml"
 hash = "84da114b518ecda7ed4fe0160a7986c2446e55820675016e3630ad87177dc55f"
@@ -516,7 +521,7 @@ metafile = true

 [[files]]
 file = "mods/fabric-api.pw.toml"
-hash = "a74044f64e15149ea7e2efd2a2fcb2d8818e26ff0d27d2f684a287a12e2378aa"
+hash = "30f42d9c40bc729d19feaa0f46f41447e8199c9f9a8dc0ea1e19c376a2e83a6d"
 metafile = true

 [[files]]
@@ -594,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"
@@ -614,9 +624,19 @@ file = "mods/gravestones.pw.toml"
 hash = "6c4eef3aaba1707c26526f8f832f0f7d2b00745092ea313704636ddee9b0d538"
 metafile = true

+[[files]]
+file = "mods/hephaestus-expansion.pw.toml"
+hash = "8123418180b839ca21e251a1dfaa32ce33b6c9440cff5250327e3c28d228bff1"
+metafile = true
+
 [[files]]
 file = "mods/hephaestus.pw.toml"
-hash = "a5af148903379317aafe576059f84e07d44107b0bc897351cb1346d6efc569bb"
+hash = "67abb6ad3e303d76b4dae43ac242590b32e1cbd4b5cfb3f8ca9b542048337304"
+metafile = true
+
+[[files]]
+file = "mods/hephaestusplus.pw.toml"
+hash = "b96ce3cc2eaaf8258df3944886175016c44bd5411714bef82e76bd9ecf823916"
 metafile = true

 [[files]]
@@ -651,7 +671,7 @@ metafile = true

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

 [[files]]
@@ -904,6 +924,11 @@ file = "mods/mru.pw.toml"
 hash = "a50f8c5b3eff24d230425afd2bae4f4a77da4ea857bff80f8320563b2b9b54da"
 metafile = true

+[[files]]
+file = "mods/mythicmetals.pw.toml"
+hash = "1dba4413d7e486191ffec2347fe9875468985ec69beade3f486d19891bb4126c"
+metafile = true
+
 [[files]]
 file = "mods/natures-compass.pw.toml"
 hash = "5ec7e0e8cb5d8cd6b09f49f9a8eff32a4f7c8f95af37e076644f15ea0011583f"
@@ -1061,7 +1086,7 @@ metafile = true

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

 [[files]]
@@ -1096,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]]
@@ -1151,7 +1176,7 @@ metafile = true

 [[files]]
 file = "mods/skills-origins.pw.toml"
-hash = "7dc772eda50205dc1551b4ca18b7f89109ea5ef148eec0197c2f499dda6a8a2f"
+hash = "f13f2c1d18f110328b6069d5b65e0608832b46371ff24f71dbc76f69adfa1e62"
 metafile = true

 [[files]]
--- a/mods/alloy-forgery.pw.toml
+++ b/mods/alloy-forgery.pw.toml
@@ -0,0 +1,13 @@
+name = "Alloy Forgery"
+filename = "alloy-forgery-2.1.2+1.20.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/jhl28YkY/versions/j3GoCoCc/alloy-forgery-2.1.2%2B1.20.jar"
+hash-format = "sha1"
+hash = "2a5b1cdd7dacaba4012c0a3d116d726302f62dca"
+
+[update]
+[update.modrinth]
+mod-id = "jhl28YkY"
+version = "j3GoCoCc"
--- a/mods/fabric-api.pw.toml
+++ b/mods/fabric-api.pw.toml
@@ -1,13 +1,13 @@
 name = "Fabric API"
-filename = "fabric-api-0.92.3+1.20.1.jar"
+filename = "fabric-api-0.92.6+1.20.1.jar"
 side = "both"

 [download]
-url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/SKPWumQf/fabric-api-0.92.3%2B1.20.1.jar"
+url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/UapVHwiP/fabric-api-0.92.6%2B1.20.1.jar"
 hash-format = "sha1"
-hash = "4fc46246c5e97514ffc563ca68338cf35d9976d0"
+hash = "3ec0a88b64f252257df6287e9a1d47ed96331e5d"

 [update]
 [update.modrinth]
 mod-id = "P7dR8mSH"
-version = "SKPWumQf"
+version = "UapVHwiP"
--- 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/hephaestus-expansion.pw.toml
+++ b/mods/hephaestus-expansion.pw.toml
@@ -0,0 +1,13 @@
+name = "Hephaestus Expansion"
+filename = "hephaestusexpansion-1.0.2.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/H6K8bKGy/versions/vnyJbqx3/hephaestusexpansion-1.0.2.jar"
+hash-format = "sha1"
+hash = "c6ab9e0a8a13d1a476d39fee94af38b61b8e5286"
+
+[update]
+[update.modrinth]
+mod-id = "H6K8bKGy"
+version = "vnyJbqx3"
--- a/mods/hephaestus.pw.toml
+++ b/mods/hephaestus.pw.toml
@@ -1,8 +1,8 @@
 name = "Hephaestus"
-filename = "Hephaestus-1.20.1-3.6.4.287.jar"
+filename = "Hephaestus-1.20.1-3.6.4.305.jar"
 side = "both"

 [download]
-url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/main/compileFromSourceMods/Hephaestus-1.20.1-3.6.4.287.jar"
+url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/develop/compileFromSourceMods/Hephaestus-1.20.1-3.6.4.DEV.73436fcbf.jar"
 hash-format = "sha256"
-hash = "a5215c5d7119d093232221ba4447aac25cffe1d382f4052c49778777c274e2cd"
+hash = "bfbbcb5824cc3bc81018b2fbebb5711b3d7965d28c2278a9b21a8eec495113ed"
--- a/mods/hephaestusplus.pw.toml
+++ b/mods/hephaestusplus.pw.toml
@@ -0,0 +1,13 @@
+name = "HephaestusPlus"
+filename = "hephaestusplus-1.1.1+1.20.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/SSoB0fRh/versions/bTPeNl8e/hephaestusplus-1.1.1%2B1.20.jar"
+hash-format = "sha1"
+hash = "5b32fe7399a5997a85d69574635cc7fad8eb19f2"
+
+[update]
+[update.modrinth]
+mod-id = "SSoB0fRh"
+version = "bTPeNl8e"
--- 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/mythicmetals.pw.toml
+++ b/mods/mythicmetals.pw.toml
@@ -0,0 +1,13 @@
+name = "Mythic Metals"
+filename = "mythicmetals-0.19.10+1.20.1.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/bAWzYNRd/versions/fxEK8ISQ/mythicmetals-0.19.10%2B1.20.1.jar"
+hash-format = "sha1"
+hash = "c73cd257b0be45877bad36851b037f8d42832188"
+
+[update]
+[update.modrinth]
+mod-id = "bAWzYNRd"
+version = "fxEK8ISQ"
--- 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/mods/skills-origins.pw.toml
+++ b/mods/skills-origins.pw.toml
@@ -3,11 +3,6 @@ filename = "puffish_skills_origins-0.2.0-1.20.1-fabric.jar"
 side = "both"

 [download]
-url = "https://cdn.modrinth.com/data/G2gG8giX/versions/xsYqLkmA/puffish_skills_origins-0.2.0-1.20.1-fabric.jar"
-hash-format = "sha1"
-hash = "8e5f1fcebb32bae175bf00b7800bf2210c85ec51"
-
-[update]
-[update.modrinth]
-mod-id = "G2gG8giX"
-version = "xsYqLkmA"
+url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/main/compileFromSourceMods/puffish_skills_origins-0.1.0-1.20.1-fabric.jar"
+hash-format = "sha256"
+hash = "c4e732e9c945f19a43d5eb5f3f4e321c99198a711c661c275b66b85199e7632d"
--- 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 = "b703b9b0f9c75dc10cab555b5d4bd9d92a3b87d1249a1584973819fe533bad43"
+hash = "3411be55f33f36c0ee21bca2bfdda7605c07817380297825a3995b8b637bfcdd"

 [versions]
-fabric = "0.16.10"
+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
cubicxp	387df5afbe	Merge pull request 'Hephaestus Bugfix' (#35 ) from develop into main Reviewed-on: #35	2025-12-07 05:11:08 -06:00
Jordan Adams	d6d5779df2	Fixes hash for Hephaestus	2025-12-07 06:08:54 -05:00
Jordan Adams	33c1ab99e8	Fixes Hephaestus (hopefully)	2025-12-07 06:06:08 -05:00
cubicxp	d25345b925	Merge pull request '2025 November End-of-Month Update' (#34 ) from develop into main Reviewed-on: #34	2025-12-02 04:52:43 -06:00
JordanPlayz158	79a18c3c7a	Switch Puffish Skills x Origins mod from modrinth to compile from source while we wait on [#3[(https://github.com/pufmat/skillsoriginsmod/pull/3 ) getting merged	2025-12-01 14:34:45 -05:00
JordanPlayz158	3dfc01575d	Revert "Updated Create from beta 0.5.1-j-build.1631 to release 6.0.8.0+build.1734" This reverts commit `7aa756dc35`.	2025-11-23 07:56:53 -05:00
JordanPlayz158	7aa756dc35	Updated Create from beta 0.5.1-j-build.1631 to release 6.0.8.0+build.1734	2025-11-23 07:45:36 -05:00
JordanPlayz158	b417d45add	Add Hephaestus Expansion, Hephaestus+, Mythic Metals and Alloy Forge (a dependency of Mythic Metals)	2025-11-23 07:23:15 -05:00
JordanPlayz158	e30f53a74e	Update Fabric API from 0.92.3 to 0.92.6 (as required by Hephaestus)	2025-11-23 04:36:54 -05:00
JordanPlayz158	831e6cb98b	Update Hephaestus to latest modrinth release and update Fabric Loader to 0.17.2 (as required by latest Hephaestus)	2025-11-23 04:34:54 -05:00
JordanPlayz158	016efa91dd	Update Fabric Loader to 0.16.14 as DecoCraft requires it	2025-11-23 04:15:39 -05:00
cubicxp	8f34e529c9	Merge pull request 'Updated UUID Impersonate to v1.1.0' (#33 ) from develop into main Reviewed-on: #33	2025-11-11 16:03:17 -06:00
cubicxp	7636c3d4f5	Merge pull request 'Lock all Skill Trees behind origin powers' (#32 ) from develop into main Reviewed-on: #32	2025-11-03 06:24:38 -06:00
cubicxp	9ebc81bfeb	Merge pull request '2025 October End-of-Month Update #2 ' (#31 ) from develop into main Reviewed-on: #31	2025-11-01 06:28:23 -05:00
cubicxp	346962e38c	Merge pull request '2025 October End-of-Month Update' (#30 ) from develop into main Reviewed-on: #30	2025-11-01 05:35:43 -05:00
cubicxp	c1e5c6987e	Merge pull request '👻' (#29 ) from develop into main Reviewed-on: #29	2025-10-26 06:58:16 -05:00