Bump version

.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.15-cp37-cp37m-manylinux2014_x86_64.AppImage
+      PYTHON_APPIMAGE: python3.7.16-cp37-cp37m-manylinux2014_x86_64.AppImage
       DEPLOY_DIR: AppDir/opt/pyfa
 #      APPVEYOR_SSH_BLOCK: true
     cache:

db_update.py

@@ -117,8 +117,7 @@ def update_db():
         for k, v in compiled_data.items():
             row = {}
             row.update(v)
-            if keyIdName not in row:
-                row[keyIdName] = int(k)
+            row[keyIdName] = int(k)
             data.append(row)
         return data
 
@@ -642,6 +641,139 @@ def update_db():
             effect.effectName = effectName
             item.effects[effectName] = effect
 
+    def hardcodeGeri():
+        attrMap = {
+            # Fitting
+            'powerOutput': 50,
+            'cpuOutput': 200,
+            'capacitorCapacity': 325,
+            'rechargeRate': 130000,
+            # Slots
+            'hiSlots': 5,
+            'medSlots': 4,
+            'lowSlots': 4,
+            'launcherSlotsLeft': 3,
+            'turretSlotsLeft': 2,
+            # Rigs
+            'rigSlots': 2,
+            'rigSize': 1,
+            'upgradeCapacity': 400,
+            # Shield
+            'shieldCapacity': 1000,
+            'shieldEmDamageResonance': 1 - 0.75,
+            'shieldThermalDamageResonance': 1 - 0.6,
+            'shieldKineticDamageResonance': 1 - 0.4,
+            'shieldExplosiveDamageResonance': 1 - 0.5,
+            # Armor
+            'armorHP': 1000,
+            'armorEmDamageResonance': 1 - 0.9,
+            'armorThermalDamageResonance': 1 - 0.675,
+            'armorKineticDamageResonance': 1 - 0.25,
+            'armorExplosiveDamageResonance': 1 - 0.1,
+            # Structure
+            'hp': 700,
+            'emDamageResonance': 1 - 0.33,
+            'thermalDamageResonance': 1 - 0.33,
+            'kineticDamageResonance': 1 - 0.33,
+            'explosiveDamageResonance': 1 - 0.33,
+            'mass': 1309000,
+            'volume': 27289,
+            'capacity': 260,
+            # Navigation
+            'maxVelocity': 440,
+            'agility': 2.5,
+            'warpSpeedMultiplier': 5.5,
+            # Drones
+            'droneCapacity': 50,
+            'droneBandwidth': 10,
+            # Targeting
+            'maxTargetRange': 42000,
+            'maxLockedTargets': 6,
+            'scanRadarStrength': 0,
+            'scanLadarStrength': 12,
+            'scanMagnetometricStrength': 0,
+            'scanGravimetricStrength': 0,
+            'signatureRadius': 33,
+            'scanResolution': 770}
+        effectMap = {
+            100100: 'pyfaCustomGeriAfExploVel',
+            100101: 'pyfaCustomGeriAfRof',
+            100102: 'pyfaCustomGeriMfDmg',
+            100103: 'pyfaCustomGeriMfRep',
+            100104: 'pyfaCustomGeriRoleWebDroneStr',
+            100105: 'pyfaCustomGeriRoleWebDroneHP',
+            100106: 'pyfaCustomGeriRoleWebDroneSpeed',
+            100107: 'pyfaCustomGeriRoleMWDSigBloom'}
+        _hardcodeAttribs(74141, attrMap)
+        _hardcodeEffects(74141, effectMap)
+
+    def hardcodeBestla():
+        attrMap = {
+            # Fitting
+            'powerOutput': 1300,
+            'cpuOutput': 500,
+            'capacitorCapacity': 1500,
+            'rechargeRate': 200000,
+            'hiSlots': 6,
+            'medSlots': 5,
+            'lowSlots': 5,
+            'launcherSlotsLeft': 4,
+            'turretSlotsLeft': 2,
+            # Rigs
+            'rigSlots': 2,
+            'rigSize': 2,
+            'upgradeCapacity': 400,
+            # Shield
+            'shieldCapacity': 3000,
+            'shieldEmDamageResonance': 1 - 0.75,
+            'shieldThermalDamageResonance': 1 - 0.6,
+            'shieldKineticDamageResonance': 1 - 0.4,
+            'shieldExplosiveDamageResonance': 1 - 0.5,
+            # Armor
+            'armorHP': 3000,
+            'armorEmDamageResonance': 1 - 0.9,
+            'armorThermalDamageResonance': 1 - 0.675,
+            'armorKineticDamageResonance': 1 - 0.25,
+            'armorExplosiveDamageResonance': 1 - 0.1,
+            # Structure
+            'hp': 1600,
+            'emDamageResonance': 1 - 0.33,
+            'thermalDamageResonance': 1 - 0.33,
+            'kineticDamageResonance': 1 - 0.33,
+            'explosiveDamageResonance': 1 - 0.33,
+            'mass': 11650000,
+            'volume': 96000,
+            'capacity': 660,
+            # Navigation
+            'maxVelocity': 300,
+            'agility': 0.47,
+            'warpSpeedMultiplier': 4.5,
+            # Drones
+            'droneCapacity': 125,
+            'droneBandwidth': 20,
+            # Targeting
+            'maxTargetRange': 80000,
+            'maxLockedTargets': 7,
+            'scanRadarStrength': 0,
+            'scanLadarStrength': 22,
+            'scanMagnetometricStrength': 0,
+            'scanGravimetricStrength': 0,
+            'signatureRadius': 120,
+            'scanResolution': 340}
+        effectMap = {
+            100200: 'pyfaCustomBestlaHacExploVel',
+            100201: 'pyfaCustomBestlaHacRof',
+            100202: 'pyfaCustomBestlaMcDmg',
+            100203: 'pyfaCustomBestlaMcRep',
+            100204: 'pyfaCustomBestlaRoleWebDroneStr',
+            100205: 'pyfaCustomBestlaRoleWebDroneHP',
+            100206: 'pyfaCustomBestlaRoleWebDroneSpeed'}
+        _hardcodeAttribs(74316, attrMap)
+        _hardcodeEffects(74316, effectMap)
+
+    # hardcodeGeri()
+    # hardcodeBestla()
+
     eos.db.gamedata_session.commit()
     eos.db.gamedata_engine.execute('VACUUM')
 

