Marcel 0d0845c32e Merge branch 'patch-2' into 'master' ...

I did it from scratch to match other languages files. -Deleted some tabs and empty spaces. I hope it's the last fix and that it finally appears in the next update.

See merge request veloren/veloren!1262

2020-08-06 23:05:41 +00:00

..

common

Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar

2020-08-05 01:21:42 +02:00

voxygen

Merge branch 'patch-2' into 'master'

2020-08-06 23:05:41 +00:00

world

Added 36 Swords

2020-05-29 18:23:00 +00:00