Samuel Keiffer f38cde9d40 Merge branch 'knightresspaladin/healing-aura' into 'master' ... Knightresspaladin/healing aura See merge request veloren/veloren!2587		2021-07-16 21:32:03 +00:00
..
abilities	Merge branch 'knightresspaladin/healing-aura' into 'master'	2021-07-16 21:32:03 +00:00
cave_scatter	trading.ron rebalance	2021-06-17 23:46:52 +03:00
entity	Clean up sceptre ai code before merge	2021-07-07 20:00:35 -07:00
items	Merge branch 'AlexBethel/item-typos' into 'master'	2021-07-15 08:15:43 +00:00
loadout	Removes warlord and warlock armours	2021-06-24 19:30:11 +02:00
loot_tables	Make ItemEquality work	2021-07-05 19:55:08 +03:00
skill_trees	Added combo scaling to healing aura and allowed cultists to use it	2021-07-10 20:02:36 -07:00
skillset	Added healing aura duration skill to voxygen UI	2021-07-10 20:02:36 -07:00
trading	Make ItemEquality work	2021-07-05 19:55:08 +03:00
material_stats_manifest.ron	Added buff strength stat to weapons.	2021-07-11 12:50:38 -05:00
npc_names.ron	Adds alpaca and llama npcs	2021-06-24 19:30:15 +02:00
professions.ron	Use labour value for prices	2021-04-18 17:05:14 +01:00
recipe_book.ron	Make ItemEquality work	2021-07-05 19:55:08 +03:00