gui/builtinContextMenus/commandFitAdd.py

@@ -44,7 +44,6 @@ class AddCommandFit(ContextMenuUnconditional):
     def display(self, callingWindow, srcContext):
         if self.mainFrame.getActiveFit() is None or len(self.__class__.commandFits) == 0 or srcContext != "commandView":
             return False
-
         return True
 
     def getText(self, callingWindow, itmContext):
@@ -52,6 +51,8 @@ class AddCommandFit(ContextMenuUnconditional):
 
     def addFit(self, menu, fit, includeShip=False):
         label = fit.name if not includeShip else "({}) {}".format(fit.ship.item.name, fit.name)
+        if not label:
+            label = ' '
         id = ContextMenuUnconditional.nextID()
         self.fitMenuItemIds[id] = fit
         menuItem = wx.MenuItem(menu, id, label)

gui/builtinContextMenus/envEffectAdd.py

@@ -123,7 +123,7 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
         data.groups[_t('Abyssal Weather')] = self.getAbyssalWeather()
         data.groups[_t('Sansha Incursion')] = self.getEffectBeacons(
             _t('ContextMenu|ProjectedEffectManipulation|Sansha Incursion'))
-        data.groups[_t('Triglavian Invasion')] = self.getDestructibleBeacons()
+        data.groups[_t('Triglavian Invasion')] = self.getInvasionBeacons()
         return data
 
     def getEffectBeacons(self, *groups, extra_garbage=()):
@@ -231,5 +231,12 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
         data.sort()
         return data
 
+    def getInvasionBeacons(self):
+        data = self.getDestructibleBeacons()
+        # Turnur weather
+        item = Market.getInstance().getItem(74002)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        return data
+
 
 AddEnvironmentEffect.register()

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

scripts/icons_update.py

@@ -59,8 +59,6 @@ copyfile(graphics_file, os.path.join(os.path.dirname(os.path.abspath(__file__)),
 
 import graphicIDsLoader
 
-print(dir(graphicIDsLoader))
-
 graphics = graphicIDsLoader.load(os.path.join(to_path, 'graphicIDs.fsdbinary'))
 
 graphics_py_ob = {}
@@ -216,8 +214,6 @@ if toadd:
         for fname in sorted(missing):
             print(('    {}'.format(fname)))
 
-print(missing)
-
 print("Doing renders")
 
 needed.clear()
@@ -232,7 +228,7 @@ toupdate = existing.intersection(needed)
 toadd = needed.difference(existing)
 
 if toadd:
-    print(('Adding {} icons...'.format(len(toadd))))
+    print(('Adding {} renders...'.format(len(toadd))))
     missing = set()
     for fname in sorted(toadd):
         try:
@@ -252,6 +248,6 @@ if toadd:
             fullpath = os.path.join(render_dir, fullname)
             icon.save(fullpath, 'png')
     if missing:
-        print(('  {} icons are missing in export:'.format(len(missing))))
+        print(('  {} renders are missing in export:'.format(len(missing))))
         for fname in sorted(missing):
             print(('    {}'.format(fname)))

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",
+}

service/market.py

@@ -319,6 +319,8 @@ class Market:
             "Raiju"                       : self.les_grp,  # AT17 prize
             "Laelaps"                     : self.les_grp,  # AT17 prize
             "Boobook"                     : self.les_grp,  # 19th EVE anniversary gift
+            "Geri"                        : self.les_grp,  # AT18 prize
+            "Bestla"                      : self.les_grp,  # AT18 prize
         }
 
         self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP)

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):

staticdata/fsd_binary/categories.0.json

@@ -310,7 +310,7 @@
     "categoryID": 26, 
     "categoryName_de": "WeltRaum", 
     "categoryName_en-us": "WorldSpace", 
-    "categoryName_es": "Lugares del mundo", 
+    "categoryName_es": "WorldSpace", 
     "categoryName_fr": "Espace planétaire", 
     "categoryName_it": "WorldSpace", 
     "categoryName_ja": "ワールドスペース", 
@@ -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,21 +624,21 @@
     "categoryName_ja": "採掘", 
     "categoryName_ko": "채굴", 
     "categoryName_ru": "Бурение", 
-    "categoryName_zh": "Mining", 
+    "categoryName_zh": "采矿", 
     "categoryNameID": 587126, 
     "published": 0
   }, 
   "2118": {
     "categoryID": 2118, 
-    "categoryName_de": "Personalization", 
+    "categoryName_de": "Anpassung", 
     "categoryName_en-us": "Personalization", 
-    "categoryName_es": "Personalization", 
-    "categoryName_fr": "Personalization", 
+    "categoryName_es": "Personalización", 
+    "categoryName_fr": "Personnalisation", 
     "categoryName_it": "Personalization", 
-    "categoryName_ja": "Personalization", 
-    "categoryName_ko": "Personalization", 
-    "categoryName_ru": "Personalization", 
-    "categoryName_zh": "Personalization", 
+    "categoryName_ja": "カスタマイズ", 
+    "categoryName_ko": "개인화", 
+    "categoryName_ru": "Персонализация", 
+    "categoryName_zh": "个性化定制", 
     "categoryNameID": 631766, 
     "published": 1
   }, 

staticdata/fsd_binary/dogmaattributes.0.json

@@ -685,7 +685,7 @@
     "displayName_ja": "サイクルあたりチャージ", 
     "displayName_ko": "주기당 충전량", 
     "displayName_ru": "Зарядов за цикл", 
-    "displayName_zh": "单次消耗量 ", 
+    "displayName_zh": "单次消耗量", 
     "displayNameID": 233609, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -1656,7 +1656,7 @@
     "dataType": 8, 
     "defaultValue": 0.0, 
     "description": "Explosive damage done.", 
-    "displayName_de": "Explosivschaden ", 
+    "displayName_de": "Explosivschaden", 
     "displayName_en-us": "Explosive damage", 
     "displayName_es": "Daño explosivo", 
     "displayName_fr": "Dégâts explosifs", 
@@ -2498,13 +2498,13 @@
     "defaultValue": 1.0, 
     "description": "distance from maximum range at which accuracy has fallen by half", 
     "displayName_de": "Präzisionsabfall", 
