Bump version

Adjust effects
Update static data to 1877575
2021-02-20 20:23:04 +03:00 · 2021-02-20 20:22:44 +03:00 · 2021-02-20 20:09:24 +03:00 · 2021-02-19 21:17:34 +03:00 · 2021-02-19 20:44:57 +03:00 · 2021-02-19 20:39:10 +03:00
32 changed files with 45759 additions and 21043 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+if:
+  tags: true
 os: linux
 language: python
 git:
--- a/db_update.py
+++ b/db_update.py
@@ -142,7 +142,17 @@ def update_db():
            ):
                row['published'] = True
            # Nearly useless and clutter search results too much
-            elif row['typeName_en-us'].startswith('Limited Synth '):
+            elif (
+                row['typeName_en-us'].startswith('Limited Synth ') or
+                row['typeName_en-us'].endswith(' Filament') and (
+                    "'Needlejack'" not in row['typeName_en-us'] and
+                    "'Devana'" not in row['typeName_en-us'] and
+                    "'Pochven'" not in row['typeName_en-us'] and
+                    "'Krai Veles'" not in row['typeName_en-us'] and
+                    "'Krai Perun'" not in row['typeName_en-us'] and
+                    "'Krai Svarog'" not in row['typeName_en-us']
+                )
+            ):
                row['published'] = False

        newData = []
--- a/eos/effects.py
+++ b/eos/effects.py
@@ -639,6 +639,8 @@ class Effect157(BaseEffect):

    Used by:
    Implants named like: Zainou 'Deadeye' Large Hybrid Turret LH (6 of 6)
+    Implant: Festival-only 'Longbow' HD4 Dose
+    Implant: Festival-only 'Longbow' HD6 Dose
    Skill: Large Hybrid Turret
    """

@@ -657,6 +659,8 @@ class Effect159(BaseEffect):

    Used by:
    Implants named like: Inherent Implants 'Lancer' Medium Energy Turret ME (6 of 6)
+    Implant: Festival-only 'Longbow' ED3 Dose
+    Implant: Festival-only 'Longbow' ED6 Dose
    Skill: Medium Energy Turret
    """

@@ -675,6 +679,8 @@ class Effect160(BaseEffect):

    Used by:
    Implants named like: Zainou 'Deadeye' Medium Hybrid Turret MH (6 of 6)
+    Implant: Festival-only 'Longbow' HD3 Dose
+    Implant: Festival-only 'Longbow' HD6 Dose
    Skill: Medium Hybrid Turret
    """

@@ -693,6 +699,8 @@ class Effect161(BaseEffect):

    Used by:
    Implants named like: Eifyr and Co. 'Gunslinger' Medium Projectile Turret MP (6 of 6)
+    Implant: Festival-only 'Longbow' PD3 Dose
+    Implant: Festival-only 'Longbow' PD6 Dose
    Skill: Medium Projectile Turret
    """

@@ -711,6 +719,8 @@ class Effect162(BaseEffect):

    Used by:
    Implants named like: Inherent Implants 'Lancer' Large Energy Turret LE (6 of 6)
+    Implant: Festival-only 'Longbow' ED4 Dose
+    Implant: Festival-only 'Longbow' ED6 Dose
    Implant: Pashan's Turret Handling Mindlink
    Skill: Large Energy Turret
    """
@@ -730,6 +740,8 @@ class Effect172(BaseEffect):

    Used by:
    Implants named like: Inherent Implants 'Lancer' Small Energy Turret SE (6 of 6)
+    Implant: Festival-only 'Longbow' ED2 Dose
+    Implant: Festival-only 'Longbow' ED6 Dose
    Skill: Small Energy Turret
    """

@@ -748,6 +760,8 @@ class Effect173(BaseEffect):

    Used by:
    Implants named like: Zainou 'Deadeye' Small Hybrid Turret SH (6 of 6)
+    Implant: Festival-only 'Longbow' HD2 Dose
+    Implant: Festival-only 'Longbow' HD6 Dose
    Skill: Small Hybrid Turret
    """

@@ -766,6 +780,8 @@ class Effect174(BaseEffect):

    Used by:
    Implants named like: Eifyr and Co. 'Gunslinger' Small Projectile Turret SP (6 of 6)
+    Implant: Festival-only 'Longbow' PD2 Dose
+    Implant: Festival-only 'Longbow' PD6 Dose
    Skill: Small Projectile Turret
    """

@@ -851,7 +867,7 @@ class Effect230(BaseEffect):

    Used by:
    Implants named like: Eifyr and Co. 'Rogue' Afterburner AB (6 of 6)
-    Implant: Eifyr and Co. 'Rogue' Agility 11-11
+    Implants named like: Eifyr and Co. 'Rogue' Agility (2 of 2)
    Implant: Zor's Custom Navigation Link
    Skill: Afterburner
    """
@@ -886,7 +902,7 @@ class Effect242(BaseEffect):

    Used by:
    Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
-    Implant: Eifyr and Co. 'Rogue' Agility 11-11
+    Implants named like: Eifyr and Co. 'Rogue' Agility (2 of 2)
    """

    type = 'passive'
@@ -1086,8 +1102,8 @@ class Effect391(BaseEffect):

    Used by:
    Implants named like: Inherent Implants 'Highwall' Mining MX (3 of 3)
+    Implants named like: ORE 'Harvester' Efficiency (2 of 2)
    Implant: Michi's Excavation Augmentor
-    Implant: ORE 'Harvester' Efficiency 11-11
    Skill: Astrogeology
    Skill: Mining
    """
@@ -1106,6 +1122,8 @@ class Effect392(BaseEffect):
    mechanicHullHpBonusPostPercentHpShip

    Used by:
+    Implants named like: Capsuleer Defense Augmentation Chip (3 of 3)
+    Implants named like: Festival only 'Rock' HH Dose (4 of 4)
    Implants named like: Inherent Implants 'Noble' Mechanic MC (6 of 6)
    Modules named like: Transverse Bulkhead (8 of 8)
    Skill: Mechanics
@@ -1196,6 +1214,7 @@ class Effect397(BaseEffect):
    Implants named like: Zainou 'Gypsy' CPU Management EE (6 of 6)
    Modules named like: Processor Overclocking Unit (8 of 8)
    Subsystems named like: Core Electronic Efficiency Gate (2 of 2)
+    Implant: Basic Capsuleer Engineering Augmentation Chip
    Implant: Genolution Core Augmentation CA-2
    Skill: CPU Management
    """
@@ -1214,6 +1233,8 @@ class Effect408(BaseEffect):

    Used by:
    Implants named like: Eifyr and Co. 'Gunslinger' Large Projectile Turret LP (6 of 6)
+    Implant: Festival-only 'Longbow' PD4 Dose
+    Implant: Festival-only 'Longbow' PD6 Dose
    Skill: Large Projectile Turret
    """

@@ -1250,6 +1271,8 @@ class Effect446(BaseEffect):
    shieldManagementShieldCapacityBonusPostPercentCapacityLocationShipGroupShield

    Used by:
+    Implants named like: Capsuleer Defense Augmentation Chip (3 of 3)
+    Implants named like: Festival only 'Rock' SH Dose (4 of 4)
    Implants named like: Zainou 'Gnome' Shield Management SM (6 of 6)
    Modules named like: Core Defense Field Extender (8 of 8)
    Implant: Genolution Core Augmentation CA-3
@@ -1267,11 +1290,13 @@ class Effect446(BaseEffect):

 class Effect485(BaseEffect):
    """
-    energysystemsoperationCapRechargeBonusPostPercentRechargeRateLocationShipGroupCapacitor
+    capacitorRechargeTimeBonusPostPercentPassive

    Used by:
    Implants named like: Inherent Implants 'Squire' Capacitor Systems Operation EO (6 of 6)
+    Implants named like: grade Rapture (15 of 18)
    Modules named like: Capacitor Control Circuit (8 of 8)
+    Implant: Basic Capsuleer Engineering Augmentation Chip
    Implant: Genolution Core Augmentation CA-2
    Skill: Capacitor Systems Operation
    """
@@ -1311,6 +1336,7 @@ class Effect490(BaseEffect):
    Implants named like: Inherent Implants 'Squire' Power Grid Management EG (6 of 6)
    Modules named like: Ancillary Current Router (8 of 8)
    Subsystems named like: Core Augmented Reactor (4 of 4)
+    Implant: Basic Capsuleer Engineering Augmentation Chip
    Implant: Genolution Core Augmentation CA-1
    Skill: Power Grid Management
    """
@@ -1787,7 +1813,7 @@ class Effect596(BaseEffect):
    ammoInfluenceRange

    Used by:
-    Items from category: Charge (608 of 975)
+    Items from category: Charge (608 of 978)
    """

    type = 'passive'
@@ -1802,7 +1828,7 @@ class Effect598(BaseEffect):
    ammoSpeedMultiplier

    Used by:
-    Charges from group: Festival Charges (30 of 30)
+    Charges from group: Festival Charges (33 of 33)
    Charges from group: Interdiction Probe (2 of 2)
    Charges from group: Structure Festival Charges (2 of 2)
    Special Edition Assetss from group: Festival Charges Expired (4 of 4)
@@ -1883,7 +1909,7 @@ class Effect604(BaseEffect):
    shipPTspeedBonusMB2

    Used by:
-    Variations of ship: Tempest (4 of 4)
+    Variations of ship: Tempest (3 of 4)
    Ship: Maelstrom
    Ship: Marshal
    Ship: Panther
@@ -2247,7 +2273,6 @@ class Effect736(BaseEffect):

    Used by:
    Ship: Apocalypse Imperial Issue
-    Ship: Paladin
    """

    type = 'passive'
@@ -2375,7 +2400,7 @@ class Effect804(BaseEffect):
    ammoInfluenceCapNeed

    Used by:
-    Items from category: Charge (514 of 975)
+    Items from category: Charge (514 of 978)
    """

    type = 'passive'
@@ -2443,10 +2468,10 @@ class Effect856(BaseEffect):
    warpSkillSpeed

    Used by:
+    Implants named like: Eifyr and Co. 'Rogue' Agility (2 of 2)
    Implants named like: Eifyr and Co. 'Rogue' Warp Drive Speed WS (6 of 6)
    Implants named like: grade Ascendancy (10 of 12)
    Modules named like: Hyperspatial Velocity Optimizer (8 of 8)
-    Implant: Eifyr and Co. 'Rogue' Agility 11-11
    Implant: Serenity YC122.9 Season Booster - Warp Speed
    """

@@ -3761,7 +3786,7 @@ class Effect1190(BaseEffect):

    Used by:
    Implants named like: Inherent Implants 'Yeti' Ice Harvesting IH (3 of 3)
-    Implant: ORE 'Harvester' Efficiency 11-11
+    Implants named like: ORE 'Harvester' Efficiency (2 of 2)
    Module: Medium Ice Harvester Accelerator I
    Skill: Ice Harvesting
    """
@@ -4271,7 +4296,7 @@ class Effect1409(BaseEffect):

    Used by:
    Implants named like: Poteque 'Prospector' Astrometric Acquisition AQ (3 of 3)
-    Implant: Poteque 'Prospector' Sharpeye 11-11
+    Implants named like: Poteque 'Prospector' Sharpeye (2 of 2)
    Skill: Astrometric Acquisition
    Skill: Astrometrics
    """
@@ -5254,7 +5279,7 @@ class Effect1730(BaseEffect):
    droneDmgBonus

    Used by:
