Marcel b0702d792a Merge branch 'juliancoffee/asset_entity' into 'master' ... EntityInfo assetization. See merge request veloren/veloren!2382		2021-06-14 12:56:28 +00:00
..
common	Merge branch 'juliancoffee/asset_entity' into 'master'	2021-06-14 12:56:28 +00:00
server	add new armour and legendary weapons to /kit	2021-06-11 01:33:18 +03:00
voxygen	Merge branch 'Veloren_Kisa-master-patch-51169' into 'master'	2021-06-13 21:55:57 +00:00
world	comment addressing, cave tweaks	2021-06-07 11:01:46 +02:00