Joshua Barretto 4bae3a4b62 Merge branch 'make-merchants-send-trade-on-iteraction' into 'master' ...

Make merchants send the player a trade request when interacted with

Closes #1368

See merge request veloren/veloren!2914

2021-10-11 16:45:18 +00:00

..

src

Merge branch 'make-merchants-send-trade-on-iteraction' into 'master'

2021-10-11 16:45:18 +00:00

Cargo.toml

Make Rtsim entity config work

2021-09-27 15:09:22 +03:00