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

Dev merge to master #6185

Merged
merged 19 commits into from
Aug 3, 2017
Merged

Dev merge to master #6185

merged 19 commits into from
Aug 3, 2017

Commits on Aug 1, 2017

  1. Merge pull request #28 from PokemonGoF/dev 

    Import Dev
    @goedzo
    goedzo authored Aug 1, 2017
    Configuration menu
    Copy the full SHA
    355082d View commit details
    Browse the repository at this point in the history

  2. Adding a yes or no question

    @goedzo
    goedzo committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    4f6c5ae View commit details
    Browse the repository at this point in the history

  3. Merge branch 'API-Warning' into PokemonGoF-Dev

    @goedzo
    goedzo authored Aug 1, 2017
    Configuration menu
    Copy the full SHA
    efa6304 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #29 from goedzo/PokemonGoF-Dev 

    Pokemon go f dev
    @goedzo
    goedzo authored Aug 1, 2017
    Configuration menu
    Copy the full SHA
    fb2cace View commit details
    Browse the repository at this point in the history

  5. User friendly API check 

    This gives the user a choice to continue the bot when a new api version is there.
    @goedzo
    goedzo committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    31e128f View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. Optional hashendpoint 

    Optional hashendpoint
    @MerlionRock
    MerlionRock authored Aug 2, 2017
    Configuration menu
    Copy the full SHA
    a887494 View commit details
    Browse the repository at this point in the history

  2. Optional hashendpoint 

    Optional hashendpoint
    @MerlionRock
    MerlionRock authored Aug 2, 2017
    Configuration menu
    Copy the full SHA
    cfa8a4b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6180 from goedzo/API-Warning 

    User Friendly Api warning (Dev)
    @MerlionRock
    MerlionRock authored Aug 2, 2017
    Configuration menu
    Copy the full SHA
    82593eb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into HashEndpoint

    @Jcolomar
    Jcolomar authored Aug 2, 2017
    Configuration menu
    Copy the full SHA
    b20ed34 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6181 from MerlionRock/HashEndpoint 

    Added optional hash end point
    @nbq
    nbq authored Aug 2, 2017
    Configuration menu
    Copy the full SHA
    400292b View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2017

  1. Merge pull request #1 from PokemonGoF/dev 

    Rebase from Main Repo
    @MerlionRock
    MerlionRock authored Aug 3, 2017
    Configuration menu
    Copy the full SHA
    1be2f1d View commit details
    Browse the repository at this point in the history

  2. Update Legendary Pokemon Buddy Distance 

    Update Legendary Pokemon Buddy Distance to 20KM
    @MerlionRock
    MerlionRock authored Aug 3, 2017
    Configuration menu
    Copy the full SHA
    ab60672 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6186 from MerlionRock/Buddy-D 

    Update Legendary Pokemon Buddy Distance
    @nbq
    nbq authored Aug 3, 2017
    Configuration menu
    Copy the full SHA
    47d4aa8 View commit details
    Browse the repository at this point in the history

  4. Update with locale_by_location 

    Update with locale_by_location
    @MerlionRock
    MerlionRock authored Aug 3, 2017
    Configuration menu
    Copy the full SHA
    78f9250 View commit details
    Browse the repository at this point in the history

  5. locale_by_location 

    locale_by_location
    @MerlionRock
    MerlionRock authored Aug 3, 2017
    Configuration menu
    Copy the full SHA
    adb1ab5 View commit details
    Browse the repository at this point in the history

  6. locale_by_location 

    locale_by_location
    @MerlionRock
    MerlionRock authored Aug 3, 2017
    Configuration menu
    Copy the full SHA
    69aaae6 View commit details
    Browse the repository at this point in the history

  7. locale_by_location 

    locale_by_location
    @MerlionRock
    MerlionRock authored Aug 3, 2017
    Configuration menu
    Copy the full SHA
    e692a11 View commit details
    Browse the repository at this point in the history

  8. Remove unused import 

    Remove unused import
    @MerlionRock
    MerlionRock authored Aug 3, 2017
    Configuration menu
    Copy the full SHA
    694222c View commit details
    Browse the repository at this point in the history

  9. Merge pull request #6187 from MerlionRock/locale-by-location 

    Locale by location
    @Jcolomar
    Jcolomar authored Aug 3, 2017
    Configuration menu
    Copy the full SHA
    e935beb View commit details
    Browse the repository at this point in the history