-    "displayName_en-us": "Accuracy falloff ", 
-    "displayName_es": "Alcance efectivo de precisión ", 
-    "displayName_fr": "Distance de perte de précision ", 
-    "displayName_it": "Accuracy falloff ", 
-    "displayName_ja": " 精度低下", 
-    "displayName_ko": "명중률 유효사거리 ", 
-    "displayName_ru": "Добавочная дальность ", 
+    "displayName_en-us": "Accuracy falloff", 
+    "displayName_es": "Alcance efectivo de precisión", 
+    "displayName_fr": "Distance de perte de précision", 
+    "displayName_it": "Accuracy falloff", 
+    "displayName_ja": "精度低下", 
+    "displayName_ko": "명중률 유효사거리", 
+    "displayName_ru": "Добавочная дальность", 
     "displayName_zh": "失准范围", 
     "displayNameID": 233554, 
     "displayWhenZero": 0, 
@@ -3103,7 +3103,7 @@
     "displayName_ja": "カーゴスキャンレジスタンス", 
     "displayName_ko": "화물 스캔 저항", 
     "displayName_ru": "Экранирование грузового отсека", 
-    "displayName_zh": "Cargo Scan Resistance", 
+    "displayName_zh": "货柜扫描抗性", 
     "displayNameID": 600128, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -4227,7 +4227,7 @@
     "tooltipDescription_it": "Shield hitpoints recharge over time and can be recovered more quickly with the use of modules", 
     "tooltipDescription_ja": "時間経過で再充電し、モジュールを使用すればさらに素早く回復します", 
     "tooltipDescription_ko": "실드 내구도는 시간이 지나면 충전되며 모듈을 사용하면 더 빨리 회복됩니다.", 
-    "tooltipDescription_ru": "Запас прочности силового поля восстанавливается со временем; с помощью модулей его можно восстановить быстрее ", 
+    "tooltipDescription_ru": "Запас прочности силового поля восстанавливается со временем; с помощью модулей его можно восстановить быстрее", 
     "tooltipDescription_zh": "护盾会随时间自动恢复，使用装备还可以使恢复速度加快", 
     "tooltipDescriptionID": 295211, 
     "tooltipTitleID": 295210, 
@@ -4513,13 +4513,13 @@
     "defaultValue": 0.0, 
     "description": "This attribute is a multiplier to the number of skill points required to train. Skill points required to train a skill = 250 * skillTimeConstant * sqrt(32)^(skillLevel - 1)", 
     "displayName_de": "Trainingszeit-Multiplikator", 
-    "displayName_en-us": "Training time multiplier ", 
-    "displayName_es": "Multiplicador de tiempo de desarrollo ", 
-    "displayName_fr": "Multiplicateur du temps de formation ", 
-    "displayName_it": "Training time multiplier ", 
-    "displayName_ja": " トレーニング時間乗数", 
-    "displayName_ko": "훈련시간 배수 ", 
-    "displayName_ru": "Множитель ", 
+    "displayName_en-us": "Training time multiplier", 
+    "displayName_es": "Multiplicador de tiempo de desarrollo", 
+    "displayName_fr": "Multiplicateur du temps de formation", 
+    "displayName_it": "Training time multiplier", 
+    "displayName_ja": "トレーニング時間乗数", 
+    "displayName_ko": "훈련시간 배수", 
+    "displayName_ru": "Множитель", 
     "displayName_zh": "训练时间倍增系数", 
     "displayNameID": 233205, 
     "displayWhenZero": 0, 
@@ -5949,13 +5949,13 @@
     "defaultValue": 100.0, 
     "description": "Production time multiplier when manufacturing amarr tech   ", 
     "displayName_de": "Amarr Tech", 
-    "displayName_en-us": "Amarr Tech ", 
-    "displayName_es": "Tecnología amarriana ", 
-    "displayName_fr": "Technologie amarr ", 
-    "displayName_it": "Amarr Tech ", 
-    "displayName_ja": " アマー技術", 
-    "displayName_ko": "아마르 기술 ", 
-    "displayName_ru": "Амаррская технология ", 
+    "displayName_en-us": "Amarr Tech", 
+    "displayName_es": "Tecnología amarriana", 
+    "displayName_fr": "Technologie amarr", 
+    "displayName_it": "Amarr Tech", 
+    "displayName_ja": "アマー技術", 
+    "displayName_ko": "아마르 기술", 
+    "displayName_ru": "Амаррская технология", 
     "displayName_zh": "艾玛科技", 
     "displayNameID": 232951, 
     "displayWhenZero": 0, 
@@ -5972,13 +5972,13 @@
     "defaultValue": 100.0, 
     "description": "Production time multiplier when manufacturing Minmatar tech   ", 
     "displayName_de": "Minmatar Tech", 
-    "displayName_en-us": "Minmatar Tech ", 
-    "displayName_es": "Tecnología minmatariana ", 
-    "displayName_fr": "Technologie minmatar ", 
-    "displayName_it": "Minmatar Tech ", 
-    "displayName_ja": " ミンマターテクノロジー", 
-    "displayName_ko": "민마타 기술 ", 
-    "displayName_ru": "Минматарская технология ", 
+    "displayName_en-us": "Minmatar Tech", 
+    "displayName_es": "Tecnología minmatariana", 
+    "displayName_fr": "Technologie minmatar", 
+    "displayName_it": "Minmatar Tech", 
+    "displayName_ja": "ミンマターテクノロジー", 
+    "displayName_ko": "민마타 기술", 
+    "displayName_ru": "Минматарская технология", 
     "displayName_zh": "米玛塔尔科技", 
     "displayNameID": 233355, 
     "displayWhenZero": 0, 
@@ -5994,15 +5994,15 @@
     "dataType": 4, 
     "defaultValue": 0.0, 
     "description": "Production time multiplier when manufacturing Gallente tech   ", 
-    "displayName_de": "Gallente Tech ", 
-    "displayName_en-us": "Gallente Tech ", 
-    "displayName_es": "Tecnología gallente ", 
-    "displayName_fr": "Technologie gallente ", 
-    "displayName_it": "Gallente Tech ", 
-    "displayName_ja": "ガレンテテック ", 
-    "displayName_ko": "갈란테 기술 ", 
-    "displayName_ru": "Галлентская технология ", 
-    "displayName_zh": "盖伦特科技 ", 
+    "displayName_de": "Gallente Tech", 
+    "displayName_en-us": "Gallente Tech", 
+    "displayName_es": "Tecnología gallente", 
+    "displayName_fr": "Technologie gallente", 
+    "displayName_it": "Gallente Tech", 
+    "displayName_ja": "ガレンテテック", 
+    "displayName_ko": "갈란테 기술", 
+    "displayName_ru": "Галлентская технология", 
+    "displayName_zh": "盖伦特科技", 
     "displayNameID": 233209, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -6018,13 +6018,13 @@
     "defaultValue": 0.0, 
     "description": "Production time multiplier when manufacturing caldari tech   ", 
     "displayName_de": "Caldari Tech", 
