Joshua Barretto b6d8182382 Merge branch 'zesterer/item-merging' into 'master' ... Zesterer/item merging See merge request veloren/veloren!3912		2023-05-05 00:03:22 +00:00
..
assets	update veloren deps	2023-05-04 11:58:43 +02:00
base	Update tracy-client to 0.15.2, also use tracy_client through the	2023-04-18 21:28:15 -04:00
benches	Add multiloot	2023-04-23 19:17:39 +00:00
dynlib	update veloren deps	2023-05-04 11:58:43 +02:00
ecs	fix clippy errors	2022-11-28 14:08:11 +01:00
frontend	we need a new version of refinery that needs a new version of rusqlite, so update both	2023-05-04 20:53:00 +02:00
net	update veloren deps	2023-05-04 11:58:43 +02:00
src	Addressed comments	2023-05-04 23:18:40 +01:00
state	Merge branch 'xMAC94x/update_deps' into 'master'	2023-05-04 18:28:59 +00:00
systems	Updated hashbrown, removed some to_owned calls in handling recently unequipped items	2023-04-19 18:43:40 -04:00
build.rs	Removed existing LFS check	2023-01-18 22:31:33 +00:00
Cargo.toml	update veloren deps	2023-05-04 11:58:43 +02:00