Bump version

Update icons
Update static data and effects
2023-10-10 02:50:42 +06:00 · 2023-10-10 02:47:00 +06:00 · 2023-10-10 02:43:44 +06:00 · 2023-10-10 00:15:47 +06:00 · 2023-09-19 23:52:50 +03:00 · 2023-09-19 23:52:24 +03:00
112 changed files with 194194 additions and 37380 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,7 +11,7 @@ for:
    environment:
      APPVEYOR_SSH_KEY: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJDW/+oYNGOiPvwuwAL9tc/LQgg58aosIVpMYfepQZ20V+VZnHpZh8IRDA8Jo5xht19p2PksA+hFgqA0kpKtrSkuiWdE8rATQItfk4gf7yB0yGasJGGQZYazy9k/9XtmYkq2HHOOeEqdxvrICddJQ88MLCLT9lJENSUP/YS/yGcjZFXVxE11pTeIcqlCRU+3eYa1v7BeNvXIKNhZoK5orXWrtuH3cy8jrSns/u70aYfJ6B2jA8CnWnDbuvpeQtEY61SQqlKUsSArNa8NAsXj41wr3Ar9gAG9330w7EMTqlutk8HZO35uHI0q5qinUhaQYufPPrVkb2L/N+ZCfu0fnh appveyor"
      APPIMAGE_TOOL: appimagetool-x86_64.AppImage
-      PYTHON_APPIMAGE: python3.7.16-cp37-cp37m-manylinux2014_x86_64.AppImage
+      PYTHON_APPIMAGE: python3.7.17-cp37-cp37m-manylinux2014_x86_64.AppImage
      DEPLOY_DIR: AppDir/opt/pyfa
 #      APPVEYOR_SSH_BLOCK: true
    cache:
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # pyfa

-[![Join us on Slack!](https://pyfainvite.azurewebsites.net/badge.svg)](https://pyfainvite.azurewebsites.net/) [![Build Status](https://travis-ci.org/pyfa-org/Pyfa.svg?branch=master)](https://travis-ci.org/pyfa-org/Pyfa)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/pyfa-org/pyfa?branch=master&svg=true)]([https://travis-ci.org/pyfa-org/Pyfa](https://ci.appveyor.com/project/pyfa-org/pyfa))

 ![pyfa](https://user-images.githubusercontent.com/275209/66119992-864be080-e5e2-11e9-994a-3a4368c9fad7.png)

--- a/db_update.py
+++ b/db_update.py
@@ -617,6 +617,16 @@ def update_db():
        eos.db.gamedata_session.delete(cat)

    # Unused normally, can be useful for customizing items
+    def _copyItem(srcName, tgtTypeID, tgtName):
+        eveType = eos.db.gamedata_session.query(eos.gamedata.Item).filter(eos.gamedata.Item.name == srcName).one()
+        eos.db.gamedata_session.expunge(eveType)
+        sqlalchemy.orm.make_transient(eveType)
+        eveType.ID = tgtTypeID
+        for suffix in eos.config.translation_mapping.values():
+            setattr(eveType, f'typeName{suffix}', tgtName)
+        eos.db.gamedata_session.add(eveType)
+        eos.db.gamedata_session.flush()
+
    def _hardcodeAttribs(typeID, attrMap):
        for attrName, value in attrMap.items():
            try:
@@ -625,7 +635,7 @@ def update_db():
            except sqlalchemy.orm.exc.NoResultFound:
                attrInfo = eos.db.gamedata_session.query(eos.gamedata.AttributeInfo).filter(eos.gamedata.AttributeInfo.name == attrName).one()
                attr = eos.gamedata.Attribute()
-                attr.ID = attrInfo.ID
+                attr.attributeID = attrInfo.ID
                attr.typeID = typeID
                attr.value = value
                eos.db.gamedata_session.add(attr)
@@ -641,139 +651,151 @@ def update_db():
            effect.effectName = effectName
            item.effects[effectName] = effect

-    def hardcodeGeri():
+    def hardcodeShapash():
+        shapashTypeID = 1000000
+        _copyItem(srcName='Utu', tgtTypeID=shapashTypeID, tgtName='Shapash')
        attrMap = {
            # Fitting
            'powerOutput': 50,
-            'cpuOutput': 200,
-            'capacitorCapacity': 325,
-            'rechargeRate': 130000,
+            'cpuOutput': 225,
+            'capacitorCapacity': 420,
+            'rechargeRate': 187500,
            # Slots
-            'hiSlots': 5,
+            'hiSlots': 3,
            'medSlots': 4,
            'lowSlots': 4,
-            'launcherSlotsLeft': 3,
-            'turretSlotsLeft': 2,
+            'launcherSlotsLeft': 0,
+            'turretSlotsLeft': 3,
            # Rigs
            'rigSlots': 2,
            'rigSize': 1,
            'upgradeCapacity': 400,
            # Shield
-            'shieldCapacity': 1000,
-            'shieldEmDamageResonance': 1 - 0.75,
+            'shieldCapacity': 575,
+            'shieldRechargeRate': 625000,
+            'shieldEmDamageResonance': 1 - 0.0,
            'shieldThermalDamageResonance': 1 - 0.6,
-            'shieldKineticDamageResonance': 1 - 0.4,
+            'shieldKineticDamageResonance': 1 - 0.85,
            'shieldExplosiveDamageResonance': 1 - 0.5,
            # Armor
-            'armorHP': 1000,
-            'armorEmDamageResonance': 1 - 0.9,
+            'armorHP': 1015,
+            'armorEmDamageResonance': 1 - 0.5,
            'armorThermalDamageResonance': 1 - 0.675,
-            'armorKineticDamageResonance': 1 - 0.25,
+            'armorKineticDamageResonance': 1 - 0.8375,
            'armorExplosiveDamageResonance': 1 - 0.1,
            # Structure
-            'hp': 700,
+            'hp': 1274,
            'emDamageResonance': 1 - 0.33,
            'thermalDamageResonance': 1 - 0.33,
            'kineticDamageResonance': 1 - 0.33,
            'explosiveDamageResonance': 1 - 0.33,
-            'mass': 1309000,
-            'volume': 27289,
-            'capacity': 260,
+            'mass': 1215000,
+            'volume': 29500,
+            'capacity': 165,
            # Navigation
-            'maxVelocity': 440,
-            'agility': 2.5,
+            'maxVelocity': 325,
+            'agility': 3.467,
            'warpSpeedMultiplier': 5.5,
            # Drones
-            'droneCapacity': 50,
-            'droneBandwidth': 10,
+            'droneCapacity': 75,
+            'droneBandwidth': 25,
            # Targeting
-            'maxTargetRange': 42000,
+            'maxTargetRange': 49000,
            'maxLockedTargets': 6,
            'scanRadarStrength': 0,
-            'scanLadarStrength': 12,
-            'scanMagnetometricStrength': 0,
+            'scanLadarStrength': 0,
+            'scanMagnetometricStrength': 9,
            'scanGravimetricStrength': 0,
-            'signatureRadius': 33,
-            'scanResolution': 770}
+            'signatureRadius': 39,
+            'scanResolution': 550,
+            # Misc
+            'energyWarfareResistance': 0,
+            'stasisWebifierResistance': 0,
+            'weaponDisruptionResistance': 0}
        effectMap = {
-            100100: 'pyfaCustomGeriAfExploVel',
-            100101: 'pyfaCustomGeriAfRof',
-            100102: 'pyfaCustomGeriMfDmg',
-            100103: 'pyfaCustomGeriMfRep',
-            100104: 'pyfaCustomGeriRoleWebDroneStr',
-            100105: 'pyfaCustomGeriRoleWebDroneHP',
-            100106: 'pyfaCustomGeriRoleWebDroneSpeed',
-            100107: 'pyfaCustomGeriRoleMWDSigBloom'}
-        _hardcodeAttribs(74141, attrMap)
-        _hardcodeEffects(74141, effectMap)
+            100100: 'pyfaCustomShapashAfArAmount',
+            100101: 'pyfaCustomShapashAfShtTrackingOptimal',
+            100102: 'pyfaCustomShapashGfShtDamage',
+            100103: 'pyfaCustomShapashGfPointRange',
+            100104: 'pyfaCustomShapashGfPropOverheat',
+            100105: 'pyfaCustomShapashRolePlateMass',
+            100106: 'pyfaCustomShapashRoleHeat'}
+        _hardcodeAttribs(shapashTypeID, attrMap)
+        _hardcodeEffects(shapashTypeID, effectMap)

-    def hardcodeBestla():
+    def hardcodeCybele():
+        cybeleTypeID = 1000001
+        _copyItem(srcName='Adrestia', tgtTypeID=cybeleTypeID, tgtName='Cybele')
        attrMap = {
            # Fitting
-            'powerOutput': 1300,
-            'cpuOutput': 500,
-            'capacitorCapacity': 1500,
-            'rechargeRate': 200000,
-            'hiSlots': 6,
-            'medSlots': 5,
-            'lowSlots': 5,
-            'launcherSlotsLeft': 4,
-            'turretSlotsLeft': 2,
+            'powerOutput': 1284,
+            'cpuOutput': 400,
+            'capacitorCapacity': 2400,
+            'rechargeRate': 334000,
+            'hiSlots': 5,
+            'medSlots': 4,
+            'lowSlots': 6,
+            'launcherSlotsLeft': 0,
+            'turretSlotsLeft': 5,
            # Rigs
            'rigSlots': 2,
            'rigSize': 2,
            'upgradeCapacity': 400,
            # Shield
-            'shieldCapacity': 3000,
-            'shieldEmDamageResonance': 1 - 0.75,
-            'shieldThermalDamageResonance': 1 - 0.6,
-            'shieldKineticDamageResonance': 1 - 0.4,
+            'shieldCapacity': 1200,
+            'shieldRechargeRate': 1250000,
+            'shieldEmDamageResonance': 1 - 0.0,
+            'shieldThermalDamageResonance': 1 - 0.5,
+            'shieldKineticDamageResonance': 1 - 0.9,
            'shieldExplosiveDamageResonance': 1 - 0.5,
            # Armor
-            'armorHP': 3000,
-            'armorEmDamageResonance': 1 - 0.9,
-            'armorThermalDamageResonance': 1 - 0.675,
-            'armorKineticDamageResonance': 1 - 0.25,
+            'armorHP': 1900,
+            'armorEmDamageResonance': 1 - 0.5,
+            'armorThermalDamageResonance': 1 - 0.69,
+            'armorKineticDamageResonance': 1 - 0.85,
            'armorExplosiveDamageResonance': 1 - 0.1,
            # Structure
-            'hp': 1600,
+            'hp': 2300,
            'emDamageResonance': 1 - 0.33,
            'thermalDamageResonance': 1 - 0.33,
            'kineticDamageResonance': 1 - 0.33,
            'explosiveDamageResonance': 1 - 0.33,
-            'mass': 11650000,
-            'volume': 96000,
-            'capacity': 660,
+            'mass': 11100000,
+            'volume': 112000,
+            'capacity': 450,
            # Navigation
-            'maxVelocity': 300,
-            'agility': 0.47,
+            'maxVelocity': 235,
+            'agility': 0.457,
            'warpSpeedMultiplier': 4.5,
            # Drones
-            'droneCapacity': 125,
-            'droneBandwidth': 20,
+            'droneCapacity': 100,
+            'droneBandwidth': 50,
            # Targeting
-            'maxTargetRange': 80000,
-            'maxLockedTargets': 7,
+            'maxTargetRange': 60000,
+            'maxLockedTargets': 6,
            'scanRadarStrength': 0,
-            'scanLadarStrength': 22,
-            'scanMagnetometricStrength': 0,
+            'scanLadarStrength': 0,
+            'scanMagnetometricStrength': 15,
            'scanGravimetricStrength': 0,
-            'signatureRadius': 120,
-            'scanResolution': 340}
+            'signatureRadius': 115,
+            'scanResolution': 330,
+            # Misc
+            'energyWarfareResistance': 0,
+            'stasisWebifierResistance': 0,
+            'weaponDisruptionResistance': 0}
        effectMap = {
-            100200: 'pyfaCustomBestlaHacExploVel',
-            100201: 'pyfaCustomBestlaHacRof',
-            100202: 'pyfaCustomBestlaMcDmg',
-            100203: 'pyfaCustomBestlaMcRep',
-            100204: 'pyfaCustomBestlaRoleWebDroneStr',
-            100205: 'pyfaCustomBestlaRoleWebDroneHP',
-            100206: 'pyfaCustomBestlaRoleWebDroneSpeed'}
-        _hardcodeAttribs(74316, attrMap)
-        _hardcodeEffects(74316, effectMap)
-
-    hardcodeGeri()
-    hardcodeBestla()
+            100200: 'pyfaCustomCybeleHacMhtFalloff',
+            100201: 'pyfaCustomCybeleHacMhtTracking',
+            100202: 'pyfaCustomCybeleGcMhtDamage',
+            100203: 'pyfaCustomCybeleGcArAmount',
+            100204: 'pyfaCustomCybeleGcPointRange',
+            100205: 'pyfaCustomCybeleRoleVelocity',
+            100206: 'pyfaCustomCybeleRolePlateMass'}
+        _hardcodeAttribs(cybeleTypeID, attrMap)
+        _hardcodeEffects(cybeleTypeID, effectMap)

+    hardcodeShapash()
+    hardcodeCybele()

    eos.db.gamedata_session.commit()
    eos.db.gamedata_engine.execute('VACUUM')
--- a/eos/effects.py
+++ b/eos/effects.py
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -477,7 +477,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
            # Some delay attributes have non-0 default value, so we have to pick according to effects
            if {'superWeaponAmarr', 'superWeaponCaldari', 'superWeaponGallente', 'superWeaponMinmatar', 'lightningWeapon'}.intersection(self.item.effects):
                dmgDelay = self.getModifiedItemAttr("damageDelayDuration", 0)
-            elif {'doomsdayBeamDOT', 'doomsdaySlash', 'doomsdayConeDOT'}.intersection(self.item.effects):
+            elif {'doomsdayBeamDOT', 'doomsdaySlash', 'doomsdayConeDOT', 'debuffLance'}.intersection(self.item.effects):
                dmgDelay = self.getModifiedItemAttr("doomsdayWarningDuration", 0)
            else:
                dmgDelay = 0
--- a/graphs/data/fitDamageStats/calc/application.py
+++ b/graphs/data/fitDamageStats/calc/application.py
@@ -211,7 +211,7 @@ def getDoomsdayMult(mod, tgt, distance, tgtSigRadius):
        # Disallow only against subcaps, allow against caps and tgt profiles
        if tgt.isFit and not tgt.item.ship.item.requiresSkill('Capital Ships'):
            return 0
