Ok, since the SF's Merge-request system is still not working, i try this one.
Although i have not created diff files, because first i want to try that you can merge using other way.
Please Try to pull/merge my branch with this link:
https://sourceforge.net/u/fenyo1/freecol/ci/QuickTrade/
If you can not pull/merge from my SF, then please try my GitHub:
https://github.com/fenyo1/FreeCol/tree/QuickTrade
If that is also not working, i will create that diff file.
When enabled, Ships and Wagon Trains do not use up their moves left when trading or arriving to a colony or (un)loading cargo.
Default State: OFF
I have placed this in the Game Options / Map, just under Amphibious moves.
This Feature can be even used for debugging purposes.
Rejected for now, this is FreeCol2 material.