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

Merge upstream to this #1

Merged
merged 36 commits into from
Jul 27, 2016
Merged

Conversation

hendrawd
Copy link
Owner

No description provided.

iBorna and others added 30 commits July 27, 2016 15:26
update for german translation
Update translation.ru_RU.json
Brazilian Portuguese Translation
This reverts commit 2e705b9.
…Experience was Awarded , instead needs to be when NOT awarded experience.
Bug Fix: softban detection was incrementing TimesZeroXPawarded incorrectly
…eater than 5 instead should fire when less than or equal to 5'
Bug Fix: FortUsedEvent needs to be called when TimesZeroXPawarded <= 5 not greater than
Update FarmPokestopsTask.cs
@hendrawd hendrawd merged commit 486a979 into hendrawd:master Jul 27, 2016
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.