Samuel Keiffer a0599ac046 Merge branch 'sam/extra-equip-slots' into 'master' ... Added Extra Loadout Slots See merge request veloren/veloren!2295		2021-05-21 20:28:53 +00:00
..
common	Set poise_resilience to sane values	2021-05-16 01:07:55 +03:00
server	Added kit for testing.	2021-05-10 18:53:50 -05:00
voxygen	Merge branch 'sam/extra-equip-slots' into 'master'	2021-05-21 20:28:53 +00:00
world	New default world map, default continent scale doubled	2021-03-28 17:07:38 +01:00