Monty Marz 0dfddb21b1 Merge branch 'bafon/always-show-bars-setting' into 'master' ... Add setting to always show energy bars See merge request veloren/veloren!2836		2021-09-15 12:04:44 +00:00
..
common	Fixed fall damage and sceptre regen.	2021-09-14 06:53:01 -04:00
server	0.11 Background images and more	2021-09-10 08:34:01 +00:00
voxygen	Merge branch 'bafon/always-show-bars-setting' into 'master'	2021-09-15 12:04:44 +00:00
world	Balanced frequency of dungeons.	2021-09-11 18:59:04 -04:00