Imbris 97e5ad02ff Merge branch 'imbris/stamina-energy' into 'master' ... Replace stamina with energy Closes #1214 See merge request veloren/veloren!2704		2021-08-01 00:26:59 +00:00
..
common	Remove sceptre, add swords	2021-07-29 22:38:35 +00:00
server	Add new food to consumables /kit	2021-07-05 10:56:29 +03:00
voxygen	Merge branch 'imbris/stamina-energy' into 'master'	2021-08-01 00:26:59 +00:00
world	Changed singleplayer map for a better default experience	2021-07-24 11:56:08 +01:00