Samuel Keiffer 79d97cdc22 Merge branch 'sam/diminishing-cc' into 'master' ... Diminishing returns for certain crowd control debuffs See merge request veloren/veloren!4482		2024-05-29 15:50:09 +00:00
..
common	Merge branch 'sam/projectile-rework' into 'master'	2024-05-29 08:13:49 +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	Merge branch 'sam/diminishing-cc' into 'master'	2024-05-29 15:50:09 +00:00
world	new_sahagin	2024-05-29 00:01:46 +00:00