Samuel Keiffer ec5a4c61d9 Merge branch 'juliancoffee/quick_trading_balancing' into 'master' ... trading.ron rebalance See merge request veloren/veloren!2471		2021-06-19 01:10:18 +00:00
..
common	balance scale to catch steel	2021-06-18 00:13:42 +03:00
server	mining exp sct color and icon; add mining to skill_preset	2021-06-13 14:34:42 -04:00
voxygen	Merge branch 'zesterer/meta' into 'master'	2021-06-18 12:35:16 +00:00
world	comment addressing, cave tweaks	2021-06-07 11:01:46 +02:00