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

Re-align git histories
Update 1.0.21-2
2024-11-13 00:24:41 -05:00 · 2024-11-13 00:21:22 -05:00 · 2024-11-13 00:18:52 -05:00 · 2024-11-13 00:07:43 -05:00 · 2024-11-13 00:06:05 -05:00 · 2024-11-01 13:28:42 -04:00
3 changed files with 2 additions and 2 deletions
--- a/index.toml
+++ b/index.toml
@@ -1182,7 +1182,7 @@ metafile = true

 [[files]]
 file = "resourcepacks/RegalityResourcePack.zip"
-hash = "7c627985b33d5d4458a4532b53a4bfc0e78f69ebb0614e178d7cddbc7714c999"
+hash = "76b0c9ff09ff1eaca3b6f9089aaed6d417a578506733172a8559d43b6c653e22"

 [[files]]
 file = "scripts/recipes.zs"
--- a/pack.toml
+++ b/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "9cbb25716799379aa7bf2e5c7705de049a95cb7b50fd142fdbf6b6157374063b"
+hash = "6c97738ab62c4719283e63f73abeb48d9a029388aa638e6aaf851565c427fd2f"

 [versions]
 fabric = "0.16.9"
--- a/resourcepacks/RegalityResourcePack.zip
+++ b/resourcepacks/RegalityResourcePack.zip
Author	SHA1	Message	Date
JordanPlayz158	49919dbad0	Merge remote-tracking branch 'cubicxp/main' into develop Re-align git histories	2024-11-13 00:24:41 -05:00
JordanPlayz158	e5c0824f0c	Update 1.0.21-2	2024-11-13 00:21:22 -05:00
JordanPlayz158	2d75ecf72a	Update 1.0.21-1	2024-11-13 00:18:52 -05:00
JordanPlayz158	eda2bf8941	Update 1.0.21	2024-11-13 00:07:43 -05:00
JordanPlayz158	d62a8a60a0	Resolved merge conflict	2024-11-13 00:06:05 -05:00
JordanPlayz158	adef3c091f	Updated Regality Resource Pack	2024-11-01 13:28:42 -04:00
cubicxp	47003d7904	Merge pull request 'BCLib/Axe Fix' (#4 ) from develop into main Reviewed-on: #4	2024-08-31 18:56:32 -05:00