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

Correct logging #2737

Closed
wants to merge 5 commits into from
Closed

Correct logging #2737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c81666d
Update README.md
solderzzc Aug 7, 2016
03b1086
Merge branch 'devlocal'
solderzzc Aug 7, 2016
b53f70f
Merge branch 'master' of https://github.com/PokemonGoF/PokemonGo-Bot
solderzzc Aug 7, 2016
ad6c21a
Update README.md (#2685)
solderzzc Aug 7, 2016
afcef0b
Correct logging
AODLeader Aug 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@

# PokemonGo-Bot
# PokemonGo-Bot (Working)
Copy link
Contributor

Choose a reason for hiding this comment

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

There shouldn't be any changes to the readme in this PR.

PokemonGo bot is a project created by the [PokemonGoF](https://github.com/PokemonGoF) team.
The project is currently setup in two main branches. `dev` and `master`.

## Please submit PR to [Dev branch](https://github.com/PokemonGoF/PokemonGo-Bot/tree/dev)

## Where to get the dll/so ?
## Where to get the dll/so ? A help channel is comming.
You need grab them from internet.

We use [Slack](https://slack.com) as a web chat. [Click here to join the chat!](https://pokemongo-bot.herokuapp.com)
Expand Down Expand Up @@ -64,10 +65,11 @@ To ensure that all updates are documented - [@eggins](https://github.com/eggins)

## Credits
- [tejado](https://github.com/tejado) many thanks for the API
- [U6 Group](http://pgoapi.com) for the U6
- [Mila432](https://github.com/Mila432/Pokemon_Go_API) for the login secrets
- [elliottcarlson](https://github.com/elliottcarlson) for the Google Auth PR
- [AeonLucid](https://github.com/AeonLucid/POGOProtos) for improved protos
- [AHAAAAAAA](https://github.com/AHAAAAAAA/PokemonGo-Map) for parts of the s2sphere stuff


[![Analytics](https://ga-beacon.appspot.com/UA-81468120-1/welcome-page-dev)](https://github.com/igrigorik/ga-beacon)
[![Analytics](https://ga-beacon.appspot.com/UA-81468120-1/welcome-page-master)](https://github.com/igrigorik/ga-beacon)
2 changes: 1 addition & 1 deletion pokecli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def main():
'api_error',
sender=bot,
level='info',
formmated='Log logged in, reconnecting in {:s}'.format(wait_time)
formatted='Log logged in, reconnecting in {:s}'.format(wait_time)
)
time.sleep(wait_time)
except ServerBusyOrOfflineException:
Expand Down
2 changes: 1 addition & 1 deletion pokemongo_bot/cell_workers/evolve_pokemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def _should_run(self):
if result is 1: # Request success
self.emit_event(
'used_lucky_egg',
formmated='Used lucky egg ({amount_left} left).',
formatted='Used lucky egg ({amount_left} left).',
data={
'amount_left': lucky_egg_count - 1
}
Expand Down