Merge branch 'move-models-to-voxel' into 'master'

Move key and lockpick models to voxel folder

See merge request veloren/veloren!3826
This commit is contained in:
Isse 2023-03-13 00:36:15 +00:00
commit 452d4b2121
4 changed files with 4 additions and 4 deletions

View File

@ -4822,12 +4822,12 @@
),
// Keys
Simple("common.items.keys.rusty_tower_key"): VoxTrans(
"element.items.key_rusty-0",
"voxel.object.key_rusty-0",
(0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 1.0,
),
// Lockpicks
Simple("common.items.utility.lockpick_0"): VoxTrans(
"element.items.lockpick",
"voxel.object.lockpick",
(0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 1.0,
),
})

View File

@ -920,8 +920,8 @@
Simple("common.items.log.ironwood"): "voxel.sprite.wood.item.ironwood",
Simple("common.items.log.wood"): "voxel.sprite.wood.item.wood",
// Keys and Lockpicks
Simple("common.items.keys.rusty_tower_key"): "element.items.key_rusty-0",
Simple("common.items.utility.lockpick_0"): "element.items.lockpick",
Simple("common.items.keys.rusty_tower_key"): "voxel.object.key_rusty-0",
Simple("common.items.utility.lockpick_0"): "voxel.object.lockpick",
// Gliders
Simple("common.items.glider.cloverleaf"): "voxel.glider.starter",
Simple("common.items.glider.basic_white"): "voxel.glider.basic_white",