Skip to content

Commit

Permalink
Merge pull request #753 from Dablakbandit/Ender-Main
Browse files Browse the repository at this point in the history 
Chalice rotations
  • Loading branch information
@EnderSven
EnderSven authored Jan 18, 2024
2 parents 26301c1 + 03309aa commit 8fc0fcf
Show file tree
Hide file tree
Showing 16 changed files with 59 additions and 7 deletions.
2 changes: 1 addition & 1 deletion assets/minecraft/models/item/arrow.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
{"predicate": {"custom_model_data":117},"model":"ms:mobs/barbarian_assault/queen_spawn_stattue"},
{"predicate": {"custom_model_data":118},"model":"ms:clutter/barbarian_anvil"},
{"predicate": {"custom_model_data":119},"model":"ms:clutter/blackboard"},
{"predicate": {"custom_model_data":120},"model":"item/empty"},
{"predicate": {"custom_model_data":120},"model":"item/cities/draynor/wise_old_man_bed"},
{"predicate": {"custom_model_data":121},"model":"item/empty"},
{"predicate": {"custom_model_data":122},"model":"item/empty"},
{"predicate": {"custom_model_data":123},"model":"item/empty"},
Expand Down
12 changes: 6 additions & 6 deletions assets/minecraft/models/item/beetroot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
{"predicate": {"custom_model_data":21},"model":"ms:quest/clock_tower/red_cog"},
{"predicate": {"custom_model_data":22},"model":"ms:quest/clock_tower/white_cog"},
{"predicate": {"custom_model_data":23},"model":"ms:quest/clock_tower/rat_poison"},
{"predicate": {"custom_model_data":24},"model":"item/empty"},
{"predicate": {"custom_model_data":25},"model":"item/empty"},
{"predicate": {"custom_model_data":26},"model":"item/empty"},
{"predicate": {"custom_model_data":27},"model":"item/empty"},
{"predicate": {"custom_model_data":28},"model":"item/empty"},
{"predicate": {"custom_model_data":29},"model":"item/empty"},
{"predicate": {"custom_model_data":24},"model":"ms:quest/waterfall_quest/book_of_baxtorian"},
{"predicate": {"custom_model_data":25},"model":"ms:quest/waterfall_quest/glarials_pebble"},
{"predicate": {"custom_model_data":26},"model":"ms:quest/waterfall_quest/glarials_urn_empty"},
{"predicate": {"custom_model_data":27},"model":"ms:quest/waterfall_quest/glarials_urn_full"},
{"predicate": {"custom_model_data":28},"model":"ms:quest/waterfall_quest/key_tgv_dungeon"},
{"predicate": {"custom_model_data":29},"model":"ms:quest/waterfall_quest/key_waterfall_dungeon"},
{"predicate": {"custom_model_data":30},"model":"item/empty"},
{"predicate": {"custom_model_data":31},"model":"item/empty"},
{"predicate": {"custom_model_data":32},"model":"item/empty"},
Expand Down
Binary file added ...s/item/custom/diamond_shovel/member_quest/waterfall_quest/book_of_baxtorian.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...res/item/custom/diamond_shovel/member_quest/waterfall_quest/glarials_pebble.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .../item/custom/diamond_shovel/member_quest/waterfall_quest/glarials_urn_empty.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/item/custom/diamond_shovel/member_quest/waterfall_quest/glarials_urn_full.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...res/item/custom/diamond_shovel/member_quest/waterfall_quest/key_tgv_dungeon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...em/custom/diamond_shovel/member_quest/waterfall_quest/key_waterfall_dungeon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/ms/models/quest/waterfall_quest/book_of_baxtorian.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"credit": "Made with Blockbench",
"parent": "item/handheld",
"textures": {
"layer0": "item/custom/diamond_shovel/member_quest/waterfall_quest/book_of_baxtorian"
}
}
5 changes: 5 additions & 0 deletions assets/ms/models/quest/waterfall_quest/chalice.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,11 @@
"head": {
"translation": [3.75, -12.25, 3],
"scale": [4, 4, 4]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [3.25, 2.75, -30],
"scale": [4, 4, 4]
}
}
}
5 changes: 5 additions & 0 deletions assets/ms/models/quest/waterfall_quest/chalice_ashes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,11 @@
"head": {
"translation": [3.75, -12.25, 3],
"scale": [4, 4, 4]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [3.25, 2.75, -30],
"scale": [4, 4, 4]
}
}
}
7 changes: 7 additions & 0 deletions assets/ms/models/quest/waterfall_quest/glarials_pebble.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"credit": "Made with Blockbench",
"parent": "item/handheld",
"textures": {
"layer0": "item/custom/diamond_shovel/member_quest/waterfall_quest/glarials_pebble"
}
}
7 changes: 7 additions & 0 deletions assets/ms/models/quest/waterfall_quest/glarials_urn_empty.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"credit": "Made with Blockbench",
"parent": "item/handheld",
"textures": {
"layer0": "item/custom/diamond_shovel/member_quest/waterfall_quest/glarials_urn_empty"
}
}
7 changes: 7 additions & 0 deletions assets/ms/models/quest/waterfall_quest/glarials_urn_full.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"credit": "Made with Blockbench",
"parent": "item/handheld",
"textures": {
"layer0": "item/custom/diamond_shovel/member_quest/waterfall_quest/glarials_urn_full"
}
}
7 changes: 7 additions & 0 deletions assets/ms/models/quest/waterfall_quest/key_tgv_dungeon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"credit": "Made with Blockbench",
"parent": "item/handheld",
"textures": {
"layer0": "item/custom/diamond_shovel/member_quest/waterfall_quest/key_tgv_dungeon"
}
}
7 changes: 7 additions & 0 deletions assets/ms/models/quest/waterfall_quest/key_waterfall_dungeon.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"credit": "Made with Blockbench",
"parent": "item/handheld",
"textures": {
"layer0": "item/custom/diamond_shovel/member_quest/waterfall_quest/key_waterfall_dungeon"
}
}

0 comments on commit 8fc0fcf

Please sign in to comment.