Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Catch pokemon with the current available best ball #422

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

Merged
merged 9 commits into from
Aug 2, 2016
Merged

Catch pokemon with the current available best ball #422

merged 9 commits into from
Aug 2, 2016

Conversation

Cyperghost
Copy link
Contributor

No description provided.

@FabianTerhorst
Copy link
Collaborator

Maybe add an parameter to make the masterball excludable, because the masterball is very rare.

@@ -1 +1 @@
Subproject commit 333e54707ca221324c6b9eedb6a7bc2fcae02270
Subproject commit 636c52f4df519dd74000bbe8e42b8cb32ba8b51a
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you updated the protos?

Copy link
Contributor Author

@Cyperghost Cyperghost Aug 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes,there is a problem?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because #419 used a newer version

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, thanks.
I forgot to change the branch ;(

@FabianTerhorst
Copy link
Collaborator

👍

* Development:
  RxJava conversion (#387)
  fix merge issue
  Development (#248)
  Inflate my ego (add Aphoh to the contributors list in README.md

# Conflicts:
#	src/main/java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java
@Grover-c13 Grover-c13 merged commit d028d78 into Grover-c13:Development Aug 2, 2016
@Cyperghost Cyperghost deleted the Development-Cyperghost branch August 2, 2016 09:40
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