-    "displayName_en-us": "Caldari Tech ", 
-    "displayName_es": "Tecnología caldari ", 
-    "displayName_fr": "Technologie caldari ", 
-    "displayName_it": "Caldari Tech ", 
-    "displayName_ja": " カルダリテクノロジー", 
-    "displayName_ko": "칼다리 기술 ", 
-    "displayName_ru": "Калдарская технология ", 
+    "displayName_en-us": "Caldari Tech", 
+    "displayName_es": "Tecnología caldari", 
+    "displayName_fr": "Technologie caldari", 
+    "displayName_it": "Caldari Tech", 
+    "displayName_ja": "カルダリテクノロジー", 
+    "displayName_ko": "칼다리 기술", 
+    "displayName_ru": "Калдарская технология", 
     "displayName_zh": "加达里科技", 
     "displayNameID": 233001, 
     "displayWhenZero": 0, 
@@ -6187,7 +6187,7 @@
     "dataType": 4, 
     "defaultValue": 100.0, 
     "description": "Refining time Multiplier", 
-    "displayName_de": "Raffinierzeit-Multiplikator ", 
+    "displayName_de": "Raffinierzeit-Multiplikator", 
     "displayName_en-us": "Refining time Multiplier", 
     "displayName_es": "Multiplicador de tiempo de refinado", 
     "displayName_fr": "Multiplicateur de temps de raffinage", 
@@ -8085,7 +8085,7 @@
     "tooltipDescription_ja": "キャパシタに貯められる最大エネルギー量です", 
     "tooltipDescription_ko": "캐패시터 최대 용량입니다.", 
     "tooltipDescription_ru": "Предельный заряд бортового накопителя", 
-    "tooltipDescription_zh": " 电容器的最大容量", 
+    "tooltipDescription_zh": "电容器的最大容量", 
     "tooltipDescriptionID": 295334, 
     "tooltipTitleID": 295333, 
     "unitID": 114
@@ -8661,13 +8661,13 @@
     "defaultValue": 0.0, 
     "description": "", 
     "displayName_de": "Forschung-Skill benötigt", 
-    "displayName_en-us": "Research Skill Required ", 
-    "displayName_es": "Habilidad de investigación necesaria ", 
-    "displayName_fr": "Compétence de recherche requise ", 
-    "displayName_it": "Research Skill Required ", 
-    "displayName_ja": " 必須研究スキル", 
-    "displayName_ko": "연구 스킬 필요 ", 
-    "displayName_ru": "Требуемый навык для исследований ", 
+    "displayName_en-us": "Research Skill Required", 
+    "displayName_es": "Habilidad de investigación necesaria", 
+    "displayName_fr": "Compétence de recherche requise", 
+    "displayName_it": "Research Skill Required", 
+    "displayName_ja": "必須研究スキル", 
+    "displayName_ko": "연구 스킬 필요", 
+    "displayName_ru": "Требуемый навык для исследований", 
     "displayName_zh": "需要研究技能", 
     "displayNameID": 233301, 
     "displayWhenZero": 0, 
@@ -8684,13 +8684,13 @@
     "defaultValue": 0.0, 
     "description": "", 
     "displayName_de": "Benötigter Produktion-Skill", 
-    "displayName_en-us": "Required Manufacturing Skill ", 
-    "displayName_es": "Habilidad de fabricación necesaria ", 
-    "displayName_fr": "Compétence de production requise ", 
-    "displayName_it": "Required Manufacturing Skill ", 
-    "displayName_ja": " 必須製造スキル", 
-    "displayName_ko": "필요 제조 스킬 ", 
-    "displayName_ru": "Требуемый навык для производства ", 
+    "displayName_en-us": "Required Manufacturing Skill", 
+    "displayName_es": "Habilidad de fabricación necesaria", 
+    "displayName_fr": "Compétence de production requise", 
+    "displayName_it": "Required Manufacturing Skill", 
+    "displayName_ja": "必須製造スキル", 
+    "displayName_ko": "필요 제조 스킬", 
+    "displayName_ru": "Требуемый навык для производства", 
     "displayName_zh": "所需制造技能", 
     "displayNameID": 233305, 
     "displayWhenZero": 0, 
@@ -11860,7 +11860,7 @@
     "dataType": 4, 
     "defaultValue": 0.0, 
     "description": "The maximum distance at which the object can be used.", 
-    "displayName_de": "Max. Bedienungsentfernung ", 
+    "displayName_de": "Max. Bedienungsentfernung", 
     "displayName_en-us": "Maximum Operational Distance", 
     "displayName_es": "Distancia máxima de funcionamiento", 
     "displayName_fr": "Distance opérationnelle maximale", 
@@ -12862,7 +12862,7 @@
     "displayName_it": "Asteroid Specialization Yield Modifier", 
     "displayName_ja": "アステロイド専門採掘量修正乗数", 
     "displayName_ko": "특화 광석 채굴량 배수", 
-    "displayName_ru": "Модификатор выработки для специализованности ", 
+    "displayName_ru": "Модификатор выработки для специализованности", 
     "displayName_zh": "专精矿种产量调整", 
     "displayNameID": 233439, 
     "displayWhenZero": 0, 
@@ -12958,7 +12958,7 @@
     "displayName_ja": "クリスタル損耗", 
     "displayName_ko": "크리스탈 피해량", 
     "displayName_ru": "Кристаллы получают повреждения", 
-    "displayName_zh": "晶体损耗 ", 
+    "displayName_zh": "晶体损耗", 
     "displayNameID": 233613, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -13627,7 +13627,7 @@
     "description": "Skill attribute for increasing effectiveness on Target Painters", 
     "displayName_de": "Zielmarkierungsbonus", 
     "displayName_en-us": "Target Painting Bonus", 