-    Skills from group: Drones (8 of 26)
+    Skills from group: Drones (8 of 27)
    """

    type = 'passive'
@@ -6990,6 +7015,7 @@ class Effect2432(BaseEffect):
    Implants named like: Mindflood Booster (4 of 4)
    Modules named like: Semiconductor Memory Cell (8 of 8)
    Implant: Antipharmakon Aeolis
+    Implant: Basic Capsuleer Engineering Augmentation Chip
    Implant: Genolution Core Augmentation CA-1
    Skill: Capacitor Management
    """
@@ -7094,6 +7120,8 @@ class Effect2485(BaseEffect):
    implantArmorHpBonus2

    Used by:
+    Implants named like: Capsuleer Defense Augmentation Chip (3 of 3)
+    Implants named like: Festival only 'Rock' AH Dose (4 of 4)
    Implants named like: Inherent Implants 'Noble' Hull Upgrades HG (7 of 7)
    Implant: Genolution Core Augmentation CA-4
    Implant: Imperial Navy Modified 'Noble' Implant
@@ -7844,10 +7872,7 @@ class Effect2735(BaseEffect):
    boosterArmorHpPenalty

    Used by:
-    Implants named like: Crash Booster (3 of 4)
-    Implants named like: Exile Booster (3 of 4)
-    Implants named like: Frentix Booster (3 of 4)
-    Implants named like: X Instinct Booster (3 of 4)
+    Implants named like: Booster (12 of 40)
    """

    attr = 'boosterArmorHPPenalty'
@@ -8697,6 +8722,8 @@ class Effect2881(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    Implant: Festival-only 'Longbow' CM3 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -8713,6 +8740,8 @@ class Effect2882(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    Implant: Festival-only 'Longbow' CM3 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -8729,6 +8758,8 @@ class Effect2883(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    Implant: Festival-only 'Longbow' CM3 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -8745,6 +8776,8 @@ class Effect2884(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    Implant: Festival-only 'Longbow' CM3 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -8761,7 +8794,7 @@ class Effect2885(BaseEffect):

    Used by:
    Implants named like: Eifyr and Co. 'Alchemist' Gas Harvesting GH (3 of 3)
-    Implant: ORE 'Harvester' Efficiency 11-11
+    Implants named like: ORE 'Harvester' Efficiency (2 of 2)
    """

    type = 'passive'
