Merge branch 'develop'

Remove unused hosting and CI files
Merge pull request #658 from leonardofelin/patch-2
2025-12-09 22:55:35 +00:00 · 2021-05-10 20:18:34 +02:00 · 2021-05-10 20:18:07 +02:00 · 2021-05-09 18:36:10 +02:00 · 2021-05-09 13:01:52 +02:00 · 2021-05-09 07:31:19 -03:00
36 changed files with 1168 additions and 912 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,77 +0,0 @@
-node_modules
-npm-debug.log
-### Node template
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# next.js build output
-.next
-
-# nuxt.js build output
-.nuxt
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless
-
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +0,0 @@
-image: docker:stable
-services:
-  - docker:dind
-
-stages:
-  - Build image
-
-docker build:
-  stage: Build image
-  script:
-  - img build --build-arg branch=$CI_COMMIT_REF_NAME -t edcd/coriolis:$CI_COMMIT_REF_NAME .
-  - echo "$REGISTRY_PASSWORD" | img login --username "$REGISTRY_USER" --password-stdin
-  - img push edcd/coriolis:$CI_COMMIT_REF_NAME
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +0,0 @@
-language: node_js
-notifications:
-  email: false
-sudo: false
-node_js:
-  - "4.8.1"
-cache:
-  directories:
-    - node_modules
-
-before_install:
-  - git clone https://github.com/EDCD/coriolis-data.git ../coriolis-data
-
-script:
-  - npm run lint
-  - npm test
--- a/35
+++ b/35
@@ -1,35 +0,0 @@
-### STAGE 1: Build ###
-FROM node:9.11.1-alpine as builder
-ARG branch=develop
-ENV BRANCH=$branch
-WORKDIR /src/app
-RUN mkdir -p /src/app/coriolis
-RUN mkdir -p /src/app/coriolis-data
-
-RUN apk add --update git
-
-COPY . /src/app/coriolis
-
-RUN npm i -g npm
-
-# Set up coriolis-data
-WORKDIR /src/app/coriolis-data
-RUN git clone https://github.com/EDCD/coriolis-data.git .
-RUN git checkout ${BRANCH}
-RUN npm install --no-package-lock
-RUN npm start
-
-# Set up coriolis
-WORKDIR /src/app/coriolis
-RUN git checkout ${BRANCH}
-RUN npm install --no-package-lock
-RUN npm run build
-
-
-### STAGE 2: Production Environment ###
-FROM fholzer/nginx-brotli as web
-COPY nginx.conf /etc/nginx/nginx.conf
-COPY --from=builder /src/app/coriolis/build /usr/share/nginx/html
-WORKDIR /usr/share/nginx/html
-EXPOSE 80
-CMD ["nginx", "-c", "/etc/nginx/nginx.conf", "-g", "daemon off;"]
--- a/README.md
+++ b/README.md
@@ -10,11 +10,6 @@ Coriolis was created using assets and imagery from Elite: Dangerous, with the pe

 Please [submit issues](https://github.com/EDCD/coriolis/issues), or better yet [pull requests](https://github.com/EDCD/coriolis/pulls) for any corrections or additions to the database or the code.

-### Translations
-
-Please use the OneSky translation site to suggest new translations: http://edcd-coriolis.oneskyapp.com  
-These will be merged regularly by the project manager.
-
 ### Feature Requests, Suggestions & Bugs

 Chat to us on [Discord](https://discord.gg/0uwCh6R62aPRjk9w)!
@@ -23,8 +18,6 @@ Chat to us on [Discord](https://discord.gg/0uwCh6R62aPRjk9w)!

 See the [Developer's Guide](https://github.com/EDCD/coriolis/wiki/Developing-for-Coriolis) in the wiki.

-Also see [the documentation site.](https://coriolis.willb.info/)
-
 ### Ship and Module Database

 See the [Data wiki](https://github.com/cmmcleod/coriolis-data/wiki) for details on structure, etc.
--- a/tests/fixtures/expected-builds.json
+++ b/tests/fixtures/expected-builds.json
@@ -1,50 +1,50 @@
 {
  "type_6_transporter": {
-    "Cargo": "A0p0tdFal8d8s8f4-----04040303430101.Iw1/kA==.Aw1/kA==.",
-    "Miner": "A0p5tdFal8d8s8f42l2l---040403451q0101.Iw1/kA==.Aw1/kA==.",
-    "Hopper": "A0p0tdFal8d0s8f41717---030302024300-.Iw1/kA==.Aw1/kA==."
+    "Cargo": "A0p0tdFal8d8s8f4-----04040303430101-.Iw18UA==.Aw18UA==.",
+    "Miner": "A0p5tdFal8d8s8f42l2l---040403451q0101-.Iw18UA==.Aw18UA==.",
+    "Hopper": "A0p0tdFal8d0s8f41717---030302024300--.Iw18UA==.Aw18UA==."
  },
  "type_7_transport": {
-    "Cargo": "A0p0tiFfliddsdf5--------0505040403480101.Iw18aQ==.Aw18aQ==.",
-    "Miner": "A0pdtiFflid8sdf5--2l2l----0505041v03450000.Iw18aQ==.Aw18aQ==."
+    "Cargo": "A0p0tiFfliddsdf5--------0505040403480101--.Iw18eQ==.Aw18eQ==.",
+    "Miner": "A0pdtiFflid8sdf5--2l2l----0505041v03450000--.Iw18eQ==.Aw18eQ==."
  },
  "federal_dropship": {
-    "Cargo": "A0pdtiFflnddsif4-1717------05040448--020201.Iw18eQ==.Aw18eQ==."
+    "Cargo": "A0pdtiFflnddsif4-1717------05040448--020201-.Iw18RQ==.Aw18RQ==."
  },
  "asp": {
-    "Miner": "A2pftfFflidfskf50s0s24242l2l---04054a1q02022o27.Iw18WQ==.Aw18WQ==."
+    "Miner": "A2pftfFflidfskf50s0s24242l2l---04054a1q02022o27-.Iw18eQ==.Aw18eQ==."
  },
  "imperial_clipper": {
-    "Cargo": "A0p5tiFflndisnf4--0s0s----0605450302020101.Iw18aQ==.Aw18aQ==.",
-    "Dream": "A2pktkFflndpskf40v0v0s0s0404040n4k5n5d2b29292o-.AwRj4yWU1I==.CwBhCYy6YRigzLIA.",
-    "Current": "A0patkFflndfskf4----------------.AwRj4yWU1I==.CwBhCYy6YRigzLIA."
+    "Cargo": "A0p5tiFflndisnf4--0s0s----0605450302020101-.Iw18WQ==.Aw18WQ==.",
+    "Dream": "A2pktkFflndpskf40v0v0s0s0404040n4k5n5d2b29292o--.AwRj4yWU1Yg=.CwBhCYy6YRigzPIA.",
+    "Current": "A0patkFflndfskf4-----------------.AwRj4yWU1Yg=.CwBhCYy6YRigzPIA."
  },
  "type_9_heavy": {
-    "Current": "A0patsFklndnsif6---------0706054a0303020224.AwRj4yoo.EwBhEYy6dsg=."
+    "Current": "A0patsFklndnsif6---------0706054a0303020224--.AwRj4yo5iA==.EwBhEYy6d6g=."
  },
  "python": {
-    "Cargo": "A0patnFflidsssf5---------050505040448020201.Iw18eQ==.Aw18eQ==.",
-    "Miner": "A0pktkFflidpspf50v0v0v2m2m0404--050505Ce4a1v02022o.Iw18eQ==.IwBhBYy6dkCYg===.",
-    "Dream": "A2pptkFfliduspf50v0v0v27270404040m5n5n4f2d2d032t0201.Iw1+gDBxA===.EwBhEYy6e0WEA===.",
-    "Missile": "A0pttoFjljdystf52f2g2d2ePh----04044j03---002h.Iw18eQ==.Aw18eQ==."
+    "Cargo": "A0patnFflidsssf5---------050505040448020201-.Iw18eAMQ.Aw18RQ==.",
+    "Miner": "A0pktkFflidpspf50v0v0v2m2m0404--050505Ce4a1v02022o-.Iw18eAMQ.IwBhBYy6dkCYRA==.",
+    "Dream": "A2pptkFfliduspf50v0v0v27270404040m5n5n4f2d2d032t0201-.Iw1+gDByUA==.EwBhEYy6e0VEA===.",
+    "Missile": "A0pttoFjljdystf52f2g2d2ePh----04044j03---00--.Iw18eAMQ.Aw18RQ==."
  },
  "anaconda": {
-    "Dream": "A4putpFklndzsuf52c0o0o0o1m1m0q0q0404040l0b0100004k5n5n112d2d04-0303326b.AwRj4yo5dyg=.MwBhCYy6duvARiA=.",
-    "Cargo": "A0patnFklndnsxf5----------------06050505040404-45030301.Iw18ZVA=.Aw18ZVA=.",
-    "Current": "A0patnFklndksxf5----------------06050505040404-03034524.Iw18ZVA=.Aw18ZVA=.",
-    "Explorer": "A0patnFklndksxf5--------0202------f7050505040s37-2f2i4524.AwRj4yVKJ9hA.AwhMIyumQRhEA===.",
-    "Test": "A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b.Iw18ZVA=.Aw18ZVA=."
+    "Dream": "A4putpFklndzsuf52c0o0o0o1m1m0q0q0404040l0b0100004k5n5n112d2d04-0303326b-.AwRj4yo5dzhA.MwBhCYy6duvARhEA.",
+    "Cargo": "A0patnFklndnsxf5----------------06050505040404-45030301-.Iw18ZUAxA===.Aw18ZXEA.",
+    "Current": "A0patnFklndksxf5----------------06050505040404-03034524-.Iw18ZUAxA===.Aw18ZXEA.",
+    "Explorer": "A0patnFklndksxf5--------0202------f7050505040s37--2i4524-.AwRj4yVKJ9jCA===.AwhMIyumQRgkA===.",
+    "Test": "A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b-.Iw18ZUAxA===.Aw18ZXEA."
  },
  "diamondback_explorer": {
-    "Explorer": "A0p0tdFfldddsdf5---0202--320p432i2f-.AwRj4zTYg===.AwiMIyoo."
+    "Explorer": "A0p0tdFfldddsdf5---0202--320p432i----.AwRj4zTZaA==.AwiMIyqo."
  },
  "vulture": {
-    "Bounty Hunter": "A3patcFalddksff31e1e0404-0l4a-5d27662j.AwRj4z2I.MwBhBYy6oJmAjLIA."
+    "Bounty Hunter": "A3patcFalddksff31e1e0404-0l4a-5d27662j--.AwRj4z2Gg===.MwBhBYy6oJmAjLMQ."
  },
  "fer_de_lance": {
-    "Attack": "A2pfthFalidpsff31r0s0s0s0s000404-04-4a-5d27-.Iw18aQ==.CwBhrSu8EZyA."
+    "Attack": "A2pfthFalidpsff31r0s0s0s0s000404-04-4a-5d27--.Iw18aAMQ.CwBhrSu8EZxEA===."
  },
  "eagle": {
-    "Figther": "A4p0t5F5l3d5s5f20p0p24-4053-2j-.Iw18kA==.Aw18kA==."
+    "Figther": "A4p0t5F5l3d5s5f20p0p24-4053-2j---.Iw18gDJQ.Aw19kA==."
  }
 }
--- a/tests/fixtures/slef-multiple-builds.json
+++ b/tests/fixtures/slef-multiple-builds.json
@@ -0,0 +1,366 @@
+[
+  {
+    "header": {
+      "appName": "Inara",
+      "appVersion": "1.0",
+      "appURL": "https:\/\/inara.cz\/cmdr-fleet\/123\/123\/",
+      "appCustomProperties": {
+        "inaraCommanderID": 123,
+        "inaraShipID": 123
+      }
+    },
+    "data": {
+      "Ship": "krait_mkii",
+      "ShipID": 7,
+      "ShipName": "pancake hammer",
+      "ShipIdent": "PH-01",
+      "HullValue": 44160710,
+      "ModulesValue": 111274094,
+      "Rebuy": 7771743,
+      "Modules": [
+        {
+          "Slot": "largehardpoint1",
+          "Item": "hpt_mininglaser_fixed_small",
+          "On": true
+        },
+        {
+          "Slot": "largehardpoint2",
+          "Item": "hpt_cannon_gimbal_large",
+          "On": true,
+          "Engineering": {
+            "BlueprintName": "weapon_overcharged",
+            "Level": 2,
+            "Quality": 1,
+            "ExperimentalEffect": "special_auto_loader"
+          }
+        },
+        {
+          "Slot": "largehardpoint3",
+          "Item": "hpt_cannon_gimbal_large",
+          "On": true,
+          "Engineering": {
+            "BlueprintName": "weapon_overcharged",
+            "Level": 2,
+            "Quality": 1,
+            "ExperimentalEffect": "special_auto_loader"
+          }
+        },
+        {
+          "Slot": "mediumhardpoint1",
+          "Item": "hpt_basicmissilerack_fixed_medium",
+          "On": true,
+          "Engineering": {
+            "BlueprintName": "weapon_highcapacity",
+            "Level": 5,
+            "Quality": 1
+          }
+        },
+        {
+          "Slot": "mediumhardpoint2",
+          "Item": "hpt_basicmissilerack_fixed_medium",
+          "On": true
+        },
+        {
+          "Slot": "tinyhardpoint1",
+          "Item": "hpt_heatsinklauncher_turret_tiny",
+          "On": true
+        },
+        {
+          "Slot": "tinyhardpoint2",
+          "Item": "hpt_cloudscanner_size0_class3",
+          "On": true
+        },
+        {
+          "Slot": "tinyhardpoint3",
+          "Item": "hpt_shieldbooster_size0_class5",
+          "On": true
+        },
+        {
+          "Slot": "tinyhardpoint4",
+          "Item": "hpt_shieldbooster_size0_class5",
+          "On": true,
+          "Priority": 1
+        },
+        {
+          "Slot": "slot01_size6",
+          "Item": "int_cargorack_size6_class1",
+          "On": true,
+          "Priority": 1
+        },
+        {
+          "Slot": "slot02_size6",
+          "Item": "int_cargorack_size6_class1",
+          "On": true,
+          "Priority": 1
+        },
+        {
+          "Slot": "slot03_size5",
+          "Item": "int_guardianfsdbooster_size5",
+          "On": true
+        },
+        {
+          "Slot": "slot04_size5",
+          "Item": "int_fighterbay_size5_class1",
+          "On": true
+        },
+        {
+          "Slot": "slot05_size4",
+          "Item": "int_shieldgenerator_size4_class5",
+          "On": true
+        },
+        {
+          "Slot": "slot06_size3",
+          "Item": "int_dronecontrol_collection_size3_class4",
+          "On": true
+        },
+        {
+          "Slot": "slot07_size3",
+          "Item": "int_dronecontrol_collection_size3_class4",
+          "On": true
+        },
+        {
+          "Slot": "slot08_size2",
+          "Item": "int_refinery_size2_class2",
+          "On": true
+        },
+        {
+          "Slot": "slot09_size1",
+          "Item": "int_dronecontrol_prospector_size1_class4",
+          "On": true
+        },
+        {
+          "Slot": "powerplant",
+          "Item": "int_powerplant_size7_class5",
+          "On": true,
+          "Priority": 1
+        },
+        {
+          "Slot": "mainengines",
+          "Item": "int_engine_size6_class5",
+          "On": true
+        },
+        {
+          "Slot": "frameshiftdrive",
+          "Item": "int_hyperdrive_size5_class5",
+          "On": true,
+          "Engineering": {
+            "BlueprintName": "fsd_longrange",
+            "Level": 2,
+            "Quality": 0.861
+          }
+        },
+        {
+          "Slot": "lifesupport",
+          "Item": "int_lifesupport_size4_class2",
+          "On": true,
+          "Priority": 3
+        },
+        {
+          "Slot": "powerdistributor",
+          "Item": "int_powerdistributor_size7_class5",
+          "On": true
+        },
+        {
+          "Slot": "radar",
+          "Item": "int_sensors_size6_class2",
+          "On": true
+        },
+        {
+          "Slot": "fueltank",
+          "Item": "int_fueltank_size5_class3",
+          "On": true,
+          "Priority": 1
+        },
+        {
+          "Slot": "armour",
+          "Item": "krait_mkii_armour_grade3",
+          "On": true,
+          "Priority": 1,
+          "Engineering": {
+            "BlueprintName": "armour_heavyduty",
+            "Level": 5,
+            "Quality": 1
+          }
+        }
+      ]
+    }
+  },
+  {
+    "header": {
+      "appName": "Inara",
+      "appVersion": "1.0",
+      "appURL": "https:\/\/inara.cz\/cmdr-fleet\/123\/123\/",
+      "appCustomProperties": {
+        "inaraCommanderID": 123,
+        "inaraShipID": 123
+      }
+    },
+    "data": {
+      "Ship": "diamondbackxl",
+      "ShipID": 11,
+      "ShipName": "star Hopper",
+      "ShipIdent": "PH-02",
+      "HullValue": 1615649,
+      "ModulesValue": 16981039,
+      "Rebuy": 929837,
+      "Modules": [
+        {
+          "Slot": "tinyhardpoint1",
+          "Item": "hpt_heatsinklauncher_turret_tiny",
+          "On": true,
+          "Value": 3072
+        },
+        {
+          "Slot": "slot01_size4",
+          "Item": "int_fuelscoop_size4_class5",
+          "On": true,
+          "Priority": 3,
+          "Value": 2862364
+        },
+        {
+          "Slot": "slot02_size4",
+          "Item": "int_guardianfsdbooster_size4",
+          "On": true,
+          "Value": 2847499
+        },
+        {
+          "Slot": "slot03_size3",
+          "Item": "int_shieldgenerator_size3_class2",
+          "On": true,
+          "Value": 18812,
+          "Engineering": {
+            "BlueprintName": "shieldgenerator_thermic",
+            "Level": 3,
+            "Quality": 1,
+            "ExperimentalEffect": "special_shield_health"
+          }
+        },
+        {
+          "Slot": "slot04_size3",
+          "Item": "int_repairer_size3_class5",
+          "On": true,
+          "Value": 2302911
+        },
+        {
+          "Slot": "slot05_size2",
+          "Item": "int_buggybay_size2_class2",
+          "On": true,
+          "Priority": 3,
+          "Value": 21600
+        },
+        {
+          "Slot": "slot06_size2",
+          "Item": "int_cargorack_size2_class1",
+          "On": true,
+          "Priority": 1,
+          "Value": 2852
+        },
+        {
+          "Slot": "slot07_size1",
+          "Item": "int_supercruiseassist",
+          "On": true,
+          "Priority": 3,
+          "Value": 9121
+        },
+        {
+          "Slot": "slot08_size1",
+          "Item": "int_detailedsurfacescanner_tiny",
+          "On": true,
+          "Value": 250000,
+          "Engineering": {
+            "BlueprintName": "sensor_expanded",
+            "Level": 5,
+            "Quality": 1
+          }
+        },
+        {
+          "Slot": "powerplant",
+          "Item": "int_powerplant_size4_class5",
+          "On": true,
+          "Priority": 1,
+          "Value": 1441233,
+          "Engineering": {
+            "BlueprintName": "powerplant_boosted",
+            "Level": 1,
+            "Quality": 1
+          }
+        },
+        {
+          "Slot": "mainengines",
+          "Item": "int_engine_size4_class5",
+          "On": true,
+          "Value": 1610080,
+          "Engineering": {
+            "BlueprintName": "engine_dirty",
+            "Level": 5,
+            "Quality": 1,
+            "ExperimentalEffect": "special_engine_lightweight"
+          }
+        },
+        {
+          "Slot": "frameshiftdrive",
+          "Item": "int_hyperdrive_size5_class5",
+          "On": true,
+          "Value": 5103953,
+          "Engineering": {
+            "BlueprintName": "fsd_longrange",
+            "Level": 5,
+            "Quality": 1,
+            "ExperimentalEffect": "special_fsd_lightweight"
+          }
+        },
+        {
+          "Slot": "lifesupport",
+          "Item": "int_lifesupport_size3_class2",
+          "On": true,
+          "Value": 10133,
+          "Engineering": {
+            "BlueprintName": "misc_lightweight",
+            "Level": 3,
+            "Quality": 1
+          }
+        },
+        {
+          "Slot": "powerdistributor",
+          "Item": "int_powerdistributor_size4_class5",
+          "On": true,
+          "Value": 389022,
+          "Engineering": {
+            "BlueprintName": "powerdistributor_highfrequency",
+            "Level": 4,
+            "Quality": 1
+          }
+        },
+        {
+          "Slot": "radar",
+          "Item": "int_sensors_size3_class2",
+          "On": true,
+          "Value": 10133,
+          "Engineering": {
+            "BlueprintName": "sensor_lightweight",
+            "Level": 5,
+            "Quality": 1
+          }
+        },
+        {
+          "Slot": "fueltank",
+          "Item": "int_fueltank_size5_class3",
+          "On": true,
+          "Priority": 1,
+          "Value": 97754
+        },
+        {
+          "Slot": "armour",
+          "Item": "diamondbackxl_armour_grade1",
+          "On": true,
+          "Priority": 1,
+          "Engineering": {
+            "BlueprintName": "armour_heavyduty",
+            "Level": 5,
+            "Quality": 1
+          }
+        }
+      ]
+    }
+  }
+]
--- a/tests/fixtures/slef-multiple-expected-builds.json
+++ b/tests/fixtures/slef-multiple-expected-builds.json
@@ -0,0 +1,8 @@
+{
+      "krait_mkii": {
+        "Imported pancake hammer": "A2pptkFflidussf52l1o1o2g2g020g040405051Ofr45C9C91oP3.Iw18eQ==.AwRgzKIkA===."
+  },
+      "diamondback_explorer": {
+        "Imported star Hopper": "A0pataFflddfsdf5---02---321P430iv6013w2i.Iw18SQ==.AwRm44GYpKg=."
+  }
+}
--- a/tests/fixtures/slef-single-build.json
+++ b/tests/fixtures/slef-single-build.json
@@ -0,0 +1,188 @@
+[
+  {
+    "header": {
+      "appName": "Inara",
+      "appVersion": "1.0",
+      "appURL": "https:\/\/inara.cz\/cmdr-fleet\/123\/123\/",
+      "appCustomProperties": {
+        "inaraCommanderID": 123,
+        "inaraShipID": 123
+      }
+    },
+    "data": {
+      "Ship": "krait_mkii",
+      "ShipID": 7,
+      "ShipName": "pancake hammer",
+      "ShipIdent": "PH-01",
+      "HullValue": 44160710,
+      "ModulesValue": 111274094,
+      "Rebuy": 7771743,
+      "Modules": [
+        {
+          "Slot": "largehardpoint1",
+          "Item": "hpt_mininglaser_fixed_small",
+          "On": true
+        },
+        {
+          "Slot": "largehardpoint2",
+          "Item": "hpt_cannon_gimbal_large",
+          "On": true,
+          "Engineering": {
+            "BlueprintName": "weapon_overcharged",
+            "Level": 2,
+            "Quality": 1,
+            "ExperimentalEffect": "special_auto_loader"
+          }
+        },
+        {
+          "Slot": "largehardpoint3",
+          "Item": "hpt_cannon_gimbal_large",
+          "On": true,
+          "Engineering": {
+            "BlueprintName": "weapon_overcharged",
+            "Level": 2,
+            "Quality": 1,
+            "ExperimentalEffect": "special_auto_loader"
+          }
+        },
+        {
+          "Slot": "mediumhardpoint1",
+          "Item": "hpt_basicmissilerack_fixed_medium",
+          "On": true,
+          "Engineering": {
+            "BlueprintName": "weapon_highcapacity",
+            "Level": 5,
+            "Quality": 1
+          }
+        },
+        {
+          "Slot": "mediumhardpoint2",
+          "Item": "hpt_basicmissilerack_fixed_medium",
+          "On": true
+        },
+        {
+          "Slot": "tinyhardpoint1",
+          "Item": "hpt_heatsinklauncher_turret_tiny",
+          "On": true
+        },
+        {
+          "Slot": "tinyhardpoint2",
+          "Item": "hpt_cloudscanner_size0_class3",
+          "On": true
+        },
+        {
+          "Slot": "tinyhardpoint3",
+          "Item": "hpt_shieldbooster_size0_class5",
+          "On": true
+        },
+        {
+          "Slot": "tinyhardpoint4",
+          "Item": "hpt_shieldbooster_size0_class5",
+          "On": true,
+          "Priority": 1
+        },
+        {
+          "Slot": "slot01_size6",
+          "Item": "int_cargorack_size6_class1",
+          "On": true,
+          "Priority": 1
+        },
+        {
+          "Slot": "slot02_size6",
+          "Item": "int_cargorack_size6_class1",
+          "On": true,
+          "Priority": 1
+        },
+        {
+          "Slot": "slot03_size5",
+          "Item": "int_guardianfsdbooster_size5",
+          "On": true
+        },
+        {
+          "Slot": "slot04_size5",
+          "Item": "int_fighterbay_size5_class1",
+          "On": true
+        },
+        {
+          "Slot": "slot05_size4",
+          "Item": "int_shieldgenerator_size4_class5",
+          "On": true
+        },
+        {
+          "Slot": "slot06_size3",
+          "Item": "int_dronecontrol_collection_size3_class4",
+          "On": true
+        },
+        {
+          "Slot": "slot07_size3",
+          "Item": "int_dronecontrol_collection_size3_class4",
+          "On": true
+        },
+        {
+          "Slot": "slot08_size2",
+          "Item": "int_refinery_size2_class2",
+          "On": true
+        },
+        {
+          "Slot": "slot09_size1",
+          "Item": "int_dronecontrol_prospector_size1_class4",
+          "On": true
+        },
+        {
+          "Slot": "powerplant",
+          "Item": "int_powerplant_size7_class5",
+          "On": true,
+          "Priority": 1
+        },
+        {
+          "Slot": "mainengines",
+          "Item": "int_engine_size6_class5",
+          "On": true
+        },
+        {
+          "Slot": "frameshiftdrive",
+          "Item": "int_hyperdrive_size5_class5",
+          "On": true,
+          "Engineering": {
+            "BlueprintName": "fsd_longrange",
+            "Level": 2,
+            "Quality": 0.861
+          }
+        },
+        {
+          "Slot": "lifesupport",
+          "Item": "int_lifesupport_size4_class2",
+          "On": true,
+          "Priority": 3
+        },
+        {
+          "Slot": "powerdistributor",
+          "Item": "int_powerdistributor_size7_class5",
+          "On": true
+        },
+        {
+          "Slot": "radar",
+          "Item": "int_sensors_size6_class2",
+          "On": true
+        },
+        {
+          "Slot": "fueltank",
+          "Item": "int_fueltank_size5_class3",
+          "On": true,
+          "Priority": 1
+        },
+        {
+          "Slot": "armour",
+          "Item": "krait_mkii_armour_grade3",
+          "On": true,
+          "Priority": 1,
+          "Engineering": {
+            "BlueprintName": "armour_heavyduty",
+            "Level": 5,
+            "Quality": 1
+          }
+        }
+      ]
+    }
+  }
+]
--- a/tests/test-import.js
+++ b/tests/test-import.js
@@ -18,13 +18,13 @@ describe('Import Modal', function() {
  const mockContext = {
    language: getLanguage('en'),
    sizeRatio: 1,
-    openMenu: jest.genMockFunction(),
-    closeMenu: jest.genMockFunction(),
-    showModal: jest.genMockFunction(),
-    hideModal: jest.genMockFunction(),
-    tooltip: jest.genMockFunction(),
-    termtip: jest.genMockFunction(),
-    onWindowResize: jest.genMockFunction()
+    openMenu: jest.fn(),
+    closeMenu: jest.fn(),
+    showModal: jest.fn(),
+    hideModal: jest.fn(),
+    tooltip: jest.fn(),
+    termtip: jest.fn(),
+    onWindowResize: jest.fn()
  };

  let modal, render, ContextProvider = Utils.createContextProvider(mockContext);
@@ -110,21 +110,25 @@ describe('Import Modal', function() {
    it('catches an invalid backup', function() {
      const importData = require('./fixtures/valid-backup');
      let invalidImportData = Object.assign({}, importData);
-      //invalidImportData.builds.asp = null;   // Remove Asp Miner build used in comparison
+      // Remove Asp Miner build used in comparison
      delete(invalidImportData.builds.asp);

      pasteText('"this is not valid"');
      expect(modal.state.importValid).toBeFalsy();
      expect(modal.state.errorMsg).toEqual('Must be an object or array!');
+
      pasteText('{ "builds": "Should not be a string" }');
      expect(modal.state.importValid).toBeFalsy();
      expect(modal.state.errorMsg).toEqual('builds must be an object!');
-      pasteText(JSON.stringify(importData).replace('anaconda', 'invalid_ship'));
+
+      pasteText(JSON.stringify(importData).replace(/anaconda/g, 'invalid_ship'));
      expect(modal.state.importValid).toBeFalsy();
-      expect(modal.state.errorMsg).toEqual('"invalid_ship" is not a valid Ship Id!');
+      expect(Object.keys(modal.state.builds)).not.toContain('anaconda');
+
      pasteText(JSON.stringify(importData).replace('Dream', ''));
      expect(modal.state.importValid).toBeFalsy();
-      expect(modal.state.errorMsg).toEqual('Imperial Clipper build "" must be a string at least 1 character long!');
+      expect(Object.keys(modal.state.builds.imperial_clipper).length).toEqual(3);
+
      pasteText(JSON.stringify(invalidImportData));
      expect(modal.state.importValid).toBeFalsy();
      expect(modal.state.errorMsg).toEqual('asp build "Miner" data is missing!');
@@ -144,7 +148,7 @@ describe('Import Modal', function() {
      expect(modal.state.singleBuild).toBe(true);
      clickProceed();
      expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/anaconda?code=A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b.AwRj4zNLaA%3D%3D.CwBhCYzBGW9qCTSqq5xA.&bn=Test%20My%20Ship');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/anaconda?code=A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b-.AwRj4zNLeI%3D%3D.CwBhCYzBGW9qCTSqq5JA.&bn=Test%20My%20Ship');
    });

    it('catches an invalid build', function() {
@@ -169,7 +173,7 @@ describe('Import Modal', function() {
      expect(modal.state.singleBuild).toBe(true);
      clickProceed();
      expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/anaconda?code=A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b.AwRj4zNLaA%3D%3D.CwBhCYzBGW9qCTSqq5xA.H4sIAAAAAAAAA2MUe8HMwPD%2FPwMAAGvB0AkAAAA%3D&bn=Test%20My%20Ship');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/anaconda?code=A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b-.AwRj4zNLeI%3D%3D.CwBhCYzBGW9qCTSqq5JA.H4sIAAAAAAAAE2MUe8HMwPD%2FPwMAAGvB0AkAAAA%3D&bn=Test%20My%20Ship');
    });
  });

@@ -186,7 +190,7 @@ describe('Import Modal', function() {
      expect(modal.state.singleBuild).toBe(true);
      clickProceed();
      expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/asp?code=A0pftiFflfddsnf5------020202033c044002v62f2i.AwRj4yvI.CwRgDBldHnJA.H4sIAAAAAAAAA2P858DAwPCXEUhwHPvx%2F78YG5AltB7I%2F8%2F0TwImJboDSPJ%2F%2B%2Ff%2Fv%2FKlX%2F%2F%2Fi3AwMTBIfARK%2FGf%2BJwVSxArStVAYqOjvz%2F%2F%2FJVo5GRhE2IBc4SKQSSz%2FDGEmCa398P8%2F%2F2%2BgTf%2F%2FA7kMAExxqlSAAAAA&bn=Multi-purpose%20Asp%20Explorer');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/asp?code=A0pftiFflfddsnf5------020202033c044002v6-2i-.AwRj4yvYg%3D%3D%3D.CwRgDBldHn5A.H4sIAAAAAAAAE2P858DAwPCXEUhwHPvx%2F78YG5AltB7I%2F8%2F0TwImJboDSPJ%2F%2B%2Ff%2Fv%2FKlX%2F%2F%2Fi3AwMTBIfARK%2FGf%2BJwVSxArStVAYqOjvz%2F%2F%2FJVo5GRhE2IBc4SKQSSz%2FDGEmCa398P8%2F%2F2%2BgTf%2F%2FA7kMAExxqlSAAAAA&bn=Multi-purpose%20Asp%20Explorer');
    });

    it('imports a valid v4 build with modifications', function() {
@@ -198,11 +202,11 @@ describe('Import Modal', function() {
      expect(modal.state.singleBuild).toBe(true);
      clickProceed();
      expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/imperial_courier?code=A0patzF5l0das8f31a1a270202000e402t0101-2f.AwRj4zKA.CwRgDBldLiQ%3D.H4sIAAAAAAAAA12OPUvDYBSFT1OTfkRJjUkbbC3Yj8mlODgUISAtdOlety5ODv0Vgji7O7kJ%2FgzBQX%2BEY7Gg0NKhfY%2FnHQLFDBdynufe9%2BRMCmCb06g29oCgacjiRx6gY6oWKUT8UgLaszqQfHmSnpVFN1uSeXNsJVcj%2FA2EHlZkspIUpUc6UjTXGT85qwHuSEuVc%2F16r99kDQeSSjvSbSjpyUpNK10uJJ3aYqk6smwm1lQ9bOxw71TMm8VanEqq9JW1r3Qo%2BREOLnQHvbWmb7rZIu5VLIyGQGOukPv%2F0WQk5LeEAjPOUDwtAP6bShy2HKAz0HPO%2B5KsP25I79O2I7LvD%2Bz4Il1XAQAA&bn=Multi-purpose%20Imperial%20Courier');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/imperial_courier?code=A0patzF5l0das8f31a1a270202000e402t0101----.AwRj4zOYg%3D%3D%3D.CwRgDBldLuZA.H4sIAAAAAAAAE12OPUvDYBSFT1OTfkRJjUkbbC3Yj8mlODgUISAtdOlety5ODv0Vgji7O7kJ%2FgzBQX%2BEY7Gg0NKhfY%2FnHQLFDBdynufe9%2BRMCmCb06g29oCgacjiRx6gY6oWKUT8UgLaszqQfHmSnpVFN1uSeXNsJVcj%2FA2EHlZkspIUpUc6UjTXGT85qwHuSEuVc%2F16r99kDQeSSjvSbSjpyUpNK10uJJ3aYqk6smwm1lQ9bOxw71TMm8VanEqq9JW1r3Qo%2BREOLnQHvbWmb7rZIu5VLIyGQGOukPv%2F0WQk5LeEAjPOUDwtAP6bShy2HKAz0HPO%2B5KsP25I79O2I7LvD%2Bz4Il1XAQAA&bn=Multi-purpose%20Imperial%20Courier');
    });
  });

-  describe('Import Detaild Builds Array', function() {
+  describe('Import Detailed Builds Array', function() {

    beforeEach(reset);

@@ -240,7 +244,7 @@ describe('Import Modal', function() {
      expect(modal.state.singleBuild).toBe(true);
      clickProceed();
      expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr--v66g2f.AwRj4zNaqA%3D%3D.CwRgDBldUExuBiIlUA%3D%3D.H4sIAAAAAAAAA12STy8DURTFb1szU53Ga8dg2qqqDmJDIoKFxJImumYjVrVqfAALC4lNbcUnkLCoDbEQu0bSlQVhI8JHsJBIQ73rXMkwMYuT9%2Bb87nl%2F7ovoRSL6ikD6TYNINZg5XsWUo7pfrBikr2USlRyXyDuLAhr6ZHanNLOzD5tjOiskysk5dOBvfTB7bjeRW0MNG3ohSBq1bKKxKwyLLUAjmwjpPu4wJx4xVbNI57heDfbUKUAy2xaRUQZpllHoHMHxKqjhhF4LgjtJiFHDmqbrEeVnUJOax7%2FSdRfRwBNotv9wo5kAuZMD2egKyDYcdYl1OBki6z%2BZQjaFnBPyFCM1LefF%2BcgrY0es9FKwbW8ZYj9gmBbxRVRdglMh6BNqnwsk4ouoO4HSIehNoBuBRHwR1QOmsBvHmk6IfMbd2fdCEka%2BjNSexPWGoEkcyX6CnxbxRZQtd%2BPpym%2B31xFtn0iSFPkf%2BBkttZlzB9KDFyBuFRfAGV0Ogoff8SSsCfjjD5hGWtLIwZB%2FgX5Zt%2BLHMI9My7sp6nzgZzekswTxVvCOkq%2FSXqb%2F3zfLxh6HrwIAAA%3D%3D&bn=Imported%20Federal%20Corvette');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr--v66g--.AwRj4zNapI%3D%3D.CwRgDBldUExuBiIlWIA%3D.&bn=Imported%20Federal%20Corvette');
    });

    it('imports a valid companion API build', function() {
@@ -252,7 +256,7 @@ describe('Import Modal', function() {
      expect(modal.state.singleBuild).toBe(true);
      clickProceed();
      expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/beluga?code=A0pktsFplCdpsnf70t0t2727270004040404043c4fmimlmm04mc0iv62i2f.AwRj4yukg%3D%3D%3D.CwRgDBldHi8IUA%3D%3D.H4sIAAAAAAAAA2P8Z8%2FAwPCXEUiIKTMxMPCv%2F%2Ff%2FP8cFIPGf6Z8YTEr0GjMDg%2FJWICERBOTzn%2Fn7%2F7%2FIO5Ai5n9SIEWsQEIoSxAolfbt%2F3%2BJPk4GBhE7YQYGYVmgcuVnf4Aq%2FwOVAAAyiFctbgAAAA%3D%3D&bn=Imported%20Beluga%20Liner');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/beluga?code=A0pktsFplCdpsnf70t0t2727270004040404043c4fmimlmm04mc0iv62i--.AwRj4yusg%3D%3D%3D.CwRgDBldHi8IWIA%3D.&bn=Imported%20Beluga%20Liner');
    });

    it('imports a valid companion API build', function() {
@@ -264,7 +268,7 @@ describe('Import Modal', function() {
      expect(modal.state.singleBuild).toBe(true);
      clickProceed();
      expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/type_7_transport?code=A0patfFflidasdf5----0404040005050504044d2402.AwRj4yrI.CwRgDBlVK7EiA%3D%3D%3D.&bn=Imported%20Type-7%20Transporter');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/type_7_transport?code=A0patfFflidasdf5----0404040005050504044d2402--.AwRj4yoo.CwRgDBlVK7HjEA%3D%3D.&bn=Imported%20Type-7%20Transporter');
    });

    it('imports a valid companion API build', function() {
@@ -276,7 +280,7 @@ describe('Import Modal', function() {
      expect(modal.state.singleBuild).toBe(true);
      clickProceed();
      expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/cobra_mk_iii?code=A0p0tdFaldd3sdf4------34---2f2i.AwRj4yKA.CwRgDMYExrezBUg%3D.&bn=Imported%20Cobra%20Mk%20III');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/cobra_mk_iii?code=A0p0tdFaldd3sdf4------34----2i--.AwRj4yqA.CwRgDMYExrezBig%3D.&bn=Imported%20Cobra%20Mk%20III');
    });
  });

@@ -324,4 +328,41 @@ describe('Import Modal', function() {
    });
  });

+  describe('Imports SLEF data', () => {
+    beforeEach(reset);
+
+    it('imports a single valid SLEF build', () => {
+      const importData = require('./fixtures/slef-single-build.json');
+      pasteText(JSON.stringify(importData));
+
+      expect(modal.state.importValid).toBeTruthy();
+      expect(modal.state.errorMsg).toEqual(null);
+      expect(modal.state.singleBuild).toBe(true);
+      clickProceed();
+      expect(MockRouter.go.mock.calls.length).toBe(1);
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/krait_mkii?code=A2pptkFflidussf52l1o1o2g2g020g040405051Ofr45C9C91oP3.Iw18eQ%3D%3D.AwRgzKIkA%3D%3D%3D.&bn=Imported%20pancake%20hammer');
+    });
+
+    it('imports multiple SLEF builds', () => {
+      const importData = require('./fixtures/slef-multiple-builds.json');
+      const expectedBuilds = require('./fixtures/slef-multiple-expected-builds.json');
+      pasteText(JSON.stringify(importData));
+
+      expect(modal.state.importValid).toBeTruthy();
+      expect(modal.state.errorMsg).toEqual(null);
+      expect(modal.state.singleBuild).toBe(false);
+      clickProceed();
+      expect(modal.state.processed).toBeTruthy();
+      clickImport();
+
+      const builds = Persist.getBuilds();
+
+      for (const shipModel in builds) {
+        for (const buildName in builds[shipModel]) {
+          expect(builds[shipModel][buildName])
+            .toEqual(expectedBuilds[shipModel][buildName]);
+        }
+      }
+    });
+  });
 });
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,56 +0,0 @@
-version: '2.2'
-
-services:
-  coriolis_prod:
-    image: edcd/coriolis:master
-    build:
-      dockerfile: Dockerfile
-      args:
-        branch: master
-    restart: always
-    volumes:
-    - ./nginx.conf:/etc/nginx/nginx.conf
-    networks:
-    - web
-    labels:
-    - "traefik.docker.network=web"
-    - "traefik.enable=true"
-    - "traefik.basic.frontend.rule=Host:coriolis.io,coriolis.edcd.io"
-    - "traefik.basic.port=80"
-    - "traefik.basic.protocol=http"
-
-  coriolis_dev:
-    image: edcd/coriolis:develop
-    build:
-      dockerfile: Dockerfile
-      args:
-        branch: develop
-    restart: always
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf
-    networks:
-    - web
-    labels:
-    - "traefik.docker.network=web"
-    - "traefik.enable=true"
-    - "traefik.basic.frontend.rule=Host:beta.coriolis.io,beta.coriolis.edcd.io"
-    - "traefik.basic.port=80"
-    - "traefik.basic.protocol=http"
-
-  coriolis_dw2:
-    image: edcd/coriolis:dw2
-    restart: always
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf
-    networks:
-    - web
-    labels:
-    - "traefik.docker.network=web"
-    - "traefik.enable=true"
-    - "traefik.basic.frontend.rule=Host:dw2.coriolis.io"
-    - "traefik.basic.port=80"
-    - "traefik.basic.protocol=http"
-
-networks:
-  web:
-    external: true
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,96 +0,0 @@
-worker_processes 1;
-user nobody nobody;
-error_log /tmp/error.log;
-pid /tmp/nginx.pid;
-
-events {
-
-	worker_connections 1024;
-}
-
-http {
-
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-    sendfile on;
-    client_body_temp_path /tmp/client_body;
-    fastcgi_temp_path /tmp/fastcgi_temp;
-    proxy_temp_path /tmp/proxy_temp;
-    scgi_temp_path /tmp/scgi_temp;
-    uwsgi_temp_path /tmp/uwsgi_temp;
-    access_log /tmp/access.log;
-    error_log /tmp/error.log;
-
-    # https://nginx.org/en/docs/http/ngx_http_gzip_module.html
-    # Enable gzip compression.
-    # Default: off
-    gzip off;
-
-    # Compression level (1-9).
-    # 5 is a perfect compromise between size and CPU usage, offering about
-    # 75% reduction for most ASCII files (almost identical to level 9).
-    # Default: 1
-    gzip_comp_level 5;
-
-    # Don't compress anything that's already small and unlikely to shrink much
-    # if at all (the default is 20 bytes, which is bad as that usually leads to
-    # larger files after gzipping).
-    # Default: 20
-    gzip_min_length 256;
-
-    # Compress data even for clients that are connecting to us via proxies,
-    # identified by the "Via" header (required for CloudFront).
-    # Default: off
-    gzip_proxied any;
-
-    # Tell proxies to cache both the gzipped and regular version of a resource
-    # whenever the client's Accept-Encoding capabilities header varies;
-    # Avoids the issue where a non-gzip capable client (which is extremely rare
-    # today) would display gibberish if their proxy gave them the gzipped version.
-    # Default: off
-    gzip_vary on;
-
-    # Compress all output labeled with one of the following MIME-types.
-    # text/html is always compressed by gzip module.
-    # Default: text/html
-    gzip_types *;
-    brotli on;
-    # brotli_static on;
-    brotli_types *;
-    # This should be turned on if you are going to have pre-compressed copies (.gz) of
-    # static files available. If not it should be left off as it will cause extra I/O
-    # for the check. It is best if you enable this in a location{} block for
-    # a specific directory, or on an individual server{} level.
-    # gzip_static on;
-	keepalive_timeout 3000;
-	server {
-		listen 80;
-		listen [::]:80;
-        index index.html;
-		server_name localhost;
-		root /usr/share/nginx/html;
-		autoindex on;
-
-		location ~* \.(?:manifest|appcache|html?|xml|json|css|js|map|jpg|jpeg|gif|png|ico|svg|eot|ttf|woff|woff2)$ {
-			add_header Access-Control-Allow-Origin *;
-			add_header Access-Control-Allow-Credentials true;
-			add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
-			add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-			access_log off;
-		}
-		location /service-worker.js {
-		    expires -1;
-		    add_header Access-Control-Allow-Origin *;
-            add_header Access-Control-Allow-Credentials true;
-            add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
-            add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-            access_log off;
-		}
-		location / {
-            try_files $uri $uri/ /index.html =404;
-		}
-		location /iframe.html {
-            try_files $uri $uri/ /iframe.html =404;
-        }
-	}
-}
--- a/src/app/Coriolis.jsx
+++ b/src/app/Coriolis.jsx
@@ -22,6 +22,7 @@ import ComparisonPage from './pages/ComparisonPage';
 import ShipyardPage from './pages/ShipyardPage';
 import ErrorDetails from './pages/ErrorDetails';

+
 const zlib = require('pako');
 const request = require('superagent');

@@ -72,7 +73,6 @@ export default class Coriolis extends React.Component {
      route: {},
      sizeRatio: Persist.getSizeRatio()
    };
-    this._getAnnouncements();
    Router('', (r) => this._setPage(ShipyardPage, r));
    Router('/import?', (r) => this._importBuild(r));
    Router('/import/:data', (r) => this._importBuild(r));
@@ -97,30 +97,35 @@ export default class Coriolis extends React.Component {
      const json = JSON.parse(data);
      console.info('Ship import data: ');
      console.info(json);
-      let ship;
-      if (json && json.modules) {
-        ship = CompanionApiUtils.shipFromJson(json);
-      } else if (json && json.Modules) {
-        ship = JournalUtils.shipFromLoadoutJSON(json);
+      let ship, importString;
+      if (json) {
+        if (json.length && json[0].data) { // SLEF
+          if (json.length > 1) { // Multiple builds, open modal
+            importString = data;
+          } else { // Single build, import directly
+            ship = JournalUtils.shipFromLoadoutJSON(json[0].data);
+          }
+        } else { // not SLEF
+          if (json.modules) {
+            ship = CompanionApiUtils.shipFromJson(json);
+          } else if (json.Modules) {
+            ship = JournalUtils.shipFromLoadoutJSON(json);
+          }
+        }
+      }
+      if (ship) {
+        r.params.ship = ship.id;
+        r.params.code = ship.toString();
+        this._setPage(OutfittingPage, r);
+      } else if (importString) {
+        this._setPage(ShipyardPage, r);
+        this._showModal(<ModalImport importString={data}/>);
      }
-      r.params.ship = ship.id;
-      r.params.code = ship.toString();
-      this._setPage(OutfittingPage, r)
    } catch (err) {
      this._onError('Failed to import ship', r.path, 0, 0, err);
    }
  }

-  async _getAnnouncements() {
-    try {
-      const announces = await request.get('https://orbis.zone/api/announcement')
-        .query({ showInCoriolis: true });
-      this.setState({ announcements: announces.body });
-    } catch (err) {
-      console.error(err)
-    }
-  }
-
  /**
   * Updates / Sets the page and route context
   * @param {[type]} page  The page to be shown
@@ -394,18 +399,18 @@ export default class Coriolis extends React.Component {
   */
  render() {
    let currentMenu = this.state.currentMenu;
-
    return <div style={{ minHeight: '100%' }} onClick={this._closeMenu}
                className={this.state.noTouch ? 'no-touch' : null}>
      <Header announcements={this.state.announcements} appCacheUpdate={this.state.appCacheUpdate}
              currentMenu={currentMenu}/>
      <div className="announcement-container">{this.state.announcements.map(a => <Announcement
-        text={a.message}/>)}</div>
+        text={a.text}/>)}</div>
      {this.state.error ? this.state.error : this.state.page ? React.createElement(this.state.page, { currentMenu }) :
        <NotFoundPage/>}
      {this.state.modal}
      {this.state.tooltip}
      <footer>
+
        <div className="right cap">
          <a href="https://github.com/EDCD/coriolis" target="_blank" rel="noopener noreferrer"
             title="Coriolis Github Project">{window.CORIOLIS_VERSION} - {window.CORIOLIS_DATE}</a>
--- a/src/app/Router.js
+++ b/src/app/Router.js
@@ -72,6 +72,7 @@ Router.go = function(path, state) {
  gaTrack(path);
  let ctx = new Context(path, state);
  Router.dispatch(ctx);
+
  if (!ctx.unhandled) {
    if (isStandAlone()) {
      Persist.setState(ctx);
--- a/src/app/components/CostSection.jsx
+++ b/src/app/components/CostSection.jsx
@@ -306,8 +306,8 @@ export default class CostSection extends TranslatedComponent {
          <tr className='main'>
            <th colSpan='2' className='sortable le' onClick={this._sortCostBy.bind(this,'m')}>
              {translate('module')}
-              {shipDiscount ? <u className='cap optional-hide' style={{ marginLeft: '0.5em' }}>{`[${translate('ship')} -${formats.pct(shipDiscount)}]`}</u> : null}
-              {moduleDiscount ? <u className='cap optional-hide' style={{ marginLeft: '0.5em' }}>{`[${translate('modules')} -${formats.pct(moduleDiscount)}]`}</u> : null}
+              {shipDiscount ? <u className='cap optional-hide' style={{ marginLeft: '0.5em' }}>{`[${translate('ship')} ${formats.pct(-1 * shipDiscount)}]`}</u> : null}
+              {moduleDiscount ? <u className='cap optional-hide' style={{ marginLeft: '0.5em' }}>{`[${translate('modules')} ${formats.pct(-1 * moduleDiscount)}]`}</u> : null}
            </th>
            <th className='sortable le' onClick={this._sortCostBy.bind(this, 'cr')} >{translate('credits')}</th>
          </tr>
--- a/src/app/components/Header.jsx
+++ b/src/app/components/Header.jsx
@@ -10,7 +10,6 @@ import { Ships } from 'coriolis-data/dist';
 import Persist from '../stores/Persist';
 import { toDetailedExport } from '../shipyard/Serializer';
 import Ship from '../shipyard/Ship';
-import ModalBatchOrbis from './ModalBatchOrbis';
 import ModalDeleteAll from './ModalDeleteAll';
 import ModalExport from './ModalExport';
 import ModalHelp from './ModalHelp';
@@ -241,43 +240,6 @@ export default class Header extends TranslatedComponent {
    />);
  };

-  /**
-   * Uploads all ship-builds to orbis
-   * @param {e} e Event
-   */
-  _uploadAllBuildsToOrbis(e) {
-    e.preventDefault();
-    const data = Persist.getBuilds();
-    let postObject = [];
-    for (const ship in data) {
-      for (const code in data[ship]) {
-        const shipModel = ship;
-        if (!shipModel) {
-          throw 'No such ship found: "' + ship + '"';
-        }
-        const shipTemplate = Ships[shipModel];
-        const shipPostObject = {};
-        let shipInstance = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots);
-        shipInstance.buildWith(null);
-        shipInstance.buildFrom(data[ship][code]);
-        shipPostObject.coriolisId = shipInstance.id;
-        shipPostObject.coriolisShip = shipInstance;
-
-        shipPostObject.coriolisShip.url = window.location.origin + outfitURL(shipModel, data[ship][code], code);
-        shipPostObject.title = code || shipInstance.id;
-        shipPostObject.description = code || shipInstance.id;
-        shipPostObject.ShipName = shipInstance.id;
-        shipPostObject.Ship = shipInstance.id;
-        postObject.push(shipPostObject);
-      }
-    }
-    console.log(postObject);
-
-    this.context.showModal(<ModalBatchOrbis
-      ships={postObject}
-    />);
-  }
-
  /**
   * Show export modal with detailed export
   * @param  {SyntheticEvent} e Event
@@ -426,7 +388,10 @@ export default class Header extends TranslatedComponent {
    if (this.props.announcements) {
      announcements = [];
      for (let announce of this.props.announcements) {
-        announcements.push(<Announcement text={announce.message} />);
+        if (announce.expiry < Date.now()) {
+          continue;
+        }
+        announcements.push(<Announcement text={announce.text} />);
        announcements.push(<hr/>);
      }
    }
@@ -496,7 +461,6 @@ export default class Header extends TranslatedComponent {
          {translate('builds')} & {translate('comparisons')}
          <li><Link href="#" className='block' onClick={this._showBackup.bind(this)}>{translate('backup')}</Link></li>
          <li><Link href="#" className='block' onClick={this._showDetailedExport.bind(this)}>{translate('detailed export')}</Link></li>
-          <li><Link href="#" className='block' onClick={this._uploadAllBuildsToOrbis.bind(this)}>{translate('upload all builds to orbis')}</Link></li>
          <li><Link href="#" className='block' onClick={this._showImport.bind(this)}>{translate('import')}</Link></li>
          <li><Link href="#" className='block' onClick={this._showDeleteAll.bind(this)}>{translate('delete all')}</Link></li>
        </ul>
--- a/src/app/components/ModalBatchOrbis.jsx
+++ b/src/app/components/ModalBatchOrbis.jsx
@@ -1,93 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import request from 'superagent';
-import TranslatedComponent from './TranslatedComponent';
-import { orbisUpload } from '../utils/ShortenUrl';
-import Persist from '../stores/Persist';
-
-/**
- * Permalink modal
- */
-export default class ModalBatchOrbis extends TranslatedComponent {
-
-  static propTypes = {
-    ships: PropTypes.any.isRequired
-  };
-
-  /**
-   * Constructor
-   * @param  {Object} props   React Component properties
-   */
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      orbisCreds: Persist.getOrbisCreds(),
-      resp: ''
-    };
-  }
-
-  /**
-   * Send ship to Orbis.zone
-   * @param {SyntheticEvent} e React Event
-   * @return {Promise} Promise sending post request to orbis
-   */
-  sendToOrbis(e) {
-    let agent;
-    try {
-      agent = request.agent(); // apparently this crashes somehow
-    } catch (e) {
-      console.error(e);
-    }
-    if (!agent) {
-      agent = request;
-    }
-    const API_ORBIS = 'https://orbis.zone/api/builds/add/batch';
-    return new Promise((resolve, reject) => {
-      try {
-        agent
-          .post(API_ORBIS)
-          .withCredentials()
-          .redirects(0)
-          .set('Content-Type', 'application/json')
-          .send(this.props.ships)
-          .end((err, response) => {
-            console.log(response);
-            if (err) {
-              console.error(err);
-              this.setState({ resp: response.text });
-              reject('Bad Request');
-            } else {
-              this.setState({ resp: 'All builds uploaded. Check https://orbis.zone' });
-              resolve('All builds uploaded. Check https://orbis.zone');
-            }
-          });
-      } catch (e) {
-        console.log(e);
-        reject(e.message ? e.message : e);
-      }
-    });
-  }
-
-  /**
-   * Render the modal
-   * @return {React.Component} Modal Content
-   */
-  render() {
-    let translate = this.context.language.translate;
-    this.sendToOrbis = this.sendToOrbis.bind(this);
-
-    return <div className='modal' onClick={ (e) => e.stopPropagation() }>
-      <h2>{translate('permalink')}</h2>
-      <br/>
-      <a className='button' href="https://orbis.zone/api/auth">Log in / signup to Orbis</a>
-      <br/><br/>
-      <h3 >{translate('success')}</h3>
-      <input value={this.state.resp} readOnly size={25} onFocus={ (e) => e.target.select() }/>
-      <br/><br/>
-      <p>Orbis.zone is currently in a trial period, and may be wiped at any time as development progresses. Some elements are also still placeholders.</p>
-      <button className={'l cb dismiss cap'} disabled={!!this.state.failed} onClick={this.sendToOrbis}>{translate('PHASE_UPLOAD_ORBIS')}</button>
-      <button className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
-    </div>;
-  }
-}
--- a/src/app/components/ModalImport.jsx
+++ b/src/app/components/ModalImport.jsx
@@ -11,7 +11,8 @@ import * as ModuleUtils from '../shipyard/ModuleUtils';
 import { fromDetailedBuild } from '../shipyard/Serializer';
 import { Download } from './SvgIcons';
 import { outfitURL } from '../utils/UrlGenerators';
-import * as CompanionApiUtils from '../utils/CompanionApiUtils';
+import { shipFromJson, shipModelFromJson } from '../utils/CompanionApiUtils';
+import { shipFromLoadoutJSON } from '../utils/JournalUtils';

 const zlib = require('pako');

@@ -88,6 +89,7 @@ export default class ModalImport extends TranslatedComponent {


  static propTypes = {
+    importString: PropTypes.string, // Optional: Default data for import modal
    builds: PropTypes.object,  // Optional: Import object
  };

@@ -106,7 +108,7 @@ export default class ModalImport extends TranslatedComponent {
      shipDiscount: null,
      moduleDiscount: null,
      errorMsg: null,
-      importString: null,
+      importString: props.importString || null,
      importValid: false,
      insurance: null
    };
@@ -214,8 +216,8 @@ export default class ModalImport extends TranslatedComponent {
   * @throws {string} if parse/import fails
   */
  _importCompanionApiBuild(build) {
-    const shipModel = CompanionApiUtils.shipModelFromJson(build);
-    const ship = CompanionApiUtils.shipFromJson(build);
+    const shipModel = shipModelFromJson(build);
+    const ship = shipFromJson(build);

    let builds = {};
    builds[shipModel] = {};
@@ -321,6 +323,30 @@ export default class ModalImport extends TranslatedComponent {
    this.setState({ builds, singleBuild: true });
  }

+  /**
+   * Import SLEF formatted builds. Sets state to a map of the builds on success
+   * and flags if there was only a single build.
+   *
+   * @param  {string} importData - Array of the list of builds.
+   * @throws {string} If parse / import fails
+   */
+  _importSlefBuilds(importData) {
+    const builds = importData.reduce((memo, { data }) => {
+      const shipModel = shipModelFromJson(data);
+      const ship = shipFromLoadoutJSON(data);
+      const shipTemplate = Ships[shipModel];
+      const shipName = data.ShipName || shipTemplate.properties.name;
+
+      const key = `Imported ${shipName}`;
+      memo[shipModel] = {};
+      memo[shipModel][key] = ship.toString();
+
+      return memo;
+    }, {});
+
+    this.setState({ builds, singleBuild: Object.keys(builds).length === 1 });
+  }
+
  /**
   * Validate the import string / text box contents
   * @param  {SyntheticEvent} event Event
@@ -355,8 +381,10 @@ export default class ModalImport extends TranslatedComponent {
          throw 'Must be an object or array!';
        }

-        if (importData.modules != null && importData.modules.Armour != null) { // Only the companion API has this information
-          this._importCompanionApiBuild(importData); // Single sihp definition
+        if (importData?.[0]?.header?.appName) { // has SLEF envelope?
+          this._importSlefBuilds(importData);
+        } else if (importData.modules != null && importData.modules.Armour != null) { // Only the companion API has this information
+          this._importCompanionApiBuild(importData); // Single ship definition
        } else if (importData.ship != null && importData.ship.modules != null && importData.ship.modules.Armour != null) { // Only the companion API has this information
          this._importCompanionApiBuild(importData.ship); // Complete API dump
        } else if (importData instanceof Array) {   // Must be detailed export json
@@ -542,7 +570,7 @@ export default class ModalImport extends TranslatedComponent {
              {comparisonRows}
            </tbody>
          </table>
-          );
+        );
      }

      if(this.state.canEdit) {
--- a/src/app/components/ModalOrbis.jsx
+++ b/src/app/components/ModalOrbis.jsx
@@ -1,141 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import TranslatedComponent from './TranslatedComponent';
-import { orbisUpload } from '../utils/ShortenUrl';
-import Persist from '../stores/Persist';
-
-/**
- * Permalink modal
- */
-export default class ModalOrbis extends TranslatedComponent {
-
-  static propTypes = {
-    ship: PropTypes.any.isRequired
-  };
-
-  /**
-   * Constructor
-   * @param  {Object} props   React Component properties
-   */
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      orbisCreds: Persist.getOrbisCreds(),
-      orbisUrl: '...',
-      ship: this.props.ship,
-      authenticatedStatus: 'Checking...'
-    };
-    this.orbisCategory = this.orbisCategory.bind(this);
-  }
-
-  /**
-   * Send ship to Orbis.zone
-   * @param {SyntheticEvent} e React Event
-   */
-  sendToOrbis(e) {
-    const target = e.target;
-    target.disabled = true;
-    this.setState({ orbisUrl: 'Sending...' }, () => {
-      orbisUpload(this.props.ship, this.state.orbisCreds)
-        .then(orbisUrl => {
-          target.disabled = false;
-          this.setState({ orbisUrl });
-        })
-        .catch(err => {
-          target.disabled = false;
-          this.setState({ orbisUrl: 'Error - ' + err });
-        });
-    });
-  }
-
-  /**
-   * Get Orbis.zone auth status
-   * @returns {Object} auth status
-   */
-  getOrbisAuthStatus() {
-    return fetch('https://orbis.zone/api/checkauth', {
-      credentials: 'include',
-      mode: 'cors'
-    })
-    .then(data => data.json())
-    .then(res => {
-      this.setState({ authenticatedStatus: res.status || res.error });
-    })
-    .catch(err => {
-      console.error(err);
-      this.setState({ authenticatedStatus: err.message });
-    });
-  }
-
-  /**
-   * Handler for changing cmdr name
-   * @param {SyntheticEvent} e React Event
-   */
-  orbisPasswordHandler(e) {
-    let password = e.target.value;
-    this.setState({ orbisCreds: { email: this.state.orbisCreds.email, password } }, () => {
-      Persist.setOrbisCreds(this.state.orbisCreds);
-    });
-  }
-
-  /**
-   * Handler for changing cmdr name
-   * @param {SyntheticEvent} e React Event
-   */
-  orbisUsername(e) {
-    let orbisUsername = e.target.value;
-    this.setState({ orbisCreds: { email: orbisUsername, password: this.state.orbisCreds.password } }, () => {
-      Persist.setOrbisCreds(this.state.orbisCreds);
-    });
-  }
-
-  /**
-   * Handler for changing category
-   * @param {SyntheticEvent} e React Event
-   */
-  orbisCategory(e) {
-    let ship = this.state.ship;
-    let cat = e.target.value;
-    ship.category = cat;
-    this.setState({ship});
-  }
-
-  /**
-   * Render the modal
-   * @return {React.Component} Modal Content
-   */
-  render() {
-    let translate = this.context.language.translate;
-    this.orbisPasswordHandler = this.orbisPasswordHandler.bind(this);
-    this.orbisUsername = this.orbisUsername.bind(this);
-    this.sendToOrbis = this.sendToOrbis.bind(this);
-    this.getOrbisAuthStatus();
-    return <div className='modal' onClick={ (e) => e.stopPropagation() }>
-      <h2>{translate('upload to orbis')}</h2>
-      <br/>
-      <label>Orbis auth status: </label>
-      <input value={this.state.authenticatedStatus} readOnly size={25} onFocus={ (e) => e.target.select() }/>
-      <br/><br/>
-      <a className='button' href="https://orbis.zone/api/auth">Log in / signup to Orbis</a>
-      <br/><br/>
-      <h3>Category</h3>
-      <select onChange={this.orbisCategory}>
-        <option value="">No Category</option>
-        <option>Combat</option>
-        <option>Mining</option>
-        <option>Trading</option>
-        <option>Exploration</option>
-        <option>Passenger Liner</option>
-        <option>PvP</option>
-      </select>
-      <br/><br/>
-      <h3 >{translate('Orbis link')}</h3>
-      <input value={this.state.orbisUrl} readOnly size={25} onFocus={ (e) => e.target.select() }/>
-      <br/><br/>
-      <p>Orbis.zone is currently in a trial period, and may be wiped at any time as development progresses. Some elements are also still placeholders.</p>
-      <button className={'l cb dismiss cap'} disabled={!!this.state.failed} onClick={this.sendToOrbis}>{translate('PHASE_UPLOAD_ORBIS')}</button>
-      <button className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
-    </div>;
-  }
-}
--- a/src/app/components/Offence.jsx
+++ b/src/app/components/Offence.jsx
@@ -243,8 +243,13 @@ export default class Offence extends TranslatedComponent {
          <td className='ri'><span onMouseOver={termtip.bind(null, baseSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>{formats.f1(weapon.sdps.base.total)}</span></td>
          <td className='ri'><span onMouseOver={termtip.bind(null, effectiveShieldsSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>{formats.f1(weapon.sdps.shields.total)}</span></td>
          <td className='ri'><span onMouseOver={termtip.bind(null, effectivenessShieldsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(weapon.effectiveness.shields.total)}</span></td>
+
+          <td className='ri'><span>{formats.f1(weapon.effectiveness.shields.dpe)}</span></td>
+
          <td className='ri'><span onMouseOver={termtip.bind(null, effectiveArmourSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>{formats.f1(weapon.sdps.armour.total)}</span></td>
          <td className='ri'><span onMouseOver={termtip.bind(null, effectivenessArmourTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(weapon.effectiveness.armour.total)}</span></td>
+
+          <td className='ri'><span>{formats.f1(weapon.effectiveness.armour.dpe)}</span></td>
        </tr>);
    }

@@ -271,15 +276,20 @@ export default class Offence extends TranslatedComponent {
              <tr className='main'>
                <th rowSpan='2' className='sortable' onClick={sortOrder.bind(this, 'n')}>{translate('weapon')}</th>
                <th colSpan='1'>{translate('overall')}</th>
-                <th colSpan='2'>{translate('opponent\'s shields')}</th>
-                <th colSpan='2'>{translate('opponent\'s armour')}</th>
+                <th colSpan='3'>{translate('opponent\'s shields')}</th>
+                <th colSpan='3'>{translate('opponent\'s armour')}</th>
              </tr>
              <tr>
                <th className='lft sortable' onMouseOver={termtip.bind(null, 'TT_EFFECTIVE_SDPS_SHIELDS')} onMouseOut={tooltip.bind(null, null)} onClick={sortOrder.bind(this, 'esdpss')}>{'sdps'}</th>
                <th className='lft sortable' onMouseOver={termtip.bind(null, 'TT_EFFECTIVE_SDPS_SHIELDS')} onMouseOut={tooltip.bind(null, null)} onClick={sortOrder.bind(this, 'esdpss')}>{'sdps'}</th>
                <th className='sortable' onMouseOver={termtip.bind(null, 'TT_EFFECTIVENESS_SHIELDS')} onMouseOut={tooltip.bind(null, null)}onClick={sortOrder.bind(this, 'es')}>{'eft'}</th>
+
+                <th className='sortable'>{'dpe'}</th>
+
                <th className='lft sortable' onMouseOver={termtip.bind(null, 'TT_EFFECTIVE_SDPS_ARMOUR')} onMouseOut={tooltip.bind(null, null)}onClick={sortOrder.bind(this, 'esdpsh')}>{'sdps'}</th>
                <th className='sortable' onMouseOver={termtip.bind(null, 'TT_EFFECTIVENESS_ARMOUR')} onMouseOut={tooltip.bind(null, null)}onClick={sortOrder.bind(this, 'eh')}>{'eft'}</th>
+
+                <th className='sortable'>{'dpe'}</th> 
              </tr>
            </thead>
            <tbody>
@@ -290,8 +300,10 @@ export default class Offence extends TranslatedComponent {
                  <td className='ri'><span onMouseOver={termtip.bind(null, totalSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>={formats.f1(totalSDps)}</span></td>
                  <td className='ri'><span onMouseOver={termtip.bind(null, totalShieldsSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>={formats.f1(totalShieldsSDps)}</span></td>
                  <td></td>
+                  <td></td>
                  <td className='ri'><span onMouseOver={termtip.bind(null, totalArmourSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>={formats.f1(totalArmourSDps)}</span></td>
                  <td></td>
+                  <td></td>
                </tr>
              }
            </tbody>
--- a/src/app/components/SvgIcons.jsx
+++ b/src/app/components/SvgIcons.jsx
@@ -247,7 +247,8 @@ export class OrbisIcon extends SvgIcon {
        <path d="m155.34 679.12 173.25-190.21-15.626-13.721-170.9 190.4zm31.01 31.714 202.41-169.1-16.418-14.417-198.76 170.43z"/>
        <path d="m702.66 178.87-173.25 190.21 15.625 13.721 170.9-190.4zm-31.01-31.714-202.41 169.1 16.418 14.417 198.76-170.43z" />
        <rect transform="matrix(-.7071 -.7071 .7071 -.7071 429.34 1036.2)" x="387.09" y="420.77" width="84.379" height="16.859" />
-    </g>);
+      </g>
+    );
  }
 }

--- a/src/app/i18n/de.json
+++ b/src/app/i18n/de.json
@@ -133,7 +133,7 @@
    "pv": "Planetenfahrzeug-Hangar",
    "rf": "Raffinerie",
    "rg": "Schienenkanone",
-    "rsl": "Steuerung Aufklärungsdrohne",
+    "rsl": "Steuerung Forschungsdrohne",
    "s": "Sensoren",
    "sb": "Schildverstärker",
    "sc": "Himmelskörperscanner",
@@ -146,7 +146,7 @@
    "ul": "Salvenlaser",
    "ws": "FS-Sogwolkenscanner",
    "rpl": "Steuerung Reparaturdrohne",
-    "rcpl": "Recon Limpet Controller",
+    "rcpl": "Steuerung Aufklärungsdrohne",
    "hrd": "Hüllenhärte",
    "pax": "Pass",
    "axmc": "AX-Mehrfachgeschütz",
--- a/src/app/i18n/en.json
+++ b/src/app/i18n/en.json
@@ -205,7 +205,7 @@
    "internal protection": "Internal protection",
    "external protection": "External protection",
    "engagement range": "Engagement range",
-    "boost interval": "Boost intervall",
+    "boost interval": "Boost interval",
    "total": "Total",
    "ammo": "Ammunition maximum",
    "boot": "Boot time",
--- a/src/app/i18n/pt.js
+++ b/src/app/i18n/pt.js
@@ -2,15 +2,15 @@ export const formats = {
  decimal: ',',
  thousands: '.',
  grouping: [3],
-  currency: ['', ' €'],
+  currency: ['$', ''],
  dateTime: '%A, %e de %B de %Y, %X',
  date: '%d/%m/%Y',
  time: '%H:%M:%S',
  periods: ['AM', 'PM'],
-  days: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes', 'sábado'],
-  shortDays: ['dom', 'lun', 'mar', 'mié', 'jue', 'vie', 'sáb'],
-  months: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
-  shortMonths: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sep', 'oct', 'nov', 'dic']
+  days: ['domingo', 'segunda', 'terça', 'quarta', 'quinta', 'sexta', 'sábado'],
+  shortDays: ['dom', 'seg', 'ter', 'qua', 'qui', 'sex', 'sab'],
+  months: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho', 'julho', 'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
+  shortMonths: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul', 'ago', 'set', 'out', 'nov', 'dez']
 };

 export { default as terms } from './pt.json';
--- a/src/app/i18n/pt.json
+++ b/src/app/i18n/pt.json
--- a/src/app/i18n/ru.json
+++ b/src/app/i18n/ru.json
@@ -16,13 +16,16 @@
    "PHRASE_ENGAGEMENT_RANGE": "Дистанция между кораблём и целью",
    "PHRASE_SELECT_BLUEPRINT": "Нажмите чтобы выбрать чертёж",
    "PHRASE_BLUEPRINT_WORST": "Худшие основные значения для чертежа",
+    "PHRASE_BLUEPRINT_FIFTY": "50% значения для чертежа",
+    "PHRASE_BLUEPRINT_SEVEN_FIVE": "75% значения для чертежа",
    "PHRASE_BLUEPRINT_RANDOM": "Случайный выбор между худшими и лучшими значениями для этого чертежа",
    "PHRASE_BLUEPRINT_BEST": "Лучшие основные значения для чертежа",
    "PHRASE_BLUEPRINT_EXTREME": "Лучшие положительные и худшие отрицательные основные значения для чертежа",
-    "PHRASE_BLUEPRINT_RESET": "Убрать все изменения и чертёж",
+    "PHRASE_BLUEPRINT_RESET": "Сбросить все модификаторы и чертеж",
    "PHRASE_SELECT_SPECIAL": "Нажмите, чтобы выбрать экспериментальный эффект",
    "PHRASE_NO_SPECIAL": "Без экспериментального эффекта",
    "PHRASE_SHOPPING_LIST": "Станции, что продают эту сборку",
+    "PHRASE_SHOPPING_MATS": "Материалы которые нужны для сборки",
    "PHRASE_REFIT_SHOPPING_LIST": "Станции, что продают необходимые модули",
    "PHRASE_TOTAL_EFFECTIVE_SHIELD": "Общий урон, что может быть нанесён в каждым типе, если используются все щитонакопители",
    "PHRASE_TIME_TO_LOSE_SHIELDS": "Щиты продержатся",
@@ -36,9 +39,11 @@
    "PHRASE_TIME_TO_LOSE_ARMOUR": "Броня продержится",
    "PHRASE_MODULE_PROTECTION_EXTERNAL": "Защита гнёзд",
    "PHRASE_MODULE_PROTECTION_INTERNAL": "Защита всех остальных модулей",
+    "PHRASE_OVERALL_DAMAGE": "Разбивка источников устойчивого ДПС",
    "PHRASE_SHIELD_DAMAGE": "Подробности источников поддерживаемого ДПС против щитов",
    "PHRASE_ARMOUR_DAMAGE": "Подробности источников поддерживаемого ДПС против брони",
    "PHRASE_TIME_TO_REMOVE_SHIELDS": "Снимет щиты за",
+    "PHRASE_MULTI_CREW_CAPACITOR_POINTS": "Щелкните правой кновкой мыши чтобы объединить в группу.",
    "TT_TIME_TO_REMOVE_SHIELDS": "Непрерывным огнём из всех орудий",
    "PHRASE_TIME_TO_REMOVE_ARMOUR": "Снимет броню за",
    "TT_TIME_TO_REMOVE_ARMOUR": "Непрерывным огнём из всех орудий",
@@ -58,8 +63,10 @@
    "TT_SUMMARY_SPEED": "С полным топливным баком и 4 пунктами в ДВИ",
    "TT_SUMMARY_SPEED_NONFUNCTIONAL": "Маневровые двигатели выключены или превышена максимальная масса с топливом и грузом",
    "TT_SUMMARY_BOOST": "С полным топливным баком и 4 пунктами в ДВИ",
+    "TT_SUMMARY_BOOST_INTERVAL": "Время заполнения с 4 пунктами в СИС",
    "TT_SUMMARY_BOOST_NONFUNCTIONAL": "Распределитель питания не может обеспечить достаточно энергии для форсажа",
    "TT_SUMMARY_SHIELDS": "Чистая сила щита, включая усилители",
+    "TT_SUMMARY_SHIELDS_SCB": "Прочность щита, включая бустеры и SCB",
    "TT_SUMMARY_SHIELDS_NONFUNCTIONAL": "Шитогенератор отсутствует или выключен",
    "TT_SUMMARY_INTEGRITY": "Целостность корабля, включая переборки и наборы для усиления корпуса",
    "TT_SUMMARY_HULL_MASS": "Масса корпуса без каких-либо модулей",
@@ -74,11 +81,14 @@
    "TT_SUMMARY_UNLADEN_TOTAL_JUMP": "Самая дальняя общая дистанция без груза, с полным топливным баком и при прыжках на максимальное расстояние",
    "TT_SUMMARY_LADEN_TOTAL_JUMP": "Самая дальняя общая дистанция с полным грузовым отсеком, с полным топливным баком и при прыжках на максимальное расстояние",
    "HELP_MODIFICATIONS_MENU": "Нажмите на номер, чтобы ввести новое значение, или потяните вдоль полосы для малых изменений",
+    "PHRASE_FAIL_EDENGINEER": "Не удалось отправить в EDEngineer (запустите EDEngineer и убедитесь, что API запущен, затем обновите страницу).",
+    "PHRASE_FIREFOX_EDENGINEER": "Отправка в EDEngineer несовместима с настройками безопасности Firefox. Пожалуйста, попробуйте еще раз в Google Chrome.",
    "am": "Блок Автом. Полевого Ремонта",
    "bh": "Переборки",
    "bl": "Пучковый лазер",
    "bsg": "Двухпоточный щитогенератор",
    "c": "Орудие",
+    "causres": "Caustic resistance",
    "cc": "Контроллер магнитного снаряда для сбора",
    "ch": "Разбрасыватель дипольных отражателей",
    "cr": "Грузовой стеллаж",
@@ -98,14 +108,17 @@
    "kw": "Сканер преступников",
    "ls": "Система жизнеобеспечения",
    "mc": "Многоствольное орудие",
+    "axmc": "Многоствольное орудие АИ",
    "ml": "Проходочный лазер",
    "mr": "Ракетный лоток",
+    "axmr": "Блок ракет АИ",
    "mrp": "Набор для усиления модуля",
    "nl": "Мины",
    "pa": "Ускоритель плазмы",
    "pas": "Комплект для сближения с планетой",
    "pc": "Контроллер магнитного снаряда для геологоразведки",
    "pce": "Каюта пассажира эконом-класса",
+    "passenger capacity": "количество пассажиров",
    "pci": "Каюта пассажира бизнес-класса",
    "pcm": "Каюта пассажира первого класса",
    "pcq": "Каюта пассажира класса люкс",
@@ -113,20 +126,46 @@
    "pl": "Импульсный лазер",
    "po": "Точечная оборона",
    "pp": "Силовая установка",
+    "gpp": "Силовая установка Cтражей",
+    "gpd": "Гибридный распределитель питания Стражей",
+    "gpc": "Плазменная пушка Стражей",
+    "ggc": "Пушка Гаусса Стражей",
+    "gsrp": "Набор для усиления щита Стражей",
+    "gfsb": "Ускоритель FSD Стражей",
+    "ghrp": "Набор для усиления корпуса Стражей",
+    "gmrp": "Набор для усиления модуля Стражей",
+    "pwa": "Анализатор импульсных волн",
+    "abl": "Абразивный бластер",
+    "scl": "Пусковая установка для сейсмических снарядов",
+    "sdm": "Вытесняющая ракета для добычи глубинных залежей",
+    "tbsc": "Шоковое орудие",
+    "gsc": "Осколочное орудие Стражей",
    "psg": "Призматический щитогенератор",
    "pv": "Гараж для планетарного транспорта",
    "rf": "Устройство переработки",
+    "rfl": "Зенитная установка (снаряды с дистанционным подрывом)",
    "rg": "Электромагнитная пушка",
+    "rsl": "Дроны-исследователи",
    "s": "Сенсоры",
    "sb": "Усилитель щита",
    "sc": "Сканер обнаружения",
    "scb": "Щитонакопитель",
+    "sfn": "Нейтрализатор глушащего поля",
    "sg": "Щитогенератор",
    "ss": "Сканер поверхностей",
+    "sua": "Помощь в гиперкрейсерском режиме",
    "t": "Маневровые двигатели",
    "tp": "Торпедная стойка",
    "ul": "Пульсирующие лазеры",
+    "Send To EDEngineer": "Отправить в EDEngineer",
    "ws": "Сканер следа FSD",
+    "rpl": "Дроны-ремонтники",
+    "rcpl": "ДРоны-разведчики",
+    "xs": "Сканер «инопланетянин»",
+    "tbem": "Блок энзимных ракет",
+    "tbrfl": "Установка для стрельбы стреловидными снарядами с дистанционным подрывом",
+    "dtl": "Дроны-очистители",
+    "mahr": "Набор для усиления корпуса из Метасплава",
    "emptyrestricted": "пусто (ограниченно)",
    "damage dealt to": "Урон нанесён",
    "damage received from": "Урон получен от",
@@ -136,6 +175,7 @@
    "ammunition": "Припасы",
    "secs": "с",
    "rebuildsperbay": "Построек за полосу",
+    "mroll": "Roll",
    "worst": "Худшее",
    "average": "Среднее",
    "random": "Случайное",
@@ -148,6 +188,7 @@
    "dpssdps": "Урон в секунду (поддерживаемый урон в секунду)",
    "eps": "Энергия в секунду",
    "epsseps": "Энергия в секунду (поддерживаемая энергия в секунду)",
+    "fallofffromrange": "Спад",
    "hps": "Нагрев в секунду",
    "hpsshps": "Нагрев в секунду (поддерживаемый нагрев в секунду)",
    "damage by": "Урон",
@@ -164,13 +205,15 @@
    "internal protection": "Внутренняя защита",
    "external protection": "Внешняя защита",
    "engagement range": "Боевое расстояние",
+    "boost interval": "Интервал повышения",
    "total": "Всего",
-    "ammo": "Боекомплект",
+    "ammo": "Макс. боекомплект",
    "boot": "Время загрузки",
+    "hacktime": "Время взлома",
    "brokenregen": "Скорость восстановления при пробое",
    "burst": "Длина очереди",
    "burstrof": "Скорострельность очереди",
-    "clip": "Боекомплект",
+    "clip": "Размер боекомплекта",
    "damage": "Урон",
    "distdraw": "Тяга распределителя",
    "duration": "Продолжительность",
@@ -199,11 +242,14 @@
    "rof": "Скорострельность",
    "angle": "Угол сканера",
    "scanrate": "Скорость сканера",
+    "proberadius": "Радиус зонда",
    "scantime": "Время сканирования",
    "shield": "Щит",
+    "armour": "Броня",
    "shieldboost": "Усиление щитов",
    "shieldreinforcement": "Усилитель щита",
    "shotspeed": "Скорость выстрела",
+    "shotdmg": "Урон за выстрел(DPS)",
    "spinup": "Время раскрутки",
    "syscap": "Ресурс систем",
    "sysrate": "Перезарядка систем",
@@ -234,9 +280,12 @@
    "explosive": "Взрывч.",
    "kinetic": "Механич.",
    "thermal": "Тепл.",
+    "caustic": "Каустик",
    "generator": "Генератор",
    "boosters": "Усилители",
    "cells": "Ячейки",
+    "shield addition": "ДОбавления к щиту",
+    "jump addition": "ДОбавления к прыжку",
    "bulkheads": "Переборки",
    "reinforcement": "Усилители",
    "power and costs": "Энергия и стоимость",
@@ -269,13 +318,45 @@
    "opponent": "Противник",
    "opponent's shields": "Щит противника",
    "opponent's armour": "Броня противника",
+    "overall damage": "overall damage",
    "shield damage sources": "источники урона по щиту",
    "armour damage sources": "источники урона по броне",
    "never": "Никогда",
    "stock": "базовый",
    "boost": "форсаж",
-    "/s": "/с",
-    "m/s": "м/с",
+    "tab_defence": "defence",
+    "federation rank 1": "Рекрут",
+    "federation rank 2": "Кадет",
+    "federation rank 3": "Гардемарин",
+    "federation rank 4": "Старшина",
+    "federation rank 5": "Главный старшина",
+    "federation rank 6": "Уорент-офицер",
+    "federation rank 7": "Энсин",
+    "federation rank 8": "Лейтенант",
+    "federation rank 9": "Капитан-лейтенант",
+    "federation rank 10": "Начальник гарнизона",
+    "federation rank 11": "Командир корабля",
+    "federation rank 12": "Контр-адмирал",
+    "federation rank 13": "  Вице-адмирал",
+    "federation rank 14": "Адмирал",
+    "federation rank required": "Минимальный ранг федерации для покупки",
+    "empire rank 1": "Чужак",
+    "empire rank 2": "Крепостной",
+    "empire rank 3": "Мастер",
+    "empire rank 4": "Оруженосец",
+    "empire rank 5": "Рыцарь",
+    "empire rank 6": "Лорд",
+    "empire rank 7": "Барон",
+    "empire rank 8": "Виконт",
+    "empire rank 9": "Граф",
+    "empire rank 10": "Эрл",
+    "empire rank 11": "Маркиз",
+    "empire rank 12": "Герцог",
+    "empire rank 13": "Принц",
+    "empire rank 14": "Король",
+    "empire rank required": "Минимальный ранг империи для покупки",
+    "\/s": "\/с",
+    "m\/s": "м\/с",
    "Ls": "Св.сек",
    "LY": "Св.лет",
    "CR": "кр.",
@@ -315,7 +396,6 @@
    "about": "О ...",
    "action": "Действие",
    "added": "Добавлено",
-    "armour": "Броня",
    "available": "доступно",
    "backup": "Резервная копия",
    "bins": "контейнеры",
@@ -363,7 +443,7 @@
    "repair": "Починка",
    "ret": "Убр.",
    "retracted": "Убрано",
-    "ROF": "В/сек",
+    "ROF": "В\/сек",
    "save": "Сохранить",
    "sell": "Продать",
    "settings": "Настройки",
--- a/src/app/pages/AboutPage.jsx
+++ b/src/app/pages/AboutPage.jsx
@@ -94,39 +94,6 @@ export default class AboutPage extends Page {
          </a>
          .
        </p>
-
-        <h3>Supporting Coriolis</h3>
-        <p>
-          Coriolis is an open source project, and I work on it in my free time.
-          I have set up a patreon at{' '}
-          <a href="https://www.patreon.com/coriolis_elite">
-            patreon.com/coriolis_elite
-          </a>
-          , which will be used to keep Coriolis up to date and the servers
-          running.
-        </p>
-        <form
-          action="https://www.paypal.com/cgi-bin/webscr"
-          method="post"
-          target="_top"
-        >
-          <input type="hidden" name="cmd" value="_s-xclick" />
-          <input type="hidden" name="hosted_button_id" value="SJBKT2SWEEU68" />
-          <input
-            type="image"
-            src="https://www.paypalobjects.com/en_AU/i/btn/btn_donate_SM.gif"
-            border="0"
-            name="submit"
-            alt="PayPal – The safer, easier way to pay online!"
-          />
-          <img
-            alt=""
-            border="0"
-            src="https://www.paypalobjects.com/en_AU/i/scr/pixel.gif"
-            width="1"
-            height="1"
-          />
-        </form>
      </div>
    );
  }
--- a/src/app/pages/OutfittingPage.jsx
+++ b/src/app/pages/OutfittingPage.jsx
@@ -19,7 +19,6 @@ import {
  LinkIcon,
  ShoppingIcon,
  MatIcon,
-  OrbisIcon
 } from '../components/SvgIcons';
 import LZString from 'lz-string';
 import ShipSummaryTable from '../components/ShipSummaryTable';
@@ -37,7 +36,6 @@ import OutfittingSubpages from '../components/OutfittingSubpages';
 import ModalExport from '../components/ModalExport';
 import ModalPermalink from '../components/ModalPermalink';
 import ModalShoppingList from '../components/ModalShoppingList';
-import ModalOrbis from '../components/ModalOrbis';

 /**
 * Document Title Generator
@@ -680,23 +678,6 @@ export default class OutfittingPage extends Page {
    this.context.showModal(<ModalPermalink url={window.location.href} />);
  }

-  /**
-   * Generate Orbis link
-   */
-  _genOrbis() {
-    const data = {};
-    const ship = this.state.ship;
-    ship.coriolisId = ship.id;
-    data.coriolisShip = ship;
-    data.url = window.location.href;
-    data.title = this.state.buildName || ship.id;
-    data.description = this.state.buildName || ship.id;
-    data.ShipName = ship.id;
-    data.Ship = ship.id;
-    console.log(data);
-    this.context.showModal(<ModalOrbis ship={data} />);
-  }
-
  /**
   * Open up a window for EDDB with a shopping list of our components
   */
@@ -946,13 +927,6 @@ export default class OutfittingPage extends Page {
            >
              <LinkIcon className="lg" />
            </button>
-            <button
-              onClick={this._genOrbis}
-              onMouseOver={termtip.bind(null, 'PHASE_UPLOAD_ORBIS')}
-              onMouseOut={hide}
-            >
-              <OrbisIcon className="lg" />
-            </button>
            <button
              onClick={this._genShoppingList}
              onMouseOver={termtip.bind(null, 'PHRASE_SHOPPING_MATS')}
--- a/src/app/pages/Page.jsx
+++ b/src/app/pages/Page.jsx
@@ -62,6 +62,14 @@ export default class Page extends React.Component {
   */
  componentDidMount() {
    document.title = this.state.title || 'Coriolis';
+    try {
+      (window.adsbygoogle = window.adsbygoogle || []).push({
+        google_ad_client: "ca-pub-3709458261881414",
+        enable_page_level_ads: true
+      });
+    } catch (error) {
+
+    }
  }

  /**
--- a/src/app/pages/ShipyardPage.jsx
+++ b/src/app/pages/ShipyardPage.jsx
@@ -205,7 +205,6 @@ export default class ShipyardPage extends Page {
        onMouseEnter={noTouch && this._highlightShip.bind(this, s.id)}
        onClick={() => this._toggleCompare(s.id)}
      >
-        <td className="ri">{s.manufacturer}</td>
        <td className="ri">{fInt(s.retailCost)}</td>
        <td className="ri cap">{translate(SizeMap[s.class])}</td>
        <td className="ri">{fInt(s.crew)}</td>
@@ -368,13 +367,6 @@ export default class ShipyardPage extends Page {
            <table style={{ marginLeft: 'calc(12em - 1px)', zIndex: 0 }} className="shipyard-table">
              <thead>
                <tr className="main">
-                  <th
-                    rowSpan={3}
-                    className="sortable"
-                    onClick={sortShips('manufacturer')}
-                  >
-                    {translate('manufacturer')}
-                  </th>
                  <th>&nbsp;</th>
                  <th
                    rowSpan={3}
--- a/src/app/shipyard/Calculations.js
+++ b/src/app/shipyard/Calculations.js
@@ -14,6 +14,7 @@ export function jumpRange(mass, fsd, fuel, ship) {
  const fsdOptimalMass = fsd instanceof Module ? fsd.getOptMass() : fsd.optmass;
  let jumpAddition = 0;
  if (ship) {
+    mass += ship.reserveFuelCapacity || 0;
    for (const module of ship.internal) {
      if (module && module.m && module.m.grp === 'gfsb' && ship.getSlotStatus(module) == 3) {
        jumpAddition += module.m.getJumpBoost();
@@ -340,63 +341,30 @@ export function shieldMetrics(ship, sys) {
  const maxSysResistance = this.sysResistance(4);

  let shield = {};
-  const dimReturnLine = (res) => 1 - (1 - res) * 0.7;

  const shieldGeneratorSlot = ship.findInternalByGroup('sg');
  if (shieldGeneratorSlot && shieldGeneratorSlot.enabled && shieldGeneratorSlot.m) {
    const shieldGenerator = shieldGeneratorSlot.m;
-    let res = {
-      kin: shieldGenerator.kinres,
-      therm: shieldGenerator.thermres,
-      expl: shieldGenerator.explres
-    };
    // Boosters
    let boost = 1;
    let boosterExplDmg = 1;
    let boosterKinDmg = 1;
    let boosterThermDmg = 1;
-    // const explDim = dimReturnLine(shieldGenerator.explres);
-    // const thermDim = dimReturnLine(shieldGenerator.thermres);
-    // const kinDim = dimReturnLine(shieldGenerator.kinres);
    for (let slot of ship.hardpoints) {
      if (slot.enabled && slot.m && slot.m.grp == 'sb') {
        boost += slot.m.getShieldBoost();
-        res.expl += slot.m.getExplosiveResistance();
-        res.kin += slot.m.getKineticResistance();
-        res.therm += slot.m.getThermalResistance();
        boosterExplDmg = boosterExplDmg * (1 - slot.m.getExplosiveResistance());
        boosterKinDmg = boosterKinDmg * (1 - slot.m.getKineticResistance());
        boosterThermDmg = boosterThermDmg * (1 - slot.m.getThermalResistance());
      }
-      if (slot.m && slot.m.grp == 'gsrp') {
-
-      }
    }
    // Calculate diminishing returns for boosters
    // Diminishing returns not currently in-game
    // boost = Math.min(boost, (1 - Math.pow(Math.E, -0.7 * boost)) * 2.5);

-
    // Remove base shield generator strength
    boost -= 1;

-    // if (res.expl > explDim) {
-    //   const overage = (res.expl - explDim) * 0.5;
-    //   res.expl = explDim + overage;
-    //   boosterExplDmg = explDim + overage;
-    // }
-    //
-    // if (res.therm > thermDim) {
-    //   const overage = (res.therm - thermDim) * 0.5;
-    //   res.therm = thermDim + overage;
-    //   boosterThermDmg = thermDim + overage;
-    // }
-    //
-    // if (res.kin > kinDim) {
-    //   const overage = (res.kin - kinDim) * 0.5;
-    //   res.kin = kinDim + overage;
-    //   boosterKinDmg = kinDim + overage;
-    // }
    let shieldAddition = 0;
    if (ship) {
      for (const module of ship.internal) {
@@ -498,7 +466,7 @@ export function shieldMetrics(ship, sys) {
     */

    let sgExplosiveDmg = 1 - shieldGenerator.getExplosiveResistance();
-    let sgSbExplosiveDmg = diminishDamageMult(sgExplosiveDmg * 0.7, (1 - shieldGenerator.getExplosiveResistance()) * boosterExplDmg);
+    let sgSbExplosiveDmg = diminishingReturnsShields(sgExplosiveDmg, sgExplosiveDmg * boosterExplDmg);
    /** @type {ShieldDamageMults} */
    shield.explosive = {
      generator: sgExplosiveDmg,
@@ -510,7 +478,7 @@ export function shieldMetrics(ship, sys) {
    };

    let sgKineticDmg = 1 - shieldGenerator.getKineticResistance();
-    let sgSbKineticDmg = diminishDamageMult(sgKineticDmg * 0.7, (1 - shieldGenerator.getKineticResistance()) * boosterKinDmg);
+    let sgSbKineticDmg = diminishingReturnsShields(sgKineticDmg, sgKineticDmg * boosterKinDmg);
    /** @type {ShieldDamageMults} */
    shield.kinetic = {
      generator: sgKineticDmg,
@@ -522,7 +490,7 @@ export function shieldMetrics(ship, sys) {
    };

    let sgThermalDmg = 1 - shieldGenerator.getThermalResistance();
-    let sgSbThermalDmg = diminishDamageMult(sgThermalDmg * 0.7, (1 - shieldGenerator.getThermalResistance()) * boosterThermDmg);
+    let sgSbThermalDmg = diminishingReturnsShields(sgThermalDmg , sgThermalDmg * boosterThermDmg);
    /** @type {ShieldDamageMults} */
    shield.thermal = {
      generator: sgThermalDmg,
@@ -562,29 +530,20 @@ export function armourMetrics(ship) {
  let moduleArmour = 0;
  let moduleProtection = 1;
  const bulkheads = ship.bulkheads.m;
-  let hullExplDmg = 1;
-  let hullKinDmg = 1;
-  let hullThermDmg = 1;
-  let hullCausDmg = 1;
-  // const dimReturnLine = (res) => 1 - (1 - res) * 0.7;
-  // let res = {
-  //   kin: 0,
-  //   therm: 0,
-  //   expl: 0
-  // };
+  let hullExplDmgs = [];
+  let hullKinDmgs = [];
+  let hullThermDmgs = [];
+  let hullCausDmgs = [];
  // Armour from HRPs and module armour from MRPs
  for (let slot of ship.internal) {
    if (slot.m && slot.enabled && (slot.m.grp === 'hr' || slot.m.grp === 'ghrp' || slot.m.grp == 'mahr')) {
      armourReinforcement += slot.m.getHullReinforcement();
      // Hull boost for HRPs is applied against the ship's base armour
      armourReinforcement += ship.baseArmour * slot.m.getModValue('hullboost') / 10000;
-      // res.expl += slot.m.getExplosiveResistance();
-      // res.kin += slot.m.getKineticResistance();
-      // res.therm += slot.m.getThermalResistance();
-      hullExplDmg = hullExplDmg * (1 - slot.m.getExplosiveResistance());
-      hullKinDmg = hullKinDmg * (1 - slot.m.getKineticResistance());
-      hullThermDmg = hullThermDmg * (1 - slot.m.getThermalResistance());
-      hullCausDmg = hullCausDmg * (1 - slot.m.getCausticResistance());
+      hullExplDmgs.push(1 - slot.m.getExplosiveResistance());
+      hullKinDmgs.push(1 - slot.m.getKineticResistance());
+      hullThermDmgs.push(1 - slot.m.getThermalResistance());
+      hullCausDmgs.push(1 - slot.m.getCausticResistance());
    }
    if (slot.m && slot.enabled && (slot.m.grp == 'mrp' || slot.m.grp == 'gmrp')) {
      moduleArmour += slot.m.getIntegrity();
@@ -593,27 +552,6 @@ export function armourMetrics(ship) {
  }
  moduleProtection = 1 - moduleProtection;

-  // const explDim = dimReturnLine(bulkheads.explres);
-  // const thermDim = dimReturnLine(bulkheads.thermres);
-  // const kinDim = dimReturnLine(bulkheads.kinres);
-  // if (res.expl > explDim) {
-  //   const overage = (res.expl - explDim) * 0.5;
-  //   res.expl = explDim + overage;
-  //   hullExplDmg = explDim + overage;
-  // }
-  //
-  // if (res.therm > thermDim) {
-  //   const overage = (res.therm - thermDim) * 0.5;
-  //   res.therm = thermDim + overage;
-  //   hullThermDmg = thermDim + overage;
-  // }
-  //
-  // if (res.kin > kinDim) {
-  //   const overage = (res.kin - kinDim) * 0.5;
-  //   res.kin = kinDim + overage;
-  //   hullKinDmg = kinDim + overage;
-  // }
-
  const armour = {
    bulkheads: armourBulkheads,
    reinforcement: armourReinforcement,
@@ -630,8 +568,8 @@ export function armourMetrics(ship) {
    total: 1
  };

-  let armourExplDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getExplosiveResistance());
-  let armourReinforcedExplDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getExplosiveResistance()) * hullExplDmg);
+  let armourExplDmg = 1 - ship.bulkheads.m.getExplosiveResistance();
+  let armourReinforcedExplDmg = diminishingReturnsArmour(armourExplDmg, ...hullExplDmgs);
  armour.explosive = {
    bulkheads: armourExplDmg,
    reinforcement: armourReinforcedExplDmg / armourExplDmg,
@@ -639,8 +577,8 @@ export function armourMetrics(ship) {
    res: 1 - armourReinforcedExplDmg
  };

-  let armourKinDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getKineticResistance());
-  let armourReinforcedKinDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getKineticResistance()) * hullKinDmg);
+  let armourKinDmg = 1 - ship.bulkheads.m.getKineticResistance();
+  let armourReinforcedKinDmg = diminishingReturnsArmour(armourKinDmg, ...hullKinDmgs);
  armour.kinetic = {
    bulkheads: armourKinDmg,
    reinforcement: armourReinforcedKinDmg / armourKinDmg,
@@ -648,8 +586,8 @@ export function armourMetrics(ship) {
    res: 1 - armourReinforcedKinDmg
  };

-  let armourThermDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getThermalResistance());
-  let armourReinforcedThermDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getThermalResistance()) * hullThermDmg);
+  let armourThermDmg = 1 - ship.bulkheads.m.getThermalResistance();
+  let armourReinforcedThermDmg = diminishingReturnsArmour(armourThermDmg, ...hullThermDmgs);
  armour.thermal = {
    bulkheads: armourThermDmg,
    reinforcement: armourReinforcedThermDmg / armourThermDmg,
@@ -657,8 +595,8 @@ export function armourMetrics(ship) {
    res: 1 - armourReinforcedThermDmg
  };

-  let armourCausDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getCausticResistance());
-  let armourReinforcedCausDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getCausticResistance()) * hullCausDmg);
+  let armourCausDmg = 1 - ship.bulkheads.m.getCausticResistance();
+  let armourReinforcedCausDmg = diminishingReturnsArmour(armourCausDmg, ...hullCausDmgs);
  armour.caustic = {
    bulkheads: armourCausDmg,
    reinforcement: armourReinforcedCausDmg / armourCausDmg,
@@ -904,12 +842,14 @@ export function _weaponSustainedDps(m, opponent, opponentShields, opponentArmour
      shields: {
        range: 1,
        sys: opponentHasShields ? opponentShields.absolute.sys : 1,
-        resistance: 1
+        resistance: 1,
+        dpe: 1
      },
      armour: {
        range: 1,
        hardness: 1,
-        resistance: 1
+        resistance: 1,
+        dpe: 1
      }
    }
  };
@@ -969,11 +909,19 @@ export function _weaponSustainedDps(m, opponent, opponentShields, opponentArmour
  weapon.damage.shields.total = weapon.damage.shields.absolute + weapon.damage.shields.explosive + weapon.damage.shields.kinetic + weapon.damage.shields.thermal;
  weapon.damage.armour.total = weapon.damage.armour.absolute + weapon.damage.armour.explosive + weapon.damage.armour.kinetic + weapon.damage.armour.thermal;

+
+
  weapon.effectiveness.shields.resistance *= shieldsResistance;
  weapon.effectiveness.armour.resistance *= armourResistance;

+
  weapon.effectiveness.shields.total = weapon.effectiveness.shields.range * weapon.effectiveness.shields.sys * weapon.effectiveness.shields.resistance;
  weapon.effectiveness.armour.total = weapon.effectiveness.armour.range * weapon.effectiveness.armour.resistance * weapon.effectiveness.armour.hardness;
+
+  weapon.effectiveness.shields.dpe = weapon.damage.shields.total / m.getEps();
+  weapon.effectiveness.armour.dpe =  weapon.damage.armour.total / m.getEps();
+
+
  return weapon;
 }

@@ -1037,15 +985,50 @@ export function timeToDeplete(amount, dps, eps, capacity, recharge) {
 }

 /**
- * Applies diminishing returns to resistances.
- * @param {number} diminishFrom The base resistance up to which no diminishing returns are applied.
- * @param {number} damageMult Resistance as damage multiplier
- * @returns {number} Actual damage multiplier
+ * Checks whether diminishing returns should be applied to shield damage
+ * multipliers and does so if necessary.
+ * @param {number} shieldMult Damage multiplier of shield generator
+ * @param {number} combinedMult Damage multiplier of shields and shield boosters
+ * @returns {number} Overall damage multiplier
 */
-export function diminishDamageMult(diminishFrom, damageMult) {
-  if (damageMult > diminishFrom) {
-    return damageMult;
+export function diminishingReturnsShields(shieldMult, combinedMult) {
+  let max = shieldMult * 0.7;
+  if (combinedMult < max) {
+    return mapIntoDiminishingRange(max / 2, max, combinedMult);
  } else {
-    return (diminishFrom / 2) + 0.5 * damageMult;
+    return combinedMult;
  }
 }
+
+/**
+ * Checks whether diminishing returns should be applied to armour damage
+ * multipliers and does so if necessary.
+ * @param  {...any} mults Damage multipliers of alloys and hull reinforcement
+ * packages
+ * @returns {number} Overall damage multiplier
+ */
+export function diminishingReturnsArmour(...mults) {
+  let max = Math.min(0.7, ...mults);
+  let combined = mults.reduce((aggr, v) => aggr * v);
+  let diminished = mapIntoDiminishingRange(0.35, max, combined);
+  if (diminished < 0.7) {
+    return diminished;
+  } else {
+    return combined;
+  }
+}
+
+/**
+ * Applies diminishing returns to a damage multiplier. Effictively, the range
+ * [`0`, `max`]` is mapped into the range [`min`, `max`] for the value `now`.
+ * It can also happen, that `now` is outside of the range [`min`, `max`], then
+ * `now` is actually improved, i.e. enlarged.
+ * @param {number} min Best theoretical damage multiplier
+ * @param {number} max Damage multiplier from which diminishing returns start to
+ * be applied
+ * @param {number} now The current damage multiplier
+ * @returns {number} Remapped damage multiplier
+ */
+export function mapIntoDiminishingRange(min, max, now) {
+  return min + (max - min) * (now / max);
+}
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -1,7 +1,8 @@
 import * as ModuleUtils from './ModuleUtils';
 import { Modifications } from 'coriolis-data/dist';
 import React from 'react';
-import { STATS_FORMATTING, SI_PREFIXES } from './StatsFormatting';
+import { SI_PREFIXES, STATS_FORMATTING } from './StatsFormatting';
+import { includes } from 'lodash';

 /**
 * Module - active module in a ship's buildout
@@ -41,8 +42,7 @@ export default class Module {
   * @return {object}     The value of the modification. If it is a numeric value then it is returned as an integer value scaled so that 1.23% == 123
   */
  getModValue(name, raw) {
-    let baseVal = this[name];
-    let result = this.mods  && this.mods[name] ? this.mods[name] : null;
+    let result = this.mods && this.mods[name] ? this.mods[name] : null;

    if ((!raw) && this.blueprint && this.blueprint.special) {
      // This module has a special effect, see if we need to alter our returned value
@@ -51,7 +51,8 @@ export default class Module {
        // this special effect modifies our returned value
        const modification = Modifications.modifications[name];
        const multiplier = modification.type === 'percentage' ? 10000 : 100;
-        if (name === 'explres' || name === 'kinres' || name === 'thermres' || name === 'causres') {
+
+        if (includes(['explres', 'kinres', 'thermres', 'causres'], name)) {
          // Apply resistance modding mechanisms to special effects subsequently
          result = result + modifierActions[name] * (1 - (this[name] + result / multiplier)) * 100;
        } else if (modification.method === 'additive') {
@@ -59,7 +60,7 @@ export default class Module {
        } else if (modification.method === 'overwrite') {
          result = modifierActions[name];
        } else {
-          result = (((1 + result / multiplier) * (1 + modifierActions[name])) - 1) * multiplier;
+          result = result + modifierActions[name] * multiplier;
        }
      }
    }
@@ -694,7 +695,7 @@ export default class Module {
    let result = 0;
    if (this['maxmass']) {
      result = this['maxmass'];
-      if (result && modified) {
+      if (result && modified && !ModuleUtils.isShieldGenerator(this['grp'])) {
        let mult = this.getModValue('optmass') / 10000;
        if (mult) { result = result * (1 + mult); }
      }
--- a/src/app/stores/Persist.js
+++ b/src/app/stores/Persist.js
@@ -15,7 +15,6 @@ const LS_KEY_SIZE_RATIO = 'sizeRatio';
 const LS_KEY_TOOLTIPS = 'tooltips';
 const LS_KEY_MODULE_RESISTANCES = 'moduleResistances';
 const LS_KEY_ROLLS = 'matsPerGrade';
-const LS_KEY_ORBIS = 'orbis';

 let LS;

@@ -95,7 +94,6 @@ export class Persist extends EventEmitter {
    let buildJson = _get(LS_KEY_BUILDS);
    let comparisonJson = _get(LS_KEY_COMPARISONS);

-    this.orbisCreds = _get(LS_KEY_ORBIS) || { email: '', password: '' };
    this.onStorageChange = this.onStorageChange.bind(this);
    this.langCode = _getString(LS_KEY_LANG) || 'en';
    this.insurance = insurance && Insurance[insurance.toLowerCase()] !== undefined ? insurance : 'standard';
@@ -169,10 +167,6 @@ export class Persist extends EventEmitter {
          this.matsPerGrade = JSON.parse(newValue);
          this.emit('matsPerGrade', this.matsPerGrade);
          break;
-        case LS_KEY_ORBIS:
-          this.orbisCreds = JSON.parse(newValue);
-          this.emit('orbis', this.orbisCreds);
-          break;
      }
    } catch (e) {
      // On JSON.Parse Error - don't sync or do anything
@@ -198,24 +192,6 @@ export class Persist extends EventEmitter {
    this.emit('language', langCode);
  }

-  /**
-   * Get the current orbis.zone credentials
-   * @return {String} language code
-   */
-  getOrbisCreds() {
-    return this.orbisCreds;
-  };
-
-  /**
-   * Update and save the orbis.zone credentials
-   * @param {Object} creds object with username and password properties.
-   */
-  setOrbisCreds(creds) {
-    this.langCode = creds;
-    _put(LS_KEY_ORBIS, creds);
-    this.emit('orbis', creds);
-  }
-
  /**
   * Show tooltips setting
   * @param  {boolean} show Optional - update setting
--- a/src/app/utils/ShortenUrl.js
+++ b/src/app/utils/ShortenUrl.js
@@ -105,7 +105,7 @@ function orbisShorten(url, success, error) {
  }
 }

-const API_ORBIS = 'https://orbis.zone/api/builds/add';
+const API_ORBIS = 'https://api.orbis.zone/ships';
 /**
 * Upload to Orbis
 * @param  {object} ship        The URL to shorten
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -8,6 +8,8 @@
    <meta name="description" content="A ship builder, outfitting and comparison
      tool for Elite Dangerous">
    <meta name="mobile-web-app-capable" content="yes">
+   
+
    <meta name="viewport" content="width=device-width, initial-scale=1.0,
      maximum-scale=1.0, user-scalable=0">
    <link rel="manifest" href="/manifest.json">
@@ -25,7 +27,7 @@
    <meta name="msapplication-TileImage" content="/mstile-144x144.png">
    <meta name="msapplication-config" content="/browserconfig.xml">
    <meta name="theme-color" content="#000000">
-
+    <!-- <script data-ad-client="ca-pub-3709458261881414" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> -->
    <script>
      window.CORIOLIS_GAPI_KEY = '<%- htmlWebpackPlugin.options.gapiKey %>';
      window.CORIOLIS_VERSION = '<%- htmlWebpackPlugin.options.version %>';
@@ -52,7 +54,8 @@
    </script>
      </head>
      <body style="background-color:#000;">
-        <section id="coriolis"></section>
+        <section id="coriolis">

+        </section>
      </body>
    </html>
--- a/src/migrate.html
+++ b/src/migrate.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Coriolis EDCD Edition</title>
+    <meta charset="UTF-8" />
+    <link rel="stylesheet" href="<%= htmlWebpackPlugin.files.css[0] %>" />
+    <!-- Standard headers -->
+    <meta
+      name="description"
+      content="A ship builder, outfitting and comparison
+      tool for Elite Dangerous"
+    />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1.0,
+      maximum-scale=1.0, user-scalable=0"
+    />
+    <link rel="manifest" href="/manifest.json" />
+    <link rel="shortcut icon" href=/favicon2.ico>
+    <link
+      rel="icon"
+      sizes="152x152 192x192"
+      type="image/png"
+      href="/192x192.png"
+    />
+    <!-- Bugsnag -->
+    <script src="https://d2wy8f7a9ursnm.cloudfront.net/v5.0.0/bugsnag.min.js"></script>
+    <script>
+      window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5', {appVersion: window.BUGSNAG_VERSION || undefined})
+      window.Bugsnag = window.bugsnagClient
+    </script>
+
+    <!-- Apple/iOS headers -->
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-title" content="Coriolis" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+    <!-- Microsoft Windows Phone/Tablet headers -->
+    <meta name="msapplication-TileColor" content="#000000" />
+    <meta name="msapplication-TileImage" content="/mstile-144x144.png" />
+    <meta name="msapplication-config" content="/browserconfig.xml" />
+    <meta name="theme-color" content="#000000" />
+  </head>
+  <body>
+    <body style="background-color:#000;">
+      <section id="coriolis">
+        <div class="modal">
+          <h2>
+            Please migrate to <a href="https://coriolis.io">coriolis.io</a>
+          </h2>
+          You are currently on coriolis.<strong>.edcd</strong>.io This domain is
+          considered deprecated. To migrate your builds, copy the below text and
+          go to
+          <a
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://coriolis.io"
+            >this link</a
+          >, press ctrl + i and then paste in the data. (If you are on mobile,
+          you can go to the settings and hit import)
+          <div>
+            <textarea id="data" class="cb json"></textarea>
+          </div>
+        </div>
+      </section>
+    </body>
+    <script>
+      const LS = localStorage;
+      /**
+       * Safe localstorage get string
+       * @param  {String} key key
+       * @return {String} The stored string
+       */
+      function _getString(key) {
+        return LS ? LS.getItem(key) : null;
+      }
+
+      /**
+       * Safe localstorage get
+       * @param  {String} key key
+       * @return {object | number} The stored data
+       */
+      function _get(key) {
+        let str = _getString(key);
+        try {
+          return str ? JSON.parse(str) : null;
+        } catch (e) {
+          return null;
+        }
+      }
+
+      const textarea = document.querySelector("#data");
+      const data = {
+        builds: _get("builds") || {},
+        comparisons: _get("comparisons") || {},
+        insurance: _get("insurance") || "standard",
+        shipDiscount: _get("shipDiscount") || 0,
+        moduleDiscount: _get("moduleDiscount") || 0
+      };
+      textarea.textContent = JSON.stringify(data, null, 2);
+    </script>
+  </body>
+</html>
Author	SHA1	Message	Date
Felix Linker	8676deba7d	Merge branch 'develop'	2021-05-10 20:18:34 +02:00
Felix Linker	d3ce8d4f7c	Remove unused hosting and CI files	2021-05-10 20:18:07 +02:00
Felix Linker	0c3de95025	Merge pull request #658 from leonardofelin/patch-2 Update pt.js	2021-05-09 18:36:10 +02:00
Felix Linker	83f1f9aa2e	Merge pull request #657 from leonardofelin/patch-1 Update pt.json	2021-05-09 13:01:52 +02:00
leonardofelin	dee14a5dee	Update pt.json Fixed.	2021-05-09 07:31:19 -03:00
Felix Linker	db13da95db	Merge pull request #659 from VAKazakov/patch-2 update recon and research limpets translation for de	2021-05-09 10:20:42 +02:00
VAKazakov	cb08b10a63	update recon and research limpets translation see conversation on [EDCD Discord](https://discord.com/channels/164411426939600896/164411501166198784/836315370632511511 "EDCD Discord")	2021-04-26 22:27:41 +03:00
leonardofelin	189eb2b726	Update pt.js Full portuguese review.	2021-04-20 14:44:57 -03:00
leonardofelin	b9abf784f4	Update pt.json Full review of Portuguese Language.	2021-04-20 14:40:49 -03:00
Felix Linker	39287bc5d7	Remove dead links from README	2021-03-27 15:22:15 +01:00
Felix Linker	bcdd0c6044	Display negative module discounts correctly Closes #563	2021-01-31 20:26:38 +01:00
Felix Linker	f70455ce26	Remove manufacturer from overview Closes #366	2021-01-31 20:20:17 +01:00
Felix Linker	888f807a7b	Remove orbis related code	2021-01-31 16:57:55 +01:00
Felix Linker	5040141096	Remove dead announcements code	2021-01-31 16:52:40 +01:00
Felix Linker	46ba782911	Remove hosting from repository	2021-01-31 16:52:21 +01:00
Felix Linker	524e204e01	Merge pull request #627 from jeneg/calculations-fix Corrected calculations of modification values	2021-01-27 20:16:29 +01:00
Felix Linker	a9753828c1	Merge pull request #639 from VAKazakov/VAKazakov-ru-l18n-1 Some Ru l18n additions	2021-01-25 20:14:29 +01:00
VAKazakov	6d30a54925	fixing encoding and deleting excess translation	2021-01-25 22:10:17 +03:00
Felix Linker	7c58eb1cde	Merge pull request #637 from kf6nux/patch-1 Remove dead code	2021-01-25 20:09:16 +01:00
VAKazakov	4001e1e9ac	changing `:` to `:`	2021-01-25 21:54:43 +03:00
VAKazakov	0da00d38a4	fixed indentation for easy comparing	2021-01-25 21:47:44 +03:00
VAKazakov	1db6fe1a34	Some l18n additions guardians and mining rows addition courtesy of LightEvil	2021-01-25 21:41:32 +03:00
VAKazakov	10b8bb95a9	Merge pull request #1 from EDCD/master Actualization of branch	2021-01-25 21:39:13 +03:00
Ben Zarzycki	8d9581900f	Remove dead code	2021-01-20 00:05:45 -08:00
Felix Linker	2bb55d2c36	Remove donation references	2021-01-06 12:11:44 +01:00
yevhenii.chubar	49c827b2c8	Corrected calculations of modification values	2020-12-29 17:47:10 +02:00
Felix Linker	cf50537e3d	Fix diminishing returns for alloys Closes #483	2020-11-16 23:27:24 +01:00
Felix Linker	804466f88a	Allow SLEF import of multiple builds via URL	2020-10-24 13:20:02 +02:00
Felix Linker	bded793374	Merge pull request #559 from Freaky/develop Shield engineering should not modify max mass	2020-10-24 12:54:42 +02:00
Felix Linker	fc918d893c	Support SLEF on import	2020-10-24 12:37:34 +02:00
Felix Linker	5fe13b26a4	Merge pull request #561 from Freaky/reserve-tank-jump-mass Calculate jump range with a full reserve fuel tank	2020-10-24 11:46:32 +02:00
Felix Linker	be1393994e	Merge pull request #554 from VAKazakov/patch-1 RU Localisation fixes	2020-10-24 11:22:54 +02:00
Felix Linker	dc6db31d43	Merge pull request #596 from jontaylor/feature/add_dpe_to_offence_stats Feature/add dpe to offence stats	2020-10-24 11:22:11 +02:00
Jon Taylor	840ce9f3e4	Remove logging	2020-07-21 17:24:06 +01:00
Jon Taylor	9674aa2367	Add the effective DPE for Shields and Armor to offence table	2020-07-21 17:20:23 +01:00
William	d19b6b107f	Merge pull request #594 from GamerKingFaiz/master Minor typo fix	2020-06-28 09:02:30 +10:00
Faiz Rahman	1b96c18ecb	Minor typo fix.	2020-06-26 16:29:23 -07:00
Felix Linker	0f43c4d7eb	Merge pull request #592 from pho3nixf1re/feature/support-slef-import Support SLEF import format for importing builds.	2020-06-24 09:41:11 +02:00
Matthew Turney	4c70806a5a	Support SLEF import format for importing builds. Inara uses the [SLEF] format to export builds. This format is mostly just a wrapper around the standard journal loadout format and includes support for source app metadata and exporting of multiple loadouts at one time. This change adds support for this format in the manual importer. Eventually it would be good to support this in the import route as well so Inara (or any other apps) can link directly to coriolis. [SLEF]: https://inara.cz/inara-impexp-slef/	2020-06-14 12:38:24 -05:00
Matthew Turney	7de304bdbe	Tests for ImportModal are failing All of the compressed data in the Persisted storage has subtly changed. It is not entirely clear why it has changed and the imports still function correctly. Another change is the 'Import Backup' tests. At some point there was a change to just remove invalid builds instead of throwing validation errors. The tests were never updated to fit this use-case.	2020-06-14 12:38:09 -05:00
Matthew Turney	34f9f28c16	Import tests fail due to Jest API change with mock functions	2020-06-14 10:51:39 -05:00
Thomas Hurst	13ec027772	Calculate jump range with a full reserve fuel tank (#560 )	2020-04-10 18:52:39 +00:00
willyb321	3966f92454	fix webpack config	2020-04-05 05:22:35 +10:00
William	38f72438dd	Update index.ejs	2020-03-25 15:13:18 +11:00
willyb321	0179382379	Merge branch 'develop'	2020-03-12 06:34:26 +11:00
willyb321	7f5c652f49	test	2020-03-12 06:33:27 +11:00
willyb321	1f9b1e5d27	invalidate docker cache for git pull	2020-03-12 06:01:11 +11:00
willyb321	ebf4491901	test	2020-03-12 05:57:47 +11:00
willyb321	d322a47592	fix	2020-03-12 05:30:37 +11:00
William Blythe	06a58d22cb	Merge branch 'master' into develop	2020-03-12 05:24:04 +11:00
William	25d4520eee	Update index.ejs	2020-03-01 19:13:13 +11:00
William	0087062468	Update index.ejs	2020-03-01 10:37:16 +11:00
William	14bb49a2bc	Update index.ejs	2020-03-01 10:27:39 +11:00
William	ab671b0af5	Update docker-compose.yml	2020-01-23 07:33:53 +11:00
William	304ddf9ea8	Update docker-compose.yml	2020-01-23 07:33:23 +11:00
William	b3f320e69f	Update docker-compose.yml	2020-01-23 07:32:16 +11:00
William	3a63e08f80	Update docker-compose.yml	2020-01-23 07:29:42 +11:00
William	a3feb42fd7	Create Dockerfile.dev	2020-01-23 07:29:20 +11:00
William	a77d991cf9	Update Dockerfile	2020-01-23 07:28:59 +11:00
William	9ebe5dc786	update paypal donation	2020-01-15 08:08:38 +11:00
Thomas Hurst	baace95f83	Shield engineering should not modify max mass (#473 )	2019-11-30 01:19:00 +00:00
VAKazakov	fc5db94f9a	Localisation fixes Changed ru localisation for params "ammo" and "clip" to in-game variants https://media.discordapp.net/attachments/301454399597969409/640856772952850462/001.PNG	2019-11-04 13:28:30 +03:00
willyb321	c3b0e8d949	fix announcements	2019-10-13 07:39:05 +11:00
willyb321	1b8c460876	orbis fixes	2019-10-13 07:16:19 +11:00
willyb321	67409a613b	add migrate page, need to make it redirect still	2019-09-27 07:45:03 +10:00