Samuel Keiffer f79493f7d0 Merge branch 'sam/sceptre-nerfs' into 'master' ... Sam/sceptre nerfs See merge request veloren/veloren!2072		2021-04-06 02:41:56 +00:00
..
common	Nerfs	2021-04-05 17:38:52 -04:00
server	airship movement bits	2021-03-21 21:43:49 -04:00
voxygen	Merge branch 'sam/sceptre-nerfs' into 'master'	2021-04-06 02:41:56 +00:00
world	New default world map, default continent scale doubled	2021-03-28 17:07:38 +01:00