Issue/1305 (#1311)

* Bump dev version

* fix issue in itemDiff

* Do not apply Prop Jamming to Grapplers (#1305)
This commit is contained in:
Ryan Holmes
2017-10-08 21:13:38 -04:00
committed by GitHub
parent dfe3d5c82a
commit 3fb7411b9d
3 changed files with 7 additions and 6 deletions

View File

@@ -89,8 +89,8 @@ def main(old, new, groups=True, effects=True, attributes=True, renames=True):
dictionary[id] = name
for id in set(old_namedata.keys()).intersection(new_namedata.keys()):
oldname = old_namedata[id]
newname = new_namedata[id]
oldname = old_namedata[id] if old_namedata[id] is not None else 'None'
newname = new_namedata[id] if new_namedata[id] is not None else 'None'
if oldname != newname:
ren_dict[id] = (oldname, newname)
return