Samuel Keiffer 5709427e63 Merge branch 'sam/small-fixes' into 'master' ...

Small fixes for sword

See merge request veloren/veloren!3694

2022-11-16 23:33:12 +00:00

..

common

Merge branch 'sam/small-fixes' into 'master'

2022-11-16 23:33:12 +00:00

server/manifests

Musical Instruments part 2

2022-11-10 20:59:53 +00:00

test/loadout/ok

Rebase commit

2022-05-16 15:11:36 -04:00

voxygen

Merge branch 'mossdrake' into 'master'

2022-11-12 13:00:44 +00:00

world

Merge branch 'ythern/more_unique_abilities' into 'master'

2022-11-15 09:58:06 +00:00