Merge branch 'master' into fix-syntax-warnings

scripts/icons_update.py

@@ -95,7 +95,7 @@ def get_children(parent):
     return children
 
 
-query_items = 'select distinct iconID from invtypes'
+query_items = 'select distinct it.iconID from invtypes as it inner join invgroups as ig on it.groupID = ig.groupID where ig.categoryID != 2118'
 query_groups = 'select distinct iconID from invgroups'
 query_cats = 'select distinct iconID from invcategories'
 query_market = 'select distinct iconID from invmarketgroups'

scripts/itemDiff.py

@@ -94,7 +94,7 @@ def main(old, new, groups=True, effects=True, attributes=True, renames=True):
             print('\nRenamed ' + title + ':')
             for id in sorted(ren_dict):
                 couple = ren_dict[id]
-                print(("    \"{0}\": \"{1}\",".format(couple[0].encode('utf-8'), couple[1].encode('utf-8'))))
+                print(("    \"{0}\": \"{1}\",".format(couple[0], couple[1])))
 
     groupcats = {}
     def getgroupcat(grp):