Marcel 3b7e3f8e74 Merge branch 'vfoulon80/trading-dialogues' into 'master'
Add dialogue when the Merchant is busy and randomize some trading dialogues

See merge request veloren/veloren!2038
2021-04-01 18:08:44 +00:00
..
2021-03-29 14:47:42 +00:00
2021-03-29 14:47:42 +00:00
2021-04-01 19:13:08 +02:00
2021-02-16 21:29:45 +00:00
2021-03-28 18:22:47 +01:00
2021-03-27 13:29:17 +01:00
2021-01-07 20:25:12 +00:00
2021-02-04 00:18:46 -05:00