Marcel e54b4d5797 Merge branch 'DaforLynx/campfire-loading-tip' into 'master' ... Loading screen tip for campfire healing See merge request veloren/veloren!1601		2020-12-12 00:29:57 +00:00
..
common	Makes consumables heal faster	2020-12-10 18:06:32 +01:00
voxygen	Merge branch 'DaforLynx/campfire-loading-tip' into 'master'	2020-12-12 00:29:57 +00:00
world	Better group frame placement	2020-12-10 21:31:19 +01:00