Marcel b09698b8ac Merge branch 'shouvik/prevent_empty_trades' into 'master' ... Fixes #1452 - Prevents empty trades Closes #1452 See merge request veloren/veloren!3202		2022-02-16 21:41:26 +00:00
..
assets	Move common-assets to 2021 edition	2022-01-26 15:09:00 +02:00
base	Move Veloren to 2021 edition	2022-01-26 16:46:40 +02:00
benches	use criterion groups and fix tracing to much on wgpu	2021-06-03 22:37:17 +02:00
ecs	Move Veloren to 2021 edition	2022-01-26 16:46:40 +02:00
frontend	Fix RUSTSEC-2022-0006	2022-01-26 22:08:38 +01:00
net	Gnarlign site tweaks and chieftain buff	2022-02-11 01:23:09 -05:00
src	Merge branch 'shouvik/prevent_empty_trades' into 'master'	2022-02-16 21:41:26 +00:00
state	Move Veloren to 2021 edition	2022-01-26 16:46:40 +02:00
systems	wallrunning	2022-02-09 19:34:23 -05:00
build.rs	use bg_main.jpg instead of bg_main.png	2021-06-18 20:41:18 +03:00
Cargo.toml	Create asset_migrate bin from entity_migrate	2022-01-28 00:02:34 +02:00