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 #5993

Merged
merged 41 commits into from
Apr 7, 2017
Merged

Dev merge to Master #5993

merged 41 commits into from
Apr 7, 2017

Commits on Mar 31, 2017

  1. Pokemon Optimizer (bulk transfer)

    @walaoaaa1234
    walaoaaa1234 committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    70df546 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5987 from walaoaaa1234/bulktransfer 

    Bulk Transfer
    @pogarek
    pogarek authored Mar 31, 2017
    Configuration menu
    Copy the full SHA
    34d0ff4 View commit details
    Browse the repository at this point in the history

  3. missed

    @walaoaaa1234
    walaoaaa1234 committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    437c2bd View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5988 from walaoaaa1234/bulktransfer 

    Bulktransfer Fix
    @pogarek
    pogarek authored Mar 31, 2017
    1 Configuration menu
    Copy the full SHA
    9fe31b7 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2017

  1. Update Pinap Uses 

    Added the following:
"pinap_on_level_below" - Set at what level (and below) of the pokemon should Pinap berry br use on
"pinap_operator": "or" - Set if Pinap berry going to be use together with "use_pinap_on_vip" or without (Operator "or" | "and")
"pinap_ignore_threshold": - Set if bot is going to ignore catch rate threshold when using pinap berry
    @MerlionRock
    MerlionRock authored Apr 1, 2017
    Configuration menu
    Copy the full SHA
    1a20519 View commit details
    Browse the repository at this point in the history

  2. Pinap berry use change 

    Added the following:
"pinap_on_level_below"
"pinap_operator": "or"
"pinap_ignore_threshold"
    @MerlionRock
    MerlionRock authored Apr 1, 2017
    Configuration menu
    Copy the full SHA
    961dee0 View commit details
    Browse the repository at this point in the history

  3. Update on Pinap berry uses 

    Added 3 new Pinap berry configuration
    @MerlionRock
    MerlionRock authored Apr 1, 2017
    Configuration menu
    Copy the full SHA
    200a618 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5990 from MerlionRock/dev 

    Update Pinap Uses
    @Jcolomar
    Jcolomar authored Apr 1, 2017
    Configuration menu
    Copy the full SHA
    3108e02 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2017

  1. UpdatHashStats

    @walaoaaa1234
    walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    7c1ae76 View commit details
    Browse the repository at this point in the history

  2. Update doc.

    @walaoaaa1234
    walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    3f09197 View commit details
    Browse the repository at this point in the history

  3. Update doc 2

    @walaoaaa1234
    walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    f1ebdb2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5991 from walaoaaa1234/UpdateHashStats 

    Nice one. Merged
    @Jcolomar
    Jcolomar authored Apr 3, 2017
    Configuration menu
    Copy the full SHA
    13a99e9 View commit details
    Browse the repository at this point in the history

  5. Pokemon Optimizer (bulk transfer)

    @walaoaaa1234
    walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    3d2bc51 View commit details
    Browse the repository at this point in the history

  6. missed

    @walaoaaa1234
    walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    9d835a7 View commit details
    Browse the repository at this point in the history

  7. Update Pinap Uses 

    Added the following:
"pinap_on_level_below" - Set at what level (and below) of the pokemon should Pinap berry br use on
"pinap_operator": "or" - Set if Pinap berry going to be use together with "use_pinap_on_vip" or without (Operator "or" | "and")
"pinap_ignore_threshold": - Set if bot is going to ignore catch rate threshold when using pinap berry
    @MerlionRock @walaoaaa1234
    MerlionRock authored and walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    3eb1a18 View commit details
    Browse the repository at this point in the history

  8. Pinap berry use change 

    Added the following:
