Marcel 4b0033ff91 Merge branch 'Nether190/update-pt_BR' into 'master' ...

Nether190/update-pt_BR

See merge request veloren/veloren!3632

2022-10-04 22:10:11 +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

Merge branch 'Nether190/update-pt_BR' into 'master'

2022-10-04 22:10:11 +00:00

world

fix_desert_rock_animals

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