Snowram 6e8daefa97 Merge branch 'snowram/new-npcs-batch' into 'master' ... Snowram/new npcs batch See merge request veloren/veloren!2495		2021-06-25 20:29:41 +00:00
..
common	Increases base damage of husk attack, rename some cultist weapons	2021-06-25 21:18:28 +02:00
server	mining exp sct color and icon; add mining to skill_preset	2021-06-13 14:34:42 -04:00
voxygen	Merge branch 'snowram/new-npcs-batch' into 'master'	2021-06-25 20:29:41 +00:00
world	Merge branch 'aweinstock/lava' into 'master'	2021-06-21 20:49:44 +00:00