Merge branch 'master' into develop

Noctem · Apr 7, 2017 · e9baf81 · e9baf81
2 parents 862e6aa + 3b7ad2e
commit e9baf81
Show file tree

Hide file tree

Showing 20 changed files with 584 additions and 38 deletions.
diff --git a/aiopogo/__init__.py b/aiopogo/__init__.py
@@ -1,7 +1,7 @@
 from .exceptions import PleaseInstallProtobufVersion3
 
 __title__ = 'aiopogo'
-__version__ = '1.6.0b2'
+__version__ = '1.7.0b1'
 __author__ = 'David Christenson'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright (c) 2017 David Christenson <https://github.com/Noctem>'

diff --git a/aiopogo/hash_server.py b/aiopogo/hash_server.py
@@ -56,7 +56,7 @@ async def hash(self, timestamp, latitude, longitude, accuracy, authticket, sessi
 
         # request hashes from hashing server
         try:
-            async with self._session.post("http://pokehash.buddyauth.com/api/v127_4/hash", headers=headers, json=payload) as resp:
+            async with self._session.post("http://pokehash.buddyauth.com/api/v129_1/hash", headers=headers, json=payload) as resp:
                 try:
                     response = await resp.json(encoding='ascii', loads=json_loads)
                 except ValueError as e:

diff --git a/aiopogo/protos/pogoprotos/data/logs/fort_search_log_entry_pb2.py b/aiopogo/protos/pogoprotos/data/logs/fort_search_log_entry_pb2.py
diff --git a/aiopogo/protos/pogoprotos/data/player_data_pb2.py b/aiopogo/protos/pogoprotos/data/player_data_pb2.py
diff --git a/aiopogo/protos/pogoprotos/data/redeem/__init__.py b/aiopogo/protos/pogoprotos/data/redeem/__init__.py
diff --git a/aiopogo/protos/pogoprotos/data/redeem/poke_candy_pb2.py b/aiopogo/protos/pogoprotos/data/redeem/poke_candy_pb2.py
diff --git a/aiopogo/protos/pogoprotos/data/redeem/redeemed_avatar_item_pb2.py b/aiopogo/protos/pogoprotos/data/redeem/redeemed_avatar_item_pb2.py
diff --git a/aiopogo/protos/pogoprotos/data/redeem/redeemed_item_pb2.py b/aiopogo/protos/pogoprotos/data/redeem/redeemed_item_pb2.py