Joshua Yanovski 0ed801d540 Merge remote-tracking branch 'origin/master' into sharp/small-fixes		2020-08-12 16:32:24 +02:00
..
items	timeout visuals, various small fixes and two new items	2020-08-08 01:15:58 +02:00
loot_table.ron	timeout visuals, various small fixes and two new items	2020-08-08 01:15:58 +02:00
npc_names.json	Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes	2020-08-07 06:47:10 +02:00
recipe_book.ron	Crafting	2020-07-14 20:11:39 +00:00