Merge pull request #9 from macaroni-p/main

建築大会トロフィーの追加
morinoparty · Aug 10, 2024 · cdc74e0 · cdc74e0
2 parents 575fe53 + 49b00ba
commit cdc74e0
Show file tree

Hide file tree

Showing 4 changed files with 431 additions and 3 deletions.
diff --git a/assets/minecraft/models/item/feather.json b/assets/minecraft/models/item/feather.json
@@ -47,6 +47,7 @@
         { "predicate": {"custom_model_data": 33}, "model": "item/fish/ponyo"},
         { "predicate": {"custom_model_data": 34}, "model": "item/trophy/archery-trophy"},
         { "predicate": {"custom_model_data": 35}, "model": "item/interi/hibiscus"},
-        { "predicate": {"custom_model_data": 36}, "model": "item/hat/kina_omen"}
+        { "predicate": {"custom_model_data": 36}, "model": "item/hat/kina_omen"},
+        { "predicate": {"custom_model_data": 37}, "model": "item/trophy/build-contest-trophy"}
     ]
 }
diff --git a/assets/minecraft/models/item/potion.json b/assets/minecraft/models/item/potion.json
@@ -5,7 +5,6 @@
         "layer1": "item/potion"
     },
     "overrides": [
-        {"predicate": {"custom_model_data": 1}, "model": "item/food/pikapika_potion"},
-        {"predicate": {"custom_model_data": 2}, "model": "item/food/tapoika_milk"}
+        {"predicate": {"custom_model_data": 1}, "model": "item/food/pikapika_potion"}
     ]
 }