Samuel Keiffer abea5bc9f3 Merge branch 'necti/revert-sword-speed-buff-energy-reward' into 'master' ... reverting recover duration of some sword attacks and increasing the energy... See merge request veloren/veloren!4338		2024-02-22 00:59:10 +00:00
..
common	Merge branch 'necti/revert-sword-speed-buff-energy-reward' into 'master'	2024-02-22 00:59:10 +00:00
server/manifests	terracotta	2024-02-15 06:08:03 +00:00
test/loadout/ok	Rebase commit	2022-05-16 15:11:36 -04:00
voxygen	Merge branch 'danielkenji83/block-based-on-poise' into 'master'	2024-02-21 16:53:24 +00:00
world	review comments	2024-02-21 14:11:20 +01:00