Merge branch 'master' into i18n

# Conflicts: # staticdata/fsd_binary/typedogma.json # staticdata/fsd_lite/evetypes.json # staticdata/phobos/metadata.0.json # staticdata/phobos/traits.json
2020-08-02 18:54:31 -04:00
parent 32a03dedaa bc2cdcdea7
commit c0f8099f49
10 changed files with 328 additions and 104 deletions
--- a/service/jargon/defaults.yaml
+++ b/service/jargon/defaults.yaml
@@ -809,11 +809,11 @@ damp:
  - 'sd-\d00'
 sd:
  - '(^| )sd'  # Checking only beginning of a word to remove unwanted spam
-  - 'remote sensor dampener'
+  - 'sensor dampener'
  - '(targeting range|scan resolution) dampening script'
 rsd:
  - 'rsd'
-  - 'remote sensor dampener'
+  - 'sensor dampener'
  - 'sd-\d00'
  - '(targeting range|scan resolution) dampening script'