Bump version

New Crowdin updates

.appveyor.yml

@@ -1,96 +1,129 @@
-image: Visual Studio 2019
+image:
+  - Visual Studio 2019
+  - macos
 clone_depth: 400
 
-environment:
-  matrix:
-    - PYTHON: "C:\\Python37-x64"
-# Should be enabled only for build process debugging
-# init:
-#   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-install:
-  - ps: echo("OS version:")
-  - ps: "[System.Environment]::OSVersion.Version"
+for:
+  -
+    matrix:
+      only:
+        - image: Visual Studio 2019
+    environment:
+      PYTHON: "C:\\Python37-x64"
+    # Should be enabled only for build process debugging
+    # init:
+    #   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+    install:
+      - ps: echo("OS version:")
+      - ps: "[System.Environment]::OSVersion.Version"
 
-  - ps: echo("Filesystem - root:")
-  - ps: "ls \"C:\\\""
+      - ps: echo("Filesystem - root:")
+      - ps: "ls \"C:\\\""
 
-  - ps: echo("Filesystem - projects root:")
-  - ps: "ls \"C:\\projects\\\""
+      - ps: echo("Filesystem - projects root:")
+      - ps: "ls \"C:\\projects\\\""
 
-  - ps: echo("Filesystem - pyfa root:")
-  - ps: "ls \"C:\\projects\\$env:APPVEYOR_PROJECT_SLUG\\\""
+      - ps: echo("Filesystem - pyfa root:")
+      - ps: "ls \"C:\\projects\\$env:APPVEYOR_PROJECT_SLUG\\\""
 
-  - ps: echo("Filesystem - installed SDKs:")
-  - ps: "ls \"C:\\Program Files (x86)\\Windows Kits\\\""
+      - ps: echo("Filesystem - installed SDKs:")
+      - ps: "ls \"C:\\Program Files (x86)\\Windows Kits\\\""
 
-  # Prepend newly installed Python to the PATH of this build (this cannot be
-  # done from inside the powershell script as it would require to restart
-  # the parent CMD process).
-  - cmd: "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - cmd: "appveyor DownloadFile https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.20.2-v1.16/gettext0.20.2-iconv1.16-shared-64.zip"
-  - cmd: "7z x gettext0.20.2-iconv1.16-shared-64.zip -ogettext"
-  - cmd: "SET PATH=gettext;%PATH%"
+      # Prepend newly installed Python to the PATH of this build (this cannot be
+      # done from inside the powershell script as it would require to restart
+      # the parent CMD process).
+      - cmd: "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+      - cmd: "appveyor DownloadFile https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.20.2-v1.16/gettext0.20.2-iconv1.16-shared-64.zip"
+      - cmd: "7z x gettext0.20.2-iconv1.16-shared-64.zip -ogettext"
+      - cmd: "SET PATH=gettext;%PATH%"
 
-  - cmd: "python --version"
-  - cmd: "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+      - cmd: "python --version"
+      - cmd: "python -c \"import struct; print(struct.calcsize('P') * 8)\""
 
-  # Upgrade to the latest version of pip to avoid it displaying warnings
-  # about it being out of date.
-  - cmd: "python -m pip install --upgrade pip"
+      # Upgrade to the latest version of pip to avoid it displaying warnings
+      # about it being out of date.
+      - cmd: "python -m pip install --upgrade pip"
 