@@ -8778,6 +8811,8 @@ class Effect2887(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' RD2 Dose
    """

    type = 'passive'
@@ -8794,6 +8829,8 @@ class Effect2888(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' RD2 Dose
    """

    type = 'passive'
@@ -8810,6 +8847,8 @@ class Effect2889(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' RD2 Dose
    """

    type = 'passive'
@@ -8826,6 +8865,8 @@ class Effect2890(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' RD2 Dose
    """

    type = 'passive'
@@ -8841,6 +8882,7 @@ class Effect2891(BaseEffect):
    missileEMDmgBonusStandard

    Used by:
+    Implants named like: Festival only 'Longbow' MD Dose (2 of 2)
    Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
    """

@@ -8857,6 +8899,7 @@ class Effect2892(BaseEffect):
    missileExplosiveDmgBonusStandard

    Used by:
+    Implants named like: Festival only 'Longbow' MD Dose (2 of 2)
    Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
    """

@@ -8873,6 +8916,7 @@ class Effect2893(BaseEffect):
    missileKineticDmgBonusStandard

    Used by:
+    Implants named like: Festival only 'Longbow' MD Dose (2 of 2)
    Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
    """

@@ -8889,6 +8933,7 @@ class Effect2894(BaseEffect):
    missileThermalDmgBonusStandard

    Used by:
+    Implants named like: Festival only 'Longbow' MD Dose (2 of 2)
    Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
    """

@@ -8906,6 +8951,8 @@ class Effect2899(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    Implant: Festival-only 'Longbow' HM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -8922,6 +8969,8 @@ class Effect2900(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    Implant: Festival-only 'Longbow' HM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -8938,6 +8987,8 @@ class Effect2901(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    Implant: Festival-only 'Longbow' HM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -8954,6 +9005,8 @@ class Effect2902(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    Implant: Festival-only 'Longbow' HM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -8970,6 +9023,8 @@ class Effect2903(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    Implant: Festival-only 'Longbow' HAM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -8986,6 +9041,8 @@ class Effect2904(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    Implant: Festival-only 'Longbow' HAM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -9002,6 +9059,8 @@ class Effect2905(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    Implant: Festival-only 'Longbow' HAM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -9018,6 +9077,8 @@ class Effect2906(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    Implant: Festival-only 'Longbow' HAM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
    """

    type = 'passive'
@@ -9034,6 +9095,8 @@ class Effect2907(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' TP3 Dose
    """

    type = 'passive'
@@ -9050,6 +9113,8 @@ class Effect2908(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' TP3 Dose
    """

    type = 'passive'
@@ -9066,6 +9131,8 @@ class Effect2909(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' TP3 Dose
    """

    type = 'passive'
@@ -9082,6 +9149,8 @@ class Effect2910(BaseEffect):

    Used by:
    Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' TP3 Dose
    """

    type = 'passive'
@@ -12514,6 +12583,7 @@ class Effect3999(BaseEffect):
    Used by:
    Celestials named like: Class Pulsar Effects (6 of 6)
    Celestials named like: Incursion Effect (2 of 2)
+    Celestials named like: Volatile Ice Storm (2 of 2)
    Celestial: Strong Metaliminal Plasma Firestorm
    Celestial: Weak Metaliminal Plasma Firestorm
    """
@@ -13458,6 +13528,7 @@ class Effect4138(BaseEffect):

    Used by:
    Celestials named like: Class Wolf Rayet Effects (6 of 6)
+    Celestials named like: Volatile Ice Storm (2 of 2)
    Celestial: Strong Metaliminal Plasma Firestorm
    Celestial: Weak Metaliminal Plasma Firestorm
    """
@@ -13577,7 +13648,7 @@ class Effect4161(BaseEffect):

    Used by:
    Implants named like: Poteque 'Prospector' Astrometric Pinpointing AP (3 of 3)
-    Implant: Poteque 'Prospector' Sharpeye 11-11
+    Implants named like: Poteque 'Prospector' Sharpeye (2 of 2)
    Skill: Astrometric Pinpointing
    Skill: Astrometrics
    """
@@ -13599,9 +13670,9 @@ class Effect4162(BaseEffect):
    Used by:
    Modules from group: Scan Probe Launcher (4 of 7)
    Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)
+    Implants named like: Poteque 'Prospector' Sharpeye (2 of 2)
    Implants named like: grade Virtue (10 of 12)
    Modules named like: Gravity Capacitor Upgrade (8 of 8)
-    Implant: Poteque 'Prospector' Sharpeye 11-11
    Implant: Serenity YC122.9 Season Booster - Probe Scanning Strength
    Skill: Astrometric Rangefinding
    Skill: Astrometrics
@@ -16421,7 +16492,6 @@ class Effect4902(BaseEffect):
    Used by:
    Ships from group: Assault Frigate (9 of 13)
    Ships from group: Command Destroyer (5 of 5)
-    Ships from group: Heavy Assault Cruiser (9 of 12)
    """

    type = 'passive'
@@ -18115,9 +18185,9 @@ class Effect5168(BaseEffect):

    @staticmethod
    def handler(fit, container, context, projectionRange, **kwargs):
-        fit.drones.filteredItemIncrease(lambda drone: drone.item.requiresSkill('Salvage Drone Operation'),
-                                        'accessDifficultyBonus',
-                                        container.getModifiedItemAttr('accessDifficultyBonus') * container.level, **kwargs)
+        fit.drones.filteredItemIncrease(
+            lambda drone: drone.item.requiresSkill('Salvage Drone Operation'), 'accessDifficultyBonus',
+            container.getModifiedItemAttr('accessDifficultyBonus') * container.level, **kwargs)


 class Effect5180(BaseEffect):
@@ -30244,13 +30314,24 @@ class Effect6658(BaseEffect):
                                                  mod.item.requiresSkill('Large Hybrid Turret') or
                                                  mod.item.requiresSkill('Large Projectile Turret'),
                                      'falloff', src.getModifiedItemAttr('falloffBonus'),
-                                      stackingPenalties=True, **kwargs)
+                                      stackingPenalties=True, penaltyGroup='postPerc', **kwargs)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret') or
+                                                  mod.item.requiresSkill('Large Hybrid Turret') or
+                                                  mod.item.requiresSkill('Large Projectile Turret'),
+                                      'speed', src.getModifiedItemAttr('siegeTurretDamageBonus'),
+                                      stackingPenalties=True, penaltyGroup='postPerc', **kwargs)

        # Missiles
        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes') or
                                                    mod.charge.requiresSkill('Cruise Missiles') or
                                                    mod.charge.requiresSkill('Heavy Missiles'),
                                        'maxVelocity', src.getModifiedItemAttr('missileVelocityBonus'), **kwargs)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cruise Missiles') or
+                                                  mod.item.requiresSkill('Torpedoes') or
+                                                  mod.item.requiresSkill('Torpedo Specialization') or
+                                                  mod.item.requiresSkill('Cruise Missile Specialization'),
+                                      'speed', src.getModifiedItemAttr('siegeMissileDamageBonus'),
+                                      stackingPenalties=True, **kwargs)

        # Tanking
        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
@@ -30263,7 +30344,6 @@ class Effect6658(BaseEffect):
        # Speed penalty
        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), **kwargs)

-        # @todo: test these for April 2016 release
        # Max locked targets
        fit.ship.forceItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargets'), **kwargs)

@@ -30276,6 +30356,7 @@ class Effect6658(BaseEffect):
        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'), **kwargs)
        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'), **kwargs)
        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'), **kwargs)
+        # This one was removed from expressions, but somehow MJD is still blocked, so leaving it here
        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Micro Jump Drive Operation'),
                                         'activationBlocked', src.getModifiedItemAttr('activationBlockedStrenght'), **kwargs)
        fit.ship.boostItemAttr('targetPainterResistance', src.getModifiedItemAttr('targetPainterResistanceBonus'), **kwargs)
@@ -36452,7 +36533,6 @@ class Effect8039(BaseEffect):
    upwellSkillaoeVelocityaoeCloudSizeBonus

    Used by:
-    Implants named like: EDENCOM Vorton Booster GU (3 of 3)
    Skill: Vorton Arc Guidance
    """

@@ -36686,22 +36766,6 @@ class Effect8062(BaseEffect):
        module.multiplyItemAttr('aoeVelocity', module.getModifiedChargeAttr('aoeVelocityBonus') or 0, **kwargs)


-class Effect8064(BaseEffect):
-    """
-    vortonProjectorOptimalRangeBonus
-
-    Used by:
-    Implants named like: EDENCOM Vorton Booster RA (3 of 3)
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, implant, context, projectionRange, **kwargs):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Vorton Projector Operation'),
-                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'), **kwargs)
-
-
 class Effect8065(BaseEffect):
    """
    vortonProjectorSkillRangeBonus
@@ -36718,22 +36782,6 @@ class Effect8065(BaseEffect):
                                      'maxRange', skill.getModifiedItemAttr('rangeSkillBonus') * skill.level, **kwargs)


-class Effect8066(BaseEffect):
-    """
-    vortonProjectorDamageBonus
-
-    Used by:
-    Implants named like: EDENCOM Vorton Booster DA (3 of 3)
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, implant, context, projectionRange, **kwargs):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Vorton Projector Operation'),
-                                      'damageMultiplier', implant.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
-
-
 class Effect8068(BaseEffect):
    """
    shipShieldResistanceBonusMBC1
@@ -36860,6 +36908,7 @@ class Effect8076(BaseEffect):
    systemHullThermalResistance

    Used by:
+    Celestials named like: Volatile Ice Storm (2 of 2)
    Celestial: Strong Metaliminal Plasma Firestorm
    Celestial: Weak Metaliminal Plasma Firestorm
    """
@@ -37218,3 +37267,95 @@ class Effect8102(BaseEffect):
            fit.drones.filteredItemBoost(
                lambda drone: drone.item.requiresSkill('Drones'),
                attr, ship.getModifiedItemAttr('shipBonusRole1'), **kwargs)
+
+
+class Effect8099(BaseEffect):
+    """
+    systemHeatDamageBonus
+
+    Used by:
+    Celestials named like: Metaliminal Yoiul Festival YC 122 Storm (4 of 4)
+    Celestials named like: Volatile Ice Storm (2 of 2)
+    """
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, source, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: 'heatDamage' in mod.itemModifiedAttributes,
+            'heatDamage', source.getModifiedItemAttr('thermodynamicsHeatDamage'), **kwargs)
+
+
+class Effect8103(BaseEffect):
+    """
+    setBonusRapture
+
+    Used by:
+    Implants named like: grade Rapture (18 of 18)
+    """
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.appliedImplants.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Cybernetics'),
+            'capRechargeBonus', src.getModifiedItemAttr('ImplantSetRapture'), **kwargs)
+
+
+class Effect8104(BaseEffect):
+    """
+    salvageDroneSpecBonus
+
+    Used by:
+    Skill: Salvage Drone Specialization
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        lvl = src.level
+        fit.drones.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Salvage Drone Specialization'),
+            'accessDifficultyBonus', src.getModifiedItemAttr('accessDifficultyBonus') * lvl, **kwargs)
+        fit.drones.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Salvage Drone Specialization'),
+            'maxVelocity', src.getModifiedItemAttr('maxVelocityBonus') * lvl, **kwargs)
+
+
+class Effect8106(BaseEffect):
+    """
+    shipPTdamageBonusMB2
+
+    Used by:
+    Ship: Vargur
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMB2'),
+                                      skill='Minmatar Battleship', **kwargs)
+
+
+class Effect8107(BaseEffect):
+    """
+    shipBonusLETcapNeedAB2
+
+    Used by:
+    Ship: Paladin
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAB2'),
+                                      skill='Amarr Battleship', **kwargs)
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -19,7 +19,7 @@


 import json
-from collections import OrderedDict
+import re

 from logbook import Logger
 from sqlalchemy.orm import reconstructor
@@ -33,6 +33,10 @@ from .eqBase import EqBase
 pyfalog = Logger(__name__)


+def _t(x):
+    return x
+
+
 class Effect(EqBase):
    """
    The effect handling class, it is used to proxy and load effect handler code,
@@ -245,6 +249,10 @@ class Item(EqBase):
                pass
        return shortName

+    @property
+    def customName(self):
+        return re.sub(_t('Caustic'), _t('Tachyon'), self.name)
+
    @property
    def attributes(self):
        return self.__attributes
@@ -481,6 +489,10 @@ class Item(EqBase):
    def isCharge(self):
        return self.category.name == 'Charge'

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


 class DamagePattern:
--- a/graphs/data/fitWarpTime/getter.py
+++ b/graphs/data/fitWarpTime/getter.py
@@ -55,7 +55,7 @@ def calculate_time_in_warp(max_warp_speed, max_subwarp_speed, warp_dist):
    k_accel = max_warp_speed
    k_decel = min(max_warp_speed / 3, 2)

-    warp_dropout_speed = max_subwarp_speed / 2
+    warp_dropout_speed = min(max_subwarp_speed / 2, 100)
    max_ms_warp_speed = max_warp_speed * AU_METERS

    accel_dist = AU_METERS
--- a/gui/builtinAdditionPanes/cargoView.py
+++ b/gui/builtinAdditionPanes/cargoView.py
@@ -70,7 +70,7 @@ class CargoView(d.Display):

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

--- a/gui/builtinContextMenus/envEffectAdd.py
+++ b/gui/builtinContextMenus/envEffectAdd.py
@@ -206,16 +206,16 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
            for beacon in sMkt.getGroup("Abyssal Hazards").items:
                if not beacon.isType('projected'):
                    continue
-                groups = (_t('Bioluminescence'), _t('Caustic'), _t('Filament'))
+                groups = (_t('Bioluminescence'), _t('Tachyon'), _t('Filament'))
                for group in groups:
-                    if re.search(group, beacon.name):
+                    if re.search(group, beacon.customName):
                        key = group
                        break
                else:
                    continue

                subsubdata = subdata.groups.setdefault(key, Group())
-                subsubdata.items.append(Entry(beacon.ID, beacon.name, beacon.name))
+                subsubdata.items.append(Entry(beacon.ID, beacon.customName, beacon.customName))
            subdata.sort()

        # PVP weather
--- a/gui/builtinViewColumns/baseName.py
+++ b/gui/builtinViewColumns/baseName.py
@@ -107,17 +107,17 @@ class BaseName(ViewColumn):
        elif isinstance(stuff, Module):
            if self.projectedView:
                # check for projected abyssal name
-                name_check = stuff.item.name[0:-2]
+                name_check = stuff.item.customName[0:-2]
                type = AddEnvironmentEffect.abyssal_mapping.get(name_check, None)
                if type:
                    sMkt = Market.getInstance()
                    type = sMkt.getItem(type)
-                    return "{} {}".format(type.name, stuff.item.name[-1:])
+                    return "{} {}".format(type.name, stuff.item.customName[-1:])

            if stuff.isEmpty:
                return "%s Slot" % FittingSlot(stuff.slot).name.capitalize()
            else:
-                return stuff.item.name
+                return stuff.item.customName
        elif isinstance(stuff, Implant):
            return stuff.item.name
        elif isinstance(stuff, TargetProfile):
--- a/gui/errorDialog.py
+++ b/gui/errorDialog.py
@@ -70,7 +70,13 @@ class ErrorFrame(AuxiliaryFrame):

        from eos.config import gamedata_version, gamedata_date

-        time = datetime.datetime.fromtimestamp(int(gamedata_date)).strftime('%Y-%m-%d %H:%M:%S')
+        if gamedata_date:
+            try:
+                time = datetime.datetime.fromtimestamp(int(gamedata_date)).strftime('%Y-%m-%d %H:%M:%S')
+            except TypeError:
+                time = None
+        else:
+            time = None
        version = "pyfa " + config.getVersion() + '\nEVE Data Version: {} ({})\n\n'.format(gamedata_version, time)  # gui.aboutData.versionString

        desc = _t("pyfa has experienced an unexpected issue. Below is a message that contains crucial \n"
--- a/locale/fr_FR/LC_MESSAGES/lang.po
+++ b/locale/fr_FR/LC_MESSAGES/lang.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: pyfa\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-07-27 15:29+0800\n"
-"PO-Revision-Date: 2020-08-02 17:09\n"
+"PO-Revision-Date: 2020-12-08 14:13\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
@@ -19,155 +19,156 @@ msgstr ""

 #: gui/builtinStatsViews/firepowerViewFull.py:107
 msgid " DPS: "
-msgstr ""
+msgstr " DPS : "

 #: gui/builtinContextMenus/itemRemove.py:44
 msgid " Stack"
-msgstr ""
+msgstr " Empiler"

 #: gui/builtinStatsViews/firepowerViewFull.py:100
 msgid " Volley: "
-msgstr ""
+msgstr " Frappe \n"
+"Alpha: "

 #: gui/builtinItemStatsViews/itemProperties.py:98
 #, python-format
 msgid "%d attribute."
 msgid_plural "%d attributes."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d attribut."
+msgstr[1] "%d attributs."

 #: gui/mainMenuBar.py:73
 msgid "&Backup All Fittings"
-msgstr ""
+msgstr "&Sauvegarder toutes les configurations"

 #: gui/mainMenuBar.py:104
 msgid "&Browse ESI Fittings"
-msgstr ""
+msgstr "&Parcourir les configurations ESI"

 #: gui/mainMenuBar.py:111
 msgid "&Character"
-msgstr ""
+msgstr "&Personnage"

 #: gui/mainMenuBar.py:144
 msgid "&Character Editor"
-msgstr ""
+msgstr "&Editeur de Personnage"

 #: gui/mainMenuBar.py:70
 msgid "&Close All Tabs"
-msgstr ""
+msgstr "Fermer tout les onglets"

 #: gui/mainMenuBar.py:69
 msgid "&Close Tab"
-msgstr ""
+msgstr "Fermer l'onglet"

 #: gui/mainMenuBar.py:150
 msgid "&Damage Pattern Editor"
-msgstr ""
+msgstr "&Éditeur de modèles de dégâts"

 #: gui/mainMenuBar.py:143
 msgid "&Editors"
-msgstr ""
+msgstr "Éditeurs"

 #: gui/mainMenuBar.py:92
 msgid "&Export Fitting"
-msgstr ""
+msgstr "&Exporter la configuration"

 #: gui/mainMenuBar.py:119
 msgid "&Export Skills Needed"
-msgstr ""
+msgstr "&Exporter les compétences requises"

 #: gui/mainMenuBar.py:66 gui/propertyEditor.py:42
 msgid "&File"
-msgstr ""
+msgstr "&Fichier"

 #: gui/mainMenuBar.py:161
 msgid "&Forums"
-msgstr ""
+msgstr "&Forums"

 #: gui/mainMenuBar.py:88
 msgid "&From Clipboard"
-msgstr ""
+msgstr "Depuis le presse-papiers"

 #: gui/mainMenuBar.py:135
 msgid "&Global"
-msgstr ""
+msgstr "Général"

 #: gui/mainMenuBar.py:96
 msgid "&Graphs"
-msgstr ""
+msgstr "&Graphiques"

 #: gui/mainMenuBar.py:159
 msgid "&Help"
-msgstr ""
+msgstr "&Aide"

 #: gui/mainMenuBar.py:147
 msgid "&Implant Set Editor"
-msgstr ""
+msgstr "&Éditeur de groupe d'implants"

 #: gui/mainMenuBar.py:118
 msgid "&Import Character File"
-msgstr ""
+msgstr "&Importer un fichier de personnage"

 #: gui/mainMenuBar.py:91
 msgid "&Import Fittings"
-msgstr ""
+msgstr "&Importer des configurations"

 #: gui/mainMenuBar.py:122
 msgid "&Manage ESI Characters"
-msgstr ""
+msgstr "&Gérer les personnages ESI"

 #: gui/mainMenuBar.py:68
 msgid "&New Tab"
-msgstr ""
+msgstr "&Nouvel onglet"

 #: gui/mainMenuBar.py:95
 msgid "&Optimize Fit Price"
-msgstr ""
+msgstr "&Optimiser le prix de la configuration"

 #: gui/mainMenuBar.py:137
 msgid "&Preferences"
-msgstr ""
+msgstr "&Préférences"

 #: gui/mainMenuBar.py:84
 msgid "&Redo"
-msgstr ""
+msgstr "&Répéter"

 #: gui/mainMenuBar.py:115
 msgid "&Revert Character"
-msgstr ""
+msgstr "&Rétablir le personnage"

 #: gui/mainMenuBar.py:113
 msgid "&Save Character"
-msgstr ""
+msgstr "&Enregistrer le personnage"

 #: gui/mainMenuBar.py:153
 msgid "&Target Profile Editor"
-msgstr ""
+msgstr "Éditeur de profil de cible"

 #: gui/mainMenuBar.py:87
 msgid "&To Clipboard"
-msgstr ""
+msgstr "Ajouter au presse-papier"

 #: gui/mainFrame.py:690
 msgid "&Turn Overrides Off"
-msgstr ""
+msgstr "&Désactiver les surchauffes"

 #: gui/mainFrame.py:690 gui/mainMenuBar.py:131
 msgid "&Turn Overrides On"
-msgstr ""
+msgstr "&Activer les surchauffes"

 #: gui/mainMenuBar.py:83
 msgid "&Undo"
-msgstr ""
+msgstr "&Annuler"

 #: gui/mainMenuBar.py:160
 msgid "&Wiki"
-msgstr ""
+msgstr "&Wiki"

 #: gui/builtinPreferenceViews/pyfaDatabasePreferences.py:25
 #: gui/builtinPreferenceViews/pyfaLoggingPreferences.py:29
 msgid "(Cannot be changed while pyfa is running. Set via command line switches.)"
-msgstr ""
+msgstr "(Ne peut pas être modifié pendant que pyfa est en cours d'exécution. Peut se modifier via les arguments de lancement)"

 #: gui/builtinStatsViews/capacitorViewFull.py:81
 msgid "0s"
@@ -175,7 +176,7 @@ msgstr ""

 #: gui/builtinContextMenus/fighterAbilities.py:33
 msgid "Abilities"
-msgstr ""
+msgstr "Capacités"

 #: eos/saveddata/damagePattern.py:95 eos/saveddata/damagePattern.py:96
 #: eos/saveddata/damagePattern.py:97 eos/saveddata/damagePattern.py:98
@@ -227,15 +228,15 @@ msgstr ""
 #: eos/saveddata/targetProfile.py:186 eos/saveddata/targetProfile.py:187
 #: eos/saveddata/targetProfile.py:188 eos/saveddata/targetProfile.py:189
 msgid "Abyssal"
-msgstr ""
+msgstr "Abysses"

 #: gui/builtinContextMenus/envEffectAdd.py:119
 msgid "Abyssal Weather"
-msgstr ""
+msgstr "Météo abyssale"

 #: gui/builtinItemStatsViews/itemEffects.py:31
 msgid "Active"
-msgstr ""
+msgstr "Activé(e)"

 #: gui/builtinViewColumns/abilities.py:37
 msgid "Active Abilities"
@@ -251,7 +252,7 @@ msgstr ""

 #: gui/esiFittings.py:350
 msgid "Add Character"
-msgstr ""
+msgstr "Ajouter un personnage"

 #: gui/esiFittings.py:183
 msgid "Add Character Error"
--- a/service/jargon/defaults.yaml
+++ b/service/jargon/defaults.yaml
@@ -983,19 +983,19 @@ slave:
 # Ammo
 lm:
  - '(^| )lm'  # Checking only beginning of a word to remove unwanted spam
-  - 'light missile(?! (launcher|bay))'
+  - 'light missile'
 hm:
  - '(^| )hm'  # Checking only beginning of a word to remove a few unwanted results
-  - 'heavy missile(?! (launcher|bay))'
+  - 'heavy missile'
 ham:
  - '(^| )ham'  # Checking only beginning of a word to remove a few unwanted results
-  - 'heavy assault missile(?! (launcher|bay))'
+  - 'heavy assault missile'
 cm:
  - '(^| )cm'  # Checking only beginning of a word to remove unwanted spam such as "ECM"
-  - 'cruise missile(?! (launcher|bay))'
+  - 'cruise missile'
 xlcm:
  - 'xlcm'
-  - 'xl cruise missile(?! (launcher|bay))'
+  - 'xl cruise missile'
 fof:
  - 'fof'
  - 'auto-targeting (.+ )?missile'
--- a/service/market.py
+++ b/service/market.py
@@ -426,7 +426,15 @@ class Market:
            "Structure",
            "Structure Module",
        )
-        self.SEARCH_GROUPS = ("Ice Product", "Cargo Container", "Secure Cargo Container", "Audit Log Secure Container", "Freight Container")
+        self.SEARCH_GROUPS = (
+            "Ice Product",
+            "Cargo Container",
+            "Secure Cargo Container",
+            "Audit Log Secure Container",
+            "Freight Container",
+            "Jump Filaments",
+            "Triglavian Space Filaments"
+        )
        self.ROOT_MARKET_GROUPS = (9,  # Ship Equipment
                                   1111,  # Rigs
                                   157,  # Drones
@@ -435,7 +443,8 @@ class Market:
                                   24,  # Implants & Boosters
                                   404,  # Deployable Structures
                                   2202,  # Structure Equipment
-                                   2203  # Structure Modifications
+                                   2203,  # Structure Modifications
+                                   2456  # Filaments
                                   )
        self.SHOWN_MARKET_GROUPS = eos.db.getMarketTreeNodeIds(self.ROOT_MARKET_GROUPS)
        self.FIT_CATEGORIES = ['Ship']
--- 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
@@ -533,7 +533,7 @@
    "description_es": "Used for resistance.\r\n0.0 = 100% 1.0 = 0%\r\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%", 
+    "description_ja": "抵抗で使用。\n0.0 = 100% 1.0 = 0%\r\n", 
    "description_ko": "저항력 표기에 사용됩니다.<br>0.0 = 100% 1.0 = 0%\n", 
    "description_ru": "Используется для обозначения силы сопротивления.\n0.0 = 100%\n1.0 = 0%", 
    "description_zh": "用于抗性。0.0 = 100% 1.0 = 0%", 
@@ -556,7 +556,7 @@
    "description_es": "Used for multipliers displayed as %\r\n1.1 = +10%\r\n0.9 = -10%", 
    "description_fr": "Utilisé pour les multiplicateurs affichés en % 1,1 = +10 % 0,9 = -10 %", 
    "description_it": "Used for multipliers displayed as %\r\n1.1 = +10%\r\n0.9 = -10%", 
-    "description_ja": "% として表示される乗数で使用\n1.1 = +10%\n\n0.9 = -10%", 
+    "description_ja": "% として表示される乗数で使用\n1.1 = +10%\r\n0.9 = -10%", 
    "description_ko": "%로 나타낸 승수 표기에 사용됩니다.<br>1.1 = +10%<br>0.9 = -10%", 
    "description_ru": "Используется для обозначения множителей, выражаемых в процентах\n1.1 = +10%\n0.9 = -10%", 
    "description_zh": "用于乘数，显示为 %\n1.1 = +10%\n0.9 = -10%", 
@@ -579,7 +579,7 @@
    "description_es": "Used to modify damage resistance. Damage resistance bonus.\r\n0.1 = 90%\r\n0.9 = 10%", 
    "description_fr": "Utilisé pour modifier la résistance aux dégâts. Bonus de résistance aux dégâts. 0,1 = 90% 0,9 = 10%", 
    "description_it": "Used to modify damage resistance. Damage resistance bonus.\r\n0.1 = 90%\r\n0.9 = 10%", 
-    "description_ja": "ダメージレジスタンスを変更するときに使用。ダメージレジスタンスボーナス。\n\n0.1 = 90%\n0.9 = 0%", 
+    "description_ja": "ダメージレジスタンスを変更するときに使用。ダメージレジスタンスボーナス。\r\n0.1 = 90%\n0.9 = 0%", 
    "description_ko": "피해 저항력 변경에 사용됩니다. 피해 저항력 보너스.<br>0.1 = 90%<br>0.9 = 10%", 
    "description_ru": "Используется для указания изменений сопротивляемости различным видам ущерба. Бонус к сопротивляемости различным видам ущерба.\n0.1 = 90%\n0.9 = 10%", 
    "description_zh": "用来调整伤害抗性。伤害抗性加成。0.1 = 90%\n0.9 = 10%", 
@@ -687,18 +687,18 @@
    "description_es": "1=small 2=medium 3=large 4=x-large", 
    "description_fr": "1=small 2=medium 3=large 4=x-large", 
    "description_it": "1=small 2=medium 3=large 4=x-large", 
-    "description_ja": "1=small 2=medium 3=large 4=x-large", 
+    "description_ja": "1=小型 2=中型 3=大型 4=超大型", 
    "description_ko": "1=소형 2=중형 3=대형 4=초대형", 
    "description_ru": "1=малый 2=средний 3=большой 4=оч. большой", 
    "description_zh": "1=小型 2=中型 3=大型 4=超大型", 
    "descriptionID": 318074, 
    "displayName_de": "1=small 2=medium 3=l", 
-    "displayName_en-us": "", 
-    "displayName_es": "", 
+    "displayName_en-us": "1=small 2=medium 3=l", 
+    "displayName_es": "1=small 2=medium 3=l", 
    "displayName_fr": "1 = petit 2 = intermédiaire 3 = l", 
-    "displayName_it": "", 
+    "displayName_it": "1=small 2=medium 3=l", 
    "displayName_ja": "1=小 2=中 3=大", 
-    "displayName_ko": "", 
+    "displayName_ko": "1= 소형 2= 중형 3= 대형", 
    "displayName_ru": "1=малые 2=средние 3=б", 
    "displayName_zh": "1=小型  2=中型  3=大型", 
    "displayNameID": 78038, 
@@ -1004,12 +1004,12 @@
    "description_zh": "用于显示布尔标记 1=True 0=False", 
    "descriptionID": 78000, 
    "displayName_de": "1=True 0=False", 
-    "displayName_en-us": "", 
-    "displayName_es": "", 
+    "displayName_en-us": "1=True 0=False", 
+    "displayName_es": "1=True 0=False", 
    "displayName_fr": "1 = vrai 0 = faux", 
-    "displayName_it": "", 
+    "displayName_it": "1=True 0=False", 
    "displayName_ja": "1=True 0=False", 
-    "displayName_ko": "", 
+    "displayName_ko": "1= 참 0= 거짓", 
    "displayName_ru": "1=True 0=False", 
    "displayName_zh": "1=True 0=False", 
    "displayNameID": 78053, 
@@ -1139,7 +1139,7 @@
    "description_es": "AU per second", 
    "description_fr": "UA par seconde", 
    "description_it": "AU per second", 
-    "description_ja": "AU per second", 
+    "description_ja": "天文単位毎秒", 
    "description_ko": "AU/s", 
    "description_ru": "а. е. в секунду", 
    "description_zh": "AU每秒", 
@@ -1149,7 +1149,7 @@
    "displayName_es": "AU/s", 
    "displayName_fr": "UA/s", 
    "displayName_it": "AU/s", 
-    "displayName_ja": "AU/s", 
+    "displayName_ja": "AU/秒", 
    "displayName_ko": "AU/s", 
    "displayName_ru": "а. е./сек.", 
    "displayName_zh": "AU/s", 
--- a/staticdata/fsd_binary/marketgroups.0.json
+++ b/staticdata/fsd_binary/marketgroups.0.json
--- a/staticdata/fsd_binary/metagroups.0.json
+++ b/staticdata/fsd_binary/metagroups.0.json
@@ -113,7 +113,7 @@
    "name_es": "Abyssal", 
    "name_fr": "Abîme", 
    "name_it": "Abyssal", 
-    "name_ja": "Abyssal", 
+    "name_ja": "アビサル", 
    "name_ko": "어비설", 
    "name_ru": "Бездна", 
    "name_zh": "深渊", 
@@ -125,7 +125,7 @@
    "description_es": "This item is only available through the New Eden Store or exclusive offers.", 
    "description_fr": "Cet objet n'est disponible que dans le magasin New Eden ou lors d'offres exclusives.", 
    "description_it": "This item is only available through the New Eden Store or exclusive offers.", 
-    "description_ja": "This item is only available through the New Eden Store or exclusive offers.", 
+    "description_ja": "このアイテムは、ニューエデンストアまたは限定特典でしか手に入らないアイテムです。", 
    "description_ko": "뉴에덴 스토어 및 특별한 오퍼를 통해서만 획득가능한 아이템입니다.", 
    "description_ru": "Этот предмет доступен только в игровом магазине и в составе эксклюзивного предложения.", 
    "description_zh": "此物品只能通过新伊甸商城或专享活动获得。", 
@@ -137,7 +137,7 @@
    "name_es": "Premium", 
    "name_fr": "Premium", 
    "name_it": "Premium", 
-    "name_ja": "Premium", 
+    "name_ja": "プレミアム", 
    "name_ko": "프리미엄", 
    "name_ru": "Эксклюзив", 
    "name_zh": "高级", 
@@ -149,7 +149,7 @@
    "description_es": "This item is only available for a limited time.", 
    "description_fr": "Cet objet n'est disponible que pour une durée limitée.", 
    "description_it": "This item is only available for a limited time.", 
-    "description_ja": "This item is only available for a limited time.", 
+    "description_ja": "このアイテムは期間限定です。", 
    "description_ko": "한정판 아이템입니다.", 
    "description_ru": "Этот предмет доступен только в течение ограниченного времени.", 
    "description_zh": "此物品只能在特定的有限时间内获得。", 
@@ -161,7 +161,7 @@
    "name_es": "Limited Time", 
    "name_fr": "Durée limitée", 
    "name_it": "Limited Time", 
-    "name_ja": "Limited Time", 
+    "name_ja": "期間限定", 
    "name_ko": "한정기간", 
    "name_ru": "Ограниченное время", 
    "name_zh": "限时", 
@@ -175,7 +175,7 @@
    "name_es": "Structure Faction", 
    "name_fr": "Faction de structure", 
    "name_it": "Structure Faction", 
-    "name_ja": "Structure Faction", 
+    "name_ja": "ストラクチャ勢力", 
    "name_ko": "팩션 구조물", 
    "name_ru": "Армейское сооружение", 
    "name_zh": "势力建筑", 
@@ -189,7 +189,7 @@
    "name_es": "Structure Tech II", 
    "name_fr": "Structure de Tech II", 
    "name_it": "Structure Tech II", 
-    "name_ja": "Structure Tech II", 
+    "name_ja": "ストラクチャT2", 
    "name_ko": "구조물 테크 II", 
    "name_ru": "Сооружение второй техкатегории", 
    "name_zh": "二级科技建筑", 
@@ -203,7 +203,7 @@
    "name_es": "Structure Tech I", 
    "name_fr": "Structure de Tech I", 
    "name_it": "Structure Tech I", 
-    "name_ja": "Structure Tech I", 
+    "name_ja": "ストラクチャT1", 
    "name_ko": "구조물 테크 I", 
    "name_ru": "Сооружение первой техкатегории", 
    "name_zh": "一级科技建筑", 
--- a/staticdata/fsd_binary/requiredskillsfortypes.0.json
+++ b/staticdata/fsd_binary/requiredskillsfortypes.0.json
@@ -11174,7 +11174,6 @@
    "17940": 1
  }, 
  "17478": {
-    "3410": 3, 
    "17940": 1
  }, 
  "17480": {
@@ -19415,7 +19414,7 @@
    "3323": 1
  }, 
  "32787": {
-    "3436": 4, 
+    "3436": 1, 
    "3440": 1, 
    "25863": 2
  }, 
@@ -20658,7 +20657,6 @@
    "20342": 5
  }, 
  "34328": {
-    "20342": 1, 
    "34327": 1
  }, 
  "34375": {
@@ -25601,6 +25599,17 @@
  "55747": {
    "3402": 1
  }, 
+  "55760": {
+    "3436": 1, 
+    "3440": 5, 
+    "25863": 4, 
+    "57164": 1
+  }, 
+  "55761": {
+    "3436": 1, 
+    "3440": 4, 
+    "25863": 4
+  }, 
  "55803": {
    "3402": 1
  }, 
@@ -25804,6 +25813,12 @@
  "56835": {
    "3402": 1
  }, 
+  "56871": {
+    "21718": 1
+  }, 
+  "56950": {
+    "16281": 1
+  }, 
  "56970": {
    "3402": 1
  }, 
@@ -25843,6 +25858,27 @@
  "56995": {
    "3402": 1
  }, 
+  "57000": {
+    "3402": 1
+  }, 
+  "57001": {
+    "3402": 1
+  }, 
+  "57002": {
+    "3402": 1
+  }, 
+  "57027": {
+    "16281": 1
+  }, 
+  "57028": {
+    "16281": 1
+  }, 
+  "57029": {
+    "21718": 1
+  }, 
+  "57030": {
+    "21718": 1
+  }, 
  "57035": {
    "3402": 1
  }, 
@@ -25851,5 +25887,141 @@
  }, 
  "57037": {
    "3402": 1
+  }, 
+  "57110": {
+    "3411": 2
+  }, 
+  "57111": {
+    "3411": 2
+  }, 
+  "57112": {
+    "3411": 3
+  }, 
+  "57113": {
+    "3411": 3
+  }, 
+  "57114": {
+    "3411": 4
+  }, 
+  "57116": {
+    "3411": 5
+  }, 
+  "57117": {
+    "3411": 2
+  }, 
+  "57118": {
+    "3411": 2
+  }, 
+  "57119": {
+    "3411": 3
+  }, 
+  "57120": {
+    "3411": 3
+  }, 
+  "57121": {
+    "3411": 4
+  }, 
+  "57122": {
+    "3411": 5
+  }, 
+  "57123": {
+    "3411": 2
+  }, 
+  "57124": {
+    "3411": 2
+  }, 
+  "57125": {
+    "3411": 3
+  }, 
+  "57126": {
+    "3411": 3
+  }, 
+  "57127": {
+    "3411": 4
+  }, 
+  "57128": {
+    "3411": 5
+  }, 
+  "57164": {
+    "3440": 5, 
+    "25863": 4
+  }, 
+  "57201": {
+    "3402": 1
+  }, 
+  "57209": {
+    "3402": 1
+  }, 
+  "57210": {
+    "3402": 1
+  }, 
+  "57211": {
+    "3402": 1
+  }, 
+  "57212": {
+    "3402": 1
+  }, 
+  "57287": {
+    "3402": 1
+  }, 
+  "57288": {
+    "3402": 1
+  }, 
+  "57289": {
+    "3402": 1
+  }, 
+  "57290": {
+    "3402": 1
+  }, 
+  "57291": {
+    "3402": 1
+  }, 
+  "57292": {
+    "3402": 1
+  }, 
+  "57293": {
+    "3402": 1
+  }, 
+  "57294": {
+    "3402": 1
+  }, 
+  "57295": {
+    "3402": 1
+  }, 
+  "57311": {
+    "3402": 1
+  }, 
+  "57312": {
+    "3402": 1
+  }, 
+  "57313": {
+    "3402": 1
+  }, 
+  "57335": {
+    "21718": 1
+  }, 
+  "57336": {
+    "21718": 1
+  }, 
+  "57428": {
+    "3402": 1
+  }, 
+  "57430": {
+    "3402": 1
+  }, 
+  "57431": {
+    "3402": 1
+  }, 
+  "57432": {
+    "3402": 1
+  }, 
+  "57433": {
+    "3402": 1
+  }, 
+  "57434": {
+    "3402": 1
+  }, 
+  "57435": {
+    "3402": 1
  }
 }
--- a/staticdata/fsd_binary/typedogma.0.json
+++ b/staticdata/fsd_binary/typedogma.0.json
@@ -92808,6 +92808,10 @@
        "attributeID": 293, 
        "value": -20.0
      }, 
+      {
+        "attributeID": 633, 
+        "value": 8.0
+      }, 
      {
        "attributeID": 1087, 
        "value": 4.0
@@ -131436,7 +131440,7 @@
      }, 
      {
        "attributeID": 30, 
-        "value": 178750.0
+        "value": 168750.0
      }, 
      {
        "attributeID": 47, 
@@ -131444,7 +131448,7 @@
      }, 
      {
        "attributeID": 50, 
-        "value": 90.0
+        "value": 80.0
      }, 
      {
        "attributeID": 51, 
@@ -347042,10 +347046,6 @@
      {
        "attributeID": 1768, 
        "value": 11412.0
-      }, 
-      {
-        "attributeID": 1803, 
-        "value": -50.0
      }
    ], 
    "dogmaEffects": [
@@ -347077,10 +347077,6 @@
        "effectID": 2810, 
        "isDefault": 0
      }, 
-      {
-        "effectID": 4902, 
-        "isDefault": 0
-      }, 
      {
        "effectID": 5644, 
        "isDefault": 0
@@ -347808,10 +347804,6 @@
      {
        "attributeID": 1768, 
        "value": 11425.0
-      }, 
-      {
-        "attributeID": 1803, 
-        "value": -50.0
      }
    ], 
    "dogmaEffects": [
@@ -347827,10 +347819,6 @@
        "effectID": 1087, 
        "isDefault": 0
      }, 
-      {
-        "effectID": 4902, 
-        "isDefault": 0
-      }, 
      {
        "effectID": 5559, 
        "isDefault": 0
@@ -348171,10 +348159,6 @@
      {
        "attributeID": 1768, 
        "value": 11319.0
-      }, 
-      {
-        "attributeID": 1803, 
-        "value": -50.0
      }
    ], 
    "dogmaEffects": [
@@ -348193,10 +348177,6 @@
      {
        "effectID": 1062, 
        "isDefault": 0
-      }, 
-      {
-        "effectID": 4902, 
-        "isDefault": 0
      }
    ]
  }, 
@@ -348535,10 +348515,6 @@
        "attributeID": 1768, 
        "value": 11406.0
      }, 
-      {
-        "attributeID": 1803, 
-        "value": -50.0
-      }, 
      {
        "attributeID": 2014, 
        "value": 5.0
@@ -348549,10 +348525,6 @@
        "effectID": 1084, 
        "isDefault": 0
      }, 
-      {
-        "effectID": 4902, 
-        "isDefault": 0
-      }, 
      {
        "effectID": 5555, 
        "isDefault": 0
@@ -348969,10 +348941,6 @@
      {
        "attributeID": 1768, 
        "value": 11409.0
-      }, 
-      {
-        "attributeID": 1803, 
-        "value": -50.0
      }
    ], 
    "dogmaEffects": [
@@ -349003,10 +348971,6 @@
      {
        "effectID": 1815, 
        "isDefault": 0
-      }, 
-      {
-        "effectID": 4902, 
-        "isDefault": 0
      }
    ]
  }, 
@@ -349723,10 +349687,6 @@
      {
        "attributeID": 1768, 
        "value": 11405.0
-      }, 
-      {
-        "attributeID": 1803, 
-        "value": -50.0
      }
    ], 
    "dogmaEffects": [
@@ -349745,10 +349705,6 @@
      {
        "effectID": 1063, 
        "isDefault": 0
-      }, 
-      {
-        "effectID": 4902, 
-        "isDefault": 0
      }
    ]
  }, 
@@ -350465,10 +350421,6 @@
      {
        "attributeID": 1768, 
        "value": 11337.0
-      }, 
-      {
-        "attributeID": 1803, 
-        "value": -50.0
      }
    ], 
    "dogmaEffects": [
@@ -350484,10 +350436,6 @@
        "effectID": 4645, 
        "isDefault": 0
      }, 
-      {
-        "effectID": 4902, 
-        "isDefault": 0
-      }, 
      {
        "effectID": 5539, 
        "isDefault": 0
@@ -351227,10 +351175,6 @@
      {
        "attributeID": 1768, 
        "value": 11407.0
-      }, 
-      {
-        "attributeID": 1803, 
-        "value": -50.0
      }
    ], 
    "dogmaEffects": [
@@ -351246,10 +351190,6 @@
        "effectID": 1080, 
        "isDefault": 0
      }, 
-      {
-        "effectID": 4902, 
-        "isDefault": 0
-      }, 
      {
        "effectID": 5554, 
        "isDefault": 0
@@ -779522,10 +779462,6 @@
        "attributeID": 182, 
        "value": 17940.0
      }, 
-      {
-        "attributeID": 183, 
-        "value": 3410.0
-      }, 
      {
        "attributeID": 192, 
        "value": 5.0
@@ -779598,10 +779534,6 @@
        "attributeID": 277, 
        "value": 1.0
      }, 
-      {
-        "attributeID": 278, 
-        "value": 3.0
-      }, 
      {
        "attributeID": 283, 
        "value": 25.0
@@ -890851,7 +890783,7 @@
      }, 
      {
        "attributeID": 11, 
-        "value": 780000.0
+        "value": 700000.0
      }, 
      {
        "attributeID": 12, 
@@ -921197,7 +921129,7 @@
      }, 
      {
        "attributeID": 30, 
-        "value": 162500.0
+        "value": 152500.0
      }, 
      {
        "attributeID": 47, 
@@ -921205,7 +921137,7 @@
      }, 
      {
        "attributeID": 50, 
-        "value": 100.0
+        "value": 90.0
      }, 
      {
        "attributeID": 51, 
@@ -932410,7 +932342,7 @@
      }, 
      {
        "attributeID": 554, 
-        "value": -1.5
+        "value": -1.75
      }, 
      {
        "attributeID": 633, 
@@ -932738,7 +932670,7 @@
      }, 
      {
        "attributeID": 554, 
-        "value": -1.75
+        "value": -1.5
      }, 
      {
        "attributeID": 633, 
@@ -1062438,7 +1062370,7 @@
      }, 
      {
        "attributeID": 1888, 
-        "value": 10.0
+        "value": 15.0
      }
    ], 
    "dogmaEffects": [
@@ -1063104,7 +1063036,7 @@
      }, 
      {
        "attributeID": 738, 
-        "value": -5.0
+        "value": -7.5
      }, 
      {
        "attributeID": 739, 
@@ -1063112,7 +1063044,7 @@
      }, 
      {
        "attributeID": 1012, 
-        "value": -15.0
+        "value": -20.0
      }, 
      {
        "attributeID": 1013, 
@@ -1063495,7 +1063427,7 @@
      }, 
      {
        "attributeID": 1012, 
-        "value": 10.0
+        "value": 15.0
      }, 
      {
        "attributeID": 1013, 
--- a/staticdata/fsd_binary/typedogma.1.json
+++ b/staticdata/fsd_binary/typedogma.1.json
@@ -522261,7 +522261,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 91000.0
+        "value": 118300.0
      }, 
      {
        "attributeID": 79, 
@@ -522321,7 +522321,7 @@
      }, 
      {
        "attributeID": 208, 
-        "value": 12.0
+        "value": 21.0
      }, 
      {
        "attributeID": 209, 
@@ -522433,7 +522433,7 @@
      }, 
      {
        "attributeID": 585, 
-        "value": 5.0
+        "value": -10.0
      }, 
      {
        "attributeID": 600, 
@@ -522553,10 +522553,6 @@
      }
    ], 
    "dogmaEffects": [
-      {
-        "effectID": 736, 
-        "isDefault": 0
-      }, 
      {
        "effectID": 3415, 
        "isDefault": 0
@@ -522584,6 +522580,10 @@
      {
        "effectID": 5610, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 8107, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -522652,7 +522652,7 @@
      }, 
      {
        "attributeID": 55, 
-        "value": 1150000.0
+        "value": 1050000.0
      }, 
      {
        "attributeID": 70, 
@@ -522660,7 +522660,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 90000.0
+        "value": 117000.0
      }, 
      {
        "attributeID": 79, 
@@ -522728,7 +522728,7 @@
      }, 
      {
        "attributeID": 210, 
-        "value": 13.0
+        "value": 22.0
      }, 
      {
        "attributeID": 211, 
@@ -522804,7 +522804,7 @@
      }, 
      {
        "attributeID": 482, 
-        "value": 6900.0
+        "value": 8000.0
      }, 
      {
        "attributeID": 484, 
@@ -523059,7 +523059,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 81000.0
+        "value": 105300.0
      }, 
      {
        "attributeID": 79, 
@@ -523123,7 +523123,7 @@
      }, 
      {
        "attributeID": 209, 
-        "value": 11.0
+        "value": 20.0
      }, 
      {
        "attributeID": 210, 
@@ -523215,7 +523215,7 @@
      }, 
      {
        "attributeID": 518, 
-        "value": -5.0
+        "value": 7.5
      }, 
      {
        "attributeID": 524, 
@@ -523351,10 +523351,6 @@
      }
    ], 
    "dogmaEffects": [
-      {
-        "effectID": 604, 
-        "isDefault": 0
-      }, 
      {
        "effectID": 3417, 
        "isDefault": 0
@@ -523382,6 +523378,10 @@
      {
        "effectID": 5560, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 8106, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -523913,7 +523913,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 95000.0
+        "value": 123500.0
      }, 
      {
        "attributeID": 79, 
@@ -523985,7 +523985,7 @@
      }, 
      {
        "attributeID": 211, 
-        "value": 14.0
+        "value": 23.0
      }, 
      {
        "attributeID": 217, 
@@ -726609,7 +726609,7 @@
      }, 
      {
        "attributeID": 279, 
-        "value": 4.0
+        "value": 1.0
      }, 
      {
        "attributeID": 422, 
@@ -761079,7 +761079,7 @@
      }, 
      {
        "attributeID": 73, 
-        "value": 60000.0
+        "value": 30000.0
      }, 
      {
        "attributeID": 182, 
@@ -761233,6 +761233,14 @@
        "attributeID": 2253, 
        "value": 1e-05
      }, 
+      {
+        "attributeID": 2306, 
+        "value": -50.0
+      }, 
+      {
+        "attributeID": 2307, 
+        "value": -50.0
+      }, 
      {
        "attributeID": 2342, 
        "value": -99.9999
@@ -824609,10 +824617,6 @@
      }, 
      {
        "attributeID": 182, 
-        "value": 20342.0
-      }, 
-      {
-        "attributeID": 183, 
        "value": 34327.0
      }, 
      {
@@ -824687,10 +824691,6 @@
        "attributeID": 277, 
        "value": 1.0
      }, 
-      {
-        "attributeID": 278, 
-        "value": 1.0
-      }, 
      {
        "attributeID": 283, 
        "value": 0.0
@@ -849061,10 +849061,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -849351,10 +849347,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -849665,10 +849657,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -850770,10 +850758,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -851084,10 +851068,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -851406,10 +851386,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -851716,10 +851692,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -852018,10 +851990,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -852349,10 +852317,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -852607,10 +852571,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -871020,7 +870980,7 @@
      }, 
      {
        "attributeID": 30, 
-        "value": 178750.0
+        "value": 168750.0
      }, 
      {
        "attributeID": 47, 
@@ -871028,7 +870988,7 @@
      }, 
      {
        "attributeID": 50, 
-        "value": 110.0
+        "value": 100.0
      }, 
      {
        "attributeID": 51, 
@@ -874378,7 +874338,7 @@
      }, 
      {
        "attributeID": 463, 
-        "value": 20.0
+        "value": 10.0
      }, 
      {
        "attributeID": 479, 
@@ -874414,7 +874374,7 @@
      }, 
      {
        "attributeID": 588, 
-        "value": 10.0
+        "value": 20.0
      }, 
      {
        "attributeID": 600, 
@@ -882753,10 +882713,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -891987,10 +891943,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -912673,7 +912625,7 @@
      }, 
      {
        "attributeID": 30, 
-        "value": 146250.0
+        "value": 136250.0
      }, 
      {
        "attributeID": 47, 
@@ -912681,7 +912633,7 @@
      }, 
      {
        "attributeID": 50, 
-        "value": 90.0
+        "value": 80.0
      }, 
      {
        "attributeID": 51, 
@@ -912803,7 +912755,7 @@
      }, 
      {
        "attributeID": 30, 
-        "value": 162500.0
+        "value": 152500.0
      }, 
      {
        "attributeID": 47, 
@@ -912811,7 +912763,7 @@
      }, 
      {
        "attributeID": 50, 
-        "value": 100.0
+        "value": 90.0
      }, 
      {
        "attributeID": 51, 
@@ -912933,7 +912885,7 @@
      }, 
      {
        "attributeID": 30, 
-        "value": 162500.0
+        "value": 152500.0
      }, 
      {
        "attributeID": 47, 
@@ -912941,7 +912893,7 @@
      }, 
      {
        "attributeID": 50, 
-        "value": 100.0
+        "value": 90.0
      }, 
      {
        "attributeID": 51, 
@@ -913063,7 +913015,7 @@
      }, 
      {
        "attributeID": 30, 
-        "value": 162500.0
+        "value": 152500.0
      }, 
      {
        "attributeID": 47, 
@@ -913071,7 +913023,7 @@
      }, 
      {
        "attributeID": 50, 
-        "value": 100.0
+        "value": 90.0
      }, 
      {
        "attributeID": 51, 
@@ -913193,7 +913145,7 @@
      }, 
      {
        "attributeID": 30, 
-        "value": 178750.0
+        "value": 168750.0
      }, 
      {
        "attributeID": 47, 
@@ -913201,7 +913153,7 @@
      }, 
      {
        "attributeID": 50, 
-        "value": 90.0
+        "value": 80.0
      }, 
      {
        "attributeID": 51, 
@@ -913331,7 +913283,7 @@
      }, 
      {
        "attributeID": 30, 
-        "value": 178750.0
+        "value": 168750.0
      }, 
      {
        "attributeID": 47, 
@@ -913339,7 +913291,7 @@
      }, 
      {
        "attributeID": 50, 
-        "value": 90.0
+        "value": 80.0
      }, 
      {
        "attributeID": 51, 
@@ -993708,10 +993660,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -1000314,7 +1000262,7 @@
      }, 
      {
        "attributeID": 1573, 
-        "value": 10.0
+        "value": 25.0
      }, 
      {
        "attributeID": 1768, 
@@ -1000340,6 +1000288,10 @@
        "attributeID": 2610, 
        "value": 0.0
      }, 
+      {
+        "attributeID": 2657, 
+        "value": 25.0
+      }, 
      {
        "attributeID": 2752, 
        "value": -4.0
@@ -1022437,10 +1022389,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -1022643,10 +1022591,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -1043439,7 +1043383,7 @@
      }, 
      {
        "attributeID": 73, 
-        "value": 11700.0
+        "value": 8775.0
      }, 
      {
        "attributeID": 182, 
@@ -1043495,19 +1043439,19 @@
      }, 
      {
        "attributeID": 974, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 975, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 976, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 977, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 1014, 
@@ -1043573,7 +1043517,7 @@
      }, 
      {
        "attributeID": 73, 
-        "value": 11700.0
+        "value": 8775.0
      }, 
      {
        "attributeID": 182, 
@@ -1043629,19 +1043573,19 @@
      }, 
      {
        "attributeID": 974, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 975, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 976, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 977, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 1014, 
@@ -1043707,7 +1043651,7 @@
      }, 
      {
        "attributeID": 73, 
-        "value": 11700.0
+        "value": 8775.0
      }, 
      {
        "attributeID": 182, 
@@ -1043763,19 +1043707,19 @@
      }, 
      {
        "attributeID": 974, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 975, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 976, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 977, 
-        "value": 0.7
+        "value": 0.75
      }, 
      {
        "attributeID": 1014, 
@@ -1043841,7 +1043785,7 @@
      }, 
      {
        "attributeID": 73, 
-        "value": 13500.0
+        "value": 10125.0
      }, 
      {
        "attributeID": 182, 
@@ -1043897,19 +1043841,19 @@
      }, 
      {
        "attributeID": 974, 
-        "value": 0.6
+        "value": 0.7
      }, 
      {
        "attributeID": 975, 
-        "value": 0.6
+        "value": 0.7
      }, 
      {
        "attributeID": 976, 
-        "value": 0.6
+        "value": 0.7
      }, 
      {
        "attributeID": 977, 
-        "value": 0.6
+        "value": 0.7
      }, 
      {
        "attributeID": 1014, 
@@ -1043975,7 +1043919,7 @@
      }, 
      {
        "attributeID": 73, 
-        "value": 14400.0
+        "value": 10800.0
      }, 
      {
        "attributeID": 182, 
@@ -1044031,19 +1043975,19 @@
      }, 
      {
        "attributeID": 974, 
-        "value": 0.6
+        "value": 0.7
      }, 
      {
        "attributeID": 975, 
-        "value": 0.6
+        "value": 0.7
      }, 
      {
        "attributeID": 976, 
-        "value": 0.6
+        "value": 0.7
      }, 
      {
        "attributeID": 977, 
-        "value": 0.6
+        "value": 0.7
      }, 
      {
        "attributeID": 1014, 
@@ -1053161,10 +1053105,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -1053515,10 +1053455,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -1053857,10 +1053793,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -1054199,10 +1054131,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
@@ -1054537,10 +1054465,6 @@
        "attributeID": 2113, 
        "value": 1e-05
      }, 
-      {
-        "attributeID": 2114, 
-        "value": 1e-05
-      }, 
      {
        "attributeID": 2115, 
        "value": 1e-05
--- a/staticdata/fsd_binary/typedogma.2.json
+++ b/staticdata/fsd_binary/typedogma.2.json
--- a/staticdata/fsd_lite/dbuffcollections.0.json
+++ b/staticdata/fsd_lite/dbuffcollections.0.json
@@ -664,7 +664,7 @@
    "displayName_es": "Propulsion disruption module range bonus", 
    "displayName_fr": "Bonus à la portée des modules de perturbation des propulsions", 
    "displayName_it": "Propulsion disruption module range bonus", 
-    "displayName_ja": "タックルモジュール範囲ボーナス", 
+    "displayName_ja": "推進力阻害モジュール範囲ボーナス", 
    "displayName_ko": "추진 방해 모듈 사거리 보너스", 
    "displayName_ru": "Повышен радиус действия средств ограничения подвижности", 
    "displayName_zh": "推进阻扰装备范围加成", 
@@ -1529,7 +1529,7 @@
    "displayName_es": "Remote Armor Repairer Strength Penalty", 
    "displayName_fr": "Pénalité de puissance sur les réparateurs de blindage à distance", 
    "displayName_it": "Remote Armor Repairer Strength Penalty", 
-    "displayName_ja": "リモート装甲修復装置強度ペナルティ", 
+    "displayName_ja": "リモートアーマーリペアラ強度ペナルティ", 
    "displayName_ko": "원격 장갑 수리 강도 페널티", 
    "displayName_ru": "Штраф на силу модулей дистанционного ремонта брони", 
    "displayName_zh": "远程装甲维修器强度惩罚", 
@@ -1631,7 +1631,7 @@
    "displayName_es": "Tether blocked", 
    "displayName_fr": "Arrimage bloqué", 
    "displayName_it": "Tether blocked", 
-    "displayName_ja": "テザリングを禁止", 
+    "displayName_ja": "牽引ブロック中", 
    "displayName_ko": "테더링 차단", 
    "displayName_ru": "Швартовка недоступна", 
    "displayName_zh": "驻留被阻止", 
@@ -1761,7 +1761,7 @@
    "displayName_es": "Signature Radius penalty", 
    "displayName_fr": "Pénalité du rayon de signature", 
    "displayName_it": "Signature Radius penalty", 
-    "displayName_ja": "Signature Radius penalty", 
+    "displayName_ja": "シグネチャ半径ペナルティ", 
    "displayName_ko": "시그니처 반경 페널티", 
    "displayName_ru": "Штраф к радиусу сигнатуры", 
    "displayName_zh": "信号半径惩罚", 
@@ -1785,7 +1785,7 @@
    "displayName_es": "Inertia Bonus", 
    "displayName_fr": "Bonus d'inertie", 
    "displayName_it": "Inertia Bonus", 
-    "displayName_ja": "Inertia Bonus", 
+    "displayName_ja": "慣性ボーナス", 
    "displayName_ko": "관성 계수 보너스", 
    "displayName_ru": "Увеличение инертности", 
    "displayName_zh": "惯性加成", 
@@ -1809,7 +1809,7 @@
    "displayName_es": "Max Velocity Bonus", 
    "displayName_fr": "Bonus de vitesse maximale", 
    "displayName_it": "Max Velocity Bonus", 
-    "displayName_ja": "Max Velocity Bonus", 
+    "displayName_ja": "最高速度ボーナス", 
    "displayName_ko": "최대 속도 보너스", 
    "displayName_ru": "Повышение максимальной скорости", 
    "displayName_zh": "最大速度加成", 
@@ -1833,7 +1833,7 @@
    "displayName_es": "Turret Tracking Speed bonus", 
    "displayName_fr": "Bonus de vitesse de poursuite des tourelles", 
    "displayName_it": "Turret Tracking Speed bonus", 
-    "displayName_ja": "Turret Tracking Speed bonus", 
+    "displayName_ja": "タレット追跡速度ボーナス", 
    "displayName_ko": "터렛 트래킹 속도 보너스", 
    "displayName_ru": "Повышение скорости слежения турелей", 
    "displayName_zh": "炮台跟踪速度加成", 
@@ -1862,7 +1862,7 @@
    "displayName_es": "Penalty to Shield Booster shield bonus", 
    "displayName_fr": "Pénalité du bonus de bouclier de booster de bouclier", 
    "displayName_it": "Penalty to Shield Booster shield bonus", 
-    "displayName_ja": "Penalty to Shield Booster shield bonus", 
+    "displayName_ja": "シールドブースターのシールドボーナス・ペナルティ", 
    "displayName_ko": "실드 부스터의 실드 보너스에 페널티", 
    "displayName_ru": "Штраф к бонусу прочности модуля накачки щитов", 
    "displayName_zh": "护盾回充增量器护盾值惩罚", 
@@ -1891,7 +1891,7 @@
    "displayName_es": "Bonus to Shield Booster duration", 
    "displayName_fr": "Bonus à la durée de booster de bouclier", 
    "displayName_it": "Bonus to Shield Booster duration", 
-    "displayName_ja": "Bonus to Shield Booster duration", 
+    "displayName_ja": "シールドブースター有効時間ボーナス", 
    "displayName_ko": "실드 부스터 사이클 시간 보너스", 
    "displayName_ru": "Ускорение цикла модулей накачки щитов", 
    "displayName_zh": "护盾回充增量器持续时间加成", 
@@ -1920,7 +1920,7 @@
    "displayName_es": "EM Resistance penalty", 
    "displayName_fr": "Pénalité à la résistance EM", 
    "displayName_it": "EM Resistance penalty", 
-    "displayName_ja": "EM Resistance penalty", 
+    "displayName_ja": "EMレジスタンス・ペナルティ", 
    "displayName_ko": "EM 저항력 페널티", 
    "displayName_ru": "Штраф к сопротивляемости ЭМ урону", 
    "displayName_zh": "电磁抗性惩罚", 
@@ -1950,7 +1950,7 @@
    "displayName_es": "Capacitor Recharge bonus", 
    "displayName_fr": "Bonus de recharge du capaciteur", 
    "displayName_it": "Capacitor Recharge bonus", 
-    "displayName_ja": "Capacitor Recharge bonus", 
+    "displayName_ja": "キャパシタリチャージボーナス", 
    "displayName_ko": "캐패시터 충전 보너스", 
    "displayName_ru": "Влияние на перезарядку накопителя", 
    "displayName_zh": "电容回充量加成", 
@@ -1974,7 +1974,7 @@
    "displayName_es": "Explosive Resistance penalty", 
    "displayName_fr": "Pénalité de résistance aux explosifs", 
    "displayName_it": "Explosive Resistance penalty", 
-    "displayName_ja": "Explosive Resistance penalty", 
+    "displayName_ja": "エクスプローシブレジスタンス・ペナルティ", 
    "displayName_ko": "폭발 저항력 페널티", 
    "displayName_ru": "Штраф к сопротивляемости взрывному урону", 
    "displayName_zh": "爆炸抗性惩罚", 
@@ -2004,7 +2004,7 @@
    "displayName_es": "Shield HP bonus", 
    "displayName_fr": "Bonus de PV du bouclier", 
    "displayName_it": "Shield HP bonus", 
-    "displayName_ja": "Shield HP bonus", 
+    "displayName_ja": "シールドHPボーナス", 
    "displayName_ko": "실드량 보너스", 
    "displayName_ru": "Повышение прочности щитов", 
    "displayName_zh": "护盾值加成", 
@@ -2028,7 +2028,7 @@
    "displayName_es": "Thermal Resistance penalty", 
    "displayName_fr": "Pénalité de résistance thermique", 
    "displayName_it": "Thermal Resistance penalty", 
-    "displayName_ja": "Thermal Resistance penalty", 
+    "displayName_ja": "サーマルレジスタンス・ペナルティ", 
    "displayName_ko": "열 저항력 페널티", 
    "displayName_ru": "Штраф к сопротивляемости тепловому урону", 
    "displayName_zh": "热能抗性惩罚", 
@@ -2058,7 +2058,7 @@
    "displayName_es": "Armor HP bonus", 
    "displayName_fr": "Bonus de PV du blindage", 
    "displayName_it": "Armor HP bonus", 
-    "displayName_ja": "Armor HP bonus", 
+    "displayName_ja": "アーマーHPボーナス", 
    "displayName_ko": "장갑 내구도 보너스", 
    "displayName_ru": "Повышение прочности брони", 
    "displayName_zh": "装甲值加成", 
@@ -2082,7 +2082,7 @@
    "displayName_es": "Turret Optimal and Falloff Range penalty", 
    "displayName_fr": "Pénalité de portée optimale et de déperdition des tourelles", 
    "displayName_it": "Turret Optimal and Falloff Range penalty", 
-    "displayName_ja": "Turret Optimal and Falloff Range penalty", 
+    "displayName_ja": "タレットの最適・精度低下範囲ボーナス", 
    "displayName_ko": "터렛 최적사거리 및 유효사거리 페널티", 
    "displayName_ru": "Штраф к оптимальной и добавочной дальности стрельбы турелей", 
    "displayName_zh": "炮台最佳射程和失准范围惩罚", 
@@ -2118,7 +2118,7 @@
    "displayName_es": "Velocity bonus", 
    "displayName_fr": "Bonus de vitesse", 
    "displayName_it": "Velocity bonus", 
-    "displayName_ja": "Velocity bonus", 
+    "displayName_ja": "速度ボーナス", 
    "displayName_ko": "속도 보너스", 
    "displayName_ru": "Повышение скорости", 
    "displayName_zh": "速度加成", 
@@ -2142,7 +2142,7 @@
    "displayName_es": "Kinetic Resistance penalty", 
    "displayName_fr": "Pénalité de résistance cinétique", 
    "displayName_it": "Kinetic Resistance penalty", 
-    "displayName_ja": "Kinetic Resistance penalty", 
+    "displayName_ja": "キネティックレジスタンス・ペナルティ", 
    "displayName_ko": "키네틱 저항력 페널티", 
    "displayName_ru": "Штраф к сопротивляемости кинетическому урону", 
    "displayName_zh": "动能抗性惩罚", 
@@ -2172,7 +2172,7 @@
    "displayName_es": "Scan Resolution bonus", 
    "displayName_fr": "Bonus de résolution du balayage", 
    "displayName_it": "Scan Resolution bonus", 
-    "displayName_ja": "Scan Resolution bonus", 
+    "displayName_ja": "スキャン分解能ボーナス", 
    "displayName_ko": "스캔 해상도 보너스", 
    "displayName_ru": "Влияние на разрешающую способность сенсоров", 
    "displayName_zh": "扫描分辨率加成", 
@@ -2196,7 +2196,7 @@
    "displayName_es": "Reduced Industrial Core Mining Drone Bonus", 
    "displayName_fr": "Bonus réduit de drone d'extraction de cellule industrielle", 
    "displayName_it": "Reduced Industrial Core Mining Drone Bonus", 
-    "displayName_ja": "Reduced Industrial Core Mining Drone Bonus", 
+    "displayName_ja": "工業コア採掘ドローンボーナス減少", 
    "displayName_ko": "산업코어 채굴 드론 보너스 감소", 
    "displayName_ru": "Уменьшен бонус для буровых дронов у промышленного ядра", 
    "displayName_zh": "降低的工业核心采矿无人机加成", 
@@ -2225,7 +2225,7 @@
    "displayName_es": "Damage bonus", 
    "displayName_fr": "Bonus de dégâts", 
    "displayName_it": "Damage bonus", 
-    "displayName_ja": "Damage bonus", 
+    "displayName_ja": "ダメージボーナス", 
    "displayName_ko": "피해량 보너스", 
    "displayName_ru": "Бонус урона", 
    "displayName_zh": "伤害加成", 
@@ -2270,7 +2270,7 @@
    "displayName_es": "Wreck Proximity Disrupting Warp Drives", 
    "displayName_fr": "Une épave à proximité perturbe les propulseurs de warp", 
    "displayName_it": "Wreck Proximity Disrupting Warp Drives", 
-    "displayName_ja": "Wreck Proximity Disrupting Warp Drives", 
+    "displayName_ja": "周囲の残骸によりワープドライブ阻害中", 
    "displayName_ko": "잔해로 인한 워프 드라이브 교란", 
    "displayName_ru": "Близость обломков нарушает работу варп-двигателей", 
    "displayName_zh": "残骸近距干扰跃迁引擎", 
@@ -2313,7 +2313,7 @@
    "displayName_es": "Stasis Webifier Range Bonus", 
    "displayName_fr": "Bonus de portée du générateur de stase", 
    "displayName_it": "Stasis Webifier Range Bonus", 
-    "displayName_ja": "Stasis Webifier Range Bonus", 
+    "displayName_ja": "ステイシスウェビファイヤーの範囲ボーナス", 
    "displayName_ko": "스테이시스 웹 생성기 사거리 보너스", 
    "displayName_ru": "Увеличение дальности действия стазис-индукторов", 
    "displayName_zh": "停滞缠绕光束范围加成", 
@@ -2329,5 +2329,54 @@
    "locationRequiredSkillModifiers": [], 
    "operationName": "PostPercent", 
    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "2109": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Module Heat Damage Reduction", 
+    "displayName_de": "Modul-Hitzeschadenreduktion", 
+    "displayName_en-us": "Module Heat Damage Reduction", 
+    "displayName_es": "Module Heat Damage Reduction", 
+    "displayName_fr": "Réduction des dégâts thermiques des modules", 
+    "displayName_it": "Module Heat Damage Reduction", 
+    "displayName_ja": "モジュール熱ダメージ減少", 
+    "displayName_ko": "모듈 과부하 피해 감소", 
+    "displayName_ru": "Снижение теплового урона для модулей", 
+    "displayName_zh": "装备超载伤害降低", 
+    "displayNameID": 573512, 
+    "itemModifiers": [], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [
+      {
+        "dogmaAttributeID": 1211
+      }
+    ], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "2110": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Webifier Strength Bonus", 
+    "displayName_de": "Bonus auf die Stärke von Stasisnetzen", 
+    "displayName_en-us": "Stasis Webifier Strength Bonus", 
+    "displayName_es": "Stasis Webifier Strength Bonus", 
+    "displayName_fr": "Bonus à la puissance des générateurs de stase", 
+    "displayName_it": "Stasis Webifier Strength Bonus", 
+    "displayName_ja": "ステイシスウェビファイヤーの強度にボーナス", 
+    "displayName_ko": "스테이시스 웹 강도 증가", 
+    "displayName_ru": "Бонус к эффективности стазис-индуктора", 
+    "displayName_zh": "停滞缠绕光束强度加成", 
+    "displayNameID": 574787, 
+    "itemModifiers": [], 
+    "locationGroupModifiers": [
+      {
+        "dogmaAttributeID": 20, 
+        "groupID": 65
+      }
+    ], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
  }
 }
--- a/staticdata/fsd_lite/evecategories.0.json
+++ b/staticdata/fsd_lite/evecategories.0.json
@@ -420,15 +420,15 @@
  }, 
  "41": {
    "categoryID": 41, 
-    "categoryName_de": "Planetarische Interaktion", 
-    "categoryName_en-us": "Planetary Interaction", 
-    "categoryName_es": "Planetary Interaction", 
-    "categoryName_fr": "Interaction planétaire", 
-    "categoryName_it": "Planetary Interaction", 
-    "categoryName_ja": "惑星開発", 
-    "categoryName_ko": "행성 상호작용", 
-    "categoryName_ru": "Эксплуатация ресурсов планет", 
-    "categoryName_zh": "行星互动", 
+    "categoryName_de": "Planetare Industrie", 
+    "categoryName_en-us": "Planetary Industry", 
+    "categoryName_es": "Planetary Industry", 
+    "categoryName_fr": "Industrie planétaire", 
+    "categoryName_it": "Planetary Industry", 
+    "categoryName_ja": "惑星インダストリー", 
+    "categoryName_ko": "행성 개발", 
+    "categoryName_ru": "Планетарная промышленность", 
+    "categoryName_zh": "行星工业", 
    "categoryNameID": 63569, 
    "published": true
  }, 
@@ -593,7 +593,7 @@
    "categoryName_es": "SKINs", 
    "categoryName_fr": "SKINS", 
    "categoryName_it": "SKINs", 
-    "categoryName_ja": "SKINs", 
+    "categoryName_ja": "SKIN", 
    "categoryName_ko": "SKIN", 
    "categoryName_ru": "Окраски", 
    "categoryName_zh": "涂装", 
--- a/staticdata/fsd_lite/evegroups.0.json
+++ b/staticdata/fsd_lite/evegroups.0.json
--- a/staticdata/fsd_lite/evetypes.0.json
+++ b/staticdata/fsd_lite/evetypes.0.json
--- a/staticdata/fsd_lite/evetypes.1.json
+++ b/staticdata/fsd_lite/evetypes.1.json
--- a/staticdata/fsd_lite/evetypes.2.json
+++ b/staticdata/fsd_lite/evetypes.2.json
--- a/staticdata/fsd_lite/evetypes.3.json
+++ b/staticdata/fsd_lite/evetypes.3.json
--- a/staticdata/phobos/metadata.0.json
+++ b/staticdata/phobos/metadata.0.json
@@ -1,10 +1,10 @@
 [
  {
    "field_name": "client_build", 
-    "field_value": 1852074
+    "field_value": 1877575
  }, 
  {
    "field_name": "dump_time", 
-    "field_value": 1606206482
+    "field_value": 1613839852
  }
 ]
--- a/staticdata/phobos/traits.0.json
+++ b/staticdata/phobos/traits.0.json
--- a/version.yml
+++ b/version.yml
@@ -1 +1 @@
-version: v2.32.0
+version: v2.34.0dev2
Author	SHA1	Message	Date
DarkPhoenix	a0317d5b3c	Bump version	2021-02-20 20:23:04 +03:00
DarkPhoenix	a697c1890a	Adjust effects	2021-02-20 20:22:44 +03:00
DarkPhoenix	aaf719437f	Update static data to 1877575	2021-02-20 20:09:24 +03:00
DarkPhoenix	3d6e703b7c	Trigger travis builds only on tags	2021-02-19 21:17:34 +03:00
DarkPhoenix	ce26b22752	Add filament market group	2021-02-19 20:44:57 +03:00
DarkPhoenix	6b30b2859e	Allow adding items to cargo via double-click	2021-02-19 20:39:10 +03:00
DarkPhoenix	961258618a	Make filaments searchable	2021-02-19 20:36:11 +03:00
DarkPhoenix	f07684875f	Use proper attribute for missiles	2021-02-19 10:37:52 +03:00
DarkPhoenix	538954f4a6	Fix vargur damage bonus	2021-02-19 02:16:57 +03:00
DarkPhoenix	30e73ed795	Fix bastion stacking penalties on RoF	2021-02-18 23:38:24 +03:00
DarkPhoenix	d216eb3e55	Bump version	2021-02-18 22:15:00 +03:00
DarkPhoenix	c25fa0f632	Update bastion effect	2021-02-18 22:11:51 +03:00
DarkPhoenix	8a115be0bd	Update effect uses	2021-02-18 21:03:53 +03:00
DarkPhoenix	b897ee5146	Update static data to 1876339	2021-02-18 20:41:40 +03:00
DarkPhoenix	09bc2da863	Limit subwarp speed to 100 for warp considerations	2021-01-26 00:33:43 +03:00
Anton Vorobyov	2d645b8f91	Merge pull request #2301 from pyfa-org/i18n I18n	2020-12-08 20:00:30 +03:00
DarkPhoenix	e33cb80608	Bump version	2020-12-08 19:56:43 +03:00
Anton Vorobyov	fcc8c3eeb9	Merge pull request #2300 from pyfa-org/crowdin_l10n New Crowdin updates	2020-12-08 19:51:37 +03:00
DarkPhoenix	c29d567255	Change default jargon definitions for missile types, they now include launchers as well	2020-12-08 19:46:13 +03:00
DarkPhoenix	e85b618cbc	Add set of hacks to rename caustic to tachyon	2020-12-08 19:40:48 +03:00
DarkPhoenix	008b6a887d	Rename Caustic to Tachyon	2020-12-08 19:30:21 +03:00
DarkPhoenix	05ab2d47c7	Fix error handler in a situation when gamedata metadata is not available	2020-12-08 19:16:05 +03:00
DarkPhoenix	75b611c94a	Fix salvaging spec effect	2020-12-08 18:01:57 +03:00
Ryan Holmes	356d594637	New translations lang.pot (French)	2020-12-08 09:14:01 -05:00
Ryan Holmes	03f4bc1d75	New translations lang.pot (French)	2020-12-08 08:13:23 -05:00
DarkPhoenix	226c5d7fad	Update static data to 1860847	2020-12-08 15:09:51 +03:00
DarkPhoenix	0c3998b640	Add new effects	2020-12-05 16:39:58 +03:00
DarkPhoenix	942f9a35ee	Update static data to 1859379	2020-12-05 14:27:19 +03:00
DarkPhoenix	031a3c2d3e	Fix IDs of new damage patterns	2020-11-27 18:03:18 +03:00
DarkPhoenix	ed7df2f1a7	Bump version	2020-11-26 15:57:15 +03:00
DarkPhoenix	fb2ad2cc10	Update static data to 1853874	2020-11-26 15:56:40 +03:00