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

Merged
merged 3 commits into from
Mar 2, 2017
Merged

Dev merge to master #5937

merged 3 commits into from
Mar 2, 2017

Conversation

solderzzc
Copy link
Contributor

Dev merge to master

pogarek and others added 3 commits March 1, 2017 21:22
#5935)

* updating jsons, web submodule and disabling social_handler to broker.pikabot.org

* fir for Kingdra evolution and for tests

* re-enabling social_handler
* Version Checking & Minor Fixes

Version checking is now fully automatic between PGoAPI and Niantic's API, using hashing endpoint provided by bossland

The check will pass even if PGoAPI is ahead of Niantic's force API

Minor Fixes:
- Corrected error throw when facing captcha during login
- Removed version checking against POGOProtos

* Extra '}' removed

* API Check Pass with more infor

Let user know what API version the bot is currently using instead of just "Niantic API Check pass"
@pogarek
Copy link
Contributor

pogarek commented Mar 2, 2017

web submodule haven't got updated.. it is ok on dev.. any idea why?

@pogarek
Copy link
Contributor

pogarek commented Mar 2, 2017

aaaa. not merged yet, sorry :)

@solderzzc
Copy link
Contributor Author

oops, forgot to merge it...

@solderzzc
Copy link
Contributor Author

You can comment a 👍 , then the button will change to green.

@solderzzc solderzzc merged commit 5e8b2e0 into master Mar 2, 2017
@pogarek
Copy link
Contributor

pogarek commented Mar 2, 2017

oh, really? I thought it comes from pull approve. good to know, thanks

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.

3 participants