Merge remote-tracking branch 'cubicxp/main' into develop

Re-align git histories
This commit is contained in:
JordanPlayz158
2024-11-13 00:24:41 -05:00
3 changed files with 2 additions and 2 deletions

View File

@@ -1182,7 +1182,7 @@ metafile = true
[[files]] [[files]]
file = "resourcepacks/RegalityResourcePack.zip" file = "resourcepacks/RegalityResourcePack.zip"
hash = "7c627985b33d5d4458a4532b53a4bfc0e78f69ebb0614e178d7cddbc7714c999" hash = "76b0c9ff09ff1eaca3b6f9089aaed6d417a578506733172a8559d43b6c653e22"
[[files]] [[files]]
file = "scripts/recipes.zs" file = "scripts/recipes.zs"

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 = "9cbb25716799379aa7bf2e5c7705de049a95cb7b50fd142fdbf6b6157374063b" hash = "6c97738ab62c4719283e63f73abeb48d9a029388aa638e6aaf851565c427fd2f"
[versions] [versions]
fabric = "0.16.9" fabric = "0.16.9"