Samuel Keiffer a0599ac046 Merge branch 'sam/extra-equip-slots' into 'master' ... Added Extra Loadout Slots See merge request veloren/veloren!2295		2021-05-21 20:28:53 +00:00
..
assets	Merge branch 'alphyr/guess_image_format' into 'master'	2021-05-12 18:41:22 +00:00
base	* Replaced diesel with rusqlite and refinery	2021-04-13 22:05:47 +00:00
benches	Remove spurious uses of Vox.	2020-09-26 16:30:40 +02:00
ecs	include origin into system name	2021-04-20 01:30:27 +02:00
frontend	Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"	2021-05-17 08:32:12 -07:00
net	Added non-admin moderators and timed bans.	2021-05-09 21:19:16 -07:00
src	Merge branch 'sam/extra-equip-slots' into 'master'	2021-05-21 20:28:53 +00:00
state	Don't remesh chunk vertex data on sprite update.	2021-05-11 12:58:15 -07:00
systems	Swapping weapon sets is now functional. (Though very hacky?)	2021-05-15 15:16:39 -05:00
build.rs	fix and improve nix build: actually output a proper veloren voxygen package now	2020-11-25 02:00:50 +03:00
Cargo.toml	Added non-admin moderators and timed bans.	2021-05-09 21:19:16 -07:00