Skip to content

Commit

Permalink
Merge branch 'master' into feat/xavbeat03
Browse files Browse the repository at this point in the history
  • Loading branch information
Xavbeat03 committed Dec 10, 2024
2 parents 2f3765e + bc3ae88 commit 3fd7cd6
Show file tree
Hide file tree
Showing 6 changed files with 10,459 additions and 1 deletion.
1 change: 1 addition & 0 deletions assets/minecraft/models/item/diamond_sword.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
{ "predicate": {"custom_model_data": 356}, "model": "item/weapons/diamond_sword/dark_iron_sword"},
{ "predicate": {"custom_model_data": 357}, "model": "item/weapons/diamond_sword/kitsune_gohei"},
{ "predicate": {"custom_model_data": 358}, "model": "item/weapons/diamond_sword/diamond_lance"},
{ "predicate": {"custom_model_data": 359}, "model": "item/weapons/diamond_sword/diamond_leviathan_blade"},
{ "predicate": {"custom_model_data": 14700}, "model": "item/extras/halloween_knife"}
]
}
3 changes: 2 additions & 1 deletion assets/minecraft/models/item/netherite_sword.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
{ "predicate": {"custom_model_data": 154}, "model": "item/weapons/netherite_sword/netherite_slasher"},
{ "predicate": {"custom_model_data": 155}, "model": "item/weapons/netherite_sword/netherite_rusteye_partisan"},
{ "predicate": {"custom_model_data": 156}, "model": "item/weapons/netherite_sword/netherite_honshu"},
{ "predicate": {"custom_model_data": 157}, "model": "item/weapons/netherite_sword/netherite_lance"}
{ "predicate": {"custom_model_data": 157}, "model": "item/weapons/netherite_sword/netherite_lance"},
{ "predicate": {"custom_model_data": 158}, "model": "item/weapons/netherite_sword/netherite_leviathan_blade"}
]
}
Loading

0 comments on commit 3fd7cd6

Please sign in to comment.