Merge branch 'master' into singularity

# Conflicts:
#	eos/effects.py
#	staticdata/fsd_built/dogmaeffects.0.json
#	staticdata/fsd_built/iconids.0.json
#	staticdata/fsd_built/marketgroups.0.json
#	staticdata/fsd_built/types.4.json
#	staticdata/fsd_built/types.5.json
#	staticdata/phobos/metadata.0.json
#	version.yml

eos/effects.py

@@ -25267,6 +25267,7 @@ class Effect6281(BaseEffect):
     shipBonusEnergyNeutOptimalAF2
 
     Used by:
+    Ship: Cruor
     Ship: Malice
     """
 
@@ -25283,6 +25284,7 @@ class Effect6285(BaseEffect):
     shipBonusEnergyNeutFalloffAF3
 
     Used by:
+    Ship: Cruor
     Ship: Malice
     """
 
@@ -25299,6 +25301,7 @@ class Effect6287(BaseEffect):
     shipBonusEnergyNosOptimalAF2
 
     Used by:
+    Ship: Cruor
     Ship: Malice
     """
 
@@ -25315,6 +25318,7 @@ class Effect6291(BaseEffect):
     shipBonusEnergyNosFalloffAF3
 
     Used by:
+    Ship: Cruor
     Ship: Malice
     """
 
@@ -25347,6 +25351,7 @@ class Effect6299(BaseEffect):
     shipBonusEnergyNeutFalloffAC3
 
     Used by:
+    Ship: Ashimmu
     Ship: Vangel
     """
 
@@ -25397,6 +25402,7 @@ class Effect6305(BaseEffect):
     shipBonusEnergyNosFalloffAC3
 
     Used by:
+    Ship: Ashimmu
     Ship: Vangel
     """
 
@@ -42232,6 +42238,40 @@ class Effect12596(BaseEffect):
             src.getModifiedItemAttr('shipMiningBonusYieldOreDestroyerRoleBonus'), **kwargs)
 
 
+class Effect12739(BaseEffect):
+    """
+    shipBonusEnergyNeutOptimalAC2
+
+    Used by:
+    Ship: Ashimmu
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+            src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs)
+
+
+class Effect12740(BaseEffect):
+    """
+    shipBonusEnergyNosOptimalAC2
+
+    Used by:
+    Ship: Ashimmu
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+            src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs)
+
+
 class Effect12753(BaseEffect):
     """
     shipRoleBonusOREExecutiveIssueMiningCriticalHitChanceBonus