Samuel Keiffer 8ed78a8bb6 Merge branch 'sam/finisher-consistency' into 'master' ... All finisher abilities now consume all combo See merge request veloren/veloren!4483		2024-05-28 23:58:48 +00:00
..
common	Merge branch 'sam/finisher-consistency' into 'master'	2024-05-28 23:58:48 +00:00
server/manifests	Initial setup	2024-04-28 19:35:12 -04:00
test/loadout/ok	Abyssal rings	2024-04-15 11:00:42 +00:00
voxygen	Fix #1806: Localize PromptDialog	2024-05-24 17:18:41 +00:00
world	new_cultist	2024-05-12 18:33:11 +00:00