Justin Shipsey 9e5c0ce601 Merge branch 'silentium/arms-and-armor' into 'master' ... Added 2 sets of armour. See merge request veloren/veloren!951		2020-05-17 19:03:00 +00:00
..
items	Merge branch 'silentium/arms-and-armor' into 'master'	2020-05-17 19:03:00 +00:00
npc_names.json	cyclops	2020-05-11 21:44:21 -04:00