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

Merged
merged 43 commits into from
Aug 19, 2017
Merged

Dev merge to master #6207

merged 43 commits into from
Aug 19, 2017

Commits on Jul 29, 2017

  1. Added only_catch_better_iv and only_catch_better_cp

    @davidakachaos
    davidakachaos committed Jul 29, 2017
    Configuration menu
    Copy the full SHA
    39a697b View commit details
    Browse the repository at this point in the history

  2. Added only_catch_better_iv and only_catch_better_cp

    @davidakachaos
    davidakachaos committed Jul 29, 2017
    Configuration menu
    Copy the full SHA
    422348c View commit details
    Browse the repository at this point in the history

  3. Get the current pokemon

    @davidakachaos
    davidakachaos committed Jul 29, 2017
    Configuration menu
    Copy the full SHA
    1770805 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. Changes to /snipe and /snipetime command 

    No longer need to delete comma from coordinates. Simply copy and paste. Changes the return time format to Min:Sec
    @MerlionRock
    MerlionRock authored Aug 4, 2017
    Configuration menu
    Copy the full SHA
    f9d2945 View commit details
    Browse the repository at this point in the history

  2. Time display changes 

    Changes the return time format to Min:Sec
    @MerlionRock
    MerlionRock authored Aug 4, 2017
    Configuration menu
    Copy the full SHA
    d8581f5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6191 from MerlionRock/tele-snipe-change 

    Tele snipe change
    @nbq
    nbq authored Aug 4, 2017
    Configuration menu
    Copy the full SHA
    2c6c8de View commit details
    Browse the repository at this point in the history

  4. brought web up to date

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

  5. Merge pull request #6192 from nbq/new-web 

    brought web up to date
    @Jcolomar
    Jcolomar authored Aug 4, 2017
    Configuration menu
    Copy the full SHA
    2c1db90 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2017

  1. Merge pull request #2 from PokemonGoF/dev 

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

  2. Updated "evolve_for_xp" 

    Added Gen 2 Pokemons to "evolve_for_xp" rule
There are:
| `#161`<br>`Sentret`   | `#220`<br>`Swinub` | `#163`<br>`Hoothoot`| `#165`<br>`Ledyba`  | `#177`<br>`Natu`      | `#167`<br>`Spinarak`  |
| `#194`<br>`Wooper`    | `#183`<br>`Marill` | `#223`<br>`Remoraid`|                     |                       |                       |
    @MerlionRock
    MerlionRock authored Aug 5, 2017
    Configuration menu
    Copy the full SHA
    ddf7713 View commit details
    Browse the repository at this point in the history

  3. Updated doc for optimizer 

    Added Gen 2 to evolve_for_xp rule
    @MerlionRock
    MerlionRock authored Aug 5, 2017
    Configuration menu
    Copy the full SHA
    64ec36a View commit details
    Browse the repository at this point in the history

  4. README feature update 

    Updated with new features as well as notable features
    @MerlionRock
    MerlionRock authored Aug 5, 2017
    Configuration menu
    Copy the full SHA
    7da4be4 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6195 from MerlionRock/readme-update 

    Read me update
    @nbq
    nbq authored Aug 5, 2017
    Configuration menu
    Copy the full SHA
    71b22ef View commit details
    Browse the repository at this point in the history

  6. Merge pull request #6193 from MerlionRock/evolve-for-xp-gen2 

    Evolve for xp gen2
    @nbq
    nbq authored Aug 5, 2017
    Configuration menu
    Copy the full SHA
    a48dd74 View commit details
    Browse the repository at this point in the history

  7. Timezone lib

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

  8. Merge pull request #6197 from PokemonGoF/Jcolomar-patch-1 

    Timezone lib
    @MerlionRock
    MerlionRock authored Aug 5, 2017
    Configuration menu
    Copy the full SHA
    5593a70 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2017

  1. web update

    @nbq
    nbq committed Aug 6, 2017
    Configuration menu
    Copy the full SHA
    5a12f2d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6199 from nbq/web_update 

    web update
    @nbq
    nbq authored Aug 6, 2017
    Configuration menu
    Copy the full SHA
    250c960 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2017

  1. testing goman proxy

    @nbq
    nbq committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    5fb48dc View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2017

  1. first run at adding proxy support

    @nbq
    nbq committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    2acb83d View commit details
    Browse the repository at this point in the history

  2. second run at adding proxy support

    @nbq
    nbq committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    69e2bae View commit details
    Browse the repository at this point in the history

  3. Mimic Niantic App in API Check

    @nbq
    nbq committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    dab6997 View commit details
    Browse the repository at this point in the history

  4. random cleanup in config doc and added proxy entry to auth example json

    @nbq
    nbq committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    3048fb8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6200 from nbq/proxy_test 

    Adding proxy support to the bot
    @MerlionRock
    MerlionRock authored Aug 9, 2017
    Configuration menu
    Copy the full SHA
    fa7d41f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #6162 from davidakachaos/dev 

    Added only_catch_better_iv and only_catch_better_cp
    @Jcolomar
    Jcolomar authored Aug 9, 2017
    Configuration menu
    Copy the full SHA
    55e910a View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2017

  1. Merge pull request #3 from PokemonGoF/dev 

    Main Dev to Fork Dev
    @MerlionRock
    MerlionRock authored Aug 11, 2017
    Configuration menu
    Copy the full SHA
    366ea66 View commit details
    Browse the repository at this point in the history

  2. Update config with "bypass_warning" 

    Update config with "bypass_warning"
    @MerlionRock
    MerlionRock authored Aug 11, 2017
    Configuration menu
    Copy the full SHA
    e49b20e View commit details
    Browse the repository at this point in the history

  3. Various Login Enhancement 

    1. Remove looping in run.sh
2. Updated get_inbox
3. Added "bypass_warning" defaulted to false
4. PGoAPI warning and Niantic Warning confirmation before bot continues. Can be by pass with "bypass_warning" set to true
    @MerlionRock
    MerlionRock authored Aug 11, 2017
    Configuration menu
    Copy the full SHA
    d30389e View commit details
    Browse the repository at this point in the history

  4. Various Login Enhancement 

    1. Remove looping in run.sh
2. Updated get_inbox
3. Added "bypass_warning" defaulted to false
4. PGoAPI warning and Niantic Warning confirmation before bot continues. Can be by pass with "bypass_warning" set to true
    @MerlionRock
    MerlionRock authored Aug 11, 2017
    Configuration menu
    Copy the full SHA
    2d1040d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6201 from MerlionRock/WarningPatch 

    Warning Patch & Login Enhancement
    @nbq
    nbq authored Aug 11, 2017
    Configuration menu
    Copy the full SHA
    e2f2436 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2017

  1. Merge pull request #4 from PokemonGoF/dev 

    Merge from Main Repo
    @MerlionRock
    MerlionRock authored Aug 15, 2017
    Configuration menu
    Copy the full SHA
    06fe782 View commit details
    Browse the repository at this point in the history

  2. Added config for Golden Razz Berries 

    Added config for Golden Razz Berries
    @MerlionRock
    MerlionRock authored Aug 15, 2017
    Configuration menu
    Copy the full SHA
    8aad5f1 View commit details
    Browse the repository at this point in the history

  3. Added Golden Razz Berry Support 

    Added Golden Razz Berry Support.

If you don't want the bot to use razz berry at all, set threshold to 0
    @MerlionRock
    MerlionRock authored Aug 15, 2017
    Configuration menu
    Copy the full SHA
    43cbeb6 View commit details
    Browse the repository at this point in the history

  4. Added golden razz 

    Added golden razz
    @MerlionRock
    MerlionRock authored Aug 15, 2017
    Configuration menu
    Copy the full SHA
    c253f40 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6203 from MerlionRock/GoldebRazz 

    Added Golden Razz Berries Support
    @Jcolomar
    Jcolomar authored Aug 15, 2017
    Configuration menu
    Copy the full SHA
    db8656b View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2017

  1. updated web again

    @nbq
    nbq committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    0762fef View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2017

  1. Merge pull request #6204 from nbq/webdate 

    updated web again
    @MerlionRock
    MerlionRock authored Aug 18, 2017
    Configuration menu
    Copy the full SHA
    022e6cc View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2017

  1. Merge pull request #5 from PokemonGoF/dev 

    Merge from Main Repo
    @MerlionRock
    MerlionRock authored Aug 19, 2017
    Configuration menu
    Copy the full SHA
    7e392c5 View commit details
    Browse the repository at this point in the history

  2. Kill Switch

    @MerlionRock
    MerlionRock authored Aug 19, 2017
    Configuration menu
    Copy the full SHA
    3870f9e View commit details
    Browse the repository at this point in the history

  3. Added Killswitch

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

  4. Kill Switch Config 

    Can be disabled
    @MerlionRock
    MerlionRock authored Aug 19, 2017
    Configuration menu
    Copy the full SHA
    d56fc80 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6206 from MerlionRock/Killswitch 

    Killswitch
    @nbq
    nbq authored Aug 19, 2017
    Configuration menu
    Copy the full SHA
    f8921bd View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into dev

    @solderzzc
    solderzzc authored Aug 19, 2017
    Configuration menu
    Copy the full SHA
    18da5c0 View commit details
    Browse the repository at this point in the history