Merge pull request '👻' (#29) from develop into main

Reviewed-on: #29

index.toml

@@ -29,11 +29,6 @@ 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"
@@ -114,6 +109,11 @@ file = "mods/balm.pw.toml"
 hash = "d5af5f53ec550a154bd6721d9c82d1e04cbcc8d3d048845870b9973ab365bc5c"
 metafile = true
 
+[[files]]
+file = "mods/bclib.pw.toml"
+hash = "928ea4c37b327a05de9251b625b13ddfc9bee66af3f142efa375627a040b0cdc"
+metafile = true
+
 [[files]]
 file = "mods/better-advancements.pw.toml"
 hash = "099fd1400b1acd5075b3d6e7594d40a24d23007567a0dd7bffdb12aa0e94ffbd"
@@ -306,7 +306,7 @@ metafile = true
 
 [[files]]
 file = "mods/conjuring.pw.toml"
-hash = "26564a342c099b4819a93f74d624c74ac546faab0064deedbf078a7f888cc432"
+hash = "812ae6a87fd70619fe6ff6b7c91802c1a01688e3ba4d5d1a468065bdbbb4ce50"
 metafile = true
 
 [[files]]
@@ -394,11 +394,6 @@ file = "mods/dcwa.pw.toml"
 hash = "e96c71e46932e7060f04e19145977c2ca71686f373273a8fae78f933a37b1b75"
 metafile = true
 
-[[files]]
-file = "mods/decocraft.pw.toml"
-hash = "9bc703802207de8db0778311f77e96ec45c4dbb634500417bf80f3003f599119"
-metafile = true
-
 [[files]]
 file = "mods/deepslatecutting.pw.toml"
 hash = "f189746778654d05f2f568cb23d3a6ea50c25b7c0f490c1091b77e2eb60327d9"
@@ -521,7 +516,7 @@ metafile = true
 
 [[files]]
 file = "mods/fabric-api.pw.toml"
-hash = "30f42d9c40bc729d19feaa0f46f41447e8199c9f9a8dc0ea1e19c376a2e83a6d"
+hash = "a74044f64e15149ea7e2efd2a2fcb2d8818e26ff0d27d2f684a287a12e2378aa"
 metafile = true
 
 [[files]]
@@ -599,6 +594,11 @@ file = "mods/free-cam.pw.toml"
 hash = "9da647b442bfea2aa6eee6389daf65d02136c5be868cdbe95934beadcb70ca5d"
 metafile = true
 
+[[files]]
+file = "mods/from-the-fog.pw.toml"
+hash = "49dfc6e8737d45a945e5a91cfd19ec8e810eec40a0f8c16d19690633c440aca1"
+metafile = true
+
 [[files]]
 file = "mods/geckolib.pw.toml"
 hash = "2321bdba8aed2b99d75de3fc2116bc28c1a1d671292bde0e4af4a3be2dee0dfe"
@@ -619,19 +619,9 @@ 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 = "7608d0fe534cebccb8a541f4bdac9791cdf82de9eb1f427798649a80b46be2a9"
-metafile = true
-
-[[files]]
-file = "mods/hephaestusplus.pw.toml"
-hash = "b96ce3cc2eaaf8258df3944886175016c44bd5411714bef82e76bd9ecf823916"
+hash = "a5af148903379317aafe576059f84e07d44107b0bc897351cb1346d6efc569bb"
 metafile = true
 
 [[files]]
@@ -666,7 +656,7 @@ metafile = true
 
 [[files]]
 file = "mods/identity-fix.pw.toml"
-hash = "6101bb45825253f4e6165af89bb3473bfffac2932c8a0de9302f79d3a87a48c2"
+hash = "de37035757a75aa69caf3deac0ae18d4f622957d57167998486faf1b7f95cd14"
 metafile = true
 
 [[files]]
@@ -919,11 +909,6 @@ 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"
@@ -971,7 +956,7 @@ metafile = true
 
 [[files]]
 file = "mods/origins.pw.toml"
-hash = "b667826180cac57d367242619cd6f744e843690edb2d3cce1e51d7126912661d"
+hash = "e09b4e3348ee5e8b836e40ea4745bf3ab0d584512e31166ab34a219c437a736a"
 metafile = true
 
 [[files]]
@@ -1169,14 +1154,9 @@ file = "mods/simple-voice-chat.pw.toml"
 hash = "6e6ab7c329eee464f5e39e7f327a148626d9aff1f74fed0020de7686d006edea"
 metafile = true
 
-[[files]]
-file = "mods/skills-origins.pw.toml"
-hash = "f13f2c1d18f110328b6069d5b65e0608832b46371ff24f71dbc76f69adfa1e62"
-metafile = true
-
 [[files]]
 file = "mods/skills.pw.toml"
-hash = "31e5435e6ea80768202a5fb4d71e36e7fa1bcedbde24ce6b39751a1aa92607d4"
+hash = "4a4b17ad43092863d796deea85aa2268bc0db8277b1b3d4b1f7159e2408c3b48"
 metafile = true
 
 [[files]]
@@ -1234,6 +1214,11 @@ file = "mods/stendhal.pw.toml"
 hash = "f891cc32728a13dec5d8763f86b926498eb745b3bd80676120292bacd03e51ab"
 metafile = true
 
+[[files]]
+file = "mods/stronger-skill-tree-for-pufferfishs-skills.pw.toml"
+hash = "0a45ac611164348c5b207eeb94aa4efd70f6ddf58c82472571301e9d0c3703cc"
+metafile = true
+
 [[files]]
 file = "mods/stylish-effects.pw.toml"
 hash = "263bf7a6be51bb4154f866d3ec0e57bb52d4109c9f0d0e0c81d31d55ceb08c61"
@@ -1294,11 +1279,6 @@ file = "mods/txnilib.pw.toml"
 hash = "0472e36be43263799441825d3c1ef1c27eae08163b230e9dd7e6d2c765a2fdab"
 metafile = true
 
-[[files]]
-file = "mods/uuid-impersonate.pw.toml"
-hash = "bedf9b3baad75ef261f817b562f9986bae8d720791df98d353dc745f9c8fb890"
-metafile = true
-
 [[files]]
 file = "mods/view-distance-fix.pw.toml"
 hash = "fb9e4ad5bd698b0698a7af8d0471998b7e2c5ab9635c35f4b46683ca6271df8b"
@@ -1378,16 +1358,12 @@ file = "world/datapacks/Light It Up v1.0.0.zip"
 hash = "4deb652eae901433665aa9a2673a68bc6716ebad9ab6e6cce2be5fc43c0e343f"
 
 [[files]]
-file = "world/datapacks/NonDefaultStrongerSkillTrees.zip"
-hash = "b742fa12895dea74bd623a1cae66081cf06d908edb84789def5dcf087ebc0705"
+file = "world/datapacks/Regality Origins 27.zip"
+hash = "7db9d1fa64daeb426ffb9a6b3c51fd5ff7ee4288e28b46837ad8d43a7b65c1d0"
 
 [[files]]
-file = "world/datapacks/Regality Origins 29.zip"
-hash = "ce954675979f4ae817c88e1f7aa911e6479f218c37ed62ff31c9f1618c79312a"
-
-[[files]]
-file = "world/datapacks/StarborneAmethyst7.zip"
-hash = "4ce3aa12290b2d9117d5b82d1ffef07d69e7cae2b726c01912cbe17cf834ed99"
+file = "world/datapacks/StarborneAmethyst6.zip"
+hash = "1e7a19fb9152b5259081dc79d298c2154cce589c5d95209384b1783d0c276521"
 
 [[files]]
 file = "world/datapacks/TempadItems.zip"

mods/alloy-forgery.pw.toml

@@ -1,13 +0,0 @@
-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"

mods/bclib.pw.toml

@@ -0,0 +1,8 @@
+name = "BCLib"
+filename = "bclib-3.0.14.jar"
+side = "both"
+
+[download]
+url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/main/compileFromSourceMods/bclib-3.0.14.jar"
+hash-format = "sha256"
+hash = "ea8b8deef5e4e9b5a9e1b7045415da8deb848e35f04c215d7f4a2cbb08d33ba2"

mods/conjuring.pw.toml

@@ -3,6 +3,11 @@ filename = "conjuring-1.0.29+1.20.jar"
 side = "both"
 
 [download]
-url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/main/compileFromSourceMods/conjuring-1.0.29%2B1.20.jar"
-hash-format = "sha256"
-hash = "7f315a0eacb1e455ab5ce2d19bded3e698a12e2c811a5b2edb463119df019b69"
+url = "https://cdn.modrinth.com/data/GriMtaoD/versions/ntapZgVV/conjuring-1.0.29%2B1.20.jar"
+hash-format = "sha1"
+hash = "ab89f011ed29b5910bb8306f97826562a55d96fa"
+
+[update]
+[update.modrinth]
+mod-id = "GriMtaoD"
+version = "ntapZgVV"

mods/decocraft.pw.toml

@@ -1,13 +0,0 @@
-name = "Decocraft"
-filename = "decocraft-3.0.4-1.20.1-fabric.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/IZJSgKZe/versions/o9CDG4YX/decocraft-3.0.4-1.20.1-fabric.jar"
-hash-format = "sha1"
-hash = "f203708043cb54dbae7f02e8580318d602f44e40"
-
-[update]
-[update.modrinth]
-mod-id = "IZJSgKZe"
-version = "o9CDG4YX"

mods/fabric-api.pw.toml

@@ -1,13 +1,13 @@
 name = "Fabric API"
-filename = "fabric-api-0.92.6+1.20.1.jar"
+filename = "fabric-api-0.92.3+1.20.1.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/UapVHwiP/fabric-api-0.92.6%2B1.20.1.jar"
+url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/SKPWumQf/fabric-api-0.92.3%2B1.20.1.jar"
 hash-format = "sha1"
-hash = "3ec0a88b64f252257df6287e9a1d47ed96331e5d"
+hash = "4fc46246c5e97514ffc563ca68338cf35d9976d0"
 
 [update]
 [update.modrinth]
 mod-id = "P7dR8mSH"
-version = "UapVHwiP"
+version = "SKPWumQf"

mods/from-the-fog.pw.toml

@@ -0,0 +1,13 @@
+name = "From The Fog"
+filename = "From-The-Fog-1.20-v1.9.2-Forge-Fabric.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/p1WH6sHr/versions/JTd3TFcc/From-The-Fog-1.20-v1.9.2-Forge-Fabric.jar"
+hash-format = "sha1"
+hash = "8508868b645b4c8bcdfef1437f0278173eaadbbb"
+
+[update]
+[update.modrinth]
+mod-id = "p1WH6sHr"
+version = "JTd3TFcc"

mods/hephaestus-expansion.pw.toml

@@ -1,13 +0,0 @@
-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"

mods/hephaestus.pw.toml

@@ -1,13 +1,8 @@
 name = "Hephaestus"
-filename = "Hephaestus-1.20.1-3.6.4.305.jar"
+filename = "Hephaestus-1.20.1-3.6.4.287.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/sdSn3wvy/versions/q5lAhdfq/Hephaestus-1.20.1-3.6.4.305.jar"
-hash-format = "sha1"
-hash = "ee3dacaee8547b6ef709873b86c4a42ef4a6f1bb"
-
-[update]
-[update.modrinth]
-mod-id = "sdSn3wvy"
-version = "q5lAhdfq"
+url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/main/compileFromSourceMods/Hephaestus-1.20.1-3.6.4.287.jar"
+hash-format = "sha256"
+hash = "a5215c5d7119d093232221ba4447aac25cffe1d382f4052c49778777c274e2cd"

mods/hephaestusplus.pw.toml

@@ -1,13 +0,0 @@
-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"

mods/identity-fix.pw.toml

@@ -1,13 +1,13 @@
 name = "Identity Fix (Morph)"
-filename = "identity-2.9.2-1.20.1-fabric.jar"
+filename = "identity-2.7.6-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"
+url = "https://cdn.modrinth.com/data/u8V1OwVf/versions/51uncGXn/identity-2.7.6-1.20.1-fabric.jar"
 hash-format = "sha1"
-hash = "54fe0b3d16bfa00178c4da1eb3a04f14e502518f"
+hash = "860cca0d47b3a0c9054ec771839f1366e2145033"
 
 [update]
 [update.modrinth]
 mod-id = "u8V1OwVf"
-version = "o2TQdEkW"
+version = "51uncGXn"

mods/mythicmetals.pw.toml

@@ -1,13 +0,0 @@
-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"

mods/origins.pw.toml

@@ -1,13 +1,13 @@
 name = "Origins"
-filename = "Origins-1.10.2+mc.1.20.x.jar"
+filename = "Origins-1.20.1-1.10.0.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/3BeIrqZR/versions/oT0CGnBQ/Origins-1.10.2%2Bmc.1.20.x.jar"
+url = "https://cdn.modrinth.com/data/3BeIrqZR/versions/OdNHB7Bh/Origins-1.20.1-1.10.0.jar"
 hash-format = "sha1"
-hash = "9a62de8be9261baeaffbde598e4b89c902851c50"
+hash = "e85bbe9554283840ca1d05b09181be29f3a623c0"
 
 [update]
 [update.modrinth]
 mod-id = "3BeIrqZR"
-version = "oT0CGnBQ"
+version = "OdNHB7Bh"

mods/skills-origins.pw.toml

@@ -1,8 +0,0 @@
-name = "Pufferfish's Skills x Origins"
-filename = "puffish_skills_origins-0.2.0-1.20.1-fabric.jar"
-side = "both"
-
-[download]
-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"

mods/skills.pw.toml

@@ -1,13 +1,8 @@
 name = "Pufferfish's Skills"
-filename = "puffish_skills-0.16.8-1.20-fabric.jar"
+filename = "puffish_skills-0.16.0-1.20-fabric.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/hqQqvaa4/versions/wsweQmsA/puffish_skills-0.16.8-1.20-fabric.jar"
-hash-format = "sha1"
-hash = "817b0389055e0400219f5f45b41a085c225a23d1"
-
-[update]
-[update.modrinth]
-mod-id = "hqQqvaa4"
-version = "wsweQmsA"
+url = "https://git.cubicxp.org/cubicxp/RegalitySMP/raw/branch/main/compileFromSourceMods/puffish_skills-0.16.0-1.20-fabric.jar"
+hash-format = "sha256"
+hash = "7cc9528f4daed3ad9fb9e964e480c043bcb3c0d9ce8619be77c0b7ed5671ecfe"

mods/stronger-skill-tree-for-pufferfishs-skills.pw.toml

@@ -0,0 +1,13 @@
+name = "Stronger Skill Tree for pufferfish's skills"
+filename = "skill tree for pufferfish's skills.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/KsIs7qhw/versions/FEi0IKJ7/skill%20tree%20for%20pufferfish%27s%20skills.jar"
+hash-format = "sha1"
+hash = "57125f21cb07c558e3988f20385a94559bf21caf"
+
+[update]
+[update.modrinth]
+mod-id = "KsIs7qhw"
+version = "FEi0IKJ7"

mods/uuid-impersonate.pw.toml

@@ -1,13 +0,0 @@
-name = "UUID Impersonate"
-filename = "uuid-impersonate-1.1.0.jar"
-side = "server"
-
-[download]
-url = "https://cdn.modrinth.com/data/lwBLig0b/versions/WN1si4vD/uuid-impersonate-1.1.0.jar"
-hash-format = "sha1"
-hash = "483e5de4ba415e286904c4fef448542402b59927"
-
-[update]
-[update.modrinth]
-mod-id = "lwBLig0b"
-version = "WN1si4vD"

pack.toml

@@ -6,10 +6,10 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "918727cfc554305a28fdf4882e3a4014e1b55b9996632cab390f54bd260ab505"
+hash = "f5f740097f7cb20c95c12656eac905ac96a006110d4022f88ac7e20b782880e6"
 
 [versions]
-fabric = "0.17.2"
+fabric = "0.16.10"
 minecraft = "1.20.1"
 
 [options]