Merge branch 'master' into stable

futapi · Nov 16, 2015 · 197b906 · 197b906
2 parents e6449d2 + 18d34e5
commit 197b906
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,10 @@ Changelog
 ---------
 
 
+0.1.5 (2015-11-15)
+++++++++++++++++++
+* core: fix club (thanks to hunterjm #169)
+
 0.1.4 (2015-10-29)
 ++++++++++++++++++
 * core: fix itemParse (thanks to hunterjm #163)

diff --git a/README.rst b/README.rst
@@ -22,6 +22,11 @@ Players database (json): http://cdn.content.easports.com/fifa/fltOnlineAssets/B4
 Usage
 -----
 
+AutoBuyer GUI
+`````````````
+If You're looking for "user friendly" autobuyer take a look at hunterjm's project:
+https://github.com/hunterjm/futgui/releases
+
 Login
 `````````````
 Optional parameters:

diff --git a/fut/__init__.py b/fut/__init__.py
@@ -18,7 +18,7 @@
 """
 
 __title__ = 'fut'
-__version__ = '0.1.4'
+__version__ = '0.1.5'
 __author__ = 'Piotr Staroszczyk'
 __author_email__ = 'piotr.staroszczyk@get24.org'
 __license__ = 'GNU GPL v3'

diff --git a/fut/core.py b/fut/core.py
@@ -551,15 +551,15 @@ def club(self, count=10, level=10, type=1, start=0):
             Returns items in your club, excluding consumables
 
             count - the number of cards you want to request
-            level - Not quite sure, It always seems to be 10
+            level - 10 for ALL, 3 for gold, 2 for silver, 1 for bronze
             type - the type of card that you need:
                 set to 1 for players
                 set to 100 for staff
                 set to 142 for club items
             start - position to start from
         """
-        data = {'count': count, 'level': level, 'type': type, 'start': start}
-        rc = self.__get__(self.urls['fut']['Club'], data=json.dumps(data))
+        params = {'count': count, 'level': level, 'type': type, 'start': start}
+        rc = self.__get__(self.urls['fut']['Club'], params=params)
         return [itemParse({'itemData': i}) for i in rc['itemData']]
 
     def squad(self, squad_id=0):

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 
 __title__ = 'fut'
-__version__ = '0.1.4'
+__version__ = '0.1.5'
 __author__ = 'Piotr Staroszczyk'
 __author_email__ = 'piotr.staroszczyk@get24.org'
 __license__ = 'GNU GPL v3'