Monty Marz 9f0ca486f7 Merge branch 'aweinstock/small-fixes' into 'master' ... Distinguish NAMETAG_MERCHANT_RANGE from NAMETAG_GROUP_RANGE. See merge request veloren/veloren!2277		2021-05-09 09:58:44 +00:00
..
anim	Removed useless clippy allow, added todo.	2021-05-04 11:27:17 -04:00
benches	rayon::join creates a global threadpool, which is only used in /world	2021-05-04 21:06:07 +02:00
examples	(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf	2020-08-20 20:34:59 +02:00
src	Merge branch 'aweinstock/small-fixes' into 'master'	2021-05-09 09:58:44 +00:00
build.rs	feat(voxygen): add logo for windows executable	2019-10-02 16:57:08 +02:00
Cargo.toml	rayon::join creates a global threadpool, which is only used in /world	2021-05-04 21:06:07 +02:00
clippy.toml	(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf	2020-08-20 20:34:59 +02:00