Dev merge to master #4987
Merged
Dev merge to master #4987
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 egg_incubators to json inventory file * Small changes in incubate_eggs.py
Fix incubate eggs
Removed PokemonGo-Bot update from start bat, because ppl could run in troubles if they didn't check the updated config.json.examples Added PokemonGo-Bot update to seperated file.
PokemonGo-Bot-Updater
* Need of api call to update inventory when an egg hatchs to be able to encounter the pokemon that hatched * Reverted/removed 'except IndexError', not needed now
Fix incubate eggs
Reduces file IO and eliminates chance of error
- Get stats from inventory instead of reading .json - Issue with "master" id - Truncated km_walked to 2 decimals for readability
This was removed due to duplication, but now the first call has been removed, this one is needed again.
Minor telegram tweak (km_walked truncated to 2 decimals)
Added capture_stats() back to UpdateLiveStats
Fixing WebUI Logging
|
@solderzzc, thanks for your PR! By analyzing the annotation information on this pull request, we identified @nivong, @danielsdian and @supercourgette to be potential reviewers |
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.
No description provided.