Samuel Keiffer 6e57380735 Merge branch 'sam/ability-pool-and-hotbar' into 'master' ... Ability pool See merge request veloren/veloren!2996		2021-11-12 05:11:12 +00:00
..
common	Abilities can now be referred to by the asset id.	2021-11-10 17:30:19 -05:00
server	Added new Spots, Shrubs and Ships.	2021-10-24 08:10:44 -04:00
voxygen	fixes to branch after my whoops	2021-11-08 17:09:19 -05:00
world	Added site2 worldgen feature	2021-11-01 22:53:38 +00:00