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

Added pokeball output for counts and an alert if they have none #1450

Merged
merged 15 commits into from
Jul 30, 2016
Merged

Added pokeball output for counts and an alert if they have none #1450

merged 15 commits into from
Jul 30, 2016

Commits on Jul 29, 2016

  1. Added output alerting user they have no pokeballs

    @BornSupercharged
    BornSupercharged committed Jul 29, 2016
    Configuration menu
    Copy the full SHA
    46ed7f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2016

  1. Merge pull request #1 from NecronomiconCoding/master 

    Merge commits
    @BornSupercharged
    BornSupercharged authored Jul 30, 2016
    Configuration menu
    Copy the full SHA
    9b390f6 View commit details
    Browse the repository at this point in the history

  2. Adding in current pokeball inventory display before recycling.

    @BornSupercharged
    BornSupercharged committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    7e1ad92 View commit details
    Browse the repository at this point in the history

  3. Merged conflicting code

    @BornSupercharged
    BornSupercharged committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    517ef5c View commit details
    Browse the repository at this point in the history

  4. Merged files

    @BornSupercharged
    BornSupercharged committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    963125a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'NecronomiconCoding-master'

    @BornSupercharged
    BornSupercharged committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    e9b58f0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2 from NecronomiconCoding/master 

    This has now been merged.
    @BornSupercharged
    BornSupercharged authored Jul 30, 2016
    Configuration menu
    Copy the full SHA
    0e3d119 View commit details
    Browse the repository at this point in the history

  7. Added translations for pokeball output

    @BornSupercharged
    BornSupercharged committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    d81fad1 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3 from NecronomiconCoding/master 

    Merging with master
    @BornSupercharged
    BornSupercharged authored Jul 30, 2016
    Configuration menu
    Copy the full SHA
    caf1554 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #4 from NecronomiconCoding/master 

    Merging with latest
    @BornSupercharged
    BornSupercharged authored Jul 30, 2016
    Configuration menu
    Copy the full SHA
    3c28ef2 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #5 from NecronomiconCoding/master 

    Merging with latest
    @BornSupercharged
    BornSupercharged authored Jul 30, 2016
    Configuration menu
    Copy the full SHA
    8f3e851 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #6 from NecronomiconCoding/master 

    Merging latest
    @BornSupercharged
    BornSupercharged authored Jul 30, 2016
    Configuration menu
    Copy the full SHA
    78726f7 View commit details
    Browse the repository at this point in the history

  12. Fixed remaining translations

    @BornSupercharged
    BornSupercharged committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    3850078 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #7 from NecronomiconCoding/master 

    Merging latest
    @BornSupercharged
    BornSupercharged authored Jul 30, 2016
    Configuration menu
    Copy the full SHA
    f223bef View commit details
    Browse the repository at this point in the history

  14. Merge pull request #8 from NecronomiconCoding/master 

    Merging latest
    @BornSupercharged
    BornSupercharged authored Jul 30, 2016
    Configuration menu
    Copy the full SHA
    ed66947 View commit details
    Browse the repository at this point in the history