Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 12 commits into from
Aug 28, 2016
Merged

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

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6c9f865
Expand simple logging options (#4832)
Gobberwart Aug 28, 2016
2832a37
Changed ) to } (#4845)
LuckyMe4Evers Aug 28, 2016
d896a80
fix incubator logic (#4848)
rawgni Aug 28, 2016
6acdc53
Update configuration_files.md (#4854)
askovpen Aug 28, 2016
5a1e246
corrected logic to respect snipe = true (#4855)
DBa2016 Aug 28, 2016
4dd28e3
Revert "corrected logic to respect snipe = true" (#4857)
mjmadsen Aug 28, 2016
f1fe942
dont forget to update the docs when adding config changes... (#4856)
Aug 28, 2016
f6775cc
please keep this as is (#4859)
Aug 28, 2016
1b90f3f
Clarify Max_distance for Sniping (#4858)
Jasperrr91 Aug 28, 2016
a01f4dd
- debug improvements for MoveToMap (#4860)
DBa2016 Aug 28, 2016
18d7589
Fixes catch rates. (#4863)
Jasperrr91 Aug 28, 2016
007f02a
Merge branch 'master' into dev
mjmadsen Aug 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.