-    damageSig = mod.getModifiedItemAttr('doomsdayDamageRadius') or mod.getModifiedItemAttr('signatureRadius')
+    damageSig = mod.getModifiedItemAttr('signatureRadius')
    if not damageSig:
        return 1
    return min(1, tgtSigRadius / damageSig)
--- a/gui/builtinStatsViews/targetingMiscViewMinimal.py
+++ b/gui/builtinStatsViews/targetingMiscViewMinimal.py
@@ -127,7 +127,9 @@ class TargetingMiscViewMinimal(StatsView):
            ("specialSalvageHoldCapacity", _t("Salvage hold")),
            ("specialCommandCenterHoldCapacity", _t("Command center hold")),
            ("specialPlanetaryCommoditiesHoldCapacity", _t("Planetary goods hold")),
-            ("specialQuafeHoldCapacity", _t("Quafe hold"))))
+            ("specialQuafeHoldCapacity", _t("Quafe hold")),
+            ("specialMobileDepotHoldCapacity", _t("Mobile depot hold")),
+        ))

        cargoValues = {
            "main": lambda: fit.ship.getModifiedItemAttr("capacity"),
@@ -148,7 +150,8 @@ class TargetingMiscViewMinimal(StatsView):
            "specialSalvageHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialSalvageHoldCapacity"),
            "specialCommandCenterHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialCommandCenterHoldCapacity"),
            "specialPlanetaryCommoditiesHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialPlanetaryCommoditiesHoldCapacity"),
-            "specialQuafeHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialQuafeHoldCapacity")
+            "specialQuafeHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialQuafeHoldCapacity"),
+            "specialMobileDepotHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialMobileDepotHoldCapacity"),
        }

        stats = (("labelTargets", {"main": lambda: fit.maxTargets}, 3, 0, 0, ""),
--- a/gui/builtinViewColumns/misc.py
+++ b/gui/builtinViewColumns/misc.py
@@ -182,6 +182,13 @@ class Miscellanea(ViewColumn):
            text = "{0} | {1}".format(formatAmount(strength, 3, 0, 3), formatAmount(coherence, 3, 0, 3))
            tooltip = "Virus strength and coherence"
            return text, tooltip
+        elif itemGroup == "Damage Control":
+            duration = stuff.getModifiedItemAttr("duration")
+            if not duration:
+                return "", None
+            text = "{0}s".format(formatAmount(duration / 1000, 3, 0, 0))
+            tooltip = "Assault ability duration"
+            return text, tooltip
        elif itemGroup in ("Warp Scrambler", "Warp Core Stabilizer", "Structure Warp Scrambler"):
            scramStr = stuff.getModifiedItemAttr("warpScrambleStrength")
            if not scramStr:
--- a/gui/characterSelection.py
+++ b/gui/characterSelection.py
@@ -22,6 +22,7 @@ import traceback

 # noinspection PyPackageRequirements
 import wx
+import roman
 from logbook import Logger

 import config
@@ -105,6 +106,9 @@ class CharacterSelection(wx.Panel):
        exportItem = menu.Append(wx.ID_ANY, _t("Copy Missing Skills"))
        self.Bind(wx.EVT_MENU, self.exportSkills, exportItem)

+        exportItem = menu.Append(wx.ID_ANY, _t("Copy Missing Skills (EVEMon)"))
+        self.Bind(wx.EVT_MENU, self.exportSkillsEveMon, exportItem)
+
        self.PopupMenu(menu, pos)

        event.Skip()
@@ -264,6 +268,15 @@ class CharacterSelection(wx.Panel):

        toClipboard(list)

+    def exportSkillsEveMon(self, evt):
+        skillsMap = self._buildSkillsTooltipCondensed(self.reqs, skillsMap={})
+
+        list = ""
+        for key in sorted(skillsMap):
+            list += "%s %s\n" % (key, roman.toRoman(skillsMap[key][0]))
+
+        toClipboard(list)
+
    def _buildSkillsTooltip(self, reqs, currItem="", tabulationLevel=0):
        tip = ""
        sCharacter = Character.getInstance()
--- a/imgs/icons/1168@1x.png
+++ b/imgs/icons/1168@1x.png
--- a/imgs/icons/1168@2x.png
+++ b/imgs/icons/1168@2x.png
--- a/imgs/icons/21894@1x.png
+++ b/imgs/icons/21894@1x.png
--- a/imgs/icons/21894@2x.png
+++ b/imgs/icons/21894@2x.png
--- a/imgs/icons/24404@1x.png
+++ b/imgs/icons/24404@1x.png
--- a/imgs/icons/24404@2x.png
+++ b/imgs/icons/24404@2x.png
--- a/imgs/icons/25240@1x.png
+++ b/imgs/icons/25240@1x.png
--- a/imgs/icons/25240@2x.png
+++ b/imgs/icons/25240@2x.png
--- a/imgs/icons/25241@1x.png
+++ b/imgs/icons/25241@1x.png
--- a/imgs/icons/25241@2x.png
+++ b/imgs/icons/25241@2x.png
--- a/imgs/icons/25242@1x.png
+++ b/imgs/icons/25242@1x.png
--- a/imgs/icons/25242@2x.png
+++ b/imgs/icons/25242@2x.png
--- a/imgs/icons/25243@1x.png
+++ b/imgs/icons/25243@1x.png
--- a/imgs/icons/25243@2x.png
+++ b/imgs/icons/25243@2x.png
--- a/imgs/icons/25250@1x.png
+++ b/imgs/icons/25250@1x.png
--- a/imgs/icons/25250@2x.png
+++ b/imgs/icons/25250@2x.png
--- a/imgs/icons/25251@1x.png
+++ b/imgs/icons/25251@1x.png
--- a/imgs/icons/25251@2x.png
+++ b/imgs/icons/25251@2x.png
--- a/imgs/icons/25252@1x.png
+++ b/imgs/icons/25252@1x.png
--- a/imgs/icons/25252@2x.png
+++ b/imgs/icons/25252@2x.png
--- a/imgs/icons/25253@1x.png
+++ b/imgs/icons/25253@1x.png
--- a/imgs/icons/25253@2x.png
+++ b/imgs/icons/25253@2x.png
--- a/imgs/icons/25621@1x.png
+++ b/imgs/icons/25621@1x.png
--- a/imgs/icons/25621@2x.png
+++ b/imgs/icons/25621@2x.png
--- a/imgs/icons/25622@1x.png
+++ b/imgs/icons/25622@1x.png
--- a/imgs/icons/25622@2x.png
+++ b/imgs/icons/25622@2x.png
--- a/imgs/icons/25624@1x.png
+++ b/imgs/icons/25624@1x.png
--- a/imgs/icons/25624@2x.png
+++ b/imgs/icons/25624@2x.png
--- a/imgs/icons/25625@1x.png
+++ b/imgs/icons/25625@1x.png
--- a/imgs/icons/25625@2x.png
+++ b/imgs/icons/25625@2x.png
--- a/imgs/icons/25629@1x.png
+++ b/imgs/icons/25629@1x.png
--- a/imgs/icons/25629@2x.png
+++ b/imgs/icons/25629@2x.png
--- a/imgs/icons/25631@1x.png
+++ b/imgs/icons/25631@1x.png
--- a/imgs/icons/25631@2x.png
+++ b/imgs/icons/25631@2x.png
--- a/imgs/icons/25632@1x.png
+++ b/imgs/icons/25632@1x.png
--- a/imgs/icons/25632@2x.png
+++ b/imgs/icons/25632@2x.png
--- a/imgs/icons/25633@1x.png
+++ b/imgs/icons/25633@1x.png
--- a/imgs/icons/25633@2x.png
+++ b/imgs/icons/25633@2x.png
--- a/imgs/icons/25634@1x.png
+++ b/imgs/icons/25634@1x.png
--- a/imgs/icons/25634@2x.png
+++ b/imgs/icons/25634@2x.png
--- a/imgs/icons/25803@1x.png
+++ b/imgs/icons/25803@1x.png
--- a/imgs/icons/25803@2x.png
+++ b/imgs/icons/25803@2x.png
--- a/imgs/icons/25833@1x.png
+++ b/imgs/icons/25833@1x.png
--- a/imgs/icons/25833@2x.png
+++ b/imgs/icons/25833@2x.png
--- a/imgs/renders/1931@1x.png
+++ b/imgs/renders/1931@1x.png
--- a/imgs/renders/1931@2x.png
+++ b/imgs/renders/1931@2x.png
--- a/imgs/renders/1950@1x.png
+++ b/imgs/renders/1950@1x.png
--- a/imgs/renders/1950@2x.png
+++ b/imgs/renders/1950@2x.png
--- a/imgs/renders/21137@1x.png
+++ b/imgs/renders/21137@1x.png
--- a/imgs/renders/21137@2x.png
+++ b/imgs/renders/21137@2x.png
--- a/imgs/renders/21138@1x.png
+++ b/imgs/renders/21138@1x.png
--- a/imgs/renders/21138@2x.png
+++ b/imgs/renders/21138@2x.png
--- a/imgs/renders/21139@1x.png
+++ b/imgs/renders/21139@1x.png
--- a/imgs/renders/21139@2x.png
+++ b/imgs/renders/21139@2x.png
--- a/imgs/renders/24531@1x.png
+++ b/imgs/renders/24531@1x.png
--- a/imgs/renders/24531@2x.png
+++ b/imgs/renders/24531@2x.png
--- a/imgs/renders/25601@1x.png
+++ b/imgs/renders/25601@1x.png
--- a/imgs/renders/25601@2x.png
+++ b/imgs/renders/25601@2x.png
--- a/imgs/renders/25602@1x.png
+++ b/imgs/renders/25602@1x.png
--- a/imgs/renders/25602@2x.png
+++ b/imgs/renders/25602@2x.png
--- a/imgs/renders/25603@1x.png
+++ b/imgs/renders/25603@1x.png
--- a/imgs/renders/25603@2x.png
+++ b/imgs/renders/25603@2x.png
--- a/imgs/renders/25604@1x.png
+++ b/imgs/renders/25604@1x.png
--- a/imgs/renders/25604@2x.png
+++ b/imgs/renders/25604@2x.png
--- a/imgs/renders/25815@1x.png
+++ b/imgs/renders/25815@1x.png
--- a/imgs/renders/25815@2x.png
+++ b/imgs/renders/25815@2x.png
--- a/imgs/renders/25969@1x.png
+++ b/imgs/renders/25969@1x.png
--- a/imgs/renders/25969@2x.png
+++ b/imgs/renders/25969@2x.png
--- a/imgs/renders/26216@1x.png
+++ b/imgs/renders/26216@1x.png
--- a/imgs/renders/26216@2x.png
+++ b/imgs/renders/26216@2x.png
--- a/imgs/renders/3799@1x.png
+++ b/imgs/renders/3799@1x.png
--- a/imgs/renders/3799@2x.png
+++ b/imgs/renders/3799@2x.png
--- a/imgs/renders/46@1x.png
+++ b/imgs/renders/46@1x.png
--- a/imgs/renders/46@2x.png
+++ b/imgs/renders/46@2x.png
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ logbook >= 1.0.0
 numpy == 1.19.2
 matplotlib == 3.2.2
 python-dateutil
-requests >= 2.0.0
+requests == 2.28.1
 sqlalchemy == 1.3.23
 cryptography >= 2.3
 markdown2 >= 2.3.5
--- a/service/conversions/releaseFeb2023.py
+++ b/service/conversions/releaseFeb2023.py
@@ -0,0 +1,16 @@
+"""
+Conversion pack for February 2023 release
+"""
+
+CONVERSIONS = {
+    # Renamed items
+    "Restrained Interdiction Nullifier": "Enduring Interdiction Nullifier",
+    "Synthetic Hull Conversion Inertia Stabilizers": "Synthetic Hull Conversion Inertial Stabilizers",
+    "Tobias's Modified Torpedo Launcher": "Tobias' Modified Torpedo Launcher",
+    "Vepas's Modified Torpedo Launcher": "Vepas' Modified Torpedo Launcher",
+    "Vepas's Modified Kinetic Shield Hardener": "Vepas' Modified Kinetic Shield Hardener",
+    "Vepas's Modified EM Shield Hardener": "Vepas' Modified EM Shield Hardener",
+    "Vepas's Modified Explosive Shield Hardener": "Vepas' Modified Explosive Shield Hardener",
+    "Vepas's Modified Thermal Shield Hardener": "Vepas' Modified Thermal Shield Hardener",
+    "Vepas's Modified Multispectrum Shield Hardener": "Vepas' Modified Multispectrum Shield Hardener",
+}
--- a/service/conversions/releaseSep2023.py
+++ b/service/conversions/releaseSep2023.py
@@ -0,0 +1,10 @@
+"""
+Actually renamed somewhere during summer, but updated only in september
+"""
+
+CONVERSIONS = {
+    # Renamed items
+    "‘Atgeir’ Explosive Disruptive Lance": "'Atgeir' Explosive Disruptive Lance",
+    "‘Steel Yari’ Kinetic Disruptive Lance": "'Steel Yari' Kinetic Disruptive Lance",
+    "‘Sarissa’ Thermal Disruptive Lance": "'Sarissa' Thermal Disruptive Lance",
+}
--- a/service/jargon/defaults.yaml
+++ b/service/jargon/defaults.yaml
@@ -976,6 +976,9 @@ cdfe:
 cp:
  - 'cp'
  - 'command processor'
+ats:
+  - 'ats'
+  - 'auto targeting system'

 # Implants
 lg:
--- a/service/market.py
+++ b/service/market.py
@@ -321,6 +321,9 @@ class Market:
            "Boobook"                     : self.les_grp,  # 19th EVE anniversary gift
            "Geri"                        : self.les_grp,  # AT18 prize
            "Bestla"                      : self.les_grp,  # AT18 prize
+            "Metamorphosis"               : self.les_grp,  # Seems to be anniversary gift
+            "Shapash"                     : self.les_grp,  # AT19 prize
+            "Cybele"                      : self.les_grp,  # AT19 prize
        }

        self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP)
--- a/service/marketSources/init.py
+++ b/service/marketSources/init.py
@@ -1 +1 @@
-__all__ = ['evemarketer', 'evepraisal', 'evemarketdata', 'fuzzwork', 'cevemarket']
+__all__ = ['evemarketer', 'evemarketdata', 'fuzzwork', 'cevemarket']
--- a/service/marketSources/evepraisal.py
+++ b/service/marketSources/evepraisal.py
@@ -1,83 +0,0 @@
-# =============================================================================
-# Copyright (C) 2010 Diego Duclos
-#
-# This file is part of pyfa.
-#
-# pyfa is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyfa is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
-# =============================================================================
-
-
-from logbook import Logger
-
-from eos.saveddata.price import PriceStatus
-from service.network import Network
-from service.price import Price
-
-pyfalog = Logger(__name__)
-
-systemAliases = {
-    None: 'universe',
-    30000142: 'jita',
-    30002187: 'amarr',
-    30002659: 'dodixie',
-    30002510: 'rens',
-    30002053: 'hek'}
-
-
-class EvePraisal:
-
-    name = 'evepraisal'
-    group = 'tranquility'
-
-    def __init__(self, priceMap, system, fetchTimeout):
-        # Try selected system first
-        self.fetchPrices(priceMap, max(2 * fetchTimeout / 3, 2), system)
-        # If price was not available - try globally
-        if priceMap:
-            self.fetchPrices(priceMap, max(fetchTimeout / 3, 2))
-
-    @staticmethod
-    def fetchPrices(priceMap, fetchTimeout, system=None):
-        if system not in systemAliases:
-            return
-        jsonData = {
-            'market_name': systemAliases[system],
-            'items': [{'type_id': typeID} for typeID in priceMap]}
-        baseurl = 'https://evepraisal.com/appraisal/structured.json'
-        network = Network.getInstance()
-        resp = network.post(baseurl, network.PRICES, jsonData=jsonData, timeout=fetchTimeout)
-        data = resp.json()
-        try:
-            itemsData = data['appraisal']['items']
-        except (KeyError, TypeError):
-            return
-        # Cycle through all types we've got from request
-        for itemData in itemsData:
-            try:
-                typeID = int(itemData['typeID'])
-                price = itemData['prices']['sell']['min']
-                orderCount = itemData['prices']['sell']['order_count']
-            except (KeyError, TypeError):
-                continue
-            # evepraisal returns 0 if price data doesn't even exist for the item
-            if price == 0:
-                continue
-            # evepraisal seems to provide price for some items despite having no orders up
-            if orderCount < 1:
-                continue
-            priceMap[typeID].update(PriceStatus.fetchSuccess, price)
-            del priceMap[typeID]
-
-
-Price.register(EvePraisal)
--- a/service/port/eft.py
+++ b/service/port/eft.py
@@ -204,7 +204,7 @@ def exportFighters(fighters):

    def fighterSorter(fighter):
        groupName = Market.getInstance().getGroupByItem(fighter.item).name
-        return (FIGHTER_ORDER.index(groupName), fighter.fullName)
+        return (FIGHTER_ORDER.index(groupName), fighter.item.typeName)

    fighterLines = []
    for fighter in sorted(fighters, key=fighterSorter):
--- a/service/price.py
+++ b/service/price.py
@@ -276,4 +276,4 @@ class PriceWorkerThread(threading.Thread):


 # Import market sources only to initialize price source modules, they register on their own
-from service.marketSources import evemarketer, evemarketdata, evepraisal, fuzzwork, cevemarket  # noqa: E402
+from service.marketSources import evemarketer, evemarketdata, fuzzwork, cevemarket  # noqa: E402
--- a/staticdata/fsd_binary/categories.0.json
+++ b/staticdata/fsd_binary/categories.0.json
@@ -406,7 +406,7 @@
  }, 
  "40": {
    "categoryID": 40, 
-    "categoryName_de": "Souveränitätsstrukturen ", 
+    "categoryName_de": "Souveränitätsstrukturen", 
    "categoryName_en-us": "Sovereignty Structures", 
    "categoryName_es": "Estructuras de soberanía", 
    "categoryName_fr": "Structures de souveraineté", 
@@ -624,7 +624,7 @@
    "categoryName_ja": "採掘", 
    "categoryName_ko": "채굴", 
    "categoryName_ru": "Бурение", 
-    "categoryName_zh": "Mining", 
+    "categoryName_zh": "采矿", 
    "categoryNameID": 587126, 
    "published": 0
  }, 
@@ -638,7 +638,7 @@
    "categoryName_ja": "カスタマイズ", 
    "categoryName_ko": "개인화", 
    "categoryName_ru": "Персонализация", 
-    "categoryName_zh": "Personalization", 
+    "categoryName_zh": "个性化定制", 
    "categoryNameID": 631766, 
    "published": 1
  }, 
--- a/staticdata/fsd_binary/dogmaattributes.0.json
+++ b/staticdata/fsd_binary/dogmaattributes.0.json
--- a/staticdata/fsd_binary/dogmaeffects.0.json
+++ b/staticdata/fsd_binary/dogmaeffects.0.json
--- a/staticdata/fsd_binary/dogmaunits.0.json
+++ b/staticdata/fsd_binary/dogmaunits.0.json
@@ -12,7 +12,7 @@
    "descriptionID": 77965, 
    "displayName_de": "m", 
    "displayName_en-us": "m", 
-    "displayName_es": " m", 
+    "displayName_es": "m", 
    "displayName_fr": "m", 
    "displayName_it": "m", 
    "displayName_ja": "m", 
@@ -35,7 +35,7 @@
    "descriptionID": 77966, 
    "displayName_de": "kg", 
    "displayName_en-us": "kg", 
-    "displayName_es": " kg", 
+    "displayName_es": "kg", 
    "displayName_fr": "kg", 
    "displayName_it": "kg", 
    "displayName_ja": "kg", 
@@ -58,7 +58,7 @@
    "descriptionID": 77967, 
    "displayName_de": "s", 
    "displayName_en-us": "sec", 
-    "displayName_es": " s", 
+    "displayName_es": "s", 
    "displayName_fr": "sec", 
    "displayName_it": "sec", 
    "displayName_ja": "sec", 
@@ -104,7 +104,7 @@
    "descriptionID": 77969, 
    "displayName_de": "K", 
    "displayName_en-us": "K", 
-    "displayName_es": " K", 
+    "displayName_es": "K", 
    "displayName_fr": "K", 
    "displayName_it": "K", 
    "displayName_ja": "K", 
@@ -127,7 +127,7 @@
    "descriptionID": 77970, 
    "displayName_de": "mol", 
    "displayName_en-us": "mol", 
-    "displayName_es": " mol", 
+    "displayName_es": "mol", 
    "displayName_fr": "mol", 
    "displayName_it": "mol", 
    "displayName_ja": "mol", 
@@ -150,7 +150,7 @@
    "descriptionID": 77971, 
    "displayName_de": "cd", 
    "displayName_en-us": "cd", 
-    "displayName_es": " cd", 
+    "displayName_es": "cd", 
    "displayName_fr": "cd", 
    "displayName_it": "cd", 
    "displayName_ja": "cd", 
@@ -173,7 +173,7 @@
    "descriptionID": 77972, 
    "displayName_de": "m2", 
    "displayName_en-us": "m2", 
-    "displayName_es": " m²", 
+    "displayName_es": "m²", 
    "displayName_fr": "m2", 
    "displayName_it": "m2", 
    "displayName_ja": "m2", 
@@ -196,7 +196,7 @@
    "descriptionID": 77973, 
    "displayName_de": "m3", 
    "displayName_en-us": "m3", 
-    "displayName_es": " m³", 
+    "displayName_es": "m³", 
    "displayName_fr": "m³", 
    "displayName_it": "m3", 
    "displayName_ja": "m3", 
@@ -214,12 +214,12 @@
    "description_it": "Meter per second", 
    "description_ja": "メートル毎秒", 
    "description_ko": "m/s", 
-    "description_ru": "метр в секунду ", 
+    "description_ru": "метр в секунду", 
    "description_zh": "米/秒", 
    "descriptionID": 77974, 
    "displayName_de": "m/s", 
    "displayName_en-us": "m/sec", 
-    "displayName_es": " m/s", 
+    "displayName_es": "m/s", 
    "displayName_fr": "m/sec", 
    "displayName_it": "m/sec", 
    "displayName_ja": "m/sec", 
@@ -242,7 +242,7 @@
    "descriptionID": 77975, 
    "displayName_de": "m/s", 
    "displayName_en-us": "m/sec", 
-    "displayName_es": " m/s", 
+    "displayName_es": "m/s", 
    "displayName_fr": "m/sec", 
    "displayName_it": "m/sec", 
    "displayName_ja": "m/sec", 
@@ -265,7 +265,7 @@
    "descriptionID": 77976, 
    "displayName_de": "m-1", 
    "displayName_en-us": "m-1", 
-    "displayName_es": " m-1", 
+    "displayName_es": "m-1", 
    "displayName_fr": "m-1", 
    "displayName_it": "m-1", 
    "displayName_ja": "m-1", 
@@ -288,7 +288,7 @@
    "descriptionID": 77977, 
    "displayName_de": "kg/m3", 
    "displayName_en-us": "kg/m3", 
-    "displayName_es": " kg/m³", 
+    "displayName_es": "kg/m³", 
    "displayName_fr": "kg/m³", 
    "displayName_it": "kg/m3", 
    "displayName_ja": "kg/m3", 
@@ -311,7 +311,7 @@
    "descriptionID": 77978, 
    "displayName_de": "m3/kg", 
    "displayName_en-us": "m3/kg", 
-    "displayName_es": " m³/kg", 
+    "displayName_es": "m³/kg", 
    "displayName_fr": "m³/kg", 
    "displayName_it": "m3/kg", 
    "displayName_ja": "m3/kg", 
@@ -334,7 +334,7 @@
    "descriptionID": 77979, 
    "displayName_de": "A/m2", 
    "displayName_en-us": "A/m2", 
-    "displayName_es": " A/m²", 
+    "displayName_es": "A/m²", 
    "displayName_fr": "A/m2", 
    "displayName_it": "A/m2", 
    "displayName_ja": "A/m2", 
@@ -357,7 +357,7 @@
    "descriptionID": 77980, 
    "displayName_de": "A/m", 
    "displayName_en-us": "A/m", 
-    "displayName_es": " A/m", 
+    "displayName_es": "A/m", 
    "displayName_fr": "A/m", 
    "displayName_it": "A/m", 
    "displayName_ja": "A/m", 
@@ -380,7 +380,7 @@
    "descriptionID": 77981, 
    "displayName_de": "mol/m3", 
    "displayName_en-us": "mol/m3", 
-    "displayName_es": " mol/m³", 
+    "displayName_es": "mol/m³", 
    "displayName_fr": "mol/m³", 
    "displayName_it": "mol/m3", 
    "displayName_ja": "mol/m3", 
@@ -403,7 +403,7 @@
    "descriptionID": 77982, 
    "displayName_de": "cd/m2", 
    "displayName_en-us": "cd/m2", 
-    "displayName_es": " cd/m²", 
+    "displayName_es": "cd/m²", 
    "displayName_fr": "cd/m2", 
    "displayName_it": "cd/m2", 
    "displayName_ja": "cd/m2", 
