Code

Dev merge to master#5640

Code

Merged

solderzzc merged 197 commits intomasterPokemonGoF/PokemonGo-Bot:masterfrom devPokemonGoF/PokemonGo-Bot:devCopy head branch name to clipboardSep 23, 2016

+8,667-6,888

Commits

Commits on Sep 3, 2016

• Created buddy_pokemon.py

  DeXtroTip

  committed
  7dea1f6

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  ac9acab

• Added pokemon filtering, including per family and best cp

  DeXtroTip

  committed
  6991951

Commits on Sep 5, 2016

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  c14bfc8

• Created set_buddy function

  DeXtroTip

  committed
  c310e5b

• Completed set_buddy

  DeXtroTip

  committed
  e87c9d3

• Added buddy_candy to class Pokemon

  DeXtroTip

  committed
  b57ff77

• Added get_buddy_walked api request to get candy from buddy

  Show description for ac87e80
  DeXtroTip

  committed
  ac87e80

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  62ed72f

Commits on Sep 6, 2016

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  7d91c30

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  2c7bc10

Commits on Sep 8, 2016

• Some updates

  DeXtroTip

  committed
  6fdd484

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  e644ae6

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  f3b5dcd

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  5ed383b

Commits on Sep 11, 2016

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  a4415b0

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  4f574ae

Commits on Sep 12, 2016

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  ebd8292

• Added configs for changing and setting buddy

  DeXtroTip

  committed
  4a6c395

• Reverted wrong file last commit

  DeXtroTip

  committed
  b6055b4

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  a7f286c

• Updated pokemon.json with the km needed for buddy reward

  DeXtroTip

  committed
  5b24650

• Added events

  Show description for e71a1b9
  DeXtroTip

  committed
  e71a1b9

Commits on Sep 13, 2016

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  c2fa0eb

Commits on Sep 14, 2016

• Some updates and errors fix

  Show description for 87909cb
  DeXtroTip

  committed
  87909cb

• Little code changes

  Show description for 4ebcd31
  DeXtroTip

  committed
  4ebcd31

• Py3 First pass

  

  Junaos

  authored and

  Junaos

  committed
  1babb08

• Autoflake/code cleanup

  

  Junaos

  authored and

  Junaos

  committed
  e31c2a7

• Reverted changes to sleep_schedule_test.py

  

  Junaos

  authored and

  Junaos

  committed
  2c44568

• Update submodule

  

  Junaos

  authored and

  Junaos

  committed
  c6efea8

• Add myself as contributor (finally)

  JSchwerberg

  authored
  e02cd59

Commits on Sep 15, 2016

• Merge remote-tracking branch 'jschwerberg/py2-to-3' into py3convert

  

  Junaos

  authored and

  Junaos

  committed
  22d66ca

• Merge remote-tracking branch 'PokemonGoF/dev'

  javajohnHub

  committed
  94502c4

• fix for #5459

  javajohnHub

  committed
  ec53853

Commits on Sep 16, 2016

• Merge remote-tracking branch 'PokemonGoF/dev' into javajohn-dev

  javajohnHub

  committed
  2306d7a

• /caught now functions like /top

  Show description for 67cdcbc
  javajohnHub

  committed
  67cdcbc

• Super ripped off /top

  javajohnHub

  committed
  dd6bbd3

• Super ripped off /top

  javajohnHub

  committed
  70ff051

• changing a mistake

  javajohnHub

  committed
  507fe37

• fixed another mistake

  javajohnHub

  committed
  b59deb2

• Added /vanished command

  javajohnHub

  committed
  9dbcb31

• Yet another fix

  javajohnHub

  committed
  3ff99ca

• Merge pull request #5466 from javajohnHub/javajohn-dev

  Show description for 5ae0afc
  javajohnHub

  authored
  5ae0afc

• Merge remote-tracking branch 'PokemonGoF/dev' into quick-fix-for-telegram

  javajohnHub

  committed
  dc7ffc6

• quick fix for /help

  Show description for 884127c
  javajohnHub

  committed
  884127c

• Changed last to top

  javajohnHub

  committed
  7eb4ae0

• Formatted ivcl so it only shows 2 decimal places

  javajohnHub

  committed
  6f5325f

