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

Made paths to .json files absolute so pokecli.py can be called from CRON #3157

Merged
merged 5 commits into from
Aug 9, 2016
Merged

Made paths to .json files absolute so pokecli.py can be called from CRON #3157

merged 5 commits into from
Aug 9, 2016

Commits on Aug 8, 2016

  1. Made paths to .json files absolute so pokecli.py can be called from CRON

    @Quantra
    Quantra committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    b631850 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2016

  1. Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int… 

    …o PokemonGoF-dev

# Conflicts:
#	pokemongo_bot/__init__.py
#	pokemongo_bot/cell_workers/catch_visible_pokemon.py
    @Quantra
    Quantra committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    b9160a0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int… 

    …o PokemonGoF-dev
    @Quantra
    Quantra committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    32a779f View commit details
    Browse the repository at this point in the history

  3. made file paths abs in inventory 

    fixed incorrect dict reference, changed to .get() as felt this was intended
    @Quantra
    Quantra committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    f246051 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int… 

    …o PokemonGoF-dev
    @Quantra
    Quantra committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    cba9e85 View commit details
    Browse the repository at this point in the history