-    "displayName_es": "Bonificación de revelación de objetivo", 
+    "displayName_es": "Bonificación de revelación de objetivos", 
     "displayName_fr": "Bonus de marquage de cible", 
     "displayName_it": "Target Painting Bonus", 
     "displayName_ja": "ターゲットペインティングボーナス", 
@@ -16407,7 +16407,7 @@
     "displayName_ja": "オートリピート不可", 
     "displayName_ko": "자동 반복 불가", 
     "displayName_ru": "Автоповтор недоступен", 
-    "displayName_zh": "无法自动重复 ", 
+    "displayName_zh": "无法自动重复", 
     "displayNameID": 233618, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -17065,7 +17065,7 @@
     "dataType": 5, 
     "defaultValue": 0.0, 
     "description": "Used for ships that are supposed to be able to use fuel.", 
-    "displayName_de": "Frachtraumgröße für Treibstoff ", 
+    "displayName_de": "Frachtraumgröße für Treibstoff", 
     "displayName_en-us": "Fuel Cargo Capacity", 
     "displayName_es": "Capacidad de carga de combustible", 
     "displayName_fr": "Capacité du conteneur carburant", 
@@ -20354,7 +20354,7 @@
     "description": "Just for the UI to display the ship warp speed.", 
     "displayName_de": "Warpgeschwindigkeit", 
     "displayName_en-us": "Ship Warp Speed", 
-    "displayName_es": "Velocidad warp ", 
+    "displayName_es": "Velocidad warp", 
     "displayName_fr": "Vitesse de warp du vaisseau", 
     "displayName_it": "Ship Warp Speed", 
     "displayName_ja": "シップワープ速度", 
@@ -20644,7 +20644,7 @@
     "displayName_de": "Bonus auf den Verbrauch von Nanite-Reparaturpaste", 
     "displayName_en-us": "Nanite Repair Paste Consumption Bonus", 
     "displayName_es": "Bonificación de consumo de fluido reparador de nanobots", 
-    "displayName_fr": "Bonus d'utilisation des nanites de réparation ", 
+    "displayName_fr": "Bonus d'utilisation des nanites de réparation", 
     "displayName_it": "Nanite Repair Paste Consumption Bonus", 
     "displayName_ja": "ナノマシンリペアペイスト使用ボーナス", 
     "displayName_ko": "나노기기 수리용액 소모량 보너스", 
@@ -21264,7 +21264,7 @@
     "description": "Target Painting Command Bonus", 
     "displayName_de": "Target Painting Command-Bonus", 
     "displayName_en-us": "Target Painting Command Bonus", 
-    "displayName_es": "Bonificación de mando de revelación de objetivo", 
+    "displayName_es": "Bonificación de mando de revelación de objetivos", 
     "displayName_fr": "Bonus de commandement de marquage de cible", 
     "displayName_it": "Target Painting Command Bonus", 
     "displayName_ja": "ターゲットペインティング用コマンドボーナス", 
@@ -24726,7 +24726,7 @@
     "displayName_ja": "採掘ホールド容量", 
     "displayName_ko": "채굴 저장고 적재량", 
     "displayName_ru": "Объём отсека для руды", 
-    "displayName_zh": "矿石舱容量", 
+    "displayName_zh": "矿舱容量", 
     "displayNameID": 233539, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -24742,7 +24742,7 @@
     "tooltipDescription_ja": "採掘ホールドに積載できる総量", 
     "tooltipDescription_ko": "채굴 저장고에 보관할 수 있는 최대 용량", 
     "tooltipDescription_ru": "Максимальный объём, допустимый к размещению в бортовом отсеке для руды", 
-    "tooltipDescription_zh": "矿石舱能装载的总体积", 
+    "tooltipDescription_zh": "矿舱的容量", 
     "tooltipDescriptionID": 295316, 
     "tooltipTitleID": 295315, 
     "unitID": 9
@@ -24777,7 +24777,7 @@
     "tooltipDescription_ja": "ガスホールドに積載できる総量", 
     "tooltipDescription_ko": "가스 저장고에 보관할 수 있는 최대 용량", 
     "tooltipDescription_ru": "Максимальный объём, допустимый к размещению в газовом отсеке", 
-    "tooltipDescription_zh": "The total volume that can be stored in the gas hold", 
+    "tooltipDescription_zh": "气云舱的容量", 
     "tooltipDescriptionID": 592043, 
     "tooltipTitleID": 592042, 
     "unitID": 9
@@ -25299,7 +25299,7 @@
     "dataType": 4, 
     "defaultValue": 0.0, 
     "description": "The required minimum military development index level", 
-    "displayName_de": "Erforderlicher Entwicklungsindex (Militär) ", 
+    "displayName_de": "Erforderlicher Entwicklungsindex (Militär)", 
     "displayName_en-us": "Required Development Index Level (Military)", 
     "displayName_es": "Nivel de índice de desarrollo necesario (militar)", 
     "displayName_fr": "Niveau d'index de développement requis (militaire)", 
@@ -25321,7 +25321,7 @@
     "dataType": 4, 
     "defaultValue": 0.0, 
     "description": "The minimum required industrial development index level", 
-    "displayName_de": "Erforderlicher Entwicklungsindex (Industrie) ", 
+    "displayName_de": "Erforderlicher Entwicklungsindex (Industrie)", 
     "displayName_en-us": "Required Development Index Level (Industrial)", 
     "displayName_es": "Nivel de índice de desarrollo necesario (industrial)", 
     "displayName_fr": "Niveau d'index de développement requis (industriel)", 
@@ -25767,7 +25767,7 @@
     "dataType": 4, 
     "defaultValue": 0.0, 
     "description": "Transport capacity (bandwidth) in m3 per hour.", 
-    "displayName_de": "Logistische Kapazität ", 
+    "displayName_de": "Logistische Kapazität", 
     "displayName_en-us": "Logistical Capacity", 
     "displayName_es": "Capacidad logística", 
     "displayName_fr": "Capacité logistique", 
@@ -28116,7 +28116,7 @@
     "displayName_ja": "MWDのシグネチャペナルティとキャパシタ消費軽減ボーナス", 
     "displayName_ko": "MWD 시그니처 페널티 및 캐패시터 사용량 보너스", 
     "displayName_ru": "Уменьшение потребления накопителя и влияния микроварп-ускорителя на радиус сигнатуры", 
