Merge branch 'master' into market_metagroups

gui/builtinAdditionPanes/boosterView.py

@@ -110,6 +110,9 @@ class BoosterView(d.Display):
 
         self.origional = fit.boosters if fit is not None else None
         self.boosters = stuff = fit.boosters[:] if fit is not None else None
+        if stuff is not None:
+            stuff.sort(key=lambda booster: booster.slot or 0)
+
 
         if event.fitID != self.lastFitId:
             self.lastFitId = event.fitID

service/port/eft.py

@@ -119,12 +119,12 @@ def exportEft(fit, options, callback):
     if options[PortEftOptions.IMPLANTS]:
         charSection = []
         implantLines = []
-        for implant in fit.implants:
+        for implant in sorted(fit.implants, key=lambda i: i.slot or 0):
             implantLines.append(implant.item.name)
         if implantLines:
             charSection.append('\n'.join(implantLines))
         boosterLines = []
-        for booster in fit.boosters:
+        for booster in sorted(fit.boosters, key=lambda b: b.slot or 0):
             boosterLines.append(booster.item.name)
         if boosterLines:
             charSection.append('\n'.join(boosterLines))