Ben Wallis 5a5cdf2362 Merge branch 'aweinstock/scaleprice' into 'master' ...

Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices.

See merge request veloren/veloren!2521

2021-06-28 21:03:44 +00:00

..

common

Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices.

2021-06-28 09:24:22 -04:00

server

Gem Rings and small change to trading.

2021-06-26 02:44:02 +00:00

voxygen

Merge branch 'imbris/bind-order' into 'master'

2021-06-28 15:39:31 +00:00

world

Merge branch 'aweinstock/lava' into 'master'

2021-06-21 20:49:44 +00:00