-    "displayName_zh": "MWD sig penalty and cap need bonus", 
+    "displayName_zh": "微型跃迁推进器信号半径惩罚和电容消耗加成", 
     "displayNameID": 595366, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -28312,7 +28312,7 @@
     "dataType": 5, 
     "defaultValue": 1.0, 
     "description": "", 
-    "displayName_de": "Energy Leech Reflektionswert ", 
+    "displayName_de": "Energy Leech Reflektionswert", 
     "displayName_en-us": "Energy Leech Reflect Amount", 
     "displayName_es": "Cantidad de reflejo de la absorción energética", 
     "displayName_fr": "Quantité renvoyée par la sangsue énergétique", 
@@ -34871,7 +34871,7 @@
     "displayName_de": "Neutralisationswert beim Aufwärmen", 
     "displayName_en-us": "Warm-up Neutralization Amount", 
     "displayName_es": "Cantidad de neutralización del calentamiento", 
-    "displayName_fr": "Échauffement – capacité de neutralisation ", 
+    "displayName_fr": "Échauffement – capacité de neutralisation", 
     "displayName_it": "Warm-up Neutralization Amount", 
     "displayName_ja": "無効化量の上昇", 
     "displayName_ko": "가동 전 뉴트럴라이제이션 수치", 
@@ -35654,7 +35654,7 @@
     "displayName_ja": "シージミサイルダメージボーナス", 
     "displayName_ko": "공성 미사일 피해 보너스", 
     "displayName_ru": "Увеличение урона от осадных ракет", 
-    "displayName_zh": "导弹伤害加成", 
+    "displayName_zh": "会战型导弹伤害加成", 
     "displayNameID": 311932, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -36281,7 +36281,7 @@
     "displayName_zh": "装甲维修器/护盾回充增量器运转周期加成", 
     "displayNameID": 312084, 
     "displayWhenZero": 0, 
-    "highIsGood": 1, 
+    "highIsGood": 0, 
     "iconID": 2104, 
     "name": "siegeLocalLogisticsDurationBonus", 
     "published": 1, 
@@ -44387,7 +44387,7 @@
     "displayName_ja": "ワープスクランブル強度ボーナス", 
     "displayName_ko": "워프 스크램블 강도 보너스", 
     "displayName_ru": "Влияние на мощность глушения варп-двигателей", 
-    "displayName_zh": "Warp Scramble Strength Bonus", 
+    "displayName_zh": "跃迁干扰强度加成", 
     "displayNameID": 600129, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -45202,7 +45202,7 @@
     "displayName_ja": "アイスホールド容量", 
     "displayName_ko": "아이스 저장고 적재량", 
     "displayName_ru": "Объём отсека для льда", 
-    "displayName_zh": "Ice Hold Capacity", 
+    "displayName_zh": "冰矿舱容量", 
     "displayNameID": 584247, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -45218,7 +45218,7 @@
     "tooltipDescription_ja": "アイスホールドに積載できる総量", 
     "tooltipDescription_ko": "아이스 저장고에 보관할 수 있는 최대 용량", 
     "tooltipDescription_ru": "Максимальный объём, допустимый к размещению в бортовом отсеке для льда", 
-    "tooltipDescription_zh": "The total volume that can be stored in the ice hold", 
+    "tooltipDescription_zh": "冰矿舱的容量", 
     "tooltipDescriptionID": 584249, 
     "tooltipTitleID": 584248, 
     "unitID": 9
@@ -45237,7 +45237,7 @@
     "displayName_ja": "有効なターゲットタイプ", 
     "displayName_ko": "유효한 타겟팅 대상", 
     "displayName_ru": "Доступные типы целей", 
-    "displayName_zh": "Valid target types", 
+    "displayName_zh": "无效的目标类型", 
     "displayNameID": 593750, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -45259,7 +45259,7 @@
     "displayName_ja": "残留物体積乗数", 
     "displayName_ko": "손실 배수", 
     "displayName_ru": "Коэффициент объёма отходов", 
-    "displayName_zh": "Residue Volume Multiplier", 
+    "displayName_zh": "残渣体积系数", 
     "displayNameID": 589052, 
     "displayWhenZero": 1, 
     "highIsGood": 0, 
@@ -45282,7 +45282,7 @@
     "displayName_ja": "残留物率", 
     "displayName_ko": "손실 확률", 
     "displayName_ru": "Шанс получения отходов", 
-    "displayName_zh": "Residue Probability", 
+    "displayName_zh": "残渣几率", 
     "displayNameID": 589053, 
     "displayWhenZero": 1, 
     "highIsGood": 0, 
@@ -45329,7 +45329,7 @@
     "displayName_ja": "残留物体積乗数ボーナス", 
     "displayName_ko": "손실량 배수 보너스", 
     "displayName_ru": "Прибавка к коэффициенту объёма отходов", 
-    "displayName_zh": "Residue Volume Multiplier Bonus", 
+    "displayName_zh": "残渣体积系数加成", 
     "displayNameID": 591643, 
     "displayWhenZero": 1, 
     "highIsGood": 0, 
@@ -45352,7 +45352,7 @@
     "displayName_ja": "残留物率ボーナス", 
     "displayName_ko": "손실 확률 보너스", 
     "displayName_ru": "Прибавка к шансу получения отходов", 
-    "displayName_zh": "Residue Probability Bonus", 
+    "displayName_zh": "残渣几率加成", 
     "displayNameID": 591644, 
     "displayWhenZero": 1, 
     "highIsGood": 0, 
@@ -45375,7 +45375,7 @@
     "displayName_ja": "アステロイドスペシャリゼーション継続時間乗数", 
     "displayName_ko": "소행성 특화 지속시간 배수", 
     "displayName_ru": "Коэффициент длительности при специализации на астероидах", 
-    "displayName_zh": "Asteroid Specialization Duration Multiplier", 
+    "displayName_zh": "小行星矿专精运转周期系数", 
     "displayNameID": 587593, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -45398,7 +45398,7 @@
     "displayName_ja": "ドロップ率の上書き", 
     "displayName_ko": "Drop Chance Overwrite", 
     "displayName_ru": "Изменение шанса выпадения добычи", 
-    "displayName_zh": "Drop Chance Overwrite", 
+    "displayName_zh": "掉率改写", 
     "displayNameID": 588129, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -45413,7 +45413,7 @@
     "tooltipDescription_ja": "プレイヤー艦のドロップ率を上書き。値が0の場合、戦利品のドロップなし", 
     "tooltipDescription_ko": "Overwriting loot chance of drop from player ship, value 0 = no loot dropped", 
     "tooltipDescription_ru": "Изменяет шанс выпадения добычи из корабля игрока. 0 = добыча не выпадает", 
-    "tooltipDescription_zh": "Overwriting loot chance of drop from player ship, value 0 = no loot dropped", 
+    "tooltipDescription_zh": "改写玩家爆船的掉率，0=无掉落", 
     "tooltipDescriptionID": 588131, 
     "tooltipTitleID": 588130
   }, 
@@ -45430,7 +45430,7 @@
     "displayName_ja": "プローブ強度ボーナス", 
     "displayName_ko": "프로브 강도 보너스", 
     "displayName_ru": "Увеличение чувствительности зондов", 
-    "displayName_zh": "Probe Strength Bonus", 
+    "displayName_zh": "探针强度加成", 
     "displayNameID": 588464, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -45541,7 +45541,7 @@
     "displayName_ja": "サイレントターゲットロック", 
     "displayName_ko": "Target Lock Silently", 
     "displayName_ru": "Незаметный захват цели", 
-    "displayName_zh": "Target Lock Silently", 
+    "displayName_zh": "暗中锁定目标", 
     "displayNameID": 588475, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -45556,7 +45556,7 @@
     "tooltipDescription_ja": "艦船などがプレイヤーにロックを行ったりエフェクトを適用している際に、その艦船などがプレイヤーに対して黄色点滅状態になるのを防ぐために使用されます。", 
     "tooltipDescription_ko": "Used to prevent the ship or entity from yellow flashing to the player when the ship or entity has the player locked and if applying an effect on the player.", 
     "tooltipDescription_ru": "Used to prevent the ship or entity from yellow flashing to the player when the ship or entity has the player locked and if applying an effect on the player.", 
-    "tooltipDescription_zh": "Used to prevent the ship or entity from yellow flashing to the player when the ship or entity has the player locked and if applying an effect on the player.", 
+    "tooltipDescription_zh": "防止舰船或其他实体因锁定玩家或对玩家施放效果而闪黄。", 
     "tooltipDescriptionID": 588477, 
     "tooltipTitleID": 588476
   }, 
@@ -45871,7 +45871,7 @@
     "displayName_ja": "ステイシスウェビファイヤーの最大範囲ボーナス", 
     "displayName_ko": "스테이시스 웹 생성기 사거리 보너스", 
     "displayName_ru": "Бонус к макс. дальности стазис-индуктора", 
-    "displayName_zh": "Stasis Webifier Maximum Range Bonus", 
+    "displayName_zh": "停滞缠绕光束最大范围加成", 
     "displayNameID": 589016, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46037,7 +46037,7 @@
     "displayName_ja": "アステロイドホールド容量", 
     "displayName_ko": "소행성 저장고 적재량", 
     "displayName_ru": "Объём отсека для астероидов", 
-    "displayName_zh": "Asteroid Hold Capacity", 
+    "displayName_zh": "小行星矿石舱容量", 
     "displayNameID": 591098, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46053,7 +46053,7 @@
     "tooltipDescription_ja": "アステロイドホールドに積載できる総量", 
     "tooltipDescription_ko": "소행성 저장고에 보관할 수 있는 최대 용량", 
     "tooltipDescription_ru": "Максимальный объём, допустимый к размещению в бортовом отсеке для астероидов", 
-    "tooltipDescription_zh": "The total volume that can be stored in the Asteroid Hold", 
+    "tooltipDescription_zh": "小行星矿石舱的容量", 
     "tooltipDescriptionID": 591100, 
     "tooltipTitleID": 591099, 
     "unitID": 9
@@ -46126,9 +46126,10 @@
   }, 
   "3236": {
     "attributeID": 3236, 
-    "categoryID": 9, 
+    "categoryID": 51, 
     "dataType": 3, 
     "defaultValue": 0.0, 
+    "description": "If set to true, this results in no mining waste.", 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
     "name": "ignoreMiningWaste", 
@@ -46203,7 +46204,7 @@
     "displayName_ja": "最適射程距離", 
     "displayName_ko": "최적사거리", 
     "displayName_ru": "Оптимальная дальность", 
-    "displayName_zh": "Optimal Range", 
+    "displayName_zh": "最佳射程", 
     "displayNameID": 593073, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46237,7 +46238,7 @@
     "displayName_ja": "圧縮可能なアイテム", 
     "displayName_ko": "압축 가능한 아이템", 
     "displayName_ru": "Сжимаемые ресурсы", 
-    "displayName_zh": "Compressible Items", 
+    "displayName_zh": "可压缩", 
     "displayNameID": 594759, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -46259,7 +46260,7 @@
     "displayName_ja": "ワープスクランブラーの最適射程距離ボーナス", 
     "displayName_ko": "워프 스크램블러 최적사거리 보너스", 
     "displayName_ru": "Влияние на оптимальную дальность действия варп-глушителя", 
-    "displayName_zh": "Warp Scrambler Optimal Range Bonus", 
+    "displayName_zh": "跃迁扰频器最佳射程加成", 
     "displayNameID": 595177, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46282,7 +46283,7 @@
     "displayName_ja": "船体ダメージレジスタンスボーナス", 
     "displayName_ko": "선체 저항력 보너스", 
     "displayName_ru": "Увеличение сопротивляемости корпуса", 
-    "displayName_zh": "Hull Damage Resistance Bonus", 
+    "displayName_zh": "结构伤害抗性加成", 
     "displayNameID": 595367, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -46304,7 +46305,7 @@
     "displayName_ja": "ガス減圧効率ボーナス", 
     "displayName_ko": "가스 압축해제 효율 보너스", 
     "displayName_ru": "Бонус к эффективности декомпрессии газа", 
-    "displayName_zh": "Gas Decompression Efficiency Bonus", 
+    "displayName_zh": "气云解压效率加成", 
     "displayNameID": 595397, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46527,7 +46528,7 @@
     "displayName_ja": "ドローン追跡速度ボーナス", 
     "displayName_ko": "드론 트래킹 속도 보너스", 
     "displayName_ru": "Бонус к скорости наведения дронов", 
-    "displayName_zh": "Drone Tracking Speed Bonus", 
+    "displayName_zh": "无人机跟踪速度加成", 
     "displayNameID": 598958, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46550,7 +46551,7 @@
     "displayName_ja": "シールド修復を停止させるDPSしきい値", 
     "displayName_ko": "실드 수리가 멈추는 기준 피해량", 
     "displayName_ru": "Порог урона/сек. для приостановки восстановления щитов", 
-    "displayName_zh": "DPS threshold to pause shield repair", 
+    "displayName_zh": "停止护盾维修的DPS阈值", 
     "displayNameID": 598991, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46572,7 +46573,7 @@
     "displayName_ja": "アーマー修復を停止させるDPSしきい値", 
     "displayName_ko": "장갑 수리가 멈추는 기준 피해량", 
     "displayName_ru": "Порог урона/сек. для приостановки восстановления брони", 
-    "displayName_zh": "DPS threshold to pause armor repair", 
+    "displayName_zh": "停止装甲维修的DPS阈值", 
     "displayNameID": 598992, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46594,7 +46595,7 @@
     "displayName_ja": "船体修復を停止させるDPSしきい値", 
     "displayName_ko": "선체 수리가 멈추는 기준 피해량", 
     "displayName_ru": "Порог урона/сек. для приостановки восстановления корпуса", 
-    "displayName_zh": "DPS threshold to pause hull repair", 
+    "displayName_zh": "停止结构维修的DPS阈值", 
     "displayNameID": 598993, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46616,7 +46617,7 @@
     "displayName_ja": "ステイシスウェビファイヤーレジスタンスボーナス", 
     "displayName_ko": "스테이시스 웹 생성기 저항 보너스", 
     "displayName_ru": "Влияние на сопротивляемость стазис-индукторов", 
-    "displayName_zh": "Stasis Webifier Resistance Bonus", 
+    "displayName_zh": "停滞缠绕抗性加成", 
     "displayNameID": 600127, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -46639,7 +46640,7 @@
     "displayName_ja": "アーマーダメージレジスタンスボーナス", 
     "displayName_ko": "장갑 피해 저항력 보너스", 
     "displayName_ru": "Влияние на сопротивляемость брони", 
-    "displayName_zh": "Armor Damage Resistance Bonus", 
+    "displayName_zh": "装甲伤害抗性加成", 
     "displayNameID": 600536, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -46729,16 +46730,16 @@
     "categoryID": 7, 
     "dataType": 3, 
     "defaultValue": 0.0, 
-    "description": "only allows attackers in fw", 
-    "displayName_de": "Allow Only Factional Warfare Attackers", 
+    "description": "It is a Boolean Value that defaults to false. If true, it will only allow players to Hack if they belong to the Faction that is an enemy of the Occupier of the Star System.", 
+    "displayName_de": "Nur Angreifer aus dem Fraktionskrieg zulassen", 
     "displayName_en-us": "Allow Only Factional Warfare Attackers", 
-    "displayName_es": "Allow Only Factional Warfare Attackers", 
-    "displayName_fr": "Allow Only Factional Warfare Attackers", 
+    "displayName_es": "Permitir solo atacantes de la guerra de facciones", 
+    "displayName_fr": "N'autoriser que les assaillants de la guerre de faction", 
     "displayName_it": "Allow Only Factional Warfare Attackers", 
-    "displayName_ja": "Allow Only Factional Warfare Attackers", 
-    "displayName_ko": "Allow Only Factional Warfare Attackers", 
-    "displayName_ru": "Allow Only Factional Warfare Attackers", 
-    "displayName_zh": "Allow Only Factional Warfare Attackers", 
+    "displayName_ja": "国家間戦争の攻撃側のみが利用可能", 
+    "displayName_ko": "팩션 전쟁 공격 측 입장 가능", 
+    "displayName_ru": "Допускать только нападающую сторону МВ", 
+    "displayName_zh": "只允许势力战争攻击方", 
     "displayNameID": 635862, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -46758,6 +46759,306 @@
     "published": 0, 
     "stackable": 1
   }, 
+  "5214": {
+    "attributeID": 2285, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "Multiplied by Amarr Dreadnought skill level", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusDreadnoughtA4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5215": {
+    "attributeID": 2291, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "Multiplied by Gallente Dreadnought skill level", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusDreadnoughtG4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5216": {
+    "attributeID": 2291, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "Multiplied by Gallente Dreadnought skill level", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusDreadnoughtG5", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5218": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr1", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5219": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr2", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5220": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr3", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5221": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5222": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr5", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5223": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr6", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5224": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr7", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5225": {
+    "attributeID": 2015, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerCaldari1", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5226": {
+    "attributeID": 2015, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerCaldari5", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5227": {
+    "attributeID": 2015, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerCaldari4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5228": {
+    "attributeID": 2015, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerCaldari2", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5229": {
+    "attributeID": 2015, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerCaldari3", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5230": {
+    "attributeID": 2027, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerGallente1", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5231": {
+    "attributeID": 2027, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerGallente5", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5232": {
+    "attributeID": 2027, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerGallente2", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5233": {
+    "attributeID": 2027, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerGallente3", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5234": {
+    "attributeID": 2027, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerGallente4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5235": {
+    "attributeID": 2004, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerMinmatar1", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5236": {
+    "attributeID": 2004, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerMinmatar2", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5237": {
+    "attributeID": 2004, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerMinmatar3", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5238": {
+    "attributeID": 2004, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerMinmatar4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5239": {
+    "attributeID": 2004, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerMinmatar5", 
+    "published": 0, 
+    "stackable": 1
+  }, 
   "5240": {
     "attributeID": 5240, 
     "categoryID": 9, 
@@ -46769,5 +47070,52 @@
     "name": "shipBonusGB3", 
     "published": 0, 
     "stackable": 1
+  }, 
+  "5248": {
+    "attributeID": 5248, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusDreadnoughtM4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5265": {
+    "attributeID": 5265, 
+    "categoryID": 9, 
+    "dataType": 3, 
+    "defaultValue": 0.0, 
+    "description": "All players will be flagged as suspect when looting a wreck with this attribute.", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "flagAllAsSuspectOnLootWreck", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5318": {
+    "attributeID": 5318, 
+    "categoryID": 9, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "Ship Bonus used for Alliance Tournament Ships", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusAT2", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5319": {
+    "attributeID": 5319, 
+    "categoryID": 9, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "Ship Bonus used for Alliance Tournament Ships", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusAT3", 
+    "published": 0, 
+    "stackable": 1
   }
 }