cubicxp/RegalitySMP
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolved merge conflict

Browse Source
This commit is contained in:
JordanPlayz158
2024-11-13 00:06:05 -05:00
parent adef3c091f 5fcf7a72a9
commit d62a8a60a0
13 changed files with 105 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
index.toml
View File

@@ -52,7 +52,7 @@ metafile = true
[[files]]
file = "mods/archon.pw.toml"
hash = "cc289958627a9104e9b916d879723b6731084675c4eab60b016132ed49dd065f"
hash = "b754d12606df72176854ef310c6a10d7a8c0826b5be7222d7b448f6d12b939f6"
metafile = true
[[files]]
@@ -280,6 +280,11 @@ file = "mods/connectivity.pw.toml"
hash = "308030498a282075732310b66eecf419baa2217ce88496ad87818ae21b1d2423"
metafile = true
[[files]]
file = "mods/corner-portal-linking.pw.toml"
hash = "20b35111df6944dc227dc073622969452e83e467b9d85dba561442f7db50d922"
metafile = true
[[files]]
file = "mods/coroutil.pw.toml"
hash = "809ab9c953bf5ca4647570fafbc76bc7f29ada644f9556831c196e26b1822ca3"
@@ -452,7 +457,7 @@ metafile = true
[[files]]
file = "mods/fabric-language-kotlin.pw.toml"
hash = "508af0c05e63443f8179d0b5a34731735fc215872318b23e26df4487d260a36b"
hash = "07620e0acf742955b2f10e73244e1828836dd8737ea6142c7c4cd03243a78b7e"
metafile = true
[[files]]
@@ -537,7 +542,7 @@ metafile = true
[[files]]
file = "mods/gravestones.pw.toml"
hash = "ace9dbdca93d66c486a4474081fc91219640e506b62679bce01318c34af51e13"
hash = "4796247d2484e92958ce0722eb485b910a0ec5321f8a8d54cd183534a4d8374f"
metafile = true
[[files]]
@@ -840,6 +845,16 @@ file = "mods/optigui.pw.toml"
hash = "2440a2e6d0ade6bc4ca8d3677b59312734dd22106fc6fc5cbac5c24b0ba2ff05"
metafile = true
[[files]]
file = "mods/origins-sun-block.pw.toml"
hash = "4bee175e1c65b254f4ce788766008a9eed089d8fc0226d27294184cdcc457ca0"
metafile = true
[[files]]
file = "mods/origins-umbrellas.pw.toml"
hash = "6475b7d81bea07d8bce00247a242dd1eff2c29d1948c221449affb2a5a4ee9ab"
metafile = true
[[files]]
file = "mods/origins-vampire.pw.toml"
hash = "074580e076ba31a5ef1465da4395dc9e3a6d34fdfbd80f109374c2aafceb4cf3"
@@ -1177,6 +1192,10 @@ hash = "242dd9fbe0d5254436c9fc98f7c322222a31ed4b4faaae96630952a2be680caa"
file = "scripts/recipes_nylium_1-0-20.zs"
hash = "cf6df7c17e2a4e927e9492855d6288a6717ceffee3e85c93b5b98f4b4275a0a7"
[[files]]
file = "scripts/recipes_silver_1-0-21.zs"
hash = "4e92b8cf4a1f9e33a043e4edce03341c5c4de04d6dac163f9b3632af3401e644"
[[files]]
file = "servers.dat"
hash = "7f7d5bbb9482fb88a30c572ed01dc77ef555d7eb8375910bdc78584042dd349f"
@@ -1193,6 +1212,18 @@ hash = "1e7a19fb9152b5259081dc79d298c2154cce589c5d95209384b1783d0c276521"
file = "world/datapacks/TempadItems.zip"
hash = "68a0fb977ad2ec4318ab914a2a5b8135447e4933f9250648c0bb971489ab2510"
[[files]]
file = "world/datapacks/durability ping v1.1.7 (MC 1.20-1.20.6).zip"
hash = "a08fd71361e857e5bea2a7462d28d633fcb811f7ec55a67e58e85085c7fdb2a7"
[[files]]
file = "world/datapacks/soultinkerer_2.zip"
hash = "05fa3ce0f4e37c208e4e626934de1882389da8d00ec5e954ff06f591cd5c7f08"
[[files]]
file = "world/datapacks/villager workstation highlights v1.1.7 (MC 1.20-1.20.6).zip"
hash = "fcf9e3bb399dd5f31d113370514ec930ce6f056a1c10dabe5c9ba83b52e6d071"
[[files]]
file = "world/datapacks/wandering trades v1.7.5 (MC 1.20-1.20.6).zip"
hash = "573cca25b597ec1670af646b449361abc617b072f5a7b980a66b9505b38d28b0"