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 to Master #5964

Merged
merged 9 commits into from
Mar 15, 2017
Merged

Dev to Master #5964

merged 9 commits into from
Mar 15, 2017

Conversation

pogarek
Copy link
Contributor

@pogarek pogarek commented Mar 15, 2017

No description provided.

davidakachaos and others added 9 commits March 14, 2017 09:24
Fixes an issue with a source hiding latitude and longitude of Pokemons
when using it without a subscription.
Also converts IV to float instead of an integer. Some sites use IVs like
96.7
Since now candy gained is no longer fixed at 3, good to show user how many candies gained instead of just total
Changes from using old API call to new API call
Added Pinap Berry Support
- Pinap berry will be used instead of Razz Berry if use_pinap_on_vip is set to true (Under ctach_pokemon task)
- Razz berry will still be used when running out of Pinap Berries
- Amount of candies gained will be reported as it is no longer fixed at 3
Added "use_pinap_on_vip" to CatchPokemon Task. Default to false
Added instruction on how to use Pinap Berry
Wrong files uploaded perviously
@mention-bot
Copy link

@pogarek, thanks for your PR! By analyzing the history of the files in this pull request, we identified @YvesHenri, @Gobberwart and @MerlionRock to be potential reviewers.

@pogarek pogarek merged commit 7e17370 into master Mar 15, 2017
@pogarek
Copy link
Contributor Author

pogarek commented Mar 15, 2017

merged #5964

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.

4 participants