Marcel 1b36f6cab3 Merge branch 'aweinstock/forcemove-no-pushback' into 'master' ...

Don't apply e2e pushback during a forced movement character state.

See merge request veloren/veloren!2429

2021-06-14 14:42:01 +00:00

..

common

Merge branch 'aweinstock/mining-skill-tree' into 'master'

2021-06-14 14:19:06 +00:00

server

mining exp sct color and icon; add mining to skill_preset

2021-06-13 14:34:42 -04:00

voxygen

Merge branch 'aweinstock/forcemove-no-pushback' into 'master'

2021-06-14 14:42:01 +00:00

world

comment addressing, cave tweaks

2021-06-07 11:01:46 +02:00