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

Fixed wrong hashes when manually merging

Browse Source
This commit is contained in:
JordanPlayz158
2024-08-30 20:56:45 -04:00
parent b9935cea83
commit 195bdf68d7
2 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
index.toml
View File

@@ -1,5 +1,57 @@
hash-format = "sha256" hash-format = "sha256"
[[files]]
file = "index.toml.orig"
hash = "d2e47d49049cc992ae2a96e8cfe7f3f7ad1bf81d1f910cf1c6ddd6f0bc430adc"
[[files]]
file = "index_BACKUP_71050.toml"
hash = "d2e47d49049cc992ae2a96e8cfe7f3f7ad1bf81d1f910cf1c6ddd6f0bc430adc"
[[files]]
file = "index_BACKUP_71357.toml"
hash = "d2e47d49049cc992ae2a96e8cfe7f3f7ad1bf81d1f910cf1c6ddd6f0bc430adc"
[[files]]
file = "index_BACKUP_72539.toml"
hash = "d2e47d49049cc992ae2a96e8cfe7f3f7ad1bf81d1f910cf1c6ddd6f0bc430adc"
[[files]]
file = "index_BASE_71050.toml"
hash = "640fe13bdfb388f75198010a1b97854715cfc4fe46879da78e2491f8e0b70a8b"
[[files]]
file = "index_BASE_71357.toml"
hash = "640fe13bdfb388f75198010a1b97854715cfc4fe46879da78e2491f8e0b70a8b"
[[files]]
file = "index_BASE_72539.toml"
hash = "640fe13bdfb388f75198010a1b97854715cfc4fe46879da78e2491f8e0b70a8b"
[[files]]
file = "index_LOCAL_71050.toml"
hash = "bb3e36e286c27eb6c12220f31a88a5affffc822a06e9b480f158e68711e8d197"
[[files]]
file = "index_LOCAL_71357.toml"
hash = "bb3e36e286c27eb6c12220f31a88a5affffc822a06e9b480f158e68711e8d197"
[[files]]
file = "index_LOCAL_72539.toml"
hash = "bb3e36e286c27eb6c12220f31a88a5affffc822a06e9b480f158e68711e8d197"
[[files]]
file = "index_REMOTE_71050.toml"
hash = "75b5dbae36624f18bfe4d76a31eb6ff002c894df839906ec9a80963509c06f5a"
[[files]]
file = "index_REMOTE_71357.toml"
hash = "75b5dbae36624f18bfe4d76a31eb6ff002c894df839906ec9a80963509c06f5a"
[[files]]
file = "index_REMOTE_72539.toml"
hash = "75b5dbae36624f18bfe4d76a31eb6ff002c894df839906ec9a80963509c06f5a"
[[files]] [[files]]
file = "mods/3dskinlayers.pw.toml" file = "mods/3dskinlayers.pw.toml"
hash = "00318827d72a18aedaf7979e4f7938a0e6a2c35fc703906cad64ea6b38cb7200" hash = "00318827d72a18aedaf7979e4f7938a0e6a2c35fc703906cad64ea6b38cb7200"
@@ -296,9 +348,8 @@ hash = "c81c390b0ef760626eb73aba959cfca1494c259c92587c722bcff815cae0ad95"
metafile = true metafile = true
[[files]] [[files]]
file = "mods/crafttweaker.pw.toml" file = "mods/crafttweaker.pw.toml.orig"
hash = "4509d50ad87085fdcb9c950ce9ba12a0a95686fefa649d426ca8bd552d0203ee" hash = "b71969ad12d289741b21a10c09d00cc1d6f896ecc13592b7fa3f95b58d23a5f0"
metafile = true
[[files]] [[files]]
file = "mods/create-big-cannons.pw.toml" file = "mods/create-big-cannons.pw.toml"
@@ -1166,12 +1217,12 @@ hash = "6e3c46cc7523df95fefba675b177ff0abfda3b72c893add5ce64390ad137ab8f"
metafile = true metafile = true
[[files]] [[files]]
file = "resourcepacks/RegalityResourcePack.zip" file = "pack.toml.orig"
hash = "7c627985b33d5d4458a4532b53a4bfc0e78f69ebb0614e178d7cddbc7714c999" hash = "a7544ab94c1d7b84c36c72ddbeadd11767164fa885668605846a69839a72b445"
[[files]] [[files]]
file = "scripts/recipes.zs" file = "resourcepacks/RegalityResourcePack.zip"
hash = "242dd9fbe0d5254436c9fc98f7c322222a31ed4b4faaae96630952a2be680caa" hash = "7c627985b33d5d4458a4532b53a4bfc0e78f69ebb0614e178d7cddbc7714c999"
[[files]] [[files]]
file = "scripts/recipes.zs" file = "scripts/recipes.zs"

2
pack.toml
View File

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