Marcel 2a0c8e575f Merge branch 'kinggred-master-patch-80352' into 'master' ... Update main.ron See merge request veloren/veloren!2123		2021-04-17 18:28:31 +00:00
..
common	Merge branch 'gGmMsS/Burning' into 'master'	2021-04-15 23:51:33 +00:00
server	Support quantity + use Enum for autocompletion + Address comments	2021-04-12 20:07:34 +02:00
voxygen	Merge branch 'kinggred-master-patch-80352' into 'master'	2021-04-17 18:28:31 +00:00
world	New default world map, default continent scale doubled	2021-03-28 17:07:38 +01:00