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.

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

Dev merge to master #5734

Merged
merged 97 commits into from
Oct 1, 2016
Merged

Dev merge to master #5734

merged 97 commits into from
Oct 1, 2016

Conversation

solderzzc
Copy link
Contributor

Dev merge to master

cmezh and others added 30 commits September 21, 2016 14:13
Add a comma in NicknamePokemon task json example
Update configuration_files.md
remove pprint since it is not being used
Respond to possible name == None
Added Nidoran M/F
javajohnHub and others added 29 commits September 25, 2016 18:22
Telegram egg fix /stardust removal
Uses a list of uniqueid strings instead of list of dicts. Unique id is
an md5 hash of (pokemon_id, latitude, longitude and expiration)
Saves scrolling back up to find resume time
Add resume time to catch disabled notifications
[Sniper] Fix cache, and name matching tweak
Avoid task init if task is disabled
Fix the chat_handler class to allow the ordering by date (parameter
_"dated"_) for those Telegram task:

/top <num> <cp-or-iv-or-dated>
/evolved <num> <cp-or-iv-or-dated>
/hatched <num> <cp-or-iv-or-dated>
/caught <num> <cp-or-iv-or-dated>
/released <num> <cp-or-iv-or-dated>
/vanished <num> <cp-or-iv-or-dated>
Telegram task : Ordering by date
…orking (#5570)

* Task EvolvePokemon should give us a status updates so we know it is working

* Task EvolvePokemon should give us a status updates so we know it is working

* Task EvolvePokemon should give us a status updates so we know it is working

* Task EvolvePokemon should give us a status updates so we know it is working

* Task EvolvePokemon should give us a status updates so we know it is working
* Rename loiter to wander

* Fix wandering, behave like loitering was originally supposed to work
…se, then the code will exit.

When daily_spin_limit is reached and bypass_daily_limit is set to true, then the bot will continue its business.
It will send a message every 2 minutes (default but can be changed) that the daily spin limit has been reached.
When daily spin limit is reached, let it continue working instead of …
Uses default values as no config is in memory
Revert "Avoid task init if task is disabled" (#5591)
Load CatchPokemon config in PokemonCatchWorker
Update the documentation with dated parameter
Telegram task : Ordering by date
@Gobberwart Gobberwart merged commit ff7eae5 into master Oct 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.