Merge remote-tracking branch 'upstream/staging/quilt/1.20.1' into release/1.20.1

2023-10-23 12:09:24 -04:00 · 2023-10-23 12:09:24 -04:00 · 8c1b9953c5
commit 8c1b9953c5
parent d826045f16 85798f76be
3 changed files with 10 additions and 1 deletions
--- a/config/yosbr/config/puzzle.json
+++ b/config/yosbr/config/puzzle.json
@ -0,0 +1,5 @@
+{
+  "disabledIntegrations": [
+    "entity_model_features"
+  ]
+}
--- a/index.toml
+++ b/index.toml
@ -20,6 +20,10 @@ hash = "b6842d4f8da21a23a32b70c584ba495d6311b5c7e2a8a79b5f7d4ee2a048016b"
 file = "config/yosbr/config/inventoryprofilesnext/inventoryprofiles.json"
 hash = "000b31b1c42d90dbc3cd9964df47b9093e698ac08c002771c924b340529e6a18"

+[[files]]
+file = "config/yosbr/config/puzzle.json"
+hash = "f4f3a9663a482ff424c2db4212fc6f6842c1af3bfb97ebe5c5d7e35e33974e78"
+
 [[files]]
 file = "config/yosbr/config/rightclickharvest.json"
 hash = "faf30cde5b1e7f771326d67ef62a96c21b77528fda556b6211e35ac15335d5df"
--- a/pack.toml
+++ b/pack.toml
@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "352ae6202730a67099b8c26940b417d952cb366f8edc6b402273831d98ab8d99"
+hash = "5cb31d5fa6937f7b236428067563203b5458aa69ea430ced45c0d0e7bcbae776"

 [versions]
 minecraft = "1.20.1"