Merge branch 'master' into issue-1289

config.py

@@ -19,8 +19,8 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.32.0"
-tag = "Stable   "
+version = "1.33.0"
+tag = "git"
 expansionName = "YC119.9"
 expansionVersion = "1.3"
 evemonMinVersion = "4081"

eos/effects/propulsionskillcapneedbonusskilllevel.py

@@ -7,7 +7,8 @@ type = "passive"
 
 
 def handler(fit, container, context):
-    groups = ("Stasis Web", "Stasis Grappler", "Warp Scrambler", "Warp Disrupt Field Generator")
+
     level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
                                   "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)

scripts/itemDiff.py

@@ -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