@@ -439,7 +439,7 @@
  "101": {
    "displayName_de": "s", 
    "displayName_en-us": "s", 
-    "displayName_es": " s", 
+    "displayName_es": "s", 
    "displayName_fr": "s", 
    "displayName_it": "s", 
    "displayName_ja": "s", 
@@ -452,7 +452,7 @@
  "102": {
    "displayName_de": "mm", 
    "displayName_en-us": "mm", 
-    "displayName_es": " mm", 
+    "displayName_es": "mm", 
    "displayName_fr": "mm", 
    "displayName_it": "mm", 
    "displayName_ja": "mm", 
@@ -478,7 +478,7 @@
    "descriptionID": 77984, 
    "displayName_de": "x", 
    "displayName_en-us": "x", 
-    "displayName_es": " x", 
+    "displayName_es": "x", 
    "displayName_fr": "x", 
    "displayName_it": "x", 
    "displayName_ja": "x", 
@@ -491,7 +491,7 @@
  "105": {
    "displayName_de": "%", 
    "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
    "displayName_fr": "%", 
    "displayName_it": "%", 
    "displayName_ja": "%", 
@@ -504,7 +504,7 @@
  "106": {
    "displayName_de": "tf", 
    "displayName_en-us": "tf", 
-    "displayName_es": " tf", 
+    "displayName_es": "tf", 
    "displayName_fr": "tf", 
    "displayName_it": "tf", 
    "displayName_ja": "tf", 
@@ -517,7 +517,7 @@
  "107": {
    "displayName_de": "MW", 
    "displayName_en-us": "MW", 
-    "displayName_es": " MW", 
+    "displayName_es": "MW", 
    "displayName_fr": "MW", 
    "displayName_it": "MW", 
    "displayName_ja": "MW", 
@@ -529,18 +529,18 @@
  }, 
  "108": {
    "description_de": "Für Resistenzen verwendet.\r\n0,0 = 100%\r\n1,0 = 0%", 
-    "description_en-us": "Used for resistance.\r\n0.0 = 100% 1.0 = 0%\r\n", 
-    "description_es": "Se usa en la resistencia.\n\n0,0 = 100% 1,0 = 0%\n\n", 
-    "description_fr": "Utilisé pour la résistance. 0,0 = 100% 1,0 = 0 %\n", 
-    "description_it": "Used for resistance.\r\n0.0 = 100% 1.0 = 0%\r\n", 
-    "description_ja": "抵抗で使用。\n0.0 = 100% 1.0 = 0%\r\n", 
-    "description_ko": "저항력 표기에 사용됩니다.<br>0.0 = 100% 1.0 = 0%\n", 
+    "description_en-us": "Used for resistance.\r\n0.0 = 100% 1.0 = 0%", 
+    "description_es": "Se usa en la resistencia.\n\n0,0 = 100% 1,0 = 0%", 
+    "description_fr": "Utilisé pour la résistance. 0,0 = 100% 1,0 = 0 %", 
+    "description_it": "Used for resistance.\r\n0.0 = 100% 1.0 = 0%", 
+    "description_ja": "抵抗で使用。\n0.0 = 100% 1.0 = 0%", 
+    "description_ko": "저항력 표기에 사용됩니다.<br>0.0 = 100% 1.0 = 0%", 
    "description_ru": "Используется для обозначения силы сопротивления.\n0.0 = 100%\n1.0 = 0%", 
    "description_zh": "用于抗性。0.0 = 100% 1.0 = 0%", 
    "descriptionID": 77985, 
    "displayName_de": "%", 
    "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
    "displayName_fr": "%", 
    "displayName_it": "%", 
    "displayName_ja": "%", 
@@ -559,11 +559,11 @@
    "description_ja": "% として表示される乗数で使用：1.1＝+10%、0.9＝-10%", 
    "description_ko": "%로 나타낸 승수 표기에 사용됩니다. 1.1 = +10%, 0.9 = -10%", 
    "description_ru": "Используется для множителей в виде %. 1,1 = +10%; 0,9 = -10%", 
-    "description_zh": "用于乘数，显示为 %\n1.1 = +10%\n0.9 = -10%", 
+    "description_zh": "用于乘数，显示为 %1.1 = +10%0.9 = -10%", 
    "descriptionID": 77986, 
    "displayName_de": "%", 
    "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
    "displayName_fr": "%", 
    "displayName_it": "%", 
    "displayName_ja": "%", 
@@ -586,7 +586,7 @@
    "descriptionID": 77987, 
    "displayName_de": "%", 
    "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
    "displayName_fr": "%", 
    "displayName_it": "%", 
    "displayName_ja": "%", 
@@ -609,7 +609,7 @@
    "descriptionID": 77988, 
    "displayName_de": "rad/s", 
    "displayName_en-us": "rad/sec", 
-    "displayName_es": " rad/s", 
+    "displayName_es": "rad/s", 
    "displayName_fr": "rad/sec", 
    "displayName_it": "rad/sec", 
    "displayName_ja": "rad/sec", 
@@ -622,7 +622,7 @@
  "113": {
    "displayName_de": "HP", 
    "displayName_en-us": "HP", 
-    "displayName_es": " PV", 
+    "displayName_es": "PV", 
    "displayName_fr": "PV", 
    "displayName_it": "HP", 
    "displayName_ja": "HP", 
@@ -645,7 +645,7 @@
    "descriptionID": 77989, 
    "displayName_de": "GJ", 
    "displayName_en-us": "GJ", 
-    "displayName_es": " GJ", 
+    "displayName_es": "GJ", 
    "displayName_fr": "GJ", 
    "displayName_it": "GJ", 
    "displayName_ja": "GJ", 
@@ -756,7 +756,7 @@
    "descriptionID": 77990, 
    "displayName_de": "%", 
    "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
    "displayName_fr": "%", 
    "displayName_it": "%", 
    "displayName_ja": "%", 
@@ -782,7 +782,7 @@
    "descriptionID": 77991, 
    "displayName_de": "s", 
    "displayName_en-us": "sec", 
-    "displayName_es": " s", 
+    "displayName_es": "s", 
    "displayName_fr": "sec", 
    "displayName_it": "sec", 
    "displayName_ja": "sec", 
@@ -805,7 +805,7 @@
    "descriptionID": 77992, 
    "displayName_de": "%", 
    "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
    "displayName_fr": "%", 
    "displayName_it": "%", 
    "displayName_ja": "%", 
@@ -818,7 +818,7 @@
  "125": {
    "displayName_de": "N", 
    "displayName_en-us": "N", 
-    "displayName_es": " N", 
+    "displayName_es": "N", 
    "displayName_fr": "N", 
    "displayName_it": "N", 
    "displayName_ja": "N", 
@@ -854,7 +854,7 @@
    "descriptionID": 77993, 
    "displayName_de": "%", 
    "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
    "displayName_fr": "%", 
    "displayName_it": "%", 
    "displayName_ja": "%", 
@@ -913,7 +913,7 @@
    "descriptionID": 77996, 
    "displayName_de": "ISK", 
    "displayName_en-us": "ISK", 
-    "displayName_es": " ISK", 
+    "displayName_es": "ISK", 
    "displayName_fr": "ISK", 
    "displayName_it": "ISK", 
    "displayName_ja": "ISK", 
@@ -936,7 +936,7 @@
    "descriptionID": 77997, 
    "displayName_de": "m3/Stunde", 
    "displayName_en-us": "m3/hour", 
-    "displayName_es": " m³/hora", 
+    "displayName_es": "m³/hora", 
    "displayName_fr": "m³/heure", 
    "displayName_it": "m3/hour", 
    "displayName_ja": "m3/hour", 
@@ -959,7 +959,7 @@
    "descriptionID": 77998, 
    "displayName_de": "AE", 
    "displayName_en-us": "AU", 
-    "displayName_es": " UA", 
+    "displayName_es": "UA", 
    "displayName_fr": "UA", 
    "displayName_it": "AU", 
    "displayName_ja": "AU", 
@@ -1146,7 +1146,7 @@
    "descriptionID": 561538, 
    "displayName_de": "AE/s", 
    "displayName_en-us": "AU/s", 
-    "displayName_es": " UA/s", 
+    "displayName_es": "UA/s", 
    "displayName_fr": "UA/s", 
    "displayName_it": "AU/s", 
    "displayName_ja": "AU/秒", 
@@ -1165,12 +1165,12 @@
    "description_ja": "% として表示される乗数で使用：10＝+10%、-10＝-10%、3.6＝+3.6%", 
    "description_ko": "%로 나타낸 승수 표기에 사용됩니다. 10 = +10%, -10 = -10%, 3.6 = +3.6%", 
    "description_ru": "Используется для множителей в виде %. 10 = +10%; -10 = -10%; 3,6 = +3,6%", 
-    "description_zh": "Used for multipliers displayed as % 10 is +10% -10 is -10% 3.6 is +3.6%", 
+    "description_zh": "用于乘数，显示为 % 10 is +10% -10 is -10% 3.6 is +3.6%", 
    "descriptionID": 592242, 
-    "displayName_de": " %", 
+    "displayName_de": "%", 
    "displayName_en-us": "%", 
-    "displayName_es": " %", 
-    "displayName_fr": " %", 
+    "displayName_es": "%", 
+    "displayName_fr": "%", 
    "displayName_it": "%", 
    "displayName_ja": "%", 
    "displayName_ko": "%", 
--- a/staticdata/fsd_binary/groups.0.json
+++ b/staticdata/fsd_binary/groups.0.json
@@ -516,7 +516,7 @@
    "groupName_ja": "ハウラー", 
    "groupName_ko": "운반선", 
    "groupName_ru": "Перевозчик", 
-    "groupName_zh": "工业舰", 
+    "groupName_zh": "运载舰", 
    "groupNameID": 63600, 
    "published": 1, 
    "useBasePrice": 0
@@ -1628,7 +1628,7 @@
    "groupName_ja": "ハウラー設計図", 
    "groupName_ko": "운반선 블루프린트", 
    "groupName_ru": "Hauler Blueprint", 
-    "groupName_zh": "工业舰蓝图", 
+    "groupName_zh": "运载舰蓝图", 
    "groupNameID": 63656, 
    "published": 1, 
    "useBasePrice": 1
@@ -7321,7 +7321,7 @@
    "groupName_ja": "エリートハウラー設計図", 
    "groupName_ko": "엘리트 운반선 블루프린트", 
    "groupName_ru": "Elite Hauler Blueprint", 
-    "groupName_zh": "精英工业舰蓝图", 
+    "groupName_zh": "精英运载舰蓝图", 
    "groupNameID": 63936, 
    "iconID": 0, 
    "published": 1, 
@@ -10033,7 +10033,7 @@
    "categoryID": 11, 
    "fittableNonSingleton": 0, 
    "groupID": 667, 
-    "groupName_de": "Missionen: Amarr Empire-Schlachtschiff ", 
+    "groupName_de": "Missionen: Amarr Empire-Schlachtschiff", 
    "groupName_en-us": "Mission Amarr Empire Battleship", 
    "groupName_es": "Acorazado de misión del Imperio Amarr", 
    "groupName_fr": "Cuirassé Empire amarr mission", 
@@ -11299,7 +11299,7 @@
    "groupName_ja": "ガス雲スクープ", 
    "groupName_ko": "가스 수집기", 
    "groupName_ru": "Газочерпатели", 
-    "groupName_zh": "气云采集器", 
+    "groupName_zh": "气云回收装置", 
    "groupNameID": 64127, 
    "iconID": 0, 
    "published": 1, 
@@ -14231,7 +14231,7 @@
    "categoryID": 9, 
    "fittableNonSingleton": 0, 
    "groupID": 890, 
-    "groupName_de": "Blueprints zur Eiskomprimierung ", 
+    "groupName_de": "Blueprints zur Eiskomprimierung", 
    "groupName_en-us": "Ice Compression Blueprints", 
    "groupName_es": "Planos de compresores de hielo", 
    "groupName_fr": "Plans de construction Compression de glace", 
@@ -14869,7 +14869,7 @@
    "groupName_ja": "ミッション勢力別ハウラー", 
    "groupName_ko": "미션 팩션 운반선", 
    "groupName_ru": "Mission Faction Haulers", 
-    "groupName_zh": "任务势力工业舰", 
+    "groupName_zh": "任务势力运载舰", 
    "groupNameID": 64290, 
    "published": 0, 
    "useBasePrice": 0
@@ -15417,7 +15417,7 @@
    "categoryID": 35, 
    "fittableNonSingleton": 0, 
    "groupID": 979, 
-    "groupName_de": "Decryptors - Hybrid ", 
+    "groupName_de": "Decryptors - Hybrid", 
    "groupName_en-us": "Decryptors - Hybrid", 
    "groupName_es": "Desencriptadores híbridos", 
    "groupName_fr": "Décrypteurs - Hybride", 
@@ -15443,7 +15443,7 @@
    "groupName_it": "Deadspace Sleeper Sleepless Defender", 
    "groupName_ja": "デッドスペーススリーパー眠らないディフェンダー", 
    "groupName_ko": "잠들지 않는 데드스페이스 슬리퍼 디펜더", 
-    "groupName_ru": "Deadspace Sleeper Sleepless Defender ", 
+    "groupName_ru": "Deadspace Sleeper Sleepless Defender", 
    "groupName_zh": "死亡空间冬眠者长明防卫者", 
    "groupNameID": 64316, 
    "iconID": 0, 
@@ -15523,7 +15523,7 @@
    "groupName_it": "Deadspace Sleeper Emergent Defender", 
    "groupName_ja": "デッドスペーススリーパー緊急ディフェンダー", 
    "groupName_ko": "이머전트 데드스페이스 슬리퍼 디펜더", 
-    "groupName_ru": "Deadspace Sleeper Emergent Defender ", 
+    "groupName_ru": "Deadspace Sleeper Emergent Defender", 
    "groupName_zh": "死亡空间冬眠者新生防卫者", 
    "groupNameID": 64322, 
    "iconID": 0, 
@@ -15536,7 +15536,7 @@
    "categoryID": 11, 
    "fittableNonSingleton": 0, 
    "groupID": 987, 
-    "groupName_de": "Raumverwerfung: Sleeper-Nachwuchspatrouille ", 
+    "groupName_de": "Raumverwerfung: Sleeper-Nachwuchspatrouille", 
    "groupName_en-us": "Deadspace Sleeper Emergent Patroller", 
    "groupName_es": "Patrullero emergente de sleepers del espacio muerto", 
    "groupName_fr": "Patrouilleur sleeper émergent Deadspace", 
@@ -15582,7 +15582,7 @@
    "groupName_it": "Sleeper Electronics Relics", 
    "groupName_ja": "スリーパー遺物（エレクトロニクス）", 
    "groupName_ko": "슬리퍼 전자 시스템 유물", 
-    "groupName_ru": "Древние электронные устройства Sleeper ", 
+    "groupName_ru": "Древние электронные устройства Sleeper", 
    "groupName_zh": "冬眠者的古老电子装备", 
    "groupNameID": 64338, 
    "published": 1, 
@@ -15620,7 +15620,7 @@
    "groupName_it": "Sleeper Engineering Relics", 
    "groupName_ja": "スリーパー遺物（エンジニアリング）", 
    "groupName_ko": "슬리퍼 엔지니어링 시스템 유물", 
-    "groupName_ru": "Древние инженерные установки Sleeper ", 
+    "groupName_ru": "Древние инженерные установки Sleeper", 
    "groupName_zh": "冬眠者的古老工程设备", 
    "groupNameID": 64339, 
    "published": 1, 
@@ -15639,7 +15639,7 @@
    "groupName_it": "Sleeper Defensive Relics", 
    "groupName_ja": "スリーパー遺物（防御）", 
    "groupName_ko": "슬리퍼 방어용 시스템 유물", 
-    "groupName_ru": "Древние защитные устройства Sleeper ", 
+    "groupName_ru": "Древние защитные устройства Sleeper", 
    "groupName_zh": "冬眠者的古老防御装备", 
    "groupNameID": 64336, 
    "published": 1, 
@@ -15696,7 +15696,7 @@
    "groupName_it": "Sleeper Hull Relics", 
    "groupName_ja": "スリーパー遺物（船体）", 
    "groupName_ko": "슬리퍼 선체 시스템 유물", 
-    "groupName_ru": "Древние корпуса Sleeper ", 
+    "groupName_ru": "Древние корпуса Sleeper", 
    "groupName_zh": "冬眠者船体", 
    "groupNameID": 64337, 
    "published": 1, 
@@ -16341,7 +16341,7 @@
    "groupName_es": "Nave capital de incursión de la Nación Sansha", 
    "groupName_fr": "Vaisseau capital Sansha's Nation incursion", 
    "groupName_it": "Incursion Sansha's Nation Capital", 
-    "groupName_ja": "インカージョンサンシャ国キャピタル", 
+    "groupName_ja": "サンシャ国侵略キャピタル", 
    "groupName_ko": "인커젼 산샤 네이션 캐피탈", 
    "groupName_ru": "Корабль большого тоннажа Флота вторжения Нации Sansha", 
    "groupName_zh": "入侵萨沙旗舰", 
@@ -16360,7 +16360,7 @@
    "groupName_es": "Fragata de incursión de la Nación Sansha", 
    "groupName_fr": "Frégate Sansha's Nation incursion", 
    "groupName_it": "Incursion Sansha's Nation Frigate", 
-    "groupName_ja": "インカージョンサンシャ国フリゲート", 
+    "groupName_ja": "サンシャ国侵略フリゲート", 
    "groupName_ko": "인커젼 산샤 네이션 프리깃", 
    "groupName_ru": "Фрегат Флота вторжения Нации Sansha", 
    "groupName_zh": "入侵萨沙护卫舰", 
@@ -16379,7 +16379,7 @@
    "groupName_es": "Crucero de incursión de la Nación Sansha", 
    "groupName_fr": "Croiseur Sansha's Nation incursion", 
    "groupName_it": "Incursion Sansha's Nation Cruiser", 
-    "groupName_ja": "インカージョンサンシャ国巡洋艦", 
+    "groupName_ja": "サンシャ国侵略巡洋艦", 
    "groupName_ko": "인커젼 산샤 네이션 크루저", 
    "groupName_ru": "Крейсер Флота вторжения Нации Sansha", 
    "groupName_zh": "入侵萨沙巡洋舰", 
@@ -16398,7 +16398,7 @@
    "groupName_es": "Acorazado de incursión de la Nación Sansha", 
    "groupName_fr": "Cuirassé Sansha's Nation incursion", 
    "groupName_it": "Incursion Sansha's Nation Battleship", 
-    "groupName_ja": "インカージョンサンシャ国戦艦", 
+    "groupName_ja": "サンシャ国侵略戦艦", 
    "groupName_ko": "인커젼 산샤 네이션 배틀쉽", 
    "groupName_ru": "Линкор Флота вторжения Нации Sansha", 
    "groupName_zh": "入侵萨沙战列舰", 
@@ -17250,7 +17250,7 @@
    "categoryID": 9, 
    "fittableNonSingleton": 0, 
    "groupID": 1151, 
-    "groupName_de": "Blueprint für Panzerungsverstärker mit Beständigkeitsanpassung ", 
+    "groupName_de": "Blueprint für Panzerungsverstärker mit Beständigkeitsanpassung", 
    "groupName_en-us": "Armor Resistance Shift Hardener Blueprint", 
    "groupName_es": "Plano de endurecedor de cambio de resistencia de blindaje", 
    "groupName_fr": "Plan de construction Renforcement de résistance de blindage adaptatif", 
@@ -17850,7 +17850,7 @@
    "groupName_ja": "マイクロジャンプドライブブループリント", 
    "groupName_ko": "마이크로 점프 드라이브 블루프린트", 
    "groupName_ru": "Чертежи маневрового гипердвигателя", 
-    "groupName_zh": "微型跳跃引擎蓝图 ", 
+    "groupName_zh": "微型跳跃引擎蓝图", 
    "groupNameID": 283702, 
    "published": 1, 
    "useBasePrice": 1
@@ -18166,7 +18166,7 @@
    "categoryID": 16, 
    "fittableNonSingleton": 0, 
    "groupID": 1218, 
-    "groupName_de": "Ressourcenverarbeitung ", 
+    "groupName_de": "Ressourcenverarbeitung", 
    "groupName_en-us": "Resource Processing", 
    "groupName_es": "Procesamiento de recursos", 
    "groupName_fr": "Traitement des ressources", 
@@ -20564,7 +20564,7 @@
    "groupName_ja": "誘導ボム", 
    "groupName_ko": "유도 폭탄", 
    "groupName_ru": "Направляемая бомба", 
-    "groupName_zh": "建筑制导炸弹", 
+    "groupName_zh": "制导炸弹", 
    "groupNameID": 510637, 
    "published": 1, 
    "useBasePrice": 0
@@ -23397,15 +23397,15 @@
    "categoryID": 11, 
    "fittableNonSingleton": 0, 
    "groupID": 1792, 
-    "groupName_de": "Hidden Zenith Caldari Schlachtschiff ", 
-    "groupName_en-us": "Hidden Zenith Caldari Battleship ", 
-    "groupName_es": "Acorazado caldari de Zenith oculto ", 
-    "groupName_fr": "Cuirassé caldari Hidden Zenith ", 
-    "groupName_it": "Hidden Zenith Caldari Battleship ", 
-    "groupName_ja": "隠されたゼニスのカルダリ戦艦 ", 
-    "groupName_ko": "숨겨진 제니스 칼다리 배틀쉽 ", 
-    "groupName_ru": "Калдарский линкор «Скрытого зенита» ", 
-    "groupName_zh": "隐藏的天穹加达里战列舰 ", 
+    "groupName_de": "Hidden Zenith Caldari Schlachtschiff", 
+    "groupName_en-us": "Hidden Zenith Caldari Battleship", 
+    "groupName_es": "Acorazado caldari de Zenith oculto", 
+    "groupName_fr": "Cuirassé caldari Hidden Zenith", 
+    "groupName_it": "Hidden Zenith Caldari Battleship", 
+    "groupName_ja": "隠されたゼニスのカルダリ戦艦", 
+    "groupName_ko": "숨겨진 제니스 칼다리 배틀쉽", 
+    "groupName_ru": "Калдарский линкор «Скрытого зенита»", 
+    "groupName_zh": "隐藏的天穹加达里战列舰", 
    "groupNameID": 518831, 
    "published": 0, 
    "useBasePrice": 0
@@ -25092,15 +25092,15 @@
    "categoryID": 11, 
    "fittableNonSingleton": 0, 
    "groupID": 1896, 
-    "groupName_de": "♦ Industrie-Kommandoschiff ", 
-    "groupName_en-us": "♦ Industrial Command ", 
-    "groupName_es": "♦ Mando de nave industrial ", 
+    "groupName_de": "♦ Industrie-Kommandoschiff", 
+    "groupName_en-us": "♦ Industrial Command", 
+    "groupName_es": "♦ Mando de nave industrial", 
    "groupName_fr": "♦ Commandement industriel", 
-    "groupName_it": "♦ Industrial Command ", 
+    "groupName_it": "♦ Industrial Command", 
    "groupName_ja": "♦ 指揮型輸送艦", 
-    "groupName_ko": "♦ 인더스트리얼 커맨드쉽 ", 
-    "groupName_ru": "♦ Буровой корабль ", 
-    "groupName_zh": "♦ 工业指挥舰 ", 
+    "groupName_ko": "♦ 인더스트리얼 커맨드쉽", 
+    "groupName_ru": "♦ Буровой корабль", 
+    "groupName_zh": "♦ 工业指挥舰", 
    "groupNameID": 528285, 
    "published": 0, 
    "useBasePrice": 0
@@ -25922,7 +25922,7 @@
    "groupName_ja": "アビサルモジュール", 
    "groupName_ko": "어비설 모듈", 
    "groupName_ru": "Модули Бездны", 
-    "groupName_zh": "Abyssal Modules", 
+    "groupName_zh": "深渊装备", 
    "groupNameID": 532741, 
    "published": 0, 
    "useBasePrice": 0
@@ -26302,7 +26302,7 @@
    "groupName_ja": "フィラメントの痕跡", 
    "groupName_ko": "필라멘트 흔적", 
    "groupName_ru": "След нити", 
-    "groupName_zh": "深渊痕迹", 
+    "groupName_zh": "纤维痕迹", 
    "groupNameID": 536427, 
    "published": 0, 
    "useBasePrice": 0
@@ -27659,7 +27659,7 @@
    "groupName_ja": "未確認エンティティ", 
    "groupName_ko": "미확인 객체", 
    "groupName_ru": "Неопознанные объекты", 
-    "groupName_zh": "Unidentified Entities", 
+    "groupName_zh": "不明实体", 
    "groupNameID": 576839, 
    "published": 0, 
    "useBasePrice": 0
@@ -27678,7 +27678,7 @@
    "groupName_ja": "AIRエンティティI", 
    "groupName_ko": "AIR 객체 I", 
    "groupName_ru": "Объекты АМИ I", 
-    "groupName_zh": "AIR Entities I", 
+    "groupName_zh": "星空会实体 I", 
    "groupNameID": 576840, 
    "published": 0, 
    "useBasePrice": 0
@@ -27794,7 +27794,7 @@
    "groupName_ja": "AIRエンティティII", 
    "groupName_ko": "AIR 객체 II", 
    "groupName_ru": "Объекты АМИ II", 
-    "groupName_zh": "AIR Entities II", 
+    "groupName_zh": "星空会实体 II", 
    "groupNameID": 582726, 
    "published": 0, 
    "useBasePrice": 0
@@ -27813,7 +27813,7 @@
    "groupName_ja": "未確認エンティティII", 
    "groupName_ko": "미확인 객체 II", 
    "groupName_ru": "Неопознанные объекты II", 
-    "groupName_zh": "Unidentified Entities II", 
+    "groupName_zh": "不明实体 II", 
    "groupNameID": 583913, 
    "published": 0, 
    "useBasePrice": 0
@@ -27832,7 +27832,7 @@
    "groupName_ja": "移動式解析ビーコン", 
    "groupName_ko": "이동식 분석 비컨", 
    "groupName_ru": "Мобильный маяк анализа", 
-    "groupName_zh": "Mobile Analysis Beacon", 
+    "groupName_zh": "移动式分析信标", 
    "groupNameID": 586787, 
    "published": 1, 
    "useBasePrice": 1
@@ -27851,7 +27851,7 @@
    "groupName_ja": "ガス雲採掘機", 
    "groupName_ko": "가스 하베스터", 
    "groupName_ru": "Сборщики газовых облаков", 
-    "groupName_zh": "Gas Cloud Harvesters", 
+    "groupName_zh": "气云采集器", 
    "groupNameID": 587196, 
    "published": 1, 
    "useBasePrice": 0
@@ -27870,7 +27870,7 @@
    "groupName_ja": "ガス採掘機設計図", 
    "groupName_ko": "가스 하베스터 블루프린트", 
    "groupName_ru": "Чертёж установки для сбора газа", 
-    "groupName_zh": "Gas Harvester Blueprint", 
+    "groupName_zh": "气云采集器蓝图", 
    "groupNameID": 587314, 
    "published": 1, 
    "useBasePrice": 1
@@ -27889,7 +27889,7 @@
    "groupName_ja": "移動式解析ビーコン設計図", 
    "groupName_ko": "이동식 분석 비컨 블루프린트", 
    "groupName_ru": "Чертёж мобильного маяка анализа", 
-    "groupName_zh": "Mobile Analysis Beacon Blueprint", 
+    "groupName_zh": "移动式分析信标蓝图", 
    "groupNameID": 588137, 
    "published": 1, 
    "useBasePrice": 1
@@ -27908,7 +27908,7 @@
    "groupName_ja": "ローグドローン解析データ", 
    "groupName_ko": "로그 드론 분석 데이터", 
    "groupName_ru": "Данные анализа восставших дронов", 
-    "groupName_zh": "Rogue Drone Analysis Data", 
+    "groupName_zh": "自由无人机分析数据", 
    "groupNameID": 588315, 
    "published": 1, 
    "useBasePrice": 1
@@ -27927,7 +27927,7 @@
    "groupName_ja": "ワープマトリクス・フィラメント", 
    "groupName_ko": "워프 매트릭스 필라멘트", 
    "groupName_ru": "Варп-матричные нити", 
-    "groupName_zh": "Warp Matrix Filaments", 
+    "groupName_zh": "跃迁矩阵纤维", 
    "groupNameID": 588713, 
    "published": 1, 
    "useBasePrice": 1
@@ -27946,7 +27946,7 @@
    "groupName_ja": "AIR鉱石アステロイド資源", 
    "groupName_ko": "AIR 소행성 광물", 
    "groupName_ru": "AIR Ore Asteroid Resources", 
-    "groupName_zh": "AIR Ore Asteroid Resources", 
+    "groupName_zh": "星空会矿石小行星资源", 
    "groupNameID": 592233, 
    "published": 0, 
    "useBasePrice": 1
@@ -27965,7 +27965,7 @@
    "groupName_ja": "奇妙な資源", 
    "groupName_ko": "기묘한 재료", 
    "groupName_ru": "Любопытные материалы", 
-    "groupName_zh": "Peculiar Materials", 
+    "groupName_zh": "奇特材料", 
    "groupNameID": 592992, 
    "published": 1, 
    "useBasePrice": 1
@@ -27984,7 +27984,7 @@
    "groupName_ja": "圧縮ガス", 
    "groupName_ko": "압축된 가스", 
    "groupName_ru": "Сжатый газ", 
-    "groupName_zh": "Compressed Gas", 
+    "groupName_zh": "高密度气云", 
    "groupNameID": 594612, 
    "iconID": 25169, 
    "published": 1, 
@@ -28004,7 +28004,7 @@
    "groupName_ja": "圧縮装置", 
    "groupName_ko": "압축기", 
    "groupName_ru": "Компрессоры", 
-    "groupName_zh": "Compressors", 
+    "groupName_zh": "压缩装置", 
    "groupNameID": 595063, 
    "iconID": 25152, 
    "published": 1, 
@@ -28024,7 +28024,7 @@
    "groupName_ja": "圧縮装置設計図", 
    "groupName_ko": "압축기 블루프린트", 
    "groupName_ru": "Чертежи компрессоров", 
-    "groupName_zh": "Compressors Blueprints", 
+    "groupName_zh": "压缩装置蓝图", 
    "groupNameID": 595230, 
    "published": 1, 
    "useBasePrice": 1
@@ -28043,7 +28043,7 @@
    "groupName_ja": "インダストリアル・ジャンプポータルジェネレーター", 
    "groupName_ko": "인더스트리얼 점프 포탈 생성기", 
    "groupName_ru": "Industrial Jump Portal Generator", 
-    "groupName_zh": "Industrial Jump Portal Generator", 
+    "groupName_zh": "工业舰跳跃通道发生器", 
    "groupNameID": 596753, 
    "iconID": 0, 
    "published": 1, 
@@ -28063,7 +28063,7 @@
    "groupName_ja": "ストラクチャ領域拒否弾薬", 
    "groupName_ko": "구조물 반접근 탄약", 
    "groupName_ru": "Боеприпасы для систем обороны сооружений", 
-    "groupName_zh": "Structure Area Denial Ammunition", 
+    "groupName_zh": "建筑区域拒止弹药", 
    "groupNameID": 597623, 
    "iconID": 1304, 
    "published": 1, 
@@ -28083,7 +28083,7 @@
    "groupName_ja": "ストラクチャ領域拒否弾薬設計図", 
    "groupName_ko": "구조물 반접근 탄약 블루프린트", 
    "groupName_ru": "Structure Area Denial Ammo Blueprint", 
-    "groupName_zh": "Structure Area Denial Ammo Blueprint", 
+    "groupName_zh": "建筑区域拒止弹药蓝图", 
    "groupNameID": 597627, 
    "published": 1, 
    "useBasePrice": 1
@@ -28096,13 +28096,13 @@
    "groupID": 4430, 
    "groupName_de": "Asteroidengürtel", 
    "groupName_en-us": "Asteroid Belt", 
-    "groupName_es": "Asteroid Belt", 
+    "groupName_es": "Cinturón de asteroides", 
    "groupName_fr": "Ceinture d'astéroïdes", 
    "groupName_it": "Asteroid Belt", 
    "groupName_ja": "アステロイドベルト", 
    "groupName_ko": "소행성 벨트", 
    "groupName_ru": "Asteroid Belt", 
-    "groupName_zh": "Asteroid Belt", 
+    "groupName_zh": "小行星带", 
    "groupNameID": 623561, 
    "published": 0, 
    "useBasePrice": 0
@@ -28115,13 +28115,13 @@
    "groupID": 4431, 
    "groupName_de": "FW Schlachtschiff des Imperiums der Amarr", 
    "groupName_en-us": "FW Amarr Empire Battleship", 
-    "groupName_es": "FW Amarr Empire Battleship", 
+    "groupName_es": "Acorazado de GF del Imperio Amarr", 
    "groupName_fr": "Cuirassé de l'Empire amarr GF", 
    "groupName_it": "FW Amarr Empire Battleship", 
    "groupName_ja": "FWアマー帝国戦艦", 
    "groupName_ko": "FW 아마르 배틀쉽", 
    "groupName_ru": "FW Amarr Empire Battleship", 
-    "groupName_zh": "FW Amarr Empire Battleship", 
+    "groupName_zh": "势力战争艾玛帝国战列舰", 
    "groupNameID": 623607, 
    "published": 1, 
    "useBasePrice": 0
@@ -28134,13 +28134,13 @@
    "groupID": 4432, 
    "groupName_de": "FW Schlachtschiff des Staats der Caldari", 
    "groupName_en-us": "FW Caldari State Battleship", 
-    "groupName_es": "FW Caldari State Battleship", 
+    "groupName_es": "Acorazado de GF del Estado Caldari", 
    "groupName_fr": "Cuirassé de l'État caldari GF", 
    "groupName_it": "FW Caldari State Battleship", 
    "groupName_ja": "FWカルダリ連合戦艦", 
    "groupName_ko": "FW 칼다리 배틀쉽", 
    "groupName_ru": "FW Caldari State Battleship", 
-    "groupName_zh": "FW Caldari State Battleship", 
+    "groupName_zh": "势力战争加达里合众国战列舰", 
    "groupNameID": 623608, 
    "published": 1, 
    "useBasePrice": 0
@@ -28153,13 +28153,13 @@
    "groupID": 4433, 
    "groupName_de": "FW Schlachtschiff der Föderation der Gallente", 
    "groupName_en-us": "FW Gallente Federation Battleship", 
-    "groupName_es": "FW Gallente Federation Battleship", 
+    "groupName_es": "Acorazado de GF de la Federación Gallente", 
    "groupName_fr": "Cuirassé de la Fédération gallente GF", 
    "groupName_it": "FW Gallente Federation Battleship", 
    "groupName_ja": "FWガレンテ連邦戦艦", 
    "groupName_ko": "FW 갈란테 배틀쉽", 
    "groupName_ru": "FW Gallente Federation Battleship", 
-    "groupName_zh": "FW Gallente Federation Battleship", 
+    "groupName_zh": "势力战争盖伦特联邦战列舰", 
    "groupNameID": 623609, 
    "published": 1, 
    "useBasePrice": 0
@@ -28172,13 +28172,13 @@
    "groupID": 4434, 
    "groupName_de": "FW Schlachtschiff der Republik Minmatar", 
    "groupName_en-us": "FW Minmatar Republic Battleship", 
-    "groupName_es": "FW Minmatar Republic Battleship", 
+    "groupName_es": "Acorazado de GF de la República Minmatar", 
    "groupName_fr": "Cuirassé de la République minmatar GF", 
    "groupName_it": "FW Minmatar Republic Battleship", 
    "groupName_ja": "FWミンマター共和国戦艦", 
    "groupName_ko": "FW 민마타 배틀쉽", 
    "groupName_ru": "FW Minmatar Republic Battleship", 
-    "groupName_zh": "FW Minmatar Republic Battleship", 
+    "groupName_zh": "势力战争米玛塔尔共和国战列舰", 
    "groupNameID": 623610, 
    "published": 1, 
    "useBasePrice": 0
@@ -28197,7 +28197,7 @@
    "groupName_ja": "艦船カスタマイズ", 
    "groupName_ko": "함선 개인화", 
    "groupName_ru": "Персонализация корабля", 
-    "groupName_zh": "Ship Personalization", 
+    "groupName_zh": "舰船个性化", 
    "groupNameID": 631767, 
    "published": 1, 
    "useBasePrice": 0
@@ -28216,7 +28216,7 @@
    "groupName_ja": "国家間戦争プロパガンダ放送ストラクチャ", 
    "groupName_ko": "팩션 전쟁 선전용 방송시설", 
    "groupName_ru": "Сооружение для передачи пропаганды МВ", 
-    "groupName_zh": "FW Propaganda Broadcast Structure", 
+    "groupName_zh": "势力战争广播宣传建筑", 
    "groupNameID": 635229, 
    "published": 1, 
    "useBasePrice": 1
@@ -28235,7 +28235,7 @@
    "groupName_ja": "移動式施設設計図", 
    "groupName_ko": "이동형 목표물 블루프린트", 
    "groupName_ru": "Чертёж подвижной цели", 
-    "groupName_zh": "Mobile Objective Blueprint", 
+    "groupName_zh": "移动目标蓝图", 
    "groupNameID": 636346, 
    "published": 1, 
    "useBasePrice": 1
@@ -28254,7 +28254,7 @@
    "groupName_ja": "コントロールポイント", 
    "groupName_ko": "컨트롤 포인트", 
    "groupName_ru": "Контрольная точка", 
-    "groupName_zh": "Control Point", 
+    "groupName_zh": "控制点", 
    "groupNameID": 637132, 
    "published": 0, 
    "useBasePrice": 0
@@ -28273,7 +28273,7 @@
    "groupName_ja": "国家間戦争のリスニングアウトポスト", 
    "groupName_ko": "팩션 전쟁 감청기지", 
    "groupName_ru": "Прослушивающий форпост МВ", 
-    "groupName_zh": "FW Listening Outpost", 
+    "groupName_zh": "势力战争监听站", 
    "groupNameID": 638199, 
    "published": 1, 
    "useBasePrice": 1
@@ -28292,7 +28292,7 @@
    "groupName_ja": "ミッション一般カプセル", 
    "groupName_ko": "미션 일반 캡슐", 
    "groupName_ru": "Mission Generic Capsules", 
-    "groupName_zh": "Mission Generic Capsules", 
+    "groupName_zh": "任务通用太空舱", 
    "groupNameID": 639247, 
    "published": 0, 
    "useBasePrice": 0
@@ -28308,8 +28308,8 @@
    "groupName_es": "Mordunium", 
    "groupName_fr": "Mordunium", 
    "groupName_it": "Mordunium", 
-    "groupName_ja": "Mordunium", 
-    "groupName_ko": "Mordunium", 
+    "groupName_ja": "モードゥニウム", 
+    "groupName_ko": "모르두늄", 
    "groupName_ru": "Mordunium", 
    "groupName_zh": "Mordunium", 
    "groupNameID": 640735, 
@@ -28328,9 +28328,9 @@
    "groupName_es": "Ytirium", 
    "groupName_fr": "Ytirium", 
    "groupName_it": "Ytirium", 
-    "groupName_ja": "Ytirium", 
-    "groupName_ko": "Ytirium", 
-    "groupName_ru": "Ytirium", 
+    "groupName_ja": "イティリウム", 
+    "groupName_ko": "이티륨", 
+    "groupName_ru": "Ютирий", 
    "groupName_zh": "Ytirium", 
    "groupNameID": 640736, 
    "iconID": 15, 
@@ -28348,9 +28348,9 @@
    "groupName_es": "Eifyrium", 
    "groupName_fr": "Eifyrium", 
    "groupName_it": "Eifyrium", 
-    "groupName_ja": "Eifyrium", 
-    "groupName_ko": "Eifyrium", 
-    "groupName_ru": "Eifyrium", 
+    "groupName_ja": "エイフィリウム", 
+    "groupName_ko": "에이피륨", 
+    "groupName_ru": "Эйфирий", 
    "groupName_zh": "Eifyrium", 
    "groupNameID": 640737, 
    "iconID": 15, 
@@ -28368,15 +28368,338 @@
    "groupName_es": "Ducinium", 
    "groupName_fr": "Ducinium", 
    "groupName_it": "Ducinium", 
-    "groupName_ja": "Ducinium", 
-    "groupName_ko": "Ducinium", 
-    "groupName_ru": "Ducinium", 
+    "groupName_ja": "ドゥシニウム", 
+    "groupName_ko": "두시늄", 
+    "groupName_ru": "Дачиний", 
    "groupName_zh": "Ducinium", 
    "groupNameID": 640738, 
    "iconID": 15, 
    "published": 1, 
    "useBasePrice": 0
  }, 
+  "4547": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 2, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4547, 
+    "groupName_de": "Interstellar Shipcaster Beacon", 
+    "groupName_en-us": "Interstellar Shipcaster Beacon", 
+    "groupName_es": "Interstellar Shipcaster Beacon", 
+    "groupName_fr": "Interstellar Shipcaster Beacon", 
+    "groupName_it": "Interstellar Shipcaster Beacon", 
+    "groupName_ja": "Interstellar Shipcaster Beacon", 
+    "groupName_ko": "Interstellar Shipcaster Beacon", 
+    "groupName_ru": "Interstellar Shipcaster Beacon", 
+    "groupName_zh": "Interstellar Shipcaster Beacon", 
+    "groupNameID": 647116, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4548": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 2, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4548, 
+    "groupName_de": "Schiffswerfer-Signalfeuer-Konstrukteur", 
+    "groupName_en-us": "Shipcaster Beacon Constructor", 
+    "groupName_es": "Constructor de balizas de lanzadores interestelares", 
+    "groupName_fr": "Constructeur de balise de lance-vaisseaux", 
+    "groupName_it": "Shipcaster Beacon Constructor", 
+    "groupName_ja": "艦艇キャスタービーコン・コンストラクター", 
+    "groupName_ko": "함선전송기 비컨 제조기", 
+    "groupName_ru": "Конструктор маяка кораблепускателя", 
+    "groupName_zh": "舰船弹射台信标建造器", 
+    "groupNameID": 647117, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4549": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 2, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4549, 
+    "groupName_de": "Interstellar Shipcaster", 
+    "groupName_en-us": "Interstellar Shipcaster", 
+    "groupName_es": "Interstellar Shipcaster", 
+    "groupName_fr": "Interstellar Shipcaster", 
+    "groupName_it": "Interstellar Shipcaster", 
+    "groupName_ja": "Interstellar Shipcaster", 
+    "groupName_ko": "Interstellar Shipcaster", 
+    "groupName_ru": "Interstellar Shipcaster", 
+    "groupName_zh": "Interstellar Shipcaster", 
+    "groupNameID": 647118, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4568": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 25, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4568, 
+    "groupName_de": "Mutanite", 
+    "groupName_en-us": "Mutanite", 
+    "groupName_es": "Mutanita", 
+    "groupName_fr": "Mutanite", 
+    "groupName_it": "Mutanite", 
+    "groupName_ja": "ミュータナイト", 
+    "groupName_ko": "뮤타나이트", 
+    "groupName_ru": "Мутанит", 
+    "groupName_zh": "突变石", 
+    "groupNameID": 656418, 
+    "published": 1, 
+    "useBasePrice": 1
+  }, 
+  "4569": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4569, 
+    "groupName_de": "Heimatfront-Operationen – Feindliche Fregatte", 
+    "groupName_en-us": "Homefront Operations Enemy Frigate", 
+    "groupName_es": "Fragata enemiga de operaciones del frente interno", 
+    "groupName_fr": "Frégate ennemie des opérations arrières", 
+    "groupName_it": "Homefront Operations Enemy Frigate", 
+    "groupName_ja": "ホームフロント・オペレーション敵フリゲート", 
+    "groupName_ko": "전략 지원 작전 적 프리깃", 
+    "groupName_ru": "Вражеский фрегат в тыловом районе", 
+    "groupName_zh": "国土行动敌军护卫舰", 
+    "groupNameID": 657368, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4570": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4570, 
+    "groupName_de": "Heimatfront-Operationen – Feindlicher Zerstörer", 
+    "groupName_en-us": "Homefront Operations Enemy Destroyer", 
+    "groupName_es": "Destructor enemigo de operaciones del frente interno", 
+    "groupName_fr": "Destroyer ennemi des opérations arrières", 
+    "groupName_it": "Homefront Operations Enemy Destroyer", 
+    "groupName_ja": "ホームフロント・オペレーション敵駆逐艦", 
+    "groupName_ko": "전략 지원 작전 적 디스트로이어", 
+    "groupName_ru": "Вражеский эсминец в тыловом районе", 
+    "groupName_zh": "国土行动敌军驱逐舰", 
+    "groupNameID": 657496, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4571": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4571, 
+    "groupName_de": "Heimatfront-Operationen – Feindlicher Kreuzer", 
+    "groupName_en-us": "Homefront Operations Enemy Cruiser", 
+    "groupName_es": "Crucero enemigo de operaciones del frente interno", 
+    "groupName_fr": "Croiseur ennemi des opérations arrières", 
+    "groupName_it": "Homefront Operations Enemy Cruiser", 
+    "groupName_ja": "ホームフロント・オペレーション敵巡洋艦", 
+    "groupName_ko": "전략 지원 작전 적 크루저", 
+    "groupName_ru": "Вражеский крейсер в тыловом районе", 
+    "groupName_zh": "国土行动敌军巡洋舰", 
+    "groupNameID": 657497, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4572": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4572, 
+    "groupName_de": "Heimatfront-Operationen – Verbündeter Dreadnought", 
+    "groupName_en-us": "Homefront Operations Allied Dreadnought", 
+    "groupName_es": "Superacorazado aliado de operaciones del frente interno", 
+    "groupName_fr": "Supercuirassé allié des opérations arrières", 
+    "groupName_it": "Homefront Operations Allied Dreadnought", 
+    "groupName_ja": "ホームフロント・オペレーション味方攻城艦", 
+    "groupName_ko": "전략 지원 작전 아군 드레드노트", 
+    "groupName_ru": "Союзный дредноут в тыловом районе", 
+    "groupName_zh": "国土行动盟军无畏舰", 
+    "groupNameID": 657513, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4573": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4573, 
+    "groupName_de": "Heimatfront-Operationen – Feindlicher Schlachtkreuzer", 
+    "groupName_en-us": "Homefront Operations Enemy Battlecruiser", 
+    "groupName_es": "Crucero de combate enemigo de operaciones del frente interno", 
+    "groupName_fr": "Croiseur cuirassé ennemi des opérations arrières", 
+    "groupName_it": "Homefront Operations Enemy Battlecruiser", 
+    "groupName_ja": "ホームフロント・オペレーション敵巡洋戦艦", 
+    "groupName_ko": "전략 지원 작전 적 배틀크루저", 
+    "groupName_ru": "Вражеский линейный крейсер в тыловом районе", 
+    "groupName_zh": "国土行动敌军战列巡洋舰", 
+    "groupNameID": 659180, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4574": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4574, 
+    "groupName_de": "Heimatfront-Operationen – Feindliches Schlachtschiff", 
+    "groupName_en-us": "Homefront Operations Enemy Battleship", 
+    "groupName_es": "Acorazado enemigo de operaciones del frente interno", 
+    "groupName_fr": "Cuirassé ennemi des opérations arrières", 
+    "groupName_it": "Homefront Operations Enemy Battleship", 
+    "groupName_ja": "ホームフロント・オペレーション敵戦艦", 
+    "groupName_ko": "전략 지원 작전 적 배틀쉽", 
+    "groupName_ru": "Вражеский линкор в тыловом районе", 
+    "groupName_zh": "国土行动敌军战列舰", 
+    "groupNameID": 659181, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4575": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 17, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4575, 
+    "groupName_de": "Heimatfront-Operationen – Ressource", 
+    "groupName_en-us": "Homefront Operations Commodity", 
+    "groupName_es": "Mercancía de operaciones del frente interno", 
+    "groupName_fr": "Marchandise des opérations arrières", 
+    "groupName_it": "Homefront Operations Commodity", 
+    "groupName_ja": "ホームフロント・オペレーション商品", 
+    "groupName_ko": "전략 지원 작전 물품", 
+    "groupName_ru": "Ценный груз в тыловом районе", 
+    "groupName_zh": "国土行动物品", 
+    "groupNameID": 659287, 
+    "published": 1, 
+    "useBasePrice": 1
+  }, 
+  "4576": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4576, 
+    "groupName_de": "Heimatfront-Operationen – Struktur", 
+    "groupName_en-us": "Homefront Operations Structure", 
+    "groupName_es": "Estructura de operaciones del frente interno", 
+    "groupName_fr": "Structure des opérations arrières", 
+    "groupName_it": "Homefront Operations Structure", 
+    "groupName_ja": "ホームフロント・オペレーション・ストラクチャ", 
+    "groupName_ko": "전략 지원 작전 구조물", 
+    "groupName_ru": "Сооружение в тыловом районе", 
+    "groupName_zh": "国土行动建筑", 
+    "groupNameID": 660753, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4577": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4577, 
+    "groupName_de": "Heimatfront-Operationen – Feindlicher Transporter", 
+    "groupName_en-us": "Homefront Operations Enemy Hauler", 
+    "groupName_es": "Nave de mercancías enemiga de operaciones del frente interno", 
+    "groupName_fr": "Cargo ennemi des opérations arrières", 
+    "groupName_it": "Homefront Operations Enemy Hauler", 
+    "groupName_ja": "ホームフロント・オペレーション敵ハウラー", 
+    "groupName_ko": "전략 지원 작전 적 운반선", 
+    "groupName_ru": "Вражеский перевозчик в тыловом районе", 
+    "groupName_zh": "国土行动敌军运载舰", 
+    "groupNameID": 660754, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4579": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 2, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4579, 
+    "groupName_de": "Skalierbares nicht interagierbares Objekt", 
+    "groupName_en-us": "Scalable Non-Interactable Object", 
+    "groupName_es": "Objeto no interactivo escalable", 
+    "groupName_fr": "Objet non interactif ajustable", 
+    "groupName_it": "Scalable Non-Interactable Object", 
+    "groupName_ja": "スケーラブル非相互オブジェクト", 
+    "groupName_ko": "확장형 상호작용 불가 오브젝트", 
+    "groupName_ru": "Масштабируемый неинтерактивный объект", 
+    "groupName_zh": "可扩展不可交互物体", 
+    "groupNameID": 660808, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4594": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 6, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4594, 
+    "groupName_de": "Lancer-Dreadnought", 
+    "groupName_en-us": "Lancer Dreadnought", 
+    "groupName_es": "Superacorazado lancer", 
+    "groupName_fr": "Supercuirassé lancier", 
+    "groupName_it": "Lancer Dreadnought", 
+    "groupName_ja": "ランサー攻城艦", 
+    "groupName_ko": "랜서 드레드노트", 
+    "groupName_ru": "Дредноут-лансер", 
+    "groupName_zh": "枪骑兵级无畏舰", 
+    "groupNameID": 662671, 
+    "published": 1, 
+    "useBasePrice": 0
+  }, 
+  "4599": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 17, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4599, 
+    "groupName_de": "Warpvektor-Daten", 
+    "groupName_en-us": "Warp Vector Data", 
+    "groupName_es": "Datos de vector de warp", 
+    "groupName_fr": "Données de vecteur de warp", 
+    "groupName_it": "Warp Vector Data", 
+    "groupName_ja": "ワープベクターデータ", 
+    "groupName_ko": "워프 벡터 데이터", 
+    "groupName_ru": "Warp Vector Data", 
+    "groupName_zh": "跃迁矢量数据", 
+    "groupNameID": 662939, 
+    "published": 1, 
+    "useBasePrice": 1
+  }, 
+  "4636": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4636, 
+    "groupName_de": "Piraten", 
+    "groupName_en-us": "Pirate Entities", 
+    "groupName_es": "Entidades piratas", 
+    "groupName_fr": "Entités pirates", 
+    "groupName_it": "Pirate Entities", 
+    "groupName_ja": "海賊エンティティ", 
+    "groupName_ko": "해적 개체", 
+    "groupName_ru": "Объекты пиратов", 
+    "groupName_zh": "海盗实体", 
+    "groupNameID": 671872, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
  "350858": {
    "anchorable": 0, 
    "anchored": 0, 
@@ -28504,7 +28827,7 @@
    "groupName_it": "Infantry Skill Enhancers", 
    "groupName_ja": "歩兵スキルエンハンサー", 
    "groupName_ko": "보병 스킬 향상장치", 
-    "groupName_ru": "Пехотные усилители навыков ", 
+    "groupName_ru": "Пехотные усилители навыков", 
    "groupName_zh": "Infantry Skill Enhancers", 
    "groupNameID": 278213, 
    "published": 0, 
@@ -28554,15 +28877,15 @@
    "categoryID": 350001, 
    "fittableNonSingleton": 0, 
    "groupID": 367487, 
-    "groupName_de": "Leistungen ", 
-    "groupName_en-us": "Services ", 
-    "groupName_es": "Servicios ", 
-    "groupName_fr": "Services ", 
-    "groupName_it": "Servizi ", 
-    "groupName_ja": "サービス ", 
-    "groupName_ko": "서비스 ", 
-    "groupName_ru": "Услуги ", 
-    "groupName_zh": "服务 ", 
+    "groupName_de": "Leistungen", 
+    "groupName_en-us": "Services", 
+    "groupName_es": "Servicios", 
+    "groupName_fr": "Services", 
+    "groupName_it": "Servizi", 
+    "groupName_ja": "サービス", 
+    "groupName_ko": "서비스", 
+    "groupName_ru": "Услуги", 
+    "groupName_zh": "服务", 
    "groupNameID": 296571, 
    "published": 0, 
    "useBasePrice": 0
--- a/staticdata/fsd_binary/iconids.0.json
+++ b/staticdata/fsd_binary/iconids.0.json
@@ -9275,7 +9275,7 @@
    "iconFile": "res:/UI/Texture/Icons/Inventory/AbyssalRandomFilament_L5Active.png"
  }, 
  "24328": {
-    "iconFile": "res:/ui/texture/classes/achievements/mouseBtnMiddle.png", 
+    "iconFile": "res:/UI/Texture/Shared/mouse_button_middle.png", 
    "iconType": "png"
  }, 
  "24329": {
@@ -11974,5 +11974,140 @@
  }, 
  "25475": {
    "iconFile": "res:/ui/texture/icons/evermarks.png"
+  }, 
+  "25547": {
+    "iconFile": "res:/ui/texture/WindowIcons/assets.png"
+  }, 
+  "25621": {
+    "iconFile": "res:/UI/Texture/Icons/Modules/amarrLance.png"
+  }, 
+  "25622": {
+    "iconFile": "res:/UI/Texture/Icons/Modules/caldariLance.png"
+  }, 
+  "25624": {
+    "iconFile": "res:/UI/Texture/Icons/Modules/gallenteLance.png"
+  }, 
+  "25625": {
+    "iconFile": "res:/UI/Texture/Icons/Modules/minmatarLance.png"
+  }, 
+  "25629": {
+    "iconFile": "res:/ui/texture/icons/35_64_13.png"
+  }, 
+  "25631": {
+    "iconFile": "res:/ui/texture/icons/35_64_11.png"
+  }, 
+  "25632": {
+    "iconFile": "res:/ui/texture/icons/36_64_6.png"
+  }, 
+  "25633": {
+    "iconFile": "res:/ui/texture/icons/36_64_7.png"
+  }, 
+  "25634": {
+    "iconFile": "res:/ui/texture/icons/35_64_16.png"
+  }, 
+  "25666": {
+    "iconFile": "res:/ui/texture/icons/43_64_12_d.png"
+  }, 
+  "25668": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_1.png"
+  }, 
+  "25669": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_2.png"
+  }, 
+  "25670": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_3.png"
+  }, 
+  "25671": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_4.png"
+  }, 
+  "25672": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_5.png"
+  }, 
+  "25673": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_6.png"
+  }, 
+  "25674": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_7.png"
+  }, 
+  "25675": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_17.png"
+  }, 
+  "25676": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_8.png"
+  }, 
+  "25677": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_9.png"
+  }, 
+  "25678": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_10.png"
+  }, 
+  "25679": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_11.png"
+  }, 
+  "25680": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_12.png"
+  }, 
+  "25681": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_13.png"
+  }, 
+  "25682": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_14.png"
+  }, 
+  "25683": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_15.png"
+  }, 
+  "25684": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_16.png"
+  }, 
+  "25685": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_18.png"
+  }, 
+  "25686": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_19.png"
+  }, 
+  "25687": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_20.png"
+  }, 
+  "25688": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_21.png"
+  }, 
+  "25689": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_22.png"
+  }, 
+  "25690": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_23.png"
+  }, 
+  "25691": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_24.png"
+  }, 
+  "25692": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_25.png"
+  }, 
+  "25693": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_26.png"
+  }, 
+  "25694": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_27.png"
+  }, 
+  "25695": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_28.png"
+  }, 
+  "25696": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_29.png"
+  }, 
+  "25697": {
+    "iconFile": "res:/ui/texture/icons/Inventory/WVItems/64/wv_64_30.png"
+  }, 
+  "25801": {
+    "iconFile": "res:/UI/Texture/Icons/StatusEffects/safeZone.png"
+  }, 
+  "25802": {
+    "iconFile": "res:/UI/Texture/Icons/StatusEffects/deathZoneGracePeriod.png"
+  }, 
+  "25803": {
+    "iconFile": "res:/UI/Texture/Icons/StatusEffects/deathZone.png"
+  }, 
+  "25833": {
+    "iconFile": "res:/UI/Texture/Corps/deathlessCircleBase.png"
  }
 }
