Merge branch 'master' into test-3

gui/builtinAdditionPanes/boosterView.py

@@ -51,6 +51,7 @@ class BoosterView(d.Display):
         "Base Name",
         "Side Effects",
         "Price",
+        "Miscellanea",
     ]
 
     def __init__(self, parent):

gui/builtinViewColumns/misc.py

@@ -72,6 +72,10 @@ class Miscellanea(ViewColumn):
 
         if itemGroup == "Ship Modifiers":
             return "", None
+        elif itemGroup == "Booster":
+            stuff.getModifiedItemAttr("boosterDuration")
+            text = "{0} min".format(formatAmount(stuff.getModifiedItemAttr("boosterDuration")/1000/60, 3, 0, 3))
+            return text, "Booster Duration"
         elif itemGroup in ("Energy Weapon", "Hybrid Weapon", "Projectile Weapon", "Combat Drone", "Fighter Drone"):
             trackingSpeed = stuff.getModifiedItemAttr("trackingSpeed")
             if not trackingSpeed: