Merge branch 'master' into fix-syntax-warnings

2024-11-27 23:37:50 +01:00
parent 954a164922 08d4e852d3
commit 45f0743c57
530 changed files with 104471 additions and 23536 deletions
--- a/scripts/itemDiff.py
+++ b/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):