"pinap_on_level_below"
"pinap_operator": "or"
"pinap_ignore_threshold"
    @MerlionRock @walaoaaa1234
    MerlionRock authored and walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    e59373c View commit details
    Browse the repository at this point in the history

  9. Update on Pinap berry uses 

    Added 3 new Pinap berry configuration
    @MerlionRock @walaoaaa1234
    MerlionRock authored and walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    a54bf1b View commit details
    Browse the repository at this point in the history

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

    …o dev
    @walaoaaa1234
    walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    14cdfda View commit details
    Browse the repository at this point in the history

  11. Transfer_pokemon update

    @walaoaaa1234
    walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    0e63e2c View commit details
    Browse the repository at this point in the history

  12. Fix

    @walaoaaa1234
    walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    be19c69 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into dev

    @solderzzc
    solderzzc authored Apr 3, 2017
    Configuration menu
    Copy the full SHA
    29e9573 View commit details
    Browse the repository at this point in the history

  14. FIX

    @walaoaaa1234
    walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    29089cf View commit details
    Browse the repository at this point in the history

  15. Docs

    @walaoaaa1234
    walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    d7b7950 View commit details
    Browse the repository at this point in the history

  16. travis

    @walaoaaa1234
    walaoaaa1234 committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    25bff50 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #5994 from walaoaaa1234/Bulktransfer 

    Bulktransfer Fix
    @pogarek
    pogarek authored Apr 3, 2017
    Configuration menu
    Copy the full SHA
    418f4a3 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2017

  1. Bulktransfer improvement.

    @walaoaaa1234
    walaoaaa1234 committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    f053ad5 View commit details
    Browse the repository at this point in the history

  2. Revert "Bulktransfer improvement." 

    This reverts commit f053ad5.
    @walaoaaa1234
    walaoaaa1234 committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    23cf321 View commit details
    Browse the repository at this point in the history

  3. Bulktransfer improve

    @walaoaaa1234
    walaoaaa1234 committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    a045494 View commit details
    Browse the repository at this point in the history

  4. Update bulktransfer docs

    @walaoaaa1234
    walaoaaa1234 committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    9840bfd View commit details
    Browse the repository at this point in the history

  5. Update and fix docs

    @walaoaaa1234
    walaoaaa1234 committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    4705ee4 View commit details
    Browse the repository at this point in the history

  6. Docs

    @walaoaaa1234
    walaoaaa1234 committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    12ef062 View commit details
    Browse the repository at this point in the history

  7. Fix

    @walaoaaa1234
    walaoaaa1234 committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    0ed2b4e View commit details
    Browse the repository at this point in the history

  8. Fix

    @walaoaaa1234
    walaoaaa1234 committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    4f8d8d5 View commit details
    Browse the repository at this point in the history

  9. Rename variable

    @walaoaaa1234
    walaoaaa1234 committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    e2024f5 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #5995 from walaoaaa1234/Bulktransfer 

    Bulktransfer improve
    @Jcolomar
    Jcolomar authored Apr 4, 2017
    Configuration menu
    Copy the full SHA
    9e38b73 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2017

  1. PGoAPI Version Change 

    Once committed, will force user to be using latest PGoAPI
    @MerlionRock
    MerlionRock authored Apr 5, 2017
    Configuration menu
    Copy the full SHA
    337a85e View commit details
    Browse the repository at this point in the history

  2. PGoAPI Version change 

    Once committed, will force user to be using latest PGoAPI
    @MerlionRock
    MerlionRock authored Apr 5, 2017
    Configuration menu
    Copy the full SHA
    3da9734 View commit details
    Browse the repository at this point in the history

  3. Version change 

    Change how bot searches for PGoAPI change.

Not the smartest way of doing it, if anyone has better suggestion, feel free to suggest.
    @MerlionRock
    MerlionRock authored Apr 5, 2017
    Configuration menu
    Copy the full SHA
    ec10c43 View commit details
    Browse the repository at this point in the history

  4. Mistake

    @walaoaaa1234
    walaoaaa1234 committed Apr 5, 2017
    Configuration menu
    Copy the full SHA
    06ecf39 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #5998 from walaoaaa1234/Bulktransfer 

    Bulktransfer fix (mistake)
    @MerlionRock
    MerlionRock authored Apr 5, 2017
    Configuration menu
    Copy the full SHA
    50832fc View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2017

  1. Merge pull request #5997 from MerlionRock/dev 

    PgoAPI Change
    @pogarek
    pogarek authored Apr 6, 2017
    Configuration menu
    Copy the full SHA
    bf03916 View commit details
    Browse the repository at this point in the history