Samuel Keiffer 4b359b8ca4 Merge branch 'aweinstock/price-equality' into 'master' ... Add a manifest for making different items count as the same item for the purpose of pricing. See merge request veloren/veloren!2360		2021-06-02 23:48:45 +00:00
..
common	Merge branch 'aweinstock/price-equality' into 'master'	2021-06-02 23:48:45 +00:00
server	Merge branch 'sam/rework-bow' into 'master'	2021-05-26 04:44:09 +00:00
voxygen	Address MR 2301 review comments.	2021-06-02 00:39:58 -04:00
world	New default world map, default continent scale doubled	2021-03-28 17:07:38 +01:00