Marcel 53746e5a2c Merge branch 'AMAIOLAMO/update-zh_CN' into 'master' ... Amaiolamo/update zh_CN translation See merge request veloren/veloren!3880		2023-04-27 10:24:30 +00:00
..
common	Add multiloot	2023-04-23 19:17:39 +00:00
server/manifests	Ability changes	2023-03-26 21:41:22 -04:00
test/loadout/ok	Rebase commit	2022-05-16 15:11:36 -04:00
voxygen	Merge branch 'AMAIOLAMO/update-zh_CN' into 'master'	2023-04-27 10:24:30 +00:00
world	taoist&floppy/cyclops&dullahan	2023-04-12 22:53:38 +00:00