Split npc-speech-merchant_busy into merchant_busy_trading and merchant_busy_combat
requested to merge veloren/dev/veloren:souffle/separate_fighting_trading_merchant_busy_speech into master
-
By opening this merge request, you agree to release your code and all other changes under the GPL 3 license and to abide by the terms set by this license. -
Migrations have been added if applicable (migrations are always necessary for removing/renaming item asset files) -
Significant changes of this merge request have been added to the changelog.