Merge lp:~widelands-dev/widelands/workerwarehotspots into lp:widelands
Proposed by
Benedikt Straub
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 8965 | ||||
Proposed branch: | lp:~widelands-dev/widelands/workerwarehotspots | ||||
Merge into: | lp:widelands | ||||
Diff against target: |
357 lines (+37/-9) 31 files modified
data/tribes/workers/atlanteans/carrier/init.lua (+1/-9) data/tribes/workers/frisians/baker/init.lua (+1/-0) data/tribes/workers/frisians/baker_master/init.lua (+1/-0) data/tribes/workers/frisians/beekeeper/init.lua (+1/-0) data/tribes/workers/frisians/blacksmith/init.lua (+1/-0) data/tribes/workers/frisians/blacksmith_master/init.lua (+1/-0) data/tribes/workers/frisians/brewer/init.lua (+1/-0) data/tribes/workers/frisians/brewer_master/init.lua (+1/-0) data/tribes/workers/frisians/brickmaker/init.lua (+1/-0) data/tribes/workers/frisians/builder/init.lua (+1/-0) data/tribes/workers/frisians/charcoal_burner/init.lua (+1/-0) data/tribes/workers/frisians/claydigger/init.lua (+1/-0) data/tribes/workers/frisians/farmer/init.lua (+1/-0) data/tribes/workers/frisians/fisher/init.lua (+1/-0) data/tribes/workers/frisians/fruit_collector/init.lua (+1/-0) data/tribes/workers/frisians/hunter/init.lua (+1/-0) data/tribes/workers/frisians/landlady/init.lua (+1/-0) data/tribes/workers/frisians/miner/init.lua (+1/-0) data/tribes/workers/frisians/miner_master/init.lua (+1/-0) data/tribes/workers/frisians/reed_farmer/init.lua (+1/-0) data/tribes/workers/frisians/reindeer_breeder/init.lua (+1/-0) data/tribes/workers/frisians/scout/init.lua (+1/-0) data/tribes/workers/frisians/seamstress/init.lua (+1/-0) data/tribes/workers/frisians/seamstress_master/init.lua (+1/-0) data/tribes/workers/frisians/shipwright/init.lua (+1/-0) data/tribes/workers/frisians/smelter/init.lua (+1/-0) data/tribes/workers/frisians/smoker/init.lua (+1/-0) data/tribes/workers/frisians/stonemason/init.lua (+1/-0) data/tribes/workers/frisians/trainer/init.lua (+1/-0) data/tribes/workers/frisians/woodcutter/init.lua (+1/-0) doc/sphinx/source/lua_tribes_workers.rst.org (+7/-0) |
||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands/workerwarehotspots | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
hessenfarmer | test review | Approve | |
GunChleoc | code | Approve | |
Review via email: mp+359915@code.launchpad.net |
Commit message
Fix the ware hotspots for frisian workers and update the documentation
To post a comment you must log in.
Continuous integration builds have changed state:
Travis build 4312. State: passed. Details: https:/ /travis- ci.org/ widelands/ widelands/ builds/ 461756507. /ci.appveyor. com/project/ widelands- dev/widelands/ build/_ widelands_ dev_widelands_ workerwarehotsp ots-4107.
Appveyor build 4107. State: success. Details: https:/