Marcel e5dfc6261c Merge branch 'ztianyang/lantern' into 'master' ...

Crafting recipe for black lantern

See merge request veloren/veloren!3590

2022-10-02 17:46:38 +00:00

..

common

Crafting recipe for black lantern

2022-10-02 17:46:36 +00:00

server/manifests

add guitar & instrument sample edits

2022-09-10 17:23:38 +00:00

test/loadout/ok

Rebase commit

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

voxygen

Complete German Translation

2022-10-02 17:45:26 +00:00

world

fix_desert_rock_animals

2022-09-22 18:42:34 +00:00