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

Jump to bottom

Merge dev to master #4864

Merged
merged 11 commits into from
Aug 28, 2016
Merged

Merge dev to master #4864

merged 11 commits into from
Aug 28, 2016

Commits on Aug 28, 2016

  1. Expand simple logging options (#4832) 

    * Fix bot crash at start on permaban

* Expanded logging options

Added "logging" section to config, with options "color",
"show_datetime", "show_process_name" and "show_log_level"

* Added warning about deprecated logging_color arg

* Display log message moved

No point trying to use the logger before it's been initialised. Moved to
init_config.

* Remove milliseconds from datetime

Because really, do we need that?

* Reversed condition order for clarity

First check: "if not in config", OR
Second check: "is in config AND set to true"

If either condition matches, the logging detail will be displayed.

* Documented new log options

* Modified conditions again

Removed unnecessary second check for config values and slightly modified
parentheses as per suggestion from @mjmadsen
    @Gobberwart @mjmadsen
    Gobberwart authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    6c9f865 View commit details
    Browse the repository at this point in the history

  2. Changed ) to } (#4845) 

    Fixed an faulty character
    @LuckyMe4Evers @mjmadsen
    LuckyMe4Evers authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    2832a37 View commit details
    Browse the repository at this point in the history

  3. fix incubator logic (#4848)

    @rawgni @mjmadsen
    rawgni authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    d896a80 View commit details
    Browse the repository at this point in the history

  4. Update configuration_files.md (#4854)

    @askovpen @mjmadsen
    askovpen authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    6acdc53 View commit details
    Browse the repository at this point in the history

  5. corrected logic to respect snipe = true (#4855)

    @DBa2016 @mjmadsen
    DBa2016 authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    5a1e246 View commit details
    Browse the repository at this point in the history

  6. Revert "corrected logic to respect snipe = true" (#4857)

    @mjmadsen
    mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    4dd28e3 View commit details
    Browse the repository at this point in the history

  7. dont forget to update the docs when adding config changes... (#4856) 

    * dont forget to update the docs when adding config changes...

* reflect config changes....
    @mjmadsen
    nivong authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    f1fe942 View commit details
    Browse the repository at this point in the history

  8. please keep this as is (#4859) 

    Add stuff in the right order.
    @mjmadsen
    nivong authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    f6775cc View commit details
    Browse the repository at this point in the history

  9. Clarify Max_distance for Sniping (#4858) 

    * Clarify Max_distance

* Added distance unit and updated configuration_files.md
    @Jasperrr91 @mjmadsen
    Jasperrr91 authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    1b90f3f View commit details
    Browse the repository at this point in the history

  10. - debug improvements for MoveToMap (#4860) 

    - fix for Telegram to accept "@username" as "master", too, along with numeric  IDs
    @DBa2016 @mjmadsen
    DBa2016 authored and mjmadsen committed Aug 28, 2016
    3 Configuration menu
    Copy the full SHA
    a01f4dd View commit details
    Browse the repository at this point in the history

  11. Fixes catch rates. (#4863)

    @Jasperrr91 @mjmadsen
    Jasperrr91 authored and mjmadsen committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    18d7589 View commit details
    Browse the repository at this point in the history