Christof Petig 2dce472d1f Merge branch 'christof/modular-weapon-prices' into 'master' ... Implement material (de-)composition for modular weapons, add tusk+crest+pincer to price list See merge request veloren/veloren!3469		2022-07-14 18:24:21 +00:00
..
assets	Upgrade assets_manager to 0.8.0 and image to 0.24	2022-05-28 23:18:31 +02:00
base	Update tracy	2022-05-26 00:04:03 -04:00
benches	use criterion groups and fix tracing to much on wgpu	2021-06-03 22:37:17 +02:00
ecs	update hashbrown, specs, and tracy	2022-07-06 15:41:59 +02:00
frontend	economy trace defaults to info	2022-05-29 19:08:39 +02:00
net	update hashbrown, specs, and tracy	2022-07-06 15:41:59 +02:00
src	Merge branch 'christof/modular-weapon-prices' into 'master'	2022-07-14 18:24:21 +00:00
state	update hashbrown, specs, and tracy	2022-07-06 15:41:59 +02:00
systems	update hashbrown, specs, and tracy	2022-07-06 15:41:59 +02:00
build.rs	use bg_main.jpg instead of bg_main.png	2021-06-18 20:41:18 +03:00
Cargo.toml	update hashbrown, specs, and tracy	2022-07-06 15:41:59 +02:00