Justin Shipsey be4d8a7138 Merge branch 'snowram/npcs-names-json-to-ron' into 'master' ... Converts npcs names file to ron See merge request veloren/veloren!1659		2020-12-23 07:43:57 +00:00
..
common	Merge branch 'snowram/npcs-names-json-to-ron' into 'master'	2020-12-23 07:43:57 +00:00
voxygen	cleanup, changelog, small bugfixes	2020-12-14 21:52:24 +01:00
world	Better group frame placement	2020-12-10 21:31:19 +01:00