Merge branch 'master' into i18n
# Conflicts: # staticdata/fsd_binary/typedogma.json # staticdata/fsd_lite/evetypes.json # staticdata/phobos/metadata.0.json # staticdata/phobos/traits.json
This commit is contained in:
@@ -563,7 +563,10 @@ class FittingView(d.Display):
|
||||
|
||||
if sFit.serviceFittingOptions["rackSlots"]:
|
||||
# flag to know when to add blanks, based on previous slot
|
||||
slotDivider = None if sFit.serviceFittingOptions["rackLabels"] else self.mods[0].slot
|
||||
if sFit.serviceFittingOptions["rackLabels"] or len(self.mods) == 0:
|
||||
slotDivider = None
|
||||
else:
|
||||
slotDivider = self.mods[0].slot
|
||||
|
||||
# first loop finds where slot dividers must go before modifying self.mods
|
||||
for i, mod in enumerate(self.mods):
|
||||
|
||||
Reference in New Issue
Block a user