Merge pull request 'Main to Develop due to hotfixes deployed live to main' (#3) from main into develop

Reviewed-on: #3

index.toml

@@ -295,11 +295,6 @@ file = "mods/crafttweaker.pw.toml"
 hash = "c81c390b0ef760626eb73aba959cfca1494c259c92587c722bcff815cae0ad95"
 metafile = true
 
-[[files]]
-file = "mods/crafttweaker.pw.toml"
-hash = "4509d50ad87085fdcb9c950ce9ba12a0a95686fefa649d426ca8bd552d0203ee"
-metafile = true
-
 [[files]]
 file = "mods/create-big-cannons.pw.toml"
 hash = "7d8fe92da9ff5b1a8d370c5e68c2e29ba68b400660266347106d7d9ec6f71182"
@@ -710,6 +705,11 @@ file = "mods/lithium.pw.toml"
 hash = "c239c951796882b9c93e649a0dba4f2d95804441faaed707b686381b7a5c67da"
 metafile = true
 
+[[files]]
+file = "mods/lithostitched.pw.toml"
+hash = "27df30bb49ab3e71eb57790364d3d01a71ecc7d797730d5c10fae4f8144e16fd"
+metafile = true
+
 [[files]]
 file = "mods/living-things.pw.toml"
 hash = "4d8754aacfa61ee190f4a5b98e12901b868b8763e725a6e95e9abaac93c14473"
@@ -1173,10 +1173,6 @@ hash = "7c627985b33d5d4458a4532b53a4bfc0e78f69ebb0614e178d7cddbc7714c999"
 file = "scripts/recipes.zs"
 hash = "242dd9fbe0d5254436c9fc98f7c322222a31ed4b4faaae96630952a2be680caa"
 
-[[files]]
-file = "scripts/recipes.zs"
-hash = "242dd9fbe0d5254436c9fc98f7c322222a31ed4b4faaae96630952a2be680caa"
-
 [[files]]
 file = "scripts/recipes_nylium_1-0-20.zs"
 hash = "cf6df7c17e2a4e927e9492855d6288a6717ceffee3e85c93b5b98f4b4275a0a7"

mods/crafttweaker.pw.toml.orig

@@ -1,27 +0,0 @@
-name = "CraftTweaker"
-<<<<<<< HEAD
-filename = "CraftTweaker-fabric-1.20.1-14.0.40.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/Xg35A4rS/versions/WG2ODwLU/CraftTweaker-fabric-1.20.1-14.0.40.jar"
-hash-format = "sha1"
-hash = "ebd455b9251a142ddddd18288e75c2aa0ce4e20b"
-=======
-filename = "CraftTweaker-fabric-1.20.1-14.0.43.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/Xg35A4rS/versions/gdH7ia6f/CraftTweaker-fabric-1.20.1-14.0.43.jar"
-hash-format = "sha1"
-hash = "cacbbf22e3e43a022ad42102a34f81e92819e5ef"
->>>>>>> develop
-
-[update]
-[update.modrinth]
-mod-id = "Xg35A4rS"
-<<<<<<< HEAD
-version = "WG2ODwLU"
-=======
-version = "gdH7ia6f"
->>>>>>> develop

mods/lithostitched.pw.toml

@@ -0,0 +1,13 @@
+name = "Lithostitched"
+filename = "lithostitched-fabric-1.20.1-1.1.8.jar"
+side = "server"
+
+[download]
+url = "https://cdn.modrinth.com/data/XaDC71GB/versions/6fbZrlp1/lithostitched-fabric-1.20.1-1.1.8.jar"
+hash-format = "sha1"
+hash = "969eabd061b2de846dbfe762c5add547221f945e"
+
+[update]
+[update.modrinth]
+mod-id = "XaDC71GB"
+version = "6fbZrlp1"

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "75b5dbae36624f18bfe4d76a31eb6ff002c894df839906ec9a80963509c06f5a"
+hash = "b214a5e03bf5b717c152123c8c1b514262758feb240abb292913dc4a431bf362"
 
 [versions]
 fabric = "0.15.11"

pack.toml.orig

@@ -1,20 +0,0 @@
-name = "Regality SMP"
-author = "JordanPlayz158"
-version = "1.0.19"
-pack-format = "packwiz:1.1.0"
-
-[index]
-file = "index.toml"
-hash-format = "sha256"
-<<<<<<< HEAD
-hash = "bb3e36e286c27eb6c12220f31a88a5affffc822a06e9b480f158e68711e8d197"
-=======
-hash = "75b5dbae36624f18bfe4d76a31eb6ff002c894df839906ec9a80963509c06f5a"
->>>>>>> develop
-
-[versions]
-fabric = "0.15.11"
-minecraft = "1.20.1"
-
-[options]
-acceptable-game-versions = ["1.20"]