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.

Sign up for GitHub

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

Jump to bottom

LevelUpPokemonTask #1586

Merged
merged 12 commits into from
Aug 1, 2016
Merged

LevelUpPokemonTask #1586

merged 12 commits into from
Aug 1, 2016

Commits on Jul 31, 2016

  1. Merge remote-tracking branch 'refs/remotes/NecronomiconCoding/master'

    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    53a1878 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/NecronomiconCoding/master'

    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    74c3e7d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/NecronomiconCoding/master'

    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    a45d81a View commit details
    Browse the repository at this point in the history

  4. fix LevelUpPokemonTask

    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    c1db967 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'refs/remotes/NecronomiconCoding/master'

    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    983612e View commit details
    Browse the repository at this point in the history

  6. Revert "fix LevelUpPokemonTask" 

    This reverts commit c1db967.
    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    d201b1e View commit details
    Browse the repository at this point in the history

  7. LevelUpPokemonTask 

    only check the list of pokemons used to upgrade
    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    6f1b75e View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'refs/remotes/NecronomiconCoding/master'

    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    a7697b3 View commit details
    Browse the repository at this point in the history

  9. line removed

    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    8bb1166 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'refs/remotes/NecronomiconCoding/master'

    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    d16e87a View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'refs/remotes/NecronomiconCoding/master'

    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    7d8df93 View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'refs/remotes/NecronomiconCoding/master'

    @keinPlan
    keinPlan committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    1713ca9 View commit details
    Browse the repository at this point in the history