-  # Install the build dependencies of the project. If some dependencies contain
-  # compiled extensions and are not provided as pre-built wheel packages,
-  # pip will build them from source using the MSVC compiler matching the
-  # target Python version and architecture
-  - ps: echo("Install pip requirements:")
-  # This one is needed to build wxpython 4.0.6 on windows
-  - cmd: "python -m pip install pathlib2"
-  - cmd: "python -m pip install -r requirements.txt"
-  - cmd: "python -m pip install PyInstaller==3.6"
-
-before_build:
-    # directory that will contain the built files
-  - ps: $env:PYFA_DIST_DIR = "c:\projects\$env:APPVEYOR_PROJECT_SLUG\dist"
-  - ps: $env:PYFA_VERSION = (python ./scripts/dump_version.py)
-  - ps: echo("pyfa version $env:PYFA_VERSION")
-
-build_script:
-  - ps: echo("Build pyfa:")
-  - ps: Get-ChildItem locale/*.po -Recurse -File| Foreach {msgen $_.fullname -o $_.fullname}
-    # Build language files
-  - cmd: "python scripts/compile_lang.py"
-    # Dump language progress
-  - cmd: "python scripts/dump_crowdin_progress.py"
-    # Build gamedata DB
-  - cmd: "python db_update.py"
-  # Build command for PyInstaller
-  - cmd: "python -m PyInstaller --noupx --clean --windowed --noconsole -y pyfa.spec"
-  # Copy over manifest (See pyfa-org/pyfa#1622)
-  - ps: xcopy /y dist_assets\win\pyfa.exe.manifest $env:PYFA_DIST_DIR\pyfa\
-  # InnoScript EXE building. This is in a separate script because I don't feel like copying over the logic to AppVeyor script right now...
-  - cmd: "python dist_assets/win/dist.py"
-  - ps: dir $env:PYFA_DIST_DIR/
-
-after_build:
-  - ps: "ls \"./\""
-  - ps: 7z a "pyfa-$env:PYFA_VERSION-win.zip" -r "$env:PYFA_DIST_DIR\pyfa\*"
-
-test_script:
-  # Ha... we're just building
-
-artifacts:
-  - path: pyfa*-win.zip
-  - path: pyfa*-win.exe
-
-deploy:
-  tag: $(pyfa_version)
-  release: pyfa $(pyfa_version)
-  description: 'Release description'
-  provider: GitHub
-  auth_token:
-    secure: X+U3hOAMTt7HGXCR/LXaGNF6qyhUXetrjz5+xlWiNJQ3XEdzhZZmHK75m0Hm6qre
-  draft: true
-  force_update: false
-  # deploy on tag push only
-  on:
-    APPVEYOR_REPO_TAG: true
+      # Install the build dependencies of the project. If some dependencies contain
+      # compiled extensions and are not provided as pre-built wheel packages,
+      # pip will build them from source using the MSVC compiler matching the
+      # target Python version and architecture
+      - ps: echo("Install pip requirements:")
+      # This one is needed to build wxpython 4.0.6 on windows
+      - cmd: "python -m pip install pathlib2"
+      - cmd: "python -m pip install -r requirements.txt"
+      - cmd: "python -m pip install PyInstaller==3.6"
+    before_build:
+        # directory that will contain the built files
+      - ps: $env:PYFA_DIST_DIR = "c:\projects\$env:APPVEYOR_PROJECT_SLUG\dist"
+      - ps: $env:PYFA_VERSION = (python ./scripts/dump_version.py)
+      - ps: echo("pyfa version $env:PYFA_VERSION")
+    build_script:
+      - ps: echo("Build pyfa:")
+      - ps: Get-ChildItem locale/*.po -Recurse -File| Foreach {msgen $_.fullname -o $_.fullname}
+        # Build language files
+      - cmd: "python scripts/compile_lang.py"
+        # Dump language progress
+      - cmd: "python scripts/dump_crowdin_progress.py"
+        # Build gamedata DB
+      - cmd: "python db_update.py"
+      # Build command for PyInstaller
+      - cmd: "python -m PyInstaller --noupx --clean --windowed --noconsole -y pyfa.spec"
+      # Copy over manifest (See pyfa-org/pyfa#1622)
+      - ps: xcopy /y dist_assets\win\pyfa.exe.manifest $env:PYFA_DIST_DIR\pyfa\
+      # InnoScript EXE building. This is in a separate script because I don't feel like copying over the logic to AppVeyor script right now...
+      - cmd: "python dist_assets/win/dist.py"
+      - ps: dir $env:PYFA_DIST_DIR/
+    after_build:
+      - ps: "ls \"./\""
+      - ps: 7z a "pyfa-$env:PYFA_VERSION-win.zip" -r "$env:PYFA_DIST_DIR\pyfa\*"
+    artifacts:
+      - path: pyfa*-win.zip
+      - path: pyfa*-win.exe
+    deploy:
+      tag: $(pyfa_version)
+      release: pyfa $(pyfa_version)
+      description: 'Release description'
+      provider: GitHub
+      auth_token:
+        secure: M94o0xMtzxrvlKpqMcXU2KfbJdd3aYJ3UxWzePUz/pkT1/Ojiis052CiLsLVyzJg
+      draft: true
+      force_update: false
+      # deploy on tag push only
+      on:
+        APPVEYOR_REPO_TAG: true
+  -
+    matrix:
+      only:
+        - image: macos
+    # Should be enabled only for build process debugging
+    init:
+    #   - sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
+      - sh: source ~/venv3.7/bin/activate
+    install:
+      - sh: bash scripts/osx-setup.sh
+    build_script:
+      - sh: bash scripts/osx-translations.sh
+      - sh: python3 scripts/compile_lang.py
+      - sh: python3 scripts/dump_crowdin_progress.py
+      - sh: python3 db_update.py
+    after_build:
+      - sh: export PYFA_VERSION="$(python3 scripts/dump_version.py)"
+      - sh: bash scripts/osx-package.sh
+    artifacts:
+      - path: dist/pyfa*-mac.zip
+    before_deploy:
+      - sh: export RELEASE_PKG_FILE=$(ls *.deb)
+      - sh: echo "deploying $RELEASE_PKG_FILE to GitHub releases"
+    deploy:
+      tag: $PYFA_VERSION
+      release: pyfa $PYFA_VERSION
+      description: 'Release description'
+      provider: GitHub
+      auth_token:
+        secure: M94o0xMtzxrvlKpqMcXU2KfbJdd3aYJ3UxWzePUz/pkT1/Ojiis052CiLsLVyzJg
+      draft: true
+      force_update: false
+      # deploy on tag push only
+      on:
+        APPVEYOR_REPO_TAG: true

.travis.yml

@@ -1,34 +0,0 @@
-os: linux
-language: python
-git:
-  depth: 400
-python:
-  - 3.8
-matrix:
-  include:
-  - os: osx
-    osx_image: xcode11.3
-    language: generic
-before_install:
-  - bash scripts/osx-translations.sh
-  - bash scripts/osx-setup.sh
-install:
-  - python3 scripts/compile_lang.py
-  - python3 scripts/dump_crowdin_progress.py
-  - python3 db_update.py
-  - export PYFA_VERSION="$(python3 scripts/dump_version.py)"
-  - bash scripts/osx-package.sh
-before_deploy:
-  - export RELEASE_PKG_FILE=$(ls *.deb)
-  - echo "deploying $RELEASE_PKG_FILE to GitHub releases"
-deploy:
-  provider: releases
-  api_key:
-    secure: D8tBW0kyHlKf/sXS69aIuexsYTx9auY2DzudKFlfcvdzqat4N2XZqZbZCTVd7YVvptQ8Dj0oZ/p3KUxEGpnJZmlTeJL142rpM/qaNd6wOIMy2yUde/aZl+W9JLFNQp7KHutM+MxObYLzJGihx/8YsupmFx6lxgdngGDXtXYZe/ruDIWDs92ShoKJ4vlce9Csm7eGKv7wv6Z6V9sD5FS3E9J8xdWStHxsbrkPBOflmG+uHU09dpEqzUm+ZYROIoTwig1Xbw3fw+gfjmNrfdSU4fAJcVZI1hrgoenZyJbMfhI2Ej/nZdbZgaXcZNF/eUpqOGgbPe1JljqFnHTbexcE+LPBVyAToScsGMpByHhig67DrZ0nk9gSZoC6CPNl5YS6xub+5dncMJ3P5L03DOGYRu4SL9NczbeuQyKuea7+JPP/8VLwfFDSEqbNEAmgzABAzrdfano+VXtuBuE/Tiy5eE7le9hJu6aSQoKW1SA3cUhMsmr2amzdO96sh+PN8FA1oNr45Yuy0pqOj4SUIkb8JUy4th7vgdhljEkSxrHDK1UcHpxUTp+IIUZkZVVk50aH68dQZxGwSTVOeRxpjrTcEf7VCGaM98qxi/ZK4RW6Ewiq0eo0AxwEeB2Zm841lycGPR/406vM9/ZBzv5IhELIdDdVWTk+dGjJBXB8z5hPJOg=
-  file_glob: true
-  file: "dist/pyfa-*.zip"
-  skip_cleanup: true
-  draft: true
-  on:
-    tags: true
-    repo: pyfa-org/Pyfa

db_update.py

@@ -142,7 +142,18 @@ def update_db():
             ):
                 row['published'] = True
             # Nearly useless and clutter search results too much
-            elif row['typeName_en-us'].startswith('Limited Synth '):
+            elif (
+                row['typeName_en-us'].startswith('Limited Synth ') or
+                row['typeName_en-us'].endswith(' Filament') and (
+                    "'Needlejack'" not in row['typeName_en-us'] and
+                    "'Devana'" not in row['typeName_en-us'] and
+                    "'Pochven'" not in row['typeName_en-us'] and
+                    "'Extraction'" not in row['typeName_en-us'] and
+                    "'Krai Veles'" not in row['typeName_en-us'] and
+                    "'Krai Perun'" not in row['typeName_en-us'] and
+                    "'Krai Svarog'" not in row['typeName_en-us']
+                )
+            ):
                 row['published'] = False
 
         newData = []

eos/db/saveddata/booster.py

@@ -24,11 +24,12 @@ import datetime
 from eos.db import saveddata_meta
 from eos.saveddata.booster import Booster
 from eos.saveddata.boosterSideEffect import BoosterSideEffect
+from eos.saveddata.fit import Fit
 
 boosters_table = Table("boosters", saveddata_meta,
                        Column("ID", Integer, primary_key=True),
                        Column("itemID", Integer),
-                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False),
+                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
                        Column("active", Boolean),
                        Column("created", DateTime, nullable=True, default=datetime.datetime.now),
                        Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
@@ -44,6 +45,7 @@ booster_side_effect_table = Table("boosterSideEffects", saveddata_meta,
 
 mapper(Booster, boosters_table,
        properties={
+        "owner": relation(Fit),
         "_Booster__sideEffects": relation(
             BoosterSideEffect,
             backref="booster",

eos/db/saveddata/fit.py

@@ -191,7 +191,6 @@ mapper(es_Fit, fits_table,
                    Booster,
                    collection_class=HandledBoosterList,
                    cascade='all, delete, delete-orphan',
-                   backref='owner',
                    single_parent=True),
            "_Fit__drones": relation(
                    Drone,

eos/effectHandlerHelpers.py

@@ -19,6 +19,7 @@
 
 
 from logbook import Logger
+from sqlalchemy.orm.attributes import flag_dirty
 from sqlalchemy.orm.collections import collection
 
 
@@ -108,10 +109,7 @@ class HandledList(list):
 
     def remove(self, thing):
         # We must flag it as modified, otherwise it not be removed from the database
-        # @todo: flag_modified isn't in os x skel. need to rebuild to include
-        # flag_modified(thing, "itemID")
-        if thing.isInvalid:  # see GH issue #324
-            thing.itemID = 0
+        flag_dirty(thing)
         list.remove(self, thing)
 
     def sort(self, *args, **kwargs):

eos/gamedata.py

@@ -19,7 +19,7 @@
 
 
 import json
-from collections import OrderedDict
+import re
 
 from logbook import Logger
 from sqlalchemy.orm import reconstructor
@@ -33,6 +33,10 @@ from .eqBase import EqBase
 pyfalog = Logger(__name__)
 
 
+def _t(x):
+    return x
+
+
 class Effect(EqBase):
     """
     The effect handling class, it is used to proxy and load effect handler code,
@@ -245,6 +249,10 @@ class Item(EqBase):
                 pass
         return shortName
 
+    @property
+    def customName(self):
+        return re.sub(_t('Caustic'), _t('Tachyon'), self.name)
+
     @property
     def attributes(self):
         return self.__attributes
@@ -481,6 +489,10 @@ class Item(EqBase):
     def isCharge(self):
         return self.category.name == 'Charge'
 
+    @property
+    def isCommodity(self):
+        return self.category.name == 'Commodity'
+
     @property
     def isDrone(self):
         return self.category.name == 'Drone'

eos/saveddata/booster.py

@@ -159,6 +159,6 @@ class Booster(HandledItem, ItemAttrShortcut):
                 sideEffect.active = sideEffectStates[sideEffect.effectID]
 
     def __repr__(self):
-        return "Booster(ID={}, name={}) at {}".format(
-            self.item.ID, self.item.name, hex(id(self))
-        )
+        if self.item is not None:
+            return f"Booster(ID={self.item.ID}, name={self.item.name}) at {hex(id(self))}"
+        return f"Booster(ID={self.itemID}) at {hex(id(self))}"

eos/saveddata/damagePattern.py

@@ -146,6 +146,9 @@ BUILTINS = OrderedDict([
     (-94, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Gallente EDENCOM Entities')) + _t('Dread/Subcaps'), 0, 417, 583, 0)),
     (-95, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Minmatar EDENCOM Entities')) + _t('Dread'), 0, 0, 583, 417)),
     (-96, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Minmatar EDENCOM Entities')) + _t('Subcaps'), 302, 136, 328, 234)),
+    (-110, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Drifter Entities'), 250, 250, 250, 250)),
+    (-112, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Sleeper Entities'), 265, 265, 235, 235)),
+    (-111, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Rogue Drone Entities'), 250, 250, 250, 250)),
     (-97, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Amarr Empire'), 4464, 3546, 97, 0)),
     (-98, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Caldari State'), 0, 2139, 4867, 0)),
     (-99, (_c(_t('NPC')) + _c(_t('Mission')) + _t('CONCORD'), 336, 134, 212, 412)),
@@ -155,10 +158,7 @@ BUILTINS = OrderedDict([
     (-103, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Mordus Legion'), 25, 262, 625, 0)),
     (-104, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Thukker'), 0, 52, 10, 79)),
     (-105, (_c(_t('NPC')) + _t('Sansha Incursion'), 1682, 1347, 3678, 3678)),
-    (-106, (_c(_t('NPC')) + _t('Sleepers'), 1472, 1472, 1384, 1384)),
-    (-107, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Drifter Entities'), 250, 250, 250, 250)),
-    (-108, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Rogue Drone Entities'), 250, 250, 250, 250)),
-    (-109, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Sleeper Entities'), 265, 265, 235, 235))])
+    (-106, (_c(_t('NPC')) + _t('Sleepers'), 1472, 1472, 1384, 1384))])
 
 
 class DamagePattern:

eos/saveddata/drone.py

@@ -111,7 +111,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
         if self.hasAmmo:
             cycleTime = self.getModifiedItemAttr("missileLaunchDuration", 0)
         else:
-            for attr in ("speed", "duration"):
+            for attr in ("speed", "duration", "durationHighisGood"):
                 cycleTime = self.getModifiedItemAttr(attr, None)
                 if cycleTime is not None:
                     break

eos/saveddata/fit.py

@@ -682,8 +682,8 @@ class Fit:
                                                    "duration", value, stackingPenalties=True)
 
                 if warfareBuffID == 25:  # Mining Burst: Mining Equipment Preservation: Crystal Volatility
-                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                                   "crystalVolatilityChance", value, stackingPenalties=True)
+                    self.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining"),
+                                                     "crystalVolatilityChance", value, stackingPenalties=True)
 
                 if warfareBuffID == 26:  # Information Burst: Sensor Optimization: Targeting Range
                     self.ship.boostItemAttr("maxTargetRange", value, stackingPenalties=True)

eos/saveddata/mode.py

@@ -23,7 +23,6 @@ from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
 
 class Mode(ItemAttrShortcut, HandledItem):
 
-
     def __init__(self, item, owner=None):
         if item.group.name != "Ship Modifiers":
             raise ValueError(
@@ -34,7 +33,6 @@ class Mode(ItemAttrShortcut, HandledItem):
         self.__itemModifiedAttributes.original = self.item.attributes
         self.__itemModifiedAttributes.overrides = self.item.overrides
 
-
     @property
     def item(self):
         return self.__item

eos/saveddata/module.py

@@ -539,7 +539,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
             return DmgTypes(0, 0, 0, 0)
         return volleyParams[min(volleyParams)]
 
-    def getDps(self, spoolOptions=None, targetProfile=None, ignoreState=False):
+    def getDps(self, spoolOptions=None, targetProfile=None, ignoreState=False, getSpreadDPS=False):
         dmgDuringCycle = DmgTypes(0, 0, 0, 0)
         cycleParams = self.getCycleParameters()
         if cycleParams is None:
@@ -556,7 +556,12 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
             thermal=dmgDuringCycle.thermal * dpsFactor,
             kinetic=dmgDuringCycle.kinetic * dpsFactor,
             explosive=dmgDuringCycle.explosive * dpsFactor)
-        return dps
+        if not getSpreadDPS:
+            return dps
+        return {'em':dmgDuringCycle.em * dpsFactor,
+                'therm': dmgDuringCycle.thermal * dpsFactor,
+                'kin': dmgDuringCycle.kinetic * dpsFactor,
+                'exp': dmgDuringCycle.explosive * dpsFactor}
 
     def isRemoteRepping(self, ignoreState=False):
         repParams = self.getRepAmountParameters(ignoreState=ignoreState)
@@ -1021,6 +1026,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
         speed = max(
                 self.getModifiedItemAttr("speed", 0),  # Most weapons
                 self.getModifiedItemAttr("duration", 0),  # Most average modules
+                self.getModifiedItemAttr("durationHighisGood", 0),  # Most average modules
                 self.getModifiedItemAttr("durationSensorDampeningBurstProjector", 0),
                 self.getModifiedItemAttr("durationTargetIlluminationBurstProjector", 0),
                 self.getModifiedItemAttr("durationECMJammerBurstProjector", 0),

graphs/data/fitWarpTime/getter.py

@@ -55,7 +55,7 @@ def calculate_time_in_warp(max_warp_speed, max_subwarp_speed, warp_dist):
     k_accel = max_warp_speed
     k_decel = min(max_warp_speed / 3, 2)
 
-    warp_dropout_speed = max_subwarp_speed / 2
+    warp_dropout_speed = min(max_subwarp_speed / 2, 100)
     max_ms_warp_speed = max_warp_speed * AU_METERS
 
     accel_dist = AU_METERS

gui/builtinAdditionPanes/cargoView.py

@@ -70,7 +70,7 @@ class CargoView(d.Display):
 
     def addItem(self, event):
         item = Market.getInstance().getItem(event.itemID, eager='group')
-        if item is None or not item.isCharge:
+        if item is None or not (item.isCharge or item.isCommodity):
             event.Skip()
             return
 

gui/builtinAdditionPanes/notesView.py

@@ -26,7 +26,12 @@ class NotesView(wx.Panel):
 
     def OnKeyDown(self, event):
         if event.RawControlDown() and event.GetKeyCode() == wx.WXK_BACK:
-            HandleCtrlBackspace(self.editNotes)
+            try:
+                HandleCtrlBackspace(self.editNotes)
+            except (KeyboardInterrupt, SystemExit):
+                raise
+            except:
+                pass
         else:
             event.Skip()
 

gui/builtinContextMenus/envEffectAdd.py

@@ -206,16 +206,16 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
             for beacon in sMkt.getGroup("Abyssal Hazards").items:
                 if not beacon.isType('projected'):
                     continue
-                groups = (_t('Bioluminescence'), _t('Caustic'), _t('Filament'))
+                groups = (_t('Bioluminescence'), _t('Tachyon'), _t('Filament'))
                 for group in groups:
-                    if re.search(group, beacon.name):
+                    if re.search(group, beacon.customName):
                         key = group
                         break
                 else:
                     continue
 
                 subsubdata = subdata.groups.setdefault(key, Group())
-                subsubdata.items.append(Entry(beacon.ID, beacon.name, beacon.name))
+                subsubdata.items.append(Entry(beacon.ID, beacon.customName, beacon.customName))
             subdata.sort()
 
         # PVP weather

gui/builtinViewColumns/baseName.py

@@ -107,17 +107,17 @@ class BaseName(ViewColumn):
         elif isinstance(stuff, Module):
             if self.projectedView:
                 # check for projected abyssal name
-                name_check = stuff.item.name[0:-2]
+                name_check = stuff.item.customName[0:-2]
                 type = AddEnvironmentEffect.abyssal_mapping.get(name_check, None)
                 if type:
                     sMkt = Market.getInstance()
                     type = sMkt.getItem(type)
-                    return "{} {}".format(type.name, stuff.item.name[-1:])
+                    return "{} {}".format(type.name, stuff.item.customName[-1:])
 
             if stuff.isEmpty:
                 return "%s Slot" % FittingSlot(stuff.slot).name.capitalize()
             else:
-                return stuff.item.name
+                return stuff.item.customName
         elif isinstance(stuff, Implant):
             return stuff.item.name
         elif isinstance(stuff, TargetProfile):

gui/errorDialog.py

@@ -70,7 +70,13 @@ class ErrorFrame(AuxiliaryFrame):
 
         from eos.config import gamedata_version, gamedata_date
 
-        time = datetime.datetime.fromtimestamp(int(gamedata_date)).strftime('%Y-%m-%d %H:%M:%S')
+        if gamedata_date:
+            try:
+                time = datetime.datetime.fromtimestamp(int(gamedata_date)).strftime('%Y-%m-%d %H:%M:%S')
+            except TypeError:
+                time = None
+        else:
+            time = None
         version = "pyfa " + config.getVersion() + '\nEVE Data Version: {} ({})\n\n'.format(gamedata_version, time)  # gui.aboutData.versionString
 
         desc = _t("pyfa has experienced an unexpected issue. Below is a message that contains crucial \n"

gui/esiFittings.py

@@ -156,7 +156,7 @@ class EveFittings(AuxiliaryFrame):
         data = json.loads(self.fitTree.fittingsTreeCtrl.GetItemData(selection))
 
         with wx.MessageDialog(
-            self, _t("Do you really want to delete {} ({}) from EVE?").format((data['name'], getItem(data['ship_type_id']).name)),
+            self, _t("Do you really want to delete {} ({}) from EVE?").format(data['name'], getItem(data['ship_type_id']).name),
             _t("Confirm Delete"), wx.YES | wx.NO | wx.ICON_QUESTION
         ) as dlg:
             if dlg.ShowModal() == wx.ID_YES:

gui/fitCommands/helpers.py

@@ -325,7 +325,8 @@ def activeStateLimit(itemIdentity):
         'cynosuralGeneration', 'jumpPortalGeneration', 'jumpPortalGenerationBO',
         'cloneJumpAccepting', 'cloakingWarpSafe', 'cloakingPrototype', 'cloaking',
         'massEntanglerEffect5', 'electronicAttributeModifyOnline', 'targetPassively',
-        'cargoScan', 'shipScan', 'surveyScan'
+        'cargoScan', 'shipScan', 'surveyScan', 'targetSpectrumBreakerBonus',
+        'interdictionNullifierBonus', 'warpCoreStabilizerActive'
     }.intersection(item.effects):
         return FittingModuleState.ONLINE
     return FittingModuleState.ACTIVE