Samuel Keiffer 4d62b9b937 Merge branch 'ygor/combat-rating-all-stats' into 'master' ... Use all armor stats to calculate combat rating Closes #1285 See merge request veloren/veloren!2770		2021-08-20 21:16:05 +00:00
..
src	Merge branch 'ygor/combat-rating-all-stats' into 'master'	2021-08-20 21:16:05 +00:00
Cargo.toml	simd must be last till we have a propper vek crate update	2021-08-20 12:44:46 +02:00