--- a/staticdata/fsd_binary/marketgroups.0.json
+++ b/staticdata/fsd_binary/marketgroups.0.json
--- a/staticdata/fsd_binary/requiredskillsfortypes.0.json
+++ b/staticdata/fsd_binary/requiredskillsfortypes.0.json
@@ -18584,6 +18584,7 @@
    "30653": 1
  }, 
  "30013": {
+    "3402": 1, 
    "3412": 1
  }, 
  "30028": {
@@ -18834,6 +18835,7 @@
    "3412": 2
  }, 
  "30488": {
+    "3402": 1, 
    "3412": 1
  }, 
  "30516": {
@@ -19293,6 +19295,7 @@
    "11584": 1
  }, 
  "32246": {
+    "3402": 1, 
    "3412": 1
  }, 
  "32248": {
@@ -27907,6 +27910,10 @@
    "3333": 5, 
    "16591": 1
  }, 
+  "74448": {
+    "9955": 5, 
+    "25863": 1
+  }, 
  "74521": {
    "3386": 1
  }, 
@@ -28002,5 +28009,612 @@
  }, 
  "75290": {
    "3386": 1
+  }, 
+  "75326": {
+    "3402": 1
+  }, 
+  "75327": {
+    "3402": 1
+  }, 
+  "75328": {
+    "3402": 1
+  }, 
+  "75677": {
+    "9955": 5, 
+    "11584": 3
+  }, 
+  "76050": {
+    "3405": 1
+  }, 
+  "76051": {
+    "3405": 1
+  }, 
+  "76052": {
+    "3405": 1
+  }, 
+  "76053": {
+    "3405": 1
+  }, 
+  "76054": {
+    "3405": 1
+  }, 
+  "76055": {
+    "3405": 1
+  }, 
+  "76056": {
+    "3405": 1
+  }, 
+  "76057": {
+    "3405": 1
+  }, 
+  "76058": {
+    "3405": 1
+  }, 
+  "76059": {
+    "3405": 1
+  }, 
+  "76060": {
+    "3405": 1
+  }, 
+  "76061": {
+    "3405": 1
+  }, 
+  "76062": {
+    "3405": 1
+  }, 
+  "76063": {
+    "3405": 1
+  }, 
+  "76064": {
+    "3405": 1
+  }, 
+  "76065": {
+    "3405": 1
+  }, 
+  "76066": {
+    "3405": 1
+  }, 
+  "76067": {
+    "3405": 1
+  }, 
+  "76068": {
+    "3405": 1
+  }, 
+  "76069": {
+    "3405": 1
+  }, 
+  "76070": {
+    "3405": 1
+  }, 
+  "76071": {
+    "3405": 1
+  }, 
+  "76072": {
+    "3405": 1
+  }, 
+  "76073": {
+    "3405": 1
+  }, 
+  "76074": {
+    "3405": 1
+  }, 
+  "76075": {
+    "3405": 1
+  }, 
+  "76076": {
+    "3405": 1
+  }, 
+  "76077": {
+    "3405": 1
+  }, 
+  "76078": {
+    "3405": 1
+  }, 
+  "76079": {
+    "3405": 1
+  }, 
+  "76080": {
+    "3405": 1
+  }, 
+  "76081": {
+    "3405": 1
+  }, 
+  "76082": {
+    "3405": 1
+  }, 
+  "76083": {
+    "3405": 1
+  }, 
+  "76084": {
+    "3405": 1
+  }, 
+  "76085": {
+    "3405": 1
+  }, 
+  "76086": {
+    "3405": 1
+  }, 
+  "76087": {
+    "3405": 1
+  }, 
+  "76088": {
+    "3405": 1
+  }, 
+  "76089": {
+    "3405": 1
+  }, 
+  "76090": {
+    "3405": 1
+  }, 
+  "76091": {
+    "3405": 1
+  }, 
+  "76092": {
+    "3405": 1
+  }, 
+  "76093": {
+    "3405": 1
+  }, 
+  "76094": {
+    "3405": 1
+  }, 
+  "76095": {
+    "3405": 1
+  }, 
+  "76096": {
+    "3405": 1
+  }, 
+  "76097": {
+    "3405": 1
+  }, 
+  "76098": {
+    "3405": 1
+  }, 
+  "76099": {
+    "3405": 1
+  }, 
+  "76100": {
+    "3405": 1
+  }, 
+  "76101": {
+    "3405": 1
+  }, 
+  "76102": {
+    "3405": 1
+  }, 
+  "76103": {
+    "3405": 1
+  }, 
+  "76104": {
+    "3405": 1
+  }, 
+  "76105": {
+    "3405": 1
+  }, 
+  "76106": {
+    "3405": 1
+  }, 
+  "76107": {
+    "3405": 1
+  }, 
+  "76108": {
+    "3405": 1
+  }, 
+  "76109": {
+    "3405": 1
+  }, 
+  "76110": {
+    "3405": 1
+  }, 
+  "76111": {
+    "3405": 1
+  }, 
+  "76112": {
+    "3405": 1
+  }, 
+  "76113": {
+    "3405": 1
+  }, 
+  "76114": {
+    "3405": 1
+  }, 
+  "76115": {
+    "3405": 1
+  }, 
+  "76116": {
+    "3405": 1
+  }, 
+  "76117": {
+    "3405": 1
+  }, 
+  "76118": {
+    "3405": 1
+  }, 
+  "76119": {
+    "3405": 1
+  }, 
+  "76120": {
+    "3405": 1
+  }, 
+  "76121": {
+    "3405": 1
+  }, 
+  "76122": {
+    "3405": 1
+  }, 
+  "76123": {
+    "3405": 1
+  }, 
+  "76124": {
+    "3405": 1
+  }, 
+  "76125": {
+    "3405": 1
+  }, 
+  "76126": {
+    "3405": 1
+  }, 
+  "76127": {
+    "3405": 1
+  }, 
+  "76128": {
+    "3405": 1
+  }, 
+  "76129": {
+    "3405": 1
+  }, 
+  "76130": {
+    "3405": 1
+  }, 
+  "76131": {
+    "3405": 1
+  }, 
+  "76132": {
+    "3405": 1
+  }, 
+  "76133": {
+    "3405": 1
+  }, 
+  "76134": {
+    "3405": 1
+  }, 
+  "76135": {
+    "3405": 1
+  }, 
+  "76136": {
+    "3405": 1
+  }, 
+  "76137": {
+    "3405": 1
+  }, 
+  "76138": {
+    "3405": 1
+  }, 
+  "76139": {
+    "3405": 1
+  }, 
+  "76140": {
+    "3405": 1
+  }, 
+  "76141": {
+    "3405": 1
+  }, 
+  "76142": {
+    "3405": 1
+  }, 
+  "76143": {
+    "3405": 1
+  }, 
+  "76144": {
+    "3405": 1
+  }, 
+  "76145": {
+    "3405": 1
+  }, 
+  "76179": {
+    "21718": 1
+  }, 
+  "76180": {
+    "21718": 1
+  }, 
+  "76181": {
+    "21718": 1
+  }, 
+  "76182": {
+    "21718": 1
+  }, 
+  "76183": {
+    "21718": 1
+  }, 
+  "76184": {
+    "21718": 1
+  }, 
+  "76185": {
+    "21718": 1
+  }, 
+  "76186": {
+    "21718": 1
+  }, 
+  "76187": {
+    "21718": 1
+  }, 
+  "76188": {
+    "21718": 1
+  }, 
+  "76189": {
+    "21718": 1
+  }, 
+  "76190": {
+    "21718": 1
+  }, 
+  "76191": {
+    "25863": 1
+  }, 
+  "76192": {
+    "25863": 1
+  }, 
+  "76193": {
+    "25863": 1
+  }, 
+  "76194": {
+    "25863": 1
+  }, 
+  "76260": {
+    "25863": 1
+  }, 
+  "76318": {
+    "25863": 1
+  }, 
+  "76319": {
+    "25863": 1
+  }, 
+  "76320": {
+    "25863": 1
+  }, 
+  "76373": {
+    "3386": 1
+  }, 
+  "76506": {
+    "3402": 1
+  }, 
+  "76507": {
+    "3402": 1
+  }, 
+  "76508": {
+    "3402": 1
+  }, 
+  "76509": {
+    "3355": 1
+  }, 
+  "76510": {
+    "3355": 1
+  }, 
+  "76511": {
+    "3355": 1
+  }, 
+  "76532": {
+    "3405": 1
+  }, 
+  "76533": {
+    "3405": 1
+  }, 
+  "76534": {
+    "3405": 1
+  }, 
+  "76535": {
+    "3405": 1
+  }, 
+  "76941": {
+    "21718": 1
+  }, 
+  "77097": {
+    "21718": 1
+  }, 
+  "77098": {
+    "21718": 1
+  }, 
+  "77099": {
+    "21718": 1
+  }, 
+  "77100": {
+    "21718": 1
+  }, 
+  "77114": {
+    "3327": 1
+  }, 
+  "77118": {
+    "3386": 1
+  }, 
+  "77121": {
+    "21718": 1
+  }, 
+  "77196": {
+    "21718": 1
+  }, 
+  "77197": {
+    "21718": 1
+  }, 
+  "77198": {
+    "21718": 1
+  }, 
+  "77281": {
+    "20531": 5, 
+    "20533": 4, 
+    "77738": 1
+  }, 
+  "77283": {
+    "20525": 5, 
+    "20533": 4, 
+    "77738": 1
+  }, 
+  "77284": {
+    "20530": 5, 
+    "20533": 4, 
+    "77738": 1
+  }, 
+  "77288": {
+    "20532": 5, 
+    "20533": 4, 
+    "77738": 1
+  }, 
+  "77398": {
+    "77738": 1, 
+    "77739": 1
+  }, 
+  "77399": {
+    "77738": 1, 
+    "77739": 1
+  }, 
+  "77400": {
+    "77738": 1, 
+    "77739": 1
+  }, 
+  "77401": {
+    "77738": 1, 
+    "77739": 1
+  }, 
+  "77418": {
+    "3386": 1
+  }, 
+  "77419": {
+    "3386": 1
+  }, 
+  "77420": {
+    "3386": 1
+  }, 
+  "77421": {
+    "3386": 1
+  }, 
+  "77524": {
+    "3386": 1
+  }, 
+  "77725": {
+    "3392": 5, 
+    "3398": 4, 
+    "22242": 4
+  }, 
+  "77738": {
+    "11433": 4, 
+    "20533": 4, 
+    "21611": 1, 
+    "22043": 4
+  }, 
+  "77739": {
+    "3421": 4, 
+    "11207": 5, 
+    "11433": 4
+  }, 
+  "78287": {
+    "3402": 1
+  }, 
+  "78288": {
+    "3402": 1
+  }, 
+  "78289": {
+    "3402": 1
+  }, 
+  "78290": {
+    "3405": 1
+  }, 
+  "78291": {
+    "3405": 1
+  }, 
+  "78292": {
+    "3405": 1
+  }, 
+  "78293": {
+    "3405": 1
+  }, 
+  "78294": {
+    "3405": 1
+  }, 
+  "78295": {
+    "3405": 1
+  }, 
+  "78300": {
+    "3405": 1
+  }, 
+  "78301": {
+    "3405": 1
+  }, 
+  "78302": {
+    "3405": 1
+  }, 
+  "78303": {
+    "3405": 1
+  }, 
+  "78305": {
+    "3405": 1
+  }, 
+  "78306": {
+    "3405": 1
+  }, 
+  "78307": {
+    "3405": 1
+  }, 
+  "78311": {
+    "3405": 1
+  }, 
+  "78312": {
+    "3405": 1
+  }, 
+  "78313": {
+    "3405": 1
+  }, 
+  "78314": {
+    "3405": 1
+  }, 
+  "78315": {
+    "3405": 1
+  }, 
+  "78316": {
+    "3405": 1
+  }, 
+  "78317": {
+    "3405": 1
+  }, 
+  "78318": {
+    "3405": 1
+  }, 
+  "78319": {
+    "3405": 1
+  }, 
+  "78320": {
+    "3405": 1
+  }, 
+  "78321": {
+    "3405": 1
+  }, 
+  "78322": {
+    "3405": 1
+  }, 
+  "78323": {
+    "3405": 1
+  }, 
+  "78324": {
+    "3405": 1
+  }, 
+  "78325": {
+    "3405": 1
+  }, 
+  "78326": {
+    "3405": 1
+  }, 
+  "78327": {
+    "3405": 1
+  }, 
+  "78328": {
+    "3405": 1
+  }, 
+  "78329": {
+    "3405": 1
+  }, 
+  "78333": {
+    "33093": 2, 
+    "33094": 2
+  }, 
+  "78367": {
+    "33092": 2, 
+    "33093": 2
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
DarkPhoenix	88970c7a95	Bump version	2023-10-10 02:50:42 +06:00
DarkPhoenix	fddaf27055	Update icons	2023-10-10 02:47:00 +06:00
DarkPhoenix	dd575bd3a0	Update static data and effects	2023-10-10 02:43:44 +06:00
DarkPhoenix	0c9b73727b	Fix DD weapon application	2023-10-10 00:15:47 +06:00
DarkPhoenix	ade9fc389a	Bump version	2023-09-19 23:52:50 +03:00
DarkPhoenix	b6c5f67085	Update effects	2023-09-19 23:52:24 +03:00
DarkPhoenix	7d86d58993	Add new icons	2023-09-19 23:34:33 +03:00
DarkPhoenix	a7ab046bc6	Update static data to 2363654	2023-09-19 23:11:22 +03:00
DarkPhoenix	c94693a72d	Update icons	2023-09-10 17:30:41 +06:00
DarkPhoenix	ea335b7d41	Bump version	2023-09-10 09:12:59 +06:00
DarkPhoenix	4838f69c40	Add effects for new AT ships	2023-09-10 09:12:29 +06:00
DarkPhoenix	fb81e6c043	Add shapash/cybele hardcoded ships	2023-09-10 08:38:39 +06:00
DarkPhoenix	84716af82b	Update effect file	2023-09-10 07:09:28 +06:00
DarkPhoenix	30dd77d462	Add renames	2023-09-10 07:03:24 +06:00
DarkPhoenix	9148611a8e	Update static data to 2353888	2023-09-10 06:51:03 +06:00
DarkPhoenix	e7be51b70e	Remove evepraiisal market source	2023-09-10 05:44:17 +06:00
DarkPhoenix	194e4657eb	Fix appimage build	2023-06-14 05:30:12 +06:00
DarkPhoenix	b08986ba74	Duration is not penalized	2023-06-14 01:09:46 +06:00
DarkPhoenix	57d8a672d9	Fix rep systems-related effect stacking penalties	2023-06-14 01:05:16 +06:00
DarkPhoenix	47dbfbd6d5	Bump version	2023-06-13 22:01:44 +06:00
DarkPhoenix	cbbf4863fb	Update static data	2023-06-13 21:56:47 +06:00
DarkPhoenix	369f62bd68	Bump version	2023-06-11 04:34:01 +06:00
DarkPhoenix	885ad4deb3	Update effects	2023-06-11 04:28:18 +06:00
DarkPhoenix	0ce3b861a4	Update EVE images	2023-06-11 00:28:05 +06:00
DarkPhoenix	48ee543c00	Update static data to 2291839	2023-06-11 00:26:27 +06:00
Anton Vorobyov	e07e2bc4f7	Merge pull request #2507 from superusercode/patch-1 Replace dead README badges with current CI badge	2023-06-10 21:19:57 +04:00
Code	17dec4d732	Update README.md	2023-05-11 21:36:00 -04:00
Anton Vorobyov	effb7e6429	Bump version	2023-04-28 01:49:55 +06:00
Anton Vorobyov	63f7762e34	Add option to export missing skills in roman / evemon format	2023-04-28 01:49:31 +06:00
Anton Vorobyov	76ff52aea8	Show seconds, not milliseconds	2023-04-28 01:38:26 +06:00
Anton Vorobyov	cd12279404	Add ADC ability duration	2023-04-28 01:36:45 +06:00
Anton Vorobyov	263929b6e3	Update icons	2023-04-28 01:33:03 +06:00
Anton Vorobyov	759135d3fe	Add auto targeting system as acronym	2023-04-28 01:31:32 +06:00
Anton Vorobyov	d240f547cc	Update effects & add mobiile depot hold	2023-04-28 01:28:55 +06:00
Anton Vorobyov	0a4f3481da	Update static data to 2258955	2023-04-27 23:06:33 +06:00
Anton Vorobyov	b248cdefdd	Bump version	2023-03-16 17:50:33 +06:00
Anton Vorobyov	6172ceda0f	Update static data to 2232464	2023-03-16 17:25:10 +06:00
Anton Vorobyov	ba236bcb54	Update static data and effects to 2228687	2023-03-10 02:26:12 +06:00
Anton Vorobyov	b4e115eb7b	Update icons	2023-02-22 19:07:51 +06:00
Anton Vorobyov	52b567a06d	Disable effect overrides for AT18 ships, and add effects for them	2023-02-22 19:06:59 +06:00
Anton Vorobyov	dd1f7e224c	Update static data to 2218819	2023-02-22 18:12:42 +06:00
Anton Vorobyov	338b298077	Specify requests version	2023-02-18 03:57:42 +06:00
Anton Vorobyov	512b370e3e	Bump version	2023-02-14 19:26:03 +06:00
Anton Vorobyov	a14210f356	Add rename mapping	2023-02-14 19:25:45 +06:00
Anton Vorobyov	f81cf4ee7b	Update effects	2023-02-14 19:22:15 +06:00
Anton Vorobyov	87b072b567	Update static data to 2214901	2023-02-14 19:18:36 +06:00
Anton Vorobyov	e21789d29c	Fix fof missile application hardwiring	2022-12-21 00:16:45 +04:00
Anton Vorobyov	dd93f348e6	Fix loki SB heat bonus	2022-12-21 00:12:03 +04:00
Anton Vorobyov	cae8088ad3	Bump version	2022-12-18 04:47:57 +04:00
Anton Vorobyov	a92cbe92f1	Update static data	2022-12-18 04:47:25 +04:00
Anton Vorobyov	52fd0bb13f	Fix fighters export	2022-12-12 04:50:28 +04:00