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

Merged
merged 14 commits into from
Apr 14, 2017
Merged

Dev merge to master #6017

merged 14 commits into from
Apr 14, 2017

Conversation

solderzzc
Copy link
Contributor

Dev merge to master

MerlionRock and others added 13 commits April 10, 2017 16:25
Change the logic of version checking with Bossland hashing
Stop hunting Ivysaurs when we need a Bulbasaur
Adding how to use a proxy with docker
I noticed my Pokemons werent upgraded at all.
After look into this, I saw the stardust calculation subtracted the would-be used
dust always! But when we determin the Pokemon cant be upgraded, we didnt use the dust
This will "refund" this dust for the calculations and determin if the following mon
can be upgraded
The GitHub Markdown interpreter has recently been changed to strictly
enforce the GFM spec which has caused some Markdown to no longer display
as originally intended.
@mention-bot
Copy link

@solderzzc, thanks for your PR! By analyzing the history of the files in this pull request, we identified @nelsyeung, @danielsdian and @alexyaoyang to be potential reviewers.

@solderzzc solderzzc merged commit 263da69 into master Apr 14, 2017
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.

7 participants