Merge pull request #99 from freeserverproject/develop

Develop
freeserverproject · Jan 1, 2022 · 5768f6b · 5768f6b
2 parents 625f42a + 10cce32
commit 5768f6b
Show file tree

Hide file tree

Showing 12 changed files with 16,028 additions and 4 deletions.
diff --git a/pack/assets/minecraft/models/item/diamond_sword.json b/pack/assets/minecraft/models/item/diamond_sword.json
@@ -4,6 +4,7 @@
         "layer0": "minecraft:item/diamond_sword"
     },
     "overrides":[
-        {"predicate": {"custom_model_data":1}, "model":"weapons/ice_sword"}
+        {"predicate": {"custom_model_data":1}, "model":"weapons/ice_sword"},
+        {"predicate": {"custom_model_data":2}, "model":"weapons/katana"}
     ]
 }
diff --git a/pack/assets/minecraft/models/item/leather.json b/pack/assets/minecraft/models/item/leather.json
@@ -5,6 +5,7 @@
         "layer0": "item/leather"
     },
     "overrides":[
-        {"predicate": {"custom_model_data":1}, "model":"tools/bundle"}
+        {"predicate": {"custom_model_data":1}, "model":"tools/bundle"},
+        {"predicate": {"custom_model_data":2}, "model":"tools/backpacks/backpack"}
       ]
 }
diff --git a/pack/assets/minecraft/models/item/stick.json b/pack/assets/minecraft/models/item/stick.json
@@ -66,6 +66,7 @@
         {"predicate": {"custom_model_data":521}, "model":"hats/masks/maple8192_mask"},
         {"predicate": {"custom_model_data":522}, "model":"hats/masks/taniyan18_mask"},
         {"predicate": {"custom_model_data":523}, "model":"item/otheritem/spinner"},
+        {"predicate": {"custom_model_data":524}, "model":"placeable/kadomatu"},
         {"predicate": {"custom_model_data":1000}, "model":"item/otheritem/eva_meds/ifak"},
         {"predicate": {"custom_model_data":1100}, "model":"item/otheritem/eva_weapons/scar_l"},
         {"predicate": {"custom_model_data":5000}, "model":"item/figure/others/momizidani"}