Merge branch 'sam/fix' into 'master'

Fix emerald sceptre. Remove duplicate asset.

See merge request veloren/veloren!2023
This commit is contained in:
Imbris 2021-03-29 01:21:37 +00:00
commit 9df3004843
2 changed files with 1 additions and 4 deletions

View File

@ -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"),

Binary file not shown.