Samuel Keiffer 00937a4e8b Merge branch 'aweinstock/modularforms' into 'master' ... Support modular weapon components made from a tagged material using the material as a multiplier. See merge request veloren/veloren!1815		2021-02-26 00:53:02 +00:00
..
common	Finish plumbing MaterialStatsManifest. Fix issue with speed clamping when recursing through components. Improve statblocks in item tooltips.	2021-02-25 15:26:49 -05:00
voxygen	Merge branch 'nwildner/pt_BR_trade-updates' into 'master'	2021-02-23 23:21:30 +00:00
world	Sarrakitty/small fixes	2021-02-08 20:37:24 +00:00