mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'sam/fix' into 'master'
Fix emerald sceptre. Remove duplicate asset. See merge request veloren/veloren!2023
This commit is contained in:
commit
9df3004843
@ -210,7 +210,7 @@
|
||||
(0.10, "common.items.weapons.staff.dragon_tongue"),
|
||||
(0.10, "common.items.weapons.staff.flamethrower_0"),
|
||||
(0.04, "common.items.weapons.staff.bent_fuse"),
|
||||
(0.04, "common.items.weapons.staff.emerald"),
|
||||
(0.04, "common.items.weapons.sceptre.emerald"),
|
||||
(0.04, "common.items.weapons.staff.orc_iron"),
|
||||
// hammers
|
||||
(0.01, "common.items.weapons.hammer.cobalt_hammer-0"),
|
||||
|
BIN
assets/voxygen/voxel/weapon/staff/emerald.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/weapon/staff/emerald.vox
(Stored with Git LFS)
Binary file not shown.
Loading…
Reference in New Issue
Block a user