Merge dev to master (fix outdated branch error).#4865

Merged

mjmadsen merged 12 commits intomasterfrom dev

Aug 28, 2016

Commits on Aug 28, 2016

Expand simple logging options (#4832 )

Gobberwart
authored and
mjmadsen
committed
Changed ) to } (#4845 )

LuckyMe4Evers
authored and
mjmadsen
committed
fix incubator logic (#4848 )

rawgni
authored and
mjmadsen
committed
Update configuration_files.md (#4854 )

askovpen
authored and
mjmadsen
committed
corrected logic to respect snipe = true (#4855 )

DBa2016
authored and
mjmadsen
committed
Revert "corrected logic to respect snipe = true" (#4857 )
mjmadsen
authored
dont forget to update the docs when adding config changes... (#4856 )

nivong
authored and
mjmadsen
committed
please keep this as is (#4859 )

nivong
authored and
mjmadsen
committed
Clarify Max_distance for Sniping (#4858 )

Jasperrr91
authored and
mjmadsen
committed
- debug improvements for MoveToMap (#4860 )

DBa2016
authored and
mjmadsen
committed
Fixes catch rates. (#4863 )

Jasperrr91
authored and
mjmadsen
committed
Merge branch 'master' into dev
mjmadsen
authored