Dev merge to master #5640
Merged
Dev merge to master #5640
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added way to search pokemon from unique_id Little changes on how task works
Some little code fixes
* Added config to force buddy change at start * Added checks to see if pokemon can be set as buddy * Added and updated some events * Added colored events * Added periodically display of buddy km track * Now prints total candy after reward
Update config example files
#5461 is due to wrong syntax in the documentation, as it mentions "never_capture" instead of "never_catch" from pokemon_catch_worker.py: ```python if pokemon_config.get('never_catch', False): return False if pokemon_config.get('always_catch', False): return True ```
Restore example vip list
Fixing issues in event fitlering (/events command in chat handler)
Added six>=1.9.0 in requirements.txt
Seems some versions of pip don't like >= ??? Wei
Remove event emit from catchworker
Requirements.txt Changed >= to ==
replaced "always_capture" occurrences with "always_catch"
Fix #5461wrong documentation
) * Snipe task: Keeping 'missing' Pokemon + sorting order correction - A 'missing' only Pokemon (not on the catch_list, no VIP and with a bad IV) will now be keep on the list as a potential target if 'missing' is specified on the order option - The sorting of the targer list is modified to be cumulative. For example, if the `order` option is [`missing`, `vip`, `priority`], then the list will be ordered by 'missing' first, and then VIP's, and finally by Priority. * Adding import Import itemgetter * ortho * Changing attribut call
fix pokemon caught being displayed in telegram
Pokemon Optimizer fixes and improvements
Add timeouts to sniper source config
Gobberwart
approved these changes
Sep 23, 2016
|
@Gobberwart great, let me use 'merge' to keep submit history of contributors. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Dev merge to master