• Merge pull request #5484 from javajohnHub/quick-fix-for-telegram

  Show description for 214dcde
  javajohnHub

  authored
  214dcde

• Format ivcp output when future release pokemon event is triggered

  javajohnHub

  committed
  7186f55

• Merge pull request #5486 from javajohnHub/quick-fix-for-telegram

  Show description for 14d1939
  javajohnHub

  authored
  14d1939

• Merge remote-tracking branch 'origin/dev' into py3convert

  Show description for 535512e
  

  Junaos

  authored and

  Junaos

  committed
  535512e

• Merge remote-tracking branch 'origin/dev' into py3convert

  Show description for 6830b9b
  

  Junaos

  authored and

  Junaos

  committed
  6830b9b

• Merge branch 'py3convert' of github.com:JSchwerberg/PokemonGo-Bot-2 into py3convert

  

  Junaos

  authored and

  Junaos

  committed
  16e4f79

• Merge remote-tracking branch 'refs/remotes/PokemonGoF/dev' into dev

  Gobberwart

  committed
  66d9362

Commits on Sep 17, 2016

• Fixed VIP and pokemon catch rules logic

  Gobberwart

  committed
  dea21ce

• Fix api issues when session stale (#5482)

  anakin5

  authored
  565c833

• Minor tweak

  Show description for 472acc1
  Gobberwart

  committed
  472acc1

• Turned off debug

  Gobberwart

  committed
  a9c6904

• Merge pull request #5495 from Gobberwart/dev_release_ivcp

  Show description for 86b889a
  Gobberwart

  authored
  86b889a

• Fix api issues when session stale (#5482)

  

  anakin5

  authored and

  Gobberwart

  committed
  1f14886

• Set different defaults based on catch logic or, and, andor, orand

  Gobberwart

  committed
  9378798

• Fixed release trigger

  Show description for 200dbd3
  Gobberwart

  committed
  200dbd3

• Merge pull request #5499 from Gobberwart/dev_fix_min_free_slot

  Show description for 7a495a1
  Gobberwart

  authored
  7a495a1

• Fixed VIP and pokemon catch rules logic

  Gobberwart

  committed
  ca73c8b

• Minor tweak

  Show description for fc8c2a9
  Gobberwart

  committed
  fc8c2a9

• Turned off debug

  Gobberwart

  committed
  1ee1872

• Set different defaults based on catch logic or, and, andor, orand

  Gobberwart

  committed
  a8d83eb

• Added back functionality

  Show description for 715ace5
  Gobberwart

  committed
  715ace5

• Merge pull request #5494 from Gobberwart/dev_faulty_catch_vip

  Show description for 5ccaf93
  javajohnHub

  authored
  5ccaf93

• Fixed conflicts

  Show description for ae58209
  Gobberwart

  committed
  ae58209

• Merge pull request #5490 from JSchwerberg/py3convert

  Show description for 4ef0417
  javajohnHub

  authored
  4ef0417

• Fixed more conflicts

  Gobberwart

  committed
  e4ca9a0

• Added back matches_config logic

  Gobberwart

  committed
  96faddb

• Merge pull request #5502 from Gobberwart/dev_faulty_catch_vip

  Show description for 43d7260
  Gobberwart

  authored
  43d7260

• Merge branch 'dev' of https://github.com/Gobberwart/PokemonGo-Bot into dev

  Gobberwart

  committed
  b6745d0

• Restore vip match functionality

  Gobberwart

  committed
  543f943

• Merge pull request #5505 from Gobberwart/dev_restore_vip

  Show description for 0b70f26
  Gobberwart

  authored
  0b70f26

• fix add pokemon

  rawgni

  committed
  9c6feca

• Telegram refactor

  javajohnHub

  committed
  9702e0f

• Added some prints to test candy limit

  Show description for d7d036b
  DeXtroTip

  committed
  d7d036b

• Fix 5459

  DeXtroTip

  committed
  d69409d

• Revert bad change

  DeXtroTip

  committed
  ec2ef38

• Fixed wrong order

  DeXtroTip

  committed
  25f9b55

• Fixed error not updating buddy_km_needed when changing buddy

  DeXtroTip

  committed
  c067064

• Fix

  DeXtroTip

  committed
  2dad47d

• Merge pull request #5515 from DeXtroTip/fix_5459

  Show description for 5325fe8
  javajohnHub

  authored
  5325fe8

• Merge pull request #5513 from rawgni/fix_addpokemon

  Show description for b2eb347
  javajohnHub

  authored
  b2eb347

Commits on Sep 18, 2016

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  31edee9

• Added a better sniper, on which you'll be able to specify multiple URLs to gather pokemon information.

  Show description for 6b3fccc
  

  YvesHenri

  authored and

  henrimeep

  committed
  6b3fccc

• Merge pull request #5514 from javajohnHub/my-brizzanch

  Show description for 1963971
  solderzzc

  authored
  1963971

• Finally added myself as contributor.

  

  henrimeep

  committed
  7c12ba4

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  acf13c8

• Added missing files (inventory.py) which would lead to errors when calling a function that did not exist until then.

  Show description for fa494d5
  

  henrimeep

  committed
  fa494d5

• Fixed the issue where it cant correctly recognize whether a pokemon has been captured or not. It now defaults to false.

  

  henrimeep

  committed
  2d461bd

• Updated some log messages

  

  henrimeep

  committed
  413965f

• Reverted some log messages

  

  henrimeep

  committed
  35af4fa

• Fix var name error

  DeXtroTip

  committed
  c467f52

• Fixed the parsing of the pokemon expiration info. It now detects whether the pokemon has been expired or not

  

  henrimeep

  committed
  7de504f

• Fixed the parsing of the pokemon expiration info. It now detects whether the pokemon has been expired or not (fixed log)

  

  henrimeep

  committed
  21d4dee

• Fixed wrong var name

  Show description for 1ddae6a
  DeXtroTip

  committed
  1ddae6a

• replace() to stri()

  DeXtroTip

  committed
  e154dd5

• Move connect to after telegram thread starts

  Show description for debe9e4
  Gobberwart

  committed
  debe9e4

Commits on Sep 19, 2016

• Fixed master identification for events

  Gobberwart

  committed
  54f368d

• Moved connect logic to after message building.

  Show description for f092166
  Gobberwart

  committed
  f092166

• Sorted events

  Show description for 0cc5b28
  Gobberwart

  committed
  0cc5b28

• Removed unnecessary import (inventory)

  Show description for ff52eee
  Gobberwart

  committed
  ff52eee

• Merge pull request #5537 from Gobberwart/gobb_dev_telegram

  Show description for a561785
  Gobberwart

  authored
  a561785

• Fixed 'pokemon_caught' event

  Show description for 4cc5b46
  Gobberwart

  committed
  4cc5b46

• Fixed and readded trigger logic

  Gobberwart

  committed
  3e37efc

• Removed try/catch

  Show description for 6b660e9
  Gobberwart

  committed
  6b660e9

• No trigger set

  Gobberwart

  committed
  bf17c33

• give a breakdown of the remaining eggs instead of just showing many eggs are left

  kolinkorr839

  committed
  1190937

• minor fix

  Gobberwart

  committed
  0aa4b42

• Merge pull request #5540 from kolinkorr839/dev

  Show description for b7310bf
  solderzzc

  authored
  b7310bf

• Fix movetomap sniping issues

  Gobberwart

  committed
  8f62190

• Merge pull request #5542 from Gobberwart/gobb_dev_movetomap

  Show description for 05b0ba8
  Gobberwart

  authored
  05b0ba8

• Merge pull request #5539 from Gobberwart/gobb_dev_catcherror

  Show description for 86d9bf7
  Gobberwart

  authored
  86d9bf7

• Fixed issues in chat_handler

  Show description for 1bdc396
  DBa2016

  committed
  1bdc396

• Minor fix in telegram handler in "/showsubs"

  DBa2016

  committed
  3b8536c

• minor fix

  DBa2016

  committed
  5338b85

• Make socket IP dynamic

  chr0nu5

  committed
  08407ab

• Fix some cpm issues (#5529)

  anakin5

  authored
  bab7b7e

• Update requirements.txt with updated api

  DeXtroTip

  committed
  fdaea49

• Should fix #5128 and #5523 (both regards MoveToMapPokemon task). NOTE: Please note that there are many reasons a pokemon will "not exist" and they are: it could be already caught by you, expired, t…

  Show description for 70db754
  

  YvesHenri

  authored and

  henrimeep

  committed
  70db754

• Merge pull request #5545 from chr0nu5/dev

  Show description for dd8736b
  solderzzc

  authored
  dd8736b

• Merge pull request #5522 from YvesHenri/dev

  Show description for 969e5d1
  YvesHenri

  authored
  969e5d1

• Small change to let people know they can also sort by date

  javajohnHub

  committed
  781fb79

• Small fix for output when egg hatches.

  Show description for 5326a41
  javajohnHub

  committed
  5326a41

• Update README.md

  solderzzc

  authored
  07e5907

Commits on Sep 20, 2016

• Updated Sniper docs, config.map.example and config.example files.

  Show description for 93c068d
  

  henrimeep

  committed
  93c068d

• Allow use of ultraball on non-vip

  

  Alex Yao

  committed
  4e98aa9

• Merge pull request #5551 from javajohnHub/telegram

  Show description for e00f444
  Gobberwart

  authored
  e00f444

• Merge pull request #5555 from alexyaoyang/allow-use-of-ultraball-on-non-vip

  Show description for 3a5c36d
  Gobberwart

  authored
  3a5c36d

• Fix incorrect VIP in Sniper

  Gobberwart

  committed
  5081316

• Merge pull request #5557 from Gobberwart/gobb_dev_fixvipsnipe

  Show description for 1bf73e7
  Gobberwart

  authored
  1bf73e7

• Add buddy selection in Pokemon Optimizer. (#5478)

  Show description for d1e983f
  anakin5

  authored
  d1e983f

• Removed discarding of events

  DBa2016

  authored
  19760bc

• Fix crash with upgrade pokemon

  julienlavergne

  committed
  ef2e9ea

• Fix buddy crash and default evolve value in doc

  julienlavergne

  committed
  53748f6

• Fixed the potential bug with homing shots under social mode.

  Show description for 7288a86
  

  henrimeep

  committed
  7288a86

• Fixed wrong config in examples

  DeXtroTip

  committed
  44a436d

• Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

  DeXtroTip

  committed
  6f4d5f8

• Fix example config

  DeXtroTip

  committed
  90a69ee

• Fixed wrong var name

  DeXtroTip

  committed
  aea9e9a

• Merge pull request #5530 from DeXtroTip/buddy_pokemon

  Show description for f4c4b4f
  DeXtroTip

  authored
  f4c4b4f

• Fixed the parsing of the pokemon expiration info. It now detects whether the pokemon has been expired or not

  

  henrimeep

  committed
  ba4673f

• Fixed bug when setting buddy for the first time

  Show description for 56001e8
  DeXtroTip

  committed
  56001e8

• Fix transfer release logic

  Gobberwart

  committed
  4c6601c

• Merge pull request #5575 from Gobberwart/gobb_dev_releasefix

  Show description for f4feb09
  Gobberwart

  authored
  f4feb09

• Fix crash on /login if args != 2

  Gobberwart

  committed
  ebb6bc5

• Merge pull request #5577 from Gobberwart/gobb_dev_fixlogin

  Show description for 1d67155
  Gobberwart

  authored
  1d67155

• Merge pull request #5564 from Anakin5/po

  Show description for 8f82b36
  YvesHenri

  authored
  8f82b36

• Merge pull request #5573 from DeXtroTip/fix_buddy

  Show description for 84bdef2
  DeXtroTip

  authored
  84bdef2

Commits on Sep 21, 2016

• Telegram formatting and msg consolidation

  Show description for 7a4581d
  javajohnHub

  committed
  7a4581d

• PokemonOptimizer: Skip tasks if not enabled (#5581)

  Show description for a99d434
  

  Gobberwart

  authored and

  anakin5

  committed
  a99d434

• removed old code from testing

  javajohnHub

  committed
  b4a9213

• Merge pull request #5583 from javajohnHub/telegramma

  Show description for 7124d15
  Gobberwart

  authored
  7124d15

• Fix PokemonOptimizer ValueError (#5588)

  

  cmezh

  authored and

  anakin5

  committed
  add2923

• Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot into dev

  

  henrimeep

  committed
  bc52edd

• fix regex pattern for gps coordinates (#5578)

  Show description for 62d674a
  

  ukos-git

  authored and

  alexyaoyang

  committed
  62d674a

• Fixed release logic if no rule matches

  Gobberwart

  committed
  2d22f7e

• Removed debug print

  Gobberwart

  committed
  3f3e178

• Added comments

  Gobberwart

  committed
  93e9b00

• Merge pull request #5596 from Gobberwart/gobb_fixrelease_nomatch

  Show description for fb3524d
  Gobberwart

  authored
  fb3524d

• Minor fix

  Show description for 2bfd63a
  Gobberwart

  committed
  2bfd63a

• Remove return true

  Gobberwart

  committed
  38201e1

• Merge pull request #5597 from Gobberwart/gobb_fixrelease_nomatch

  Show description for cf12383
  Gobberwart

  authored
  cf12383

Commits on Sep 22, 2016

• Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot into dev

  

  henrimeep

  committed
  7ee6213

• Fixed the docs typo (sources -> enabled).

  Show description for 2808ee5
  

  henrimeep

  committed
  2808ee5

• Merge pull request #5554 from YvesHenri/dev

  Show description for a8d7a22
  Gobberwart

  authored
  a8d7a22

• Fix #5461wrong documentation

  Show description for f189742
  

  Christian Cardin

  authored
  f189742

• restored example vip list

  Gobberwart

  committed
  b0b6687

• Merge pull request #5599 from Gobberwart/gobb_restore_vips

  Show description for 7de764a
  Gobberwart

  authored
  7de764a

• Merge pull request #5544 from DBa2016/fix_chat_handler

  Show description for e12bae9
  Gobberwart

  authored
  e12bae9

• Added six>=1.9.0 in requirements.txt

  Gobberwart

  committed
  530c7c7

• Merge pull request #5601 from Gobberwart/gobb_requirements

  Show description for 7ecaa17
  Gobberwart

  authored
  7ecaa17

• Remove event emit from catchworker

  Gobberwart

  committed
  2cd76ac

• Changed >= to ==

  Show description for 516ae30
  Gobberwart

  committed
  516ae30

• Merge pull request #5604 from Gobberwart/gobb_candyspam

  Show description for 8cf361e
  Gobberwart

  authored
  8cf361e

• Merge pull request #5606 from Gobberwart/gobb_requirements

  Show description for 9ad0dc4
  Gobberwart

  authored
  9ad0dc4

• Fix wrong documentation for always_catch

  Show description for 261438d
  

  Christian Cardin

  authored
  261438d

• Merge pull request #5598 from sech90/patch-1

  Show description for 120a20d
  Gobberwart

  authored
  120a20d

• fix pokemon caught being displayed in telegram

  javajohnHub

  committed
  e1f3d60

• Sniper task: Keeping 'missing' Pokemon + sorting order correction (#5613)

  Show description for 66f2fe2
  

  GhosterBot

  authored and

  solderzzc

  committed
  66f2fe2

• fix pokemon caught being displayed in telegram (#5616)

  

  javajohnHub

  authored and

  solderzzc

  committed
  f753a9e

• Fix order/display of IV and CP in Telegram /caught function (#5610)

  

  JaapMoolenaar

  authored and

  solderzzc

  committed
  fcc2a3f

• Add source timeouts

  Gobberwart

  committed
  cf1b13d

• Added more info to doc

  Gobberwart

  committed
  91be91d

• Merge pull request #1 from javajohnHub/telegram

  Show description for f8faac5
  javajohnHub

  authored
  f8faac5

• Removed print debug statement

  Gobberwart

  committed
  b31f8af

Commits on Sep 23, 2016

• Pokemon Optimizer improvements

  julienlavergne

  committed
  8521101

• Merge pull request #5626 from Anakin5/po

  Show description for dfbfa87
  cmezh

  authored
  dfbfa87

• Merge pull request #5624 from Gobberwart/gobb_snipetimeout

  Show description for 9c05c96
  Gobberwart

  authored
  9c05c96

• Merge remote-tracking branch 'PokemonGoF/dev' into tele-fix

  javajohnHub

  committed
  c0d5d6c

• fix logout issue

  Show description for 937ede9
  javajohnHub

  committed
  937ede9

• Merge pull request #5637 from javajohnHub/tele-fix

  Show description for 629fcaa
  javajohnHub

  authored
  629fcaa

• Merge branch 'master' into dev

  solderzzc

  authored
  ffc7e0e