Samuel Keiffer a2c19cd047 Merge branch 'aweinstock/trade-requestitem' into 'master' ...

During a trade, allow requesting items from the counterparty's inventory...

See merge request veloren/veloren!1829

2021-03-01 02:39:36 +00:00

..

common

weapon/manifest tweaks

2021-02-27 10:44:55 -05:00

voxygen

Merge branch 'aweinstock/trade-requestitem' into 'master'

2021-03-01 02:39:36 +00:00

world

Sarrakitty/small fixes

2021-02-08 20:37:24 +00:00