Merge branch 'develop' into ISSUE_764_Unknown_Modules_Are_Selectable

Added 'special' field to certain modules to allow for clearer …

.babelrc

@@ -7,6 +7,8 @@
     "@babel/plugin-syntax-dynamic-import",
     "@babel/plugin-syntax-import-meta",
     ["@babel/plugin-proposal-class-properties", { "loose": true }],
+    "@babel/plugin-proposal-do-expressions",
+    "@babel/plugin-proposal-function-bind",
     "@babel/plugin-proposal-json-strings",
     [
       "@babel/plugin-proposal-decorators",
@@ -28,7 +30,7 @@
       }
     ],
     "@babel/plugin-proposal-nullish-coalescing-operator",
-    "@babel/plugin-proposal-do-expressions",
+    ["@babel/plugin-proposal-private-methods", { "loose": true }],
-    "@babel/plugin-proposal-function-bind"
+    ["@babel/plugin-proposal-private-property-in-object", { "loose": true }]
   ]
 }

.dockerignore

@@ -1,77 +1,7 @@
+Dockerfile
+.dockerignore
+.gitignore
+README.md
+
+build
 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
-

.gitattributes

@@ -0,0 +1,14 @@
+# Set the default behavior, in case people don't have core.autocrlf set, in order to prevent line ending inconsistency.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.jsx text
+*.js text
+
+# Declare files that will always have CRLF line endings on checkout.
+# *.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary

.github/workflows/autodeploy.yml

@@ -0,0 +1,28 @@
+# This is a basic deployment workflow triggered by pushes to the alpha branch.
+
+name: Auto-Deploy
+
+# Controls when the action will run. Workflow runs when the alpha branch receives a push event
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - alpha
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  downloadcode:
+    runs-on: self-hosted
+    steps:
+      - shell: bash
+        run: |
+          rm -Rf ./coriolis
+          rm -Rf ./coriolis-data
+          git clone https://github.com/alex-williams/coriolis.git --single-branch --branch alpha
+          git clone https://github.com/alex-williams/coriolis-data.git --single-branch --branch alpha
+          cd coriolis-data
+          npm install
+          cd ../coriolis
+          npm install
+          npm run build
+          sudo -u www-data cp -r ./build/* /var/www/newdisk/coriolis.brighter-applications.co.uk/

.gitignore

@@ -10,4 +10,3 @@ env
 .project
 .vscode/
 docs/
-package-lock.json

.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

.npmrc

@@ -1 +0,0 @@
-package-lock=false

.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

Dockerfile

@@ -1,35 +1,25 @@
-### STAGE 1: Build ###
+#syntax=docker/dockerfile:1.4
-FROM node:9.11.1-alpine as builder
+# Run this from within this directory. Change the location of coriolis-data repo and image name/tag as needed.
-ARG branch=develop
+# docker buildx build --build-context data=../coriolis-data --tag coriolis .
-ENV BRANCH=$branch
-WORKDIR /src/app
-RUN mkdir -p /src/app/coriolis
-RUN mkdir -p /src/app/coriolis-data
 
-RUN apk add --update git
+FROM node:18-alpine
 
-COPY . /src/app/coriolis
+# TODO: For a production build, we may want to just build the bundle and copy that in. No need for local copy of source.
+WORKDIR /app
+ADD . .
+COPY --from=data . /coriolis-data/
 
-RUN npm i -g npm
+# Git is required before install if any modules (like coriolis-data) are loaded from github
+RUN apk update
+RUN apk add git
 
-# Set up coriolis-data
+WORKDIR /app/coriolis-data
-WORKDIR /src/app/coriolis-data
+RUN npm install
-RUN git clone https://github.com/EDCD/coriolis-data.git .
+WORKDIR /app
-RUN git checkout ${BRANCH}
+RUN npm install
-RUN npm install --no-package-lock
+# Bundle for production config with webpack & log
-RUN npm start
+RUN npm run build > >(tee -a stdout.log) 2> >(tee -a stderr.log >&2)
 
-# Set up coriolis
+# Optimally, this will start a static asset server like nginx/apache. Currently, this will start dev webpack server.
-WORKDIR /src/app/coriolis
+CMD ["npm", "start"]
-RUN git checkout ${BRANCH}
+EXPOSE 3300
-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;"]

Dockerfile-dev

@@ -0,0 +1,23 @@
+#syntax=docker/dockerfile:1.4
+# Run this from within this directory. Change the location of coriolis-data repo and image name/tag as needed.
+# docker buildx build --build-context data=../coriolis-data --tag coriolis -f ./Dockerfile-dev .
+
+FROM node:18-alpine
+
+WORKDIR /app
+ADD . .
+COPY --from=data . /coriolis-data/
+
+# Install git & any other desired in-container dev tools
+# Git is required before install if any modules (like coriolis-data) are loaded from github
+RUN apk update
+RUN apk add git
+
+WORKDIR /app/coriolis-data
+RUN npm install
+WORKDIR /app
+RUN npm install
+
+
+CMD ["npm", "start"]
+EXPOSE 3300

Dockerfile-local-prod

@@ -0,0 +1,32 @@
+#syntax=docker/dockerfile:1.4
+# Run this from within this directory. Change the location of coriolis-data repo and image name/tag as needed.
+# docker buildx build --build-context data=../coriolis-data --tag coriolis:0.0.7-local-prod -f Dockerfile-local-prod .
+# docker run -d -p 80:8080 coriolis:0.0.7-local-prod
+
+FROM node:18-alpine
+
+# TODO: For a production build, we may want to just build the bundle and copy that in. No need for local copy of source.
+WORKDIR /app
+ADD . .
+# COPY --from=data . /coriolis-data/
+
+# Git is required before install if any modules (like coriolis-data is now referenced in the package.json) are loaded from github
+RUN apk update
+RUN apk add git
+
+# WORKDIR /app/coriolis-data
+# RUN npm install
+# WORKDIR /app
+# RUN npm install
+# Bundle for production config with webpack & log
+# In this version of the dockerfile, I'm deferring automated webpack build so I can monitor a manual build
+# RUN npm run build > >(tee -a stdout.log) 2> >(tee -a stderr.log >&2)
+
+RUN npm install -g http-server
+
+# Optimally, this will start a static asset server like nginx/apache. Currently, this will start dev webpack server.
+# CMD ["http-server", "/app/build", "-c-1"]
+CMD ["/bin/ash"]
+# CMD [""]
+
+EXPOSE 8080

README.md

@@ -1,4 +1,4 @@
-![Latest Release](https://img.shields.io/github/release/EDCD/coriolis.svg) [![Build Status](https://travis-ci.org/EDCD/coriolis.svg?branch=master)](https://travis-ci.org/EDCD/coriolis) [![Chat to us on Discord](https://img.shields.io/badge/Discord-EDCD%20%23coriolis-blue.svg?style=social)](https://discord.gg/0uwCh6R62aPRjk9w)
+[![Chat to us on Discord](https://img.shields.io/badge/Discord-EDCD%20%23coriolis-blue.svg?style=social)](https://discord.gg/0uwCh6R62aPRjk9w)
 
 ## About
 
@@ -8,53 +8,50 @@ Coriolis was created using assets and imagery from Elite: Dangerous, with the pe
 
 ## Contributing
 
-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.
+- [Submit issues](https://github.com/EDCD/coriolis/issues)
-
+- [Submit pull requests](https://github.com/EDCD/coriolis/pulls) targetting `develop` branch
-### Translations
+- Chat to us on [Discord](https://discord.gg/0uwCh6R62aPRjk9w)!
-
-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)!
 
 ## Development
 
-See the [Developer's Guide](https://github.com/EDCD/coriolis/wiki/Developing-for-Coriolis) in the wiki.
+This release includes the ability to run the app as a Docker container.
+```sh
+> git clone https://github.com/EDCD/coriolis.git
+> git clone https://github.com/EDCD/coriolis-data.git
+> cd coriolis
+> docker buildx build --build-context data=../coriolis-data --tag coriolis .
+> docker run -d -p 3300:3300 coriolis
+```
 
-Also see [the documentation site.](https://coriolis.willb.info/)
+Or to run an instance of coriolis without Docker Desktop, perform the following steps in a shell:
+```sh
+> git clone https://github.com/EDCD/coriolis.git
+> git clone https://github.com/EDCD/coriolis-data.git
+> cd ./coriolis-data
+> npm install
+> cd ../coriolis
+> npm install
+> npm start
+```
+
+You will then have a development server running on `localhost:3300`.
 
 ### Ship and Module Database
 
-See the [Data wiki](https://github.com/cmmcleod/coriolis-data/wiki) for details on structure, etc.
+See the [Data wiki](https://github.com/EDCD/coriolis-data/wiki) for details on structure, etc.
 
-You can find hosted and compiled versions of these data-jsons under https://coriolis.io/data/ and https://beta.coriolis.io/data/.
+## Deployment
-You might want to load these as depedency instead of reyling on the npm-dependency.
 
-## License
+Follow the steps for [Development](#development) as above, but instead
+of `npm start` you'll want to:
 
-All Data and [associated JSON](https://github.com/EDCD/coriolis-data) files are intellectual property and copyright of Frontier Developments plc ('Frontier', 'Frontier Developments') and are subject to their
+```sh
-[terms and conditions](https://www.frontierstore.net/terms-and-conditions/).
+> npm run build
+```
 
-The code (Javascript, CSS, HTML, and SVG files only) specificially for Coriolis.io is released under the MIT License.
+this will result in a `build/` directory being created containing all the necessary files.
 
-Copyright (c) 2015 Coriolis.io, Colin McLeod
+After this you need to serve the files in some manner.
-
+Either configure your webserver to make the actual `build/` directory
-Permission is hereby granted, free of charge, to any person obtaining a copy
+visible on the web, or alternatively copy it to somewhere to serve it
-of this software (Javascript, CSS, HTML, and SVG files only), and associated documentation files (the "Software"), to deal
+from.
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

__tests__/fixtures/expected-builds.json

@@ -1,50 +1,50 @@
 {
   "type_6_transporter": {
-    "Cargo": "A0p0tdFal8d8s8f4-----04040303430101.Iw1/kA==.Aw1/kA==.",
+    "Cargo": "A0p0tdFal8d8s8f4-----04040303430101-.Iw18UA==.Aw18UA==.",
-    "Miner": "A0p5tdFal8d8s8f42l2l---040403451q0101.Iw1/kA==.Aw1/kA==.",
+    "Miner": "A0p5tdFal8d8s8f42l2l---040403451q0101-.Iw18UA==.Aw18UA==.",
-    "Hopper": "A0p0tdFal8d0s8f41717---030302024300-.Iw1/kA==.Aw1/kA==."
+    "Hopper": "A0p0tdFal8d0s8f41717---030302024300--.Iw18UA==.Aw18UA==."
   },
   "type_7_transport": {
-    "Cargo": "A0p0tiFfliddsdf5--------0505040403480101.Iw18aQ==.Aw18aQ==.",
+    "Cargo": "A0p0tiFfliddsdf5--------0505040403480101--.Iw18eQ==.Aw18eQ==.",
-    "Miner": "A0pdtiFflid8sdf5--2l2l----0505041v03450000.Iw18aQ==.Aw18aQ==."
+    "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==.",
+    "Cargo": "A0p5tiFflndisnf4--0s0s----0605450302020101-.Iw18WQ==.Aw18WQ==.",
-    "Dream": "A2pktkFflndpskf40v0v0s0s0404040n4k5n5d2b29292o-.AwRj4yWU1I==.CwBhCYy6YRigzLIA.",
+    "Dream": "A2pktkFflndpskf40v0v0s0s0404040n4k5n5d2b29292o--.AwRj4yWU1Yg=.CwBhCYy6YRigzPIA.",
-    "Current": "A0patkFflndfskf4----------------.AwRj4yWU1I==.CwBhCYy6YRigzLIA."
+    "Current": "A0patkFflndfskf4-----------------.AwRj4yWU1Yg=.CwBhCYy6YRigzPIA."
   },
   "type_9_heavy": {
-    "Current": "A0patsFklndnsif6---------0706054a0303020224.AwRj4yoo.EwBhEYy6dsg=."
+    "Current": "A0patsFklndnsif6---------0706054a0303020224--.AwRj4yo5iA==.EwBhEYy6d6g=."
   },
   "python": {
-    "Cargo": "A0patnFflidsssf5---------050505040448020201.Iw18eQ==.Aw18eQ==.",
+    "Cargo": "A0patnFflidsssf5---------050505040448020201-.Iw18eAMQ.Aw18RQ==.",
-    "Miner": "A0pktkFflidpspf50v0v0v2m2m0404--050505Ce4a1v02022o.Iw18eQ==.IwBhBYy6dkCYg===.",
+    "Miner": "A0pktkFflidpspf50v0v0v2m2m0404--050505Ce4a1v02022o-.Iw18eAMQ.IwBhBYy6dkCYRA==.",
-    "Dream": "A2pptkFfliduspf50v0v0v27270404040m5n5n4f2d2d032t0201.Iw1+gDBxA===.EwBhEYy6e0WEA===.",
+    "Dream": "A2pptkFfliduspf50v0v0v27270404040m5n5n4f2d2d032t0201-.Iw1+gDByUA==.EwBhEYy6e0VEA===.",
-    "Missile": "A0pttoFjljdystf52f2g2d2ePh----04044j03---002h.Iw18eQ==.Aw18eQ==."
+    "Missile": "A0pttoFjljdystf52f2g2d2ePh----04044j03---00--.Iw18eAMQ.Aw18RQ==."
   },
   "anaconda": {
-    "Dream": "A4putpFklndzsuf52c0o0o0o1m1m0q0q0404040l0b0100004k5n5n112d2d04-0303326b.AwRj4yo5dyg=.MwBhCYy6duvARiA=.",
+    "Dream": "A4putpFklndzsuf52c0o0o0o1m1m0q0q0404040l0b0100004k5n5n112d2d04-0303326b-.AwRj4yo5dzhA.MwBhCYy6duvARhEA.",
-    "Cargo": "A0patnFklndnsxf5----------------06050505040404-45030301.Iw18ZVA=.Aw18ZVA=.",
+    "Cargo": "A0patnFklndnsxf5----------------06050505040404-45030301-.Iw18ZUAxA===.Aw18ZXEA.",
-    "Current": "A0patnFklndksxf5----------------06050505040404-03034524.Iw18ZVA=.Aw18ZVA=.",
+    "Current": "A0patnFklndksxf5----------------06050505040404-03034524-.Iw18ZUAxA===.Aw18ZXEA.",
-    "Explorer": "A0patnFklndksxf5--------0202------f7050505040s37-2f2i4524.AwRj4yVKJ9hA.AwhMIyumQRhEA===.",
+    "Explorer": "A0patnFklndksxf5--------0202------f7050505040s37--2i4524-.AwRj4yVKJ9jCA===.AwhMIyumQRgkA===.",
-    "Test": "A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b.Iw18ZVA=.Aw18ZVA=."
+    "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==."
   }
 }

__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
+          }
+        }
+      ]
+    }
+  }
+]

__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=."
+  }
+}

__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
+          }
+        }
+      ]
+    }
+  }
+]

__tests__/test-import.js

@@ -18,13 +18,13 @@ describe('Import Modal', function() {
   const mockContext = {
     language: getLanguage('en'),
     sizeRatio: 1,
-    openMenu: jest.genMockFunction(),
+    openMenu: jest.fn(),
-    closeMenu: jest.genMockFunction(),
+    closeMenu: jest.fn(),
-    showModal: jest.genMockFunction(),
+    showModal: jest.fn(),
-    hideModal: jest.genMockFunction(),
+    hideModal: jest.fn(),
-    tooltip: jest.genMockFunction(),
+    tooltip: jest.fn(),
-    termtip: jest.genMockFunction(),
+    termtip: jest.fn(),
-    onWindowResize: jest.genMockFunction()
+    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]);
+        }
+      }
+    });
+  });
 });

devServer.js

@@ -3,24 +3,13 @@ var WebpackDevServer = require("webpack-dev-server");
 var config = require('./webpack.config.dev');
 
 new WebpackDevServer(webpack(config), {
-  publicPath: config.output.publicPath,
   hot: true,
-  disableHostCheck: true,
   headers: { "Access-Control-Allow-Origin": "*" },
   historyApiFallback: {
     rewrites: [
       // For some reason connect-history-api-fallback does not allow '.' in the URL for history fallback...
       { from: /\/outfit\//, to: '/index.html' }
     ]
-  },
-  stats: {
-    assets: true,
-    colors: true,
-    version: false,
-    hash: false,
-    timings: true,
-    chunks: false,
-    chunkModules: false
   }
 }).listen(3300, "0.0.0.0", function (err, result) {
   if (err) {

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

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;
-        }
-	}
-}

package.json

@@ -1,14 +1,19 @@
 {
   "name": "coriolis_shipyard",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis"
   },
   "homepage": "https://coriolis.io",
   "bugs": "https://github.com/EDCD/coriolis/issues",
+  "contributors": [
+    { "name": "cmdrmcdonald" },
+    { "name": "willb321" },
+    { "name": "felixlinker" }
+  ],
   "private": true,
-  "engine": "node >= 4.8.1",
+  "engine": "node >= 10.13.0",
   "license": "MIT",
   "scripts": {
     "extract-translations": "grep -hroE \"(translate\\('[^']+'\\))|(tip.bind\\(null, '[^']+')\" src/* | grep -oE \"'[^']+'\" | grep -oE \"[^']+\" | sort -u -f",
@@ -18,7 +23,8 @@
     "test": "jest",
     "prod-serve": "nginx -p $(pwd) -c nginx.conf",
     "prod-stop": "kill -QUIT $(cat nginx.pid)",
-    "build": "npm run clean && cross-env NODE_ENV=production webpack -p --config webpack.config.prod.js",
+    "buildfresh": "rimraf node_modules && rm package-lock.json && npm install && npm run build > >(tee -a stdout.log) 2> >(tee -a stderr.log >&2)",
+    "build": "npm run clean && cross-env NODE_ENV=production webpack --config webpack.config.prod.js",
     "rsync": "rsync -ae \"ssh -i $CORIOLIS_PEM\" --delete build/ $CORIOLIS_USER@$CORIOLIS_HOST:~/wwws",
     "deploy": "npm run lint && npm test && npm run build && npm run rsync"
   },
@@ -55,7 +61,7 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
     "@babel/plugin-proposal-decorators": "^7.0.0",
     "@babel/plugin-proposal-do-expressions": "^7.0.0",
@@ -74,15 +80,12 @@
     "@babel/plugin-syntax-import-meta": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
-    "appcache-webpack-plugin": "^1.4.0",
+    "@rollup/plugin-node-resolve": "^15.0.1",
-    "babel-core": "^7.0.0-bridge.0",
-    "babel-eslint": "^10.0.1",
-    "babel-jest": "^23.6.0",
     "babel-loader": "^8.0.0",
-    "copy-webpack-plugin": "^4.5.2",
+    "copy-webpack-plugin": "^10.2.4",
     "create-react-class": "^15.6.3",
     "cross-env": "^5.2.0",
-    "css-loader": "^1.0.0",
+    "css-loader": "^6.7.3",
     "d3-selection": "^1.3.2",
     "esdoc": "^1.1.0",
     "esdoc-custom-theme": "^1.4.2",
@@ -93,54 +96,66 @@
     "esdoc-standard-plugin": "^1.0.0",
     "eslint": "^5.6.0",
     "eslint-plugin-react": "^7.11.1",
-    "expose-loader": "^0.7.5",
+    "expose-loader": "^3.1.0",
-    "express": "^4.16.3",
+    "express": "^4.18.2",
-    "extract-text-webpack-plugin": "^4.0.0-beta.0",
+    "html-webpack-plugin": "^5.5.0",
-    "file-loader": "^2.0.0",
+    "jsen": "^0.6.6",
-    "html-webpack-plugin": "^3.0.7",
-    "jest-cli": "^23.6.0",
-    "jsen": "^0.6.4",
     "json-loader": "^0.5.4",
     "less": "^3.8.1",
-    "less-loader": "^4.1.0",
+    "less-loader": "^11.1.0",
-    "react-addons-perf": "^15.4.2",
+    "mini-css-extract-plugin": "^2.7.2",
     "react-container-dimensions": "^1.4.1",
-    "react-testutils-additions": "^16.0.0",
+    "react-testutils-additions": "^15.0.0",
     "react-transition-group": "^2.5.0",
-    "rimraf": "^2.6.1",
+    "rimraf": "^4.1.2",
-    "rollup": "^0.66.2",
+    "rollup": "^3.17.2",
-    "rollup-plugin-node-resolve": "^3.4.0",
+    "style-loader": "^3.3.1",
-    "style-loader": "^0.23.0",
+    "uglify-js": "^3.17.4",
-    "uglify-js": "^3.4.9",
+    "webpack": "^5.75.0",
-    "url-loader": "^1.1.1",
+    "webpack-cli": "^5.0.1",
-    "webpack": "^4.20.2",
+    "webpack-dev-server": "^4.11.1",
-    "webpack-bugsnag-plugins": "^1.2.2",
+    "webpack-merge": "^5.8.0",
-    "webpack-cli": "^3.1.1",
+    "webpack-notifier": "^1.15.0",
-    "webpack-dev-server": "^3.1.9",
+    "workbox-cacheable-response": "^6.5.4",
-    "webpack-notifier": "^1.6.0",
+    "workbox-expiration": "^6.5.4",
-    "workbox-webpack-plugin": "^3.6.1"
+    "workbox-precaching": "^6.5.4",
+    "workbox-routing": "^6.5.4",
+    "workbox-strategies": "^6.5.4",
+    "workbox-webpack-plugin": "^6.5.4"
   },
   "sideEffects": false,
   "dependencies": {
-    "@babel/polyfill": "^7.0.0",
+    "assert": "^1.5.0",
+    "auto-bind": "^5.0.1",
+    "base64url": "^3.0.1",
     "browserify-zlib-next": "^1.0.1",
+    "buffer": "^5.7.0",
     "classnames": "^2.2.6",
+    "constants-browserify": "^1.0.0",
+    "core-js": "^3.28.0",
     "coriolis-data": "../coriolis-data",
+    "crypto-browserify": "^3.12.0",
     "d3": "^5.7.0",
     "detect-browser": "^3.0.1",
     "fbemitter": "^2.1.1",
+    "https-browserify": "^1.0.0",
     "lodash": "^4.17.11",
     "lz-string": "^1.4.4",
-    "pako": "^1.0.6",
+    "os-browserify": "^0.3.0",
+    "pako": "^2.1.0",
+    "path-browserify": "^1.0.1",
     "prop-types": "^15.6.2",
-    "react": "^15.5.4",
+    "react": "^15.6.2",
-    "react-dom": "^15.5.4",
+    "react-dom": "^15.6.2",
-    "react-extras": "^0.7.1",
     "react-fuzzy": "^0.5.2",
     "react-ga": "^2.5.3",
-    "react-number-editor": "Athanasius/react-number-editor.git#miggy",
+    "react-number-editor": "^4.0.3",
     "recharts": "^1.2.0",
-    "register-service-worker": "^1.5.2",
+    "register-service-worker": "^1.7.2",
-    "superagent": "^3.8.3"
+    "stream-browserify": "^3.0.0",
+    "stream-http": "^3.2.0",
+    "superagent": "^3.8.3",
+    "url": "^0.11.0",
+    "vm-browserify": "^1.1.2"
   }
 }

rollup.config.js

@@ -1,4 +1,4 @@
-import nodeResolve from "rollup-plugin-node-resolve";
+import nodeResolve from "@rollup/plugin-node-resolve";
 
 export default {
 	  entry: "d3-funcs.js",

src/.htaccess

@@ -214,7 +214,7 @@ Options -MultiViews
     #       </Files>
 
     AddType application/x-web-app-manifest+json         webapp
-    AddType text/cache-manifest                         appcache manifest
+    # AddType text/cache-manifest                         appcache manifest
 
   # Media files
     AddType audio/mp4                                   f4a f4b m4a

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));
@@ -93,34 +93,39 @@ export default class Coriolis extends React.Component {
   _importBuild(r) {
     try {
       // Need to decode and gunzip the data, then build the ship
-      const data = zlib.inflate(new Buffer(r.params.data, 'base64'), { to: 'string' });
+      const data = zlib.inflate(new Buffer.from(r.params.data, 'base64'), { to: 'string' });
       const json = JSON.parse(data);
       console.info('Ship import data: ');
       console.info(json);
-      let ship;
+      let ship, importString;
-      if (json && json.modules) {
+      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 && json.Modules) {
+          } else if (json.Modules) {
             ship = JournalUtils.shipFromLoadoutJSON(json);
           }
+        }
+      }
+      if (ship) {
         r.params.ship = ship.id;
         r.params.code = ship.toString();
-      this._setPage(OutfittingPage, r)
+        this._setPage(OutfittingPage, r);
+      } else if (importString) {
+        this._setPage(ShipyardPage, r);
+        this._showModal(<ModalImport importString={data}/>);
+      }
     } 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
@@ -144,13 +149,6 @@ export default class Coriolis extends React.Component {
    */
   _onError(msg, scriptUrl, line, col, errObj) {
     console && console.error && console.error(arguments); // eslint-disable-line no-console
-    if (errObj) {
-      if (errObj instanceof Error) {
-        bugsnagClient.notify(errObj); // eslint-disable-line
-      } else if (errObj instanceof String) {
-        bugsnagClient.notify(msg, errObj); // eslint-disable-line
-      }
-    }
     this.setState({
       error: <ErrorDetails error={{ message: msg, details: { scriptUrl, line, col, error: JSON.stringify(errObj) } }}/>,
       page: null,
@@ -394,18 +392,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>

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

src/app/components/Announcement.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { autoBind } from 'react-extras';
+import autoBind from 'auto-bind';
 
 /**
  * Announcement component

src/app/components/AvailableModulesMenu.jsx

@@ -4,7 +4,7 @@ import * as ModuleUtils from '../shipyard/ModuleUtils';
 import TranslatedComponent from './TranslatedComponent';
 import { stopCtxPropagation } from '../utils/UtilityFunctions';
 import cn from 'classnames';
-import { MountFixed, MountGimballed, MountTurret } from './SvgIcons';
+import { CoriolisLogo, MountFixed, MountGimballed, MountTurret } from './SvgIcons';
 import FuzzySearch from 'react-fuzzy';
 
 const PRESS_THRESHOLD = 500; // mouse/touch down threshold
@@ -20,6 +20,7 @@ const GRPCAT = {
   'cc': 'limpet controllers',
   'fx': 'limpet controllers',
   'hb': 'limpet controllers',
+  'mlc': 'limpet controllers',
   'pc': 'limpet controllers',
   'rpl': 'limpet controllers',
   'pce': 'passenger cabins',
@@ -38,13 +39,18 @@ const GRPCAT = {
   'ml': 'lasers',
   'c': 'projectiles',
   'mc': 'projectiles',
+  'advmc': 'projectiles',
   'axmc': 'experimental',
+  'axmce': 'experimental',
+  'ntp': 'experimental',
   'fc': 'projectiles',
   'rfl': 'experimental',
   'pa': 'projectiles',
   'rg': 'projectiles',
   'mr': 'ordnance',
+  'amr': 'ordnance',
   'axmr': 'experimental',
+  'axmre': 'experimental',
   'rcpl': 'experimental',
   'dtl': 'experimental',
   'tbsc': 'experimental',
@@ -83,6 +89,8 @@ const GRPCAT = {
   // Assists
   'dc': 'flight assists',
   'sua': 'flight assists',
+  // Stabilizers
+  'ews': 'weapon stabilizers',
 };
 // Order here is the order in which items will be shown in the modules menu
 const CATEGORIES = {
@@ -92,7 +100,7 @@ const CATEGORIES = {
   'fi': ['fi'],
   'fuel': ['ft', 'fs'],
   'hangars': ['fh', 'pv'],
-  'limpet controllers': ['cc', 'fx', 'hb', 'pc', 'rpl'],
+  'limpet controllers': ['cc', 'fx', 'hb', 'pc', 'rpl', 'mlc'],
   'passenger cabins': ['pce', 'pci', 'pcm', 'pcq'],
   'rf': ['rf'],
   'shields': ['sg', 'bsg', 'psg', 'scb'],
@@ -101,16 +109,17 @@ const CATEGORIES = {
 
   // Hardpoints
   'lasers': ['pl', 'ul', 'bl'],
-  'projectiles': ['mc', 'c', 'fc', 'pa', 'rg'],
+  'projectiles': ['mc', 'advmc', 'c', 'fc', 'pa', 'rg'],
-  'ordnance': ['mr', 'tp', 'nl'],
+  'ordnance': ['mr', 'amr', 'tp', 'nl'],
   // Utilities
   'sb': ['sb'],
   'hs': ['hs'],
+  'csl': ['csl'],
   'defence': ['ch', 'po', 'ec'],
   'scanners': ['sc', 'ss', 'cs', 'kw', 'ws'], // Overloaded with internal scanners
   // Experimental
-  'experimental': ['axmc', 'axmr', 'rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn', 'rcpl', 'dtl', 'rsl', 'mahr',],
+  'experimental': ['axmc', 'axmce', 'axmr', 'axmre', 'ntp','rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn', 'rcpl', 'dtl', 'rsl', 'mahr',],
-
+  'weapon stabilizers': ['ews'],
   // Guardian
   'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc'],
 
@@ -209,17 +218,31 @@ export default class AvailableModulesMenu extends TranslatedComponent {
               if (categories.length === 1) {
                 // Show category header instead of group header
                 if (m && grp == m.grp) {
+                  // If this is a missing module/weapon, skip it
+                  if (m.grp == "mh" || m.grp == "mm"){
+                    continue;
+                  } else {
                     list.push(<div ref={(elem) => this.groupElem = elem} key={category}
                                  className={'select-category upp'}>{translate(category)}</div>);
+                  }
+                } else {
+                  if (category == "mh" || category == "mm"){
+                    continue;
                   } else {
                     list.push(<div key={category} className={'select-category upp'}>{translate(category)}</div>);
                   }
+                }
               } else {
                 // Show category header as well as group header
                 if (!categoryHeader) {
+                  if (category == "mh" || category == "mm"){
+                    continue;
+                  }
+                  else {
                     list.push(<div key={category} className={'select-category upp'}>{translate(category)}</div>);
                     categoryHeader = true;
                   }
+                }
                 if (m && grp == m.grp) {
                   list.push(<div ref={(elem) => this.groupElem = elem} key={grp}
                                  className={'select-group cap'}>{translate(grp)}</div>);
@@ -237,7 +260,11 @@ export default class AvailableModulesMenu extends TranslatedComponent {
                 } else if (i.mount === 'T') {
                   mount = 'Turreted';
                 }
-                const fuzz = { grp, m: i, name: `${i.class}${i.rating}${mount ? ' '  + mount : ''} ${translate(grp)}` };
+                let special = '';
+                if (typeof(i.special) !== 'undefined') {
+                  special = `(${translate(i.special)})`;
+                }
+                const fuzz = { grp, m: i, name: `${i.class}${i.rating}${mount ? ' '  + mount : ''} ${translate(grp)} ${translate(special)}` };
                 fuzzy.push(fuzz);
               }
             }
@@ -249,6 +276,24 @@ export default class AvailableModulesMenu extends TranslatedComponent {
     return { list, currentGroup, fuzzy, trackingFocus };
   }
 
+  /**
+   * Return Is expiremental capacity reached
+   * @return {boolean}      Is experimental capacity reached
+   */
+  _experimentalCapacityReached() {
+    const ship = this.props.ship;
+    const ews = ship.internal.filter(o => o.m && o.m.grp === 'ews');
+    let expCap;
+
+    if(ews.length < 1){
+      expCap = 4;
+    } else{
+      expCap = ews[0].m.class == 3 ? 5 : 6;
+    }
+
+    return expCap <= this.props.ship.hardpoints.filter(o => o.m && o.m.experimental).length;
+  }
+
   /**
    * Generate React Components for Module Group
    * @param  {Ship} ship            Ship the selection is for
@@ -276,6 +321,11 @@ export default class AvailableModulesMenu extends TranslatedComponent {
     let itemsOnThisRow = 0;
     for (let i = 0; i < sortedModules.length; i++) {
       let m = sortedModules[i];
+      // If m.grp is mh or mm, or m.symbol contains 'Missing' skip it
+      if (m.grp == 'mh' || m.grp == 'mm' || m.symbol.includes("Missing")) {
+        // If this is a missing module, skip it
+        continue;
+      }
       let mount = null;
       let disabled = false;
       prevName = m.name;
@@ -285,7 +335,9 @@ export default class AvailableModulesMenu extends TranslatedComponent {
       // If the mounted module is experimental as well, we can replace it so
       // the maximum does not apply
       } else if (m.experimental && (!mountedModule || !mountedModule.experimental)) {
-        disabled = 4 <= ship.hardpoints.filter(o => o.m && o.m.experimental).length;
+        disabled = this._experimentalCapacityReached();
+      } else if (m.grp === 'mlc' && (!mountedModule || mountedModule.grp !== 'mlc')) {
+        disabled = 1 <= ship.internal.filter(o => o.m && o.m.grp === 'mlc').length;
       }
       let active = mountedModule && mountedModule.id === m.id;
       let classes = cn(m.name ? 'lc' : 'c', {
@@ -382,6 +434,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
     if (this.props.modules instanceof Array) {
       return;
     }
+    const mountedModule = this.props.m;
     return (
       <FuzzySearch
         list={this.state.fuzzy}
@@ -393,11 +446,20 @@ export default class AvailableModulesMenu extends TranslatedComponent {
         onSelect={e => this.props.onSelect.bind(null, e.m)()}
         resultsTemplate={(props, state, styles, clickHandler) => {
           return state.results.map((val, i) => {
+            let disabled;
+
+            if(val.m.experimental && (!mountedModule || !mountedModule.experimental)) {
+              disabled = this._experimentalCapacityReached();
+            } else{
+              disabled = false;
+            }
+            const handler = disabled ? null : () => clickHandler(i);
+
             return (
               <div
                 key={i}
-                className={'lc'}
+                className={cn('lc', {disabled})}
-                onClick={() => clickHandler(i)}
+                onClick={handler}
               >
                 {val.name}
               </div>
@@ -516,6 +578,15 @@ export default class AvailableModulesMenu extends TranslatedComponent {
         return 1;
       }
     }
+    // Sort multi limpet controllers by name
+    if (a.grp === 'mlc') {
+      if (a.name[0] <= b.name[0]) {
+        return -1;
+      }
+      if (a.name[0] > b.name[0]) {
+        return 1;
+      }
+    }
     // Rating ordered from highest (A) to lowest (E)
     if (a.rating < b.rating) {
       return -1;

src/app/components/CostSection.jsx

@@ -32,7 +32,7 @@ export default class CostSection extends TranslatedComponent {
     this._buildRetrofitShip = this._buildRetrofitShip.bind(this);
     this._onBaseRetrofitChange = this._onBaseRetrofitChange.bind(this);
     this._defaultRetrofitName = this._defaultRetrofitName.bind(this);
-    this._eddbShoppingList = this._eddbShoppingList.bind(this);
+    this._eddbShoppingList = this._inaraShoppingList.bind(this);
 
     let data = Ships[props.ship.id];   // Retrieve the basic ship properties, slots and defaults
     let retrofitName = this._defaultRetrofitName(props.ship.id, props.buildName);
@@ -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}
+              {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(moduleDiscount)}]`}</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>
@@ -328,9 +328,9 @@ export default class CostSection extends TranslatedComponent {
   }
 
   /**
-   * Open up a window for EDDB with a shopping list of our retrofit components
+   * Open up a window for inara with a shopping list of our retrofit components
    */
-  _eddbShoppingList() {
+  _inaraShoppingList() {
     const { retrofitCosts } = this.state;
     const { ship } = this.props;
 
@@ -338,7 +338,7 @@ export default class CostSection extends TranslatedComponent {
     const modIds = retrofitCosts.filter(item => item.retroItem.incCost && item.buyId && !item.buyPp).map(item => item.buyId).filter((v, i, a) => a.indexOf(v) === i);
 
     // Open up the relevant URL
-    window.open('https://eddb.io/station?m=' + modIds.join(','));
+    window.open('https://inara.cz/inapi/corisearch.php?m=' + modIds.join(','));
   }
 
   /**
@@ -387,7 +387,7 @@ export default class CostSection extends TranslatedComponent {
           <tbody>
             {rows}
             <tr className='ri'>
-              <td className='lbl' ><button onClick={this._eddbShoppingList} onMouseOver={termtip.bind(null, 'PHRASE_REFIT_SHOPPING_LIST')} onMouseOut={tooltip.bind(null, null)}><ShoppingIcon className='lg' style={{ fill: 'black' }}/></button></td>
+              <td className='lbl' ><button onClick={this._inaraShoppingList} onMouseOver={termtip.bind(null, 'PHRASE_REFIT_SHOPPING_LIST')} onMouseOut={tooltip.bind(null, null)}><ShoppingIcon className='lg' style={{ fill: 'black' }}/></button></td>
               <td colSpan='3' className='lbl' >{translate('cost')}</td>
               <td colSpan='2' className={cn('val', retrofitTotal > 0 ? 'warning' : 'secondary-disabled')} style={{ borderBottom:'none' }}>
                 {int(retrofitTotal)}{units.CR}

src/app/components/HardpointSlot.jsx

@@ -136,6 +136,7 @@ export default class HardpointSlot extends Slot {
           {showModuleResistances && m.getThermalResistance() ? <div
             className='l'>{translate('thermres')}: {formats.pct(m.getThermalResistance())}</div> : null}
           {m.getIntegrity() ? <div className='l'>{translate('integrity')}: {formats.int(m.getIntegrity())}</div> : null}
+          {m.getInfo() ? <div className='l'>{translate(m.getInfo())}</div> : null}
           {m && validMods.length > 0 ? <div className='r' tabIndex="0" ref={modButton => this.modButton = modButton}>
             <button tabIndex="-1" onClick={this._toggleModifications.bind(this)} onContextMenu={stopCtxPropagation}
                     onMouseOver={termtip.bind(null, 'modifications')} onMouseOut={tooltip.bind(null, null)}>

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>

src/app/components/InternalSlot.jsx

@@ -88,6 +88,7 @@ export default class InternalSlot extends Slot {
           { m.getHullReinforcement() ? <div className='l'>{translate('armour')}: {formats.int(m.getHullReinforcement() + ship.baseArmour * m.getModValue('hullboost') / 10000)}</div> : null }
           { m.getProtection() ? <div className='l'>{translate('protection')}: {formats.rPct(m.getProtection())}</div> : null }
           { m.getIntegrity() ? <div className='l'>{translate('integrity')}: {formats.int(m.getIntegrity())}</div> : null }
+          { m.getInfo() ? <div className='l'>{translate(m.getInfo())}</div> : null }
 	  { m && validMods.length > 0 ? <div className='r' tabIndex="0" ref={ modButton => this.modButton = modButton }><button tabIndex="-1" onClick={this._toggleModifications.bind(this)} onContextMenu={stopCtxPropagation} onMouseOver={termtip.bind(null, 'modifications')} onMouseOut={tooltip.bind(null, null)}><ListModifications /></button></div> : null }
         </div>
       </div>;

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>;
-  }
-}

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 shipModel = shipModelFromJson(build);
-    const ship = CompanionApiUtils.shipFromJson(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
+        if (importData?.[0]?.header?.appName) { // has SLEF envelope?
-          this._importCompanionApiBuild(importData); // Single sihp definition
+          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

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>;
-  }
-}

src/app/components/ModalShoppingList.jsx

@@ -3,6 +3,8 @@ import PropTypes from 'prop-types';
 import TranslatedComponent from './TranslatedComponent';
 import request from 'superagent';
 import Persist from '../stores/Persist';
+const zlib = require('zlib');
+const base64url = require('base64url');
 
 /**
  * Permalink modal
@@ -56,7 +58,6 @@ export default class ModalShoppingList extends TranslatedComponent {
           continue;
         }
         if (module.m.blueprint.special) {
-          console.log(module.m.blueprint.special);
           blueprints.push({ uuid: module.m.blueprint.special.uuid, number: 1 });
         }
         for (const g in module.m.blueprint.grades) {
@@ -146,6 +147,64 @@ export default class ModalShoppingList extends TranslatedComponent {
     }
   }
 
+  /**
+ * Send all blueprints to EDOMH. This is a modified copy of registerBPs because this.state.blueprints was empty when I tried to modify sendToEDEng and I couldn't figure out why
+ * @param {Event} event React event
+ */
+  sendToEDOMH(event) {
+    event.preventDefault();
+    const ship = this.props.ship;
+    let blueprints = [];
+
+    //create the json
+    for (const module of ship.costList) {
+      if (module.type === 'SHIP') {
+        continue;
+      }
+      if (module.m && module.m.blueprint) {
+        if (!module.m.blueprint.grade || !module.m.blueprint.grades) {
+          continue;
+        }
+        if (module.m.blueprint.special) {
+          blueprints.push({
+            "item": module.m.symbol,
+            "blueprint": module.m.blueprint.special.edname
+          });
+        }
+        for (const g in module.m.blueprint.grades) {
+          if (!module.m.blueprint.grades.hasOwnProperty(g)) {
+            continue;
+          }
+          if (g < module.m.blueprint.grade) {
+            continue;
+          }
+          blueprints.push({
+            "item": module.m.symbol,
+            "blueprint": module.m.blueprint.fdname,
+            "grade": module.m.blueprint.grade,
+            "highestGradePercentage":1.0
+          });
+        }
+      }
+    }
+
+    //create JSON to encode
+    let baseJson = {
+      "version":1,
+      "name":ship.name, // TO-DO: Import build name and put that here correctly
+      "items": blueprints
+    }      
+    
+    let JSONString = JSON.stringify(baseJson)
+    let deflated = zlib.deflateSync(JSONString)
+    
+    //actually encode
+    let link = base64url.encode(deflated)
+    link = "edomh://coriolis/?" + link;
+
+    window.open(link, "_self")
+  }
+
   /**
    * Convert mats object to string
    */
@@ -177,6 +236,18 @@ export default class ModalShoppingList extends TranslatedComponent {
               mats[i] = module.m.blueprint.grades[g].components[i] * this.state.matsPerGrade[g];
             }
           }
+          if (module.m.blueprint.special) {
+            for (const j in module.m.blueprint.special.components) {
+              if (!module.m.blueprint.special.components.hasOwnProperty(j)) {
+                continue;
+              }
+              if (mats[j]) {
+                mats[j] += module.m.blueprint.special.components[j];
+              } else {
+                mats[j] = module.m.blueprint.special.components[j];
+              }
+            }
+          }
         }
       }
     }
@@ -229,6 +300,7 @@ export default class ModalShoppingList extends TranslatedComponent {
     const compatible = this.checkBrowserIsCompatible();
     this.cmdrChangeHandler = this.cmdrChangeHandler.bind(this);
     this.sendToEDEng = this.sendToEDEng.bind(this);
+    this.sendToEDOMH = this.sendToEDOMH.bind(this);
     return <div className='modal' onClick={ (e) => e.stopPropagation() }>
       <h2>{translate('PHRASE_SHOPPING_MATS')}</h2>
       <label>{translate('Grade 1 rolls ')}</label>
@@ -257,6 +329,7 @@ export default class ModalShoppingList extends TranslatedComponent {
       <p hidden={!this.state.failed} id={'failed'} className={'l'}>{translate('PHRASE_FAIL_EDENGINEER')}</p>
       <p hidden={compatible} id={'browserbad'} className={'l'}>{translate('PHRASE_FIREFOX_EDENGINEER')}</p>
       <button className={'l cb dismiss cap'} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send to EDEngineer')}</button>
+      <button style={{marginTop: 5}} className={'l cb dismiss cap'} disabled={!!this.state.failed} onClick={this.sendToEDOMH}>{translate('Send to EDOMH')}</button>
       <button className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
     </div>;
   }

src/app/components/Modification.jsx

@@ -44,7 +44,7 @@ export default class Modification extends TranslatedComponent {
     if (reCast.endsWith(value) || reCast.startsWith(value)) {
       let { m, name, ship } = this.props;
       value = Math.max(Math.min(value, 50000), -50000);
-      ship.setModification(m, name, value, true, true);
+      ship.setModification(m, name, value, true);
     }
   }
 

src/app/components/ModificationsMenu.jsx

@@ -436,7 +436,7 @@ export default class ModificationsMenu extends TranslatedComponent {
     let specialLabel;
     let specialTt;
     if (m.blueprint && m.blueprint.special) {
-      specialLabel = m.blueprint.special.name;
+      specialLabel = translate(m.blueprint.special.name);
       specialTt = specialToolTip(translate, m.blueprint.grades[m.blueprint.grade], m.grp, m, m.blueprint.special.edname);
     } else {
       specialLabel = translate('PHRASE_SELECT_SPECIAL');

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='3'>{translate('opponent\'s shields')}</th>
-                <th colSpan='2'>{translate('opponent\'s armour')}</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>

src/app/components/Pips.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import TranslatedComponent from './TranslatedComponent';
 import { Pip } from './SvgIcons';
-import { autoBind } from 'react-extras';
+import autoBind from 'auto-bind';
 
 /**
  * Pips displays SYS/ENG/WEP pips and allows users to change them with key presses by clicking on the relevant area.

src/app/components/Slot.jsx

@@ -99,6 +99,7 @@ export default class Slot extends TranslatedComponent {
     let translate = language.translate;
     let { ship, m, enabled, dropClass, dragOver, onOpen, onChange, selected, eligible, onSelect, warning, availableModules } = this.props;
     let slotDetails, modificationsMarker, menu;
+    let missing = false;
 
     if (!selected) {
       // If not selected then sure that modifications flag is unset
@@ -108,6 +109,11 @@ export default class Slot extends TranslatedComponent {
     if (m) {
       slotDetails = this._getSlotDetails(m, enabled, translate, language.formats, language.units);  // Must be implemented by sub classes
       modificationsMarker = JSON.stringify(m);
+      if(typeof m.grp !== 'undefined' || m.grp !== null) {
+        if(m.grp == "mh" || m.grp == "mm") {
+          missing = true;
+        }
+      }
     } else {
       slotDetails = <div className={'empty'}>{translate(eligible ? 'emptyrestricted' : 'empty')}</div>;
       modificationsMarker = '';
@@ -141,7 +147,10 @@ export default class Slot extends TranslatedComponent {
     
     return (
       <div className={cn('slot', dropClass, { selected })} onClick={onOpen} onKeyDown={this._keyDown} onContextMenu={this._contextMenu} onDragOver={dragOver} tabIndex="0" ref={slotDiv => this.slotDiv = slotDiv}>
-        <div className='details-container'>
+        {
+          // If missing module/hardpoint, set the div container to warning status.
+        }
+        <div className={ missing === true ? 'details-container warning' : 'details-container'}>
           <div className='sz'>{this._getMaxClassLabel(translate)}</div>
             {slotDetails}
   	    </div>

src/app/components/StandardSlot.jsx

@@ -93,6 +93,11 @@ export default class StandardSlot extends TranslatedComponent {
       this._modificationsSelected = false;
     }
 
+    // If this is a missing module, therefore has the 'info' field, set the warning value on the module to be true when loaded.
+    if (m.info) {
+      warning = () => true;
+    }
+
     const modificationsMarker = JSON.stringify(m);
 
     if (selected) {
@@ -124,7 +129,7 @@ export default class StandardSlot extends TranslatedComponent {
         <div className={cn('details-container', { warning: warning && warning(slot.m), disabled: m.grp !== 'bh' && !slot.enabled })}>
           <div className={'sz'}>{m.grp == 'bh' ? m.name.charAt(0) : slot.maxClass}</div>
           <div>
-            <div className={'l'}>{classRating} {translate(m.name || m.grp)}{m.mods && Object.keys(m.mods).length > 0 ? <span className='r' onMouseOver={termtip.bind(null, modTT)} onMouseOut={tooltip.bind(null, null)}><Modified /></span> : null }</div>
+            <div className={'l'}>{classRating} {m.getInfo() ? translate(m.ukName) : translate(m.name || m.grp)}{m.mods && Object.keys(m.mods).length > 0 ? <span className='r' onMouseOver={termtip.bind(null, modTT)} onMouseOut={tooltip.bind(null, null)}><Modified /></span> : null }</div>
             <div className={'r'}>{formats.round(mass)}{units.T}</div>
 	    <div/>
             <div className={'cb'}>
@@ -144,7 +149,8 @@ export default class StandardSlot extends TranslatedComponent {
                 { showModuleResistances && m.getKineticResistance() ? <div className='l'>{translate('kinres')}: {formats.pct(m.getKineticResistance())}</div> : null }
                 { showModuleResistances && m.getThermalResistance() ? <div className='l'>{translate('thermres')}: {formats.pct(m.getThermalResistance())}</div> : null }
                 { m.getIntegrity() ? <div className='l'>{translate('integrity')}: {formats.int(m.getIntegrity())}</div> : null }
-	        { validMods.length > 0 ? <div className='r' tabIndex="0" ref={ modButton => this.modButton = modButton }><button  tabIndex="-1" onClick={this._toggleModifications.bind(this)} onContextMenu={stopCtxPropagation} onMouseOver={termtip.bind(null, 'modifications')} onMouseOut={tooltip.bind(null, null)}><ListModifications /></button></div> : null }
+                { m.getInfo() ? <div className='l'>{translate(m.getInfo())}</div> : null }
+	        { m.getInfo() ? <div className='r'></div> : validMods.length > 0 ? <div className='r' tabIndex="0" ref={ modButton => this.modButton = modButton }><button  tabIndex="-1" onClick={this._toggleModifications.bind(this)} onContextMenu={stopCtxPropagation} onMouseOver={termtip.bind(null, 'modifications')} onMouseOut={tooltip.bind(null, null)}><ListModifications /></button></div> : null }
             </div>
           </div>
         </div>

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>
+    );
   }
 }
 

src/app/i18n/Language.jsx

@@ -8,6 +8,7 @@ import * as RU from './ru';
 import * as PL from './pl';
 import * as PT from './pt';
 import * as CN from './cn';
+import * as KO from './ko';
 import * as d3 from 'd3';
 
 let fallbackTerms = EN.terms;
@@ -29,6 +30,7 @@ export function getLanguage(langCode) {
     case 'pl': lang = PL; break;
     case 'pt': lang = PT; break;
     case 'cn': lang = CN; break;
+    case 'ko': lang = KO; break;
     default:
       lang = EN;
   }
@@ -97,5 +99,6 @@ export const Languages = {
   ru: 'ру́сский',
   pl: 'polski',
   pt: 'português',
-  cn: '中文'
+  cn: '中文',
+  ko: '한국어'
 };

src/app/i18n/cn.json

@@ -398,6 +398,7 @@
   "No modded components.": "没有改装的部件",
   "Sending...": "发送中...",
   "Send to EDEngineer": "发送至EDEngineer",
+  "Send to EDOMH": "发送至EDOMH",
   "PHASE_UPLOAD_ORBIS": "上传到orbis.zone（测试阶段）",
   "orbis username": "orbis.zone的Email或用户名",
   "orbis password": "orbis.zone的密码",

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",
@@ -162,7 +162,7 @@
     "life support": "Lebenserhaltung",
     "power plant": "Kraftwerk",
     "thrusters": "Antriebe",
-    "power distriubtor": "Energieverteiler",
+    "power distributor": "Energieverteiler",
     "sensors": "Sensoren",
     "bins": "Behältnisse",
     "bays": "Slots",

src/app/i18n/en.json

@@ -83,6 +83,7 @@
     "HELP_MODIFICATIONS_MENU": "Click on a number to enter a new value, or drag along the bar for small changes",
 	"PHRASE_FAIL_EDENGINEER": "Failed to send to EDEngineer (Launch EDEngineer and make sure the API is started then refresh the page.)",
 	"PHRASE_FIREFOX_EDENGINEER": "Sending to EDEngineer is not compatible with Firefox's security settings. Please try again with Chrome.",
+    "MISSING_MODULES": "Missing Modules",
     "am": "Auto Field-Maintenance Unit",
     "bh": "Bulkheads",
     "bl": "Beam Laser",
@@ -93,6 +94,7 @@
     "ch": "Chaff Launcher",
     "cr": "Cargo Rack",
     "cs": "Manifest Scanner",
+    "csl": "Caustic Sink Launcher",
     "dc": "Docking Computer",
     "ec": "Electronic Countermeasure",
     "fc": "Fragment Cannon",
@@ -108,10 +110,18 @@
     "kw": "Kill Warrant Scanner",
     "ls": "Life Support",
     "mc": "Multi-cannon",
+    "mh": "Missing Weapon/Utility",
+    "mm": "Missing Module",
+    "advmc": "Multi-cannon (Advanced)",
     "axmc": "AX Multi-cannon",
+    "axmce": "AX Multi-cannon (Enhanced)",
     "ml": "Mining Laser",
+    "mlc": "Multi Limpet Controller",
     "mr": "Missile Rack",
+    "amr": "Missile Rack (Advanced)",
     "axmr": "AX Missile Rack",
+    "axmre": "AX Missile Rack (Enhanced)",
+    "ews": "Experimental Weapon Stabilizer",
     "mrp": "Module Reinforcement Package",
     "nl": "Mine Launcher",
     "pa": "Plasma Accelerator",
@@ -156,8 +166,10 @@
     "sua": "Supercruise Assist",
     "t": "thrusters",
     "tp": "Torpedo Pylon",
+    "ntp": "Nanite Torpedo Pylon",
     "ul": "Burst Laser",
     "Send To EDEngineer": "Send To EDEngineer",
+    "Send To EDOMH": "Send To EDOMH",
     "ws": "Frame Shift Wake Scanner",
     "rpl": "Repair Limpet Controller",
     "rcpl": "Recon Limpet Controller",
@@ -205,9 +217,10 @@
     "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",
+    "info": "Info",
     "boot": "Boot time",
     "hacktime": "Hack time",
     "brokenregen": "Broken regeneration rate",

src/app/i18n/ko.js

@@ -0,0 +1,16 @@
+export const formats = {
+    decimal: '.',
+    thousands: ',',
+    grouping: [3],
+    currency: ['₩', ''],
+    dateTime: '%a %b %e %X %Y',
+    date: '%Y/%m/%d',
+    time: '%H:%M:%S',
+    periods: ['오전', '오후'],
+    days: ['일요일', '월요일', '화요일', '수요일', '목요일', '금요일', '토요일'],
+    shortDays: ['일', '월', '화', '수', '목', '금', '토'],
+    months: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'],
+    shortMonths: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월']
+};
+
+export { default as terms } from './ko.json';

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'],
+  days: ['domingo', 'segunda', 'terça', 'quarta', 'quinta', 'sexta', 'sábado'],
-  shortDays: ['dom', 'lun', 'mar', 'mié', 'jue', 'vie', 'sáb'],
+  shortDays: ['dom', 'seg', 'ter', 'qua', 'qui', 'sex', 'sab'],
-  months: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
+  months: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho', 'julho', 'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
-  shortMonths: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sep', 'oct', 'nov', 'dic']
+  shortMonths: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul', 'ago', 'set', 'out', 'nov', 'dez']
 };
 
 export { default as terms } from './pt.json';

src/app/i18n/ru.json

@@ -5,7 +5,7 @@
     "PHRASE_EXPORT_DESC": "Детальный JSON-экспорт вашей сборки для использования в других местах и инструментах",
     "PHRASE_FASTEST_RANGE": "Последовательные прыжки максимальной дальности",
     "PHRASE_IMPORT": "Для импорта вставьте код в эту форму",
-    "PHRASE_LADEN": "Масса корабля с учётом топлива и грузов",
+    "PHRASE_LADEN": "Масса корабля с учетом топлива и грузов",
     "PHRASE_NO_BUILDS": "Нечего сравнивать",
     "PHRASE_NO_RETROCH": "Нет ранних версий сборки",
     "PHRASE_SELECT_BUILDS": "Выберите конфигурацию для сравнения",
@@ -14,17 +14,20 @@
     "PHRASE_UNLADEN": "Масса корабля без учета топлива и грузов",
     "PHRASE_UPDATE_RDY": "Доступна новая версия. Нажмите для обновления.",
     "PHRASE_ENGAGEMENT_RANGE": "Дистанция между кораблём и целью",
-    "PHRASE_SELECT_BLUEPRINT": "Нажмите чтобы выбрать чертёж",
+    "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_LIST": "Станции, на которых продают эту сборку",
-    "PHRASE_REFIT_SHOPPING_LIST": "Станции, что продают необходимые модули",
+    "PHRASE_SHOPPING_MATS": "Материалы которые нужны для сборки",
-    "PHRASE_TOTAL_EFFECTIVE_SHIELD": "Общий урон, что может быть нанесён в каждым типе, если используются все щитонакопители",
+    "PHRASE_REFIT_SHOPPING_LIST": "Станции, на которых продают необходимые модули",
+    "PHRASE_TOTAL_EFFECTIVE_SHIELD": "Общий урон, что может быть нанесен в каждым типе, если используются все щитонакопители",
     "PHRASE_TIME_TO_LOSE_SHIELDS": "Щиты продержатся",
     "PHRASE_TIME_TO_RECOVER_SHIELDS": "Щиты восстановятся за",
     "PHRASE_TIME_TO_RECHARGE_SHIELDS": "Щиты будут заряжены за",
@@ -36,76 +39,89 @@
     "PHRASE_TIME_TO_LOSE_ARMOUR": "Броня продержится",
     "PHRASE_MODULE_PROTECTION_EXTERNAL": "Защита гнёзд",
     "PHRASE_MODULE_PROTECTION_INTERNAL": "Защита всех остальных модулей",
-    "PHRASE_SHIELD_DAMAGE": "Подробности источников поддерживаемого ДПС против щитов",
+    "PHRASE_OVERALL_DAMAGE": "Разбивка источников устойчивого УвС",
-    "PHRASE_ARMOUR_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": "Непрерывным огнём из всех орудий",
-    "PHRASE_TIME_TO_DRAIN_WEP": "Опустошит ОРУЖ за",
+    "PHRASE_TIME_TO_DRAIN_WEP": "Опустошит ОРУ за",
-    "TT_TIME_TO_DRAIN_WEP": "Время, за которое опустошится аккумулятор ОРУЖ при стрельбе из всех орудий",
+    "TT_TIME_TO_DRAIN_WEP": "Время, за которое опустошится аккумулятор ОРУ при стрельбе из всех орудий",
     "TT_TIME_TO_LOSE_SHIELDS": "Против поддерживаемой стрельбы из всех орудий противника",
     "TT_TIME_TO_LOSE_ARMOUR": "Против поддерживаемой стрельбы из всех орудий противника",
     "TT_MODULE_ARMOUR": "Броня, защищающая модули от урона",
-    "TT_MODULE_PROTECTION_EXTERNAL": "Процент урона, перенаправленного от гнёзд на наборы для усиления модулей",
+    "TT_MODULE_PROTECTION_EXTERNAL": "Процент урона, перенаправленного от гнезд на наборы для усиления модулей",
     "TT_MODULE_PROTECTION_INTERNAL": "Процент урона, перенаправленного от модулей вне гнёзд на наборы для усиления модулей",
-    "TT_EFFECTIVE_SDPS_SHIELDS": "Реальный поддерживаемый ДПС пока аккумулятор ОРУЖ не пуст",
+    "TT_EFFECTIVE_SDPS_SHIELDS": "Реальный поддерживаемый УвС пока ёмкость ОРУ не пуста",
     "TT_EFFECTIVENESS_SHIELDS": "Эффективность в сравнении с попаданием по цели с 0-сопротивляемостью без пунктов в СИС на 0 метрах",
-    "TT_EFFECTIVE_SDPS_ARMOUR": "Реальный поддерживаемый ДПС пока аккумулятор ОРУЖ не пуст",
+    "TT_EFFECTIVE_SDPS_ARMOUR": "Реальный поддерживаемый УвС пока аккумулятор ОРУ не пуст",
     "TT_EFFECTIVENESS_ARMOUR": "Эффективность в сравнении с попаданием по цели с 0-сопротивляемостью на 0 метрах",
-    "PHRASE_EFFECTIVE_SDPS_SHIELDS": "ПДПС против щитов",
+    "PHRASE_EFFECTIVE_SDPS_SHIELDS": "ПУвС против щитов",
-    "PHRASE_EFFECTIVE_SDPS_ARMOUR": "ПДПС против брони",
+    "PHRASE_EFFECTIVE_SDPS_ARMOUR": "ПУвС против брони",
-    "TT_SUMMARY_SPEED": "С полным топливным баком и 4 пунктами в ДВИ",
+    "TT_SUMMARY_SPEED": "С полным топливным баком и 4 пунктами в ДВГ",
     "TT_SUMMARY_SPEED_NONFUNCTIONAL": "Маневровые двигатели выключены или превышена максимальная масса с топливом и грузом",
-    "TT_SUMMARY_BOOST": "С полным топливным баком и 4 пунктами в ДВИ",
+    "TT_SUMMARY_BOOST": "С полным топливным баком и 4 пунктами в ДВГ",
+    "TT_SUMMARY_BOOST_INTERVAL": "Время заполнения с 4 пунктами в СИС",
     "TT_SUMMARY_BOOST_NONFUNCTIONAL": "Распределитель питания не может обеспечить достаточно энергии для форсажа",
     "TT_SUMMARY_SHIELDS": "Чистая сила щита, включая усилители",
+    "TT_SUMMARY_SHIELDS_SCB": "Прочность щита, включая бустеры и щитонакопители",
     "TT_SUMMARY_SHIELDS_NONFUNCTIONAL": "Шитогенератор отсутствует или выключен",
     "TT_SUMMARY_INTEGRITY": "Целостность корабля, включая переборки и наборы для усиления корпуса",
     "TT_SUMMARY_HULL_MASS": "Масса корпуса без каких-либо модулей",
     "TT_SUMMARY_UNLADEN_MASS": "Масса корпуса и модулей без топлива и груза",
     "TT_SUMMARY_LADEN_MASS": "Масса корпуса и модулей с топливом и грузом",
     "TT_SUMMARY_DPS": "Урон в секунду при стрельбе из всех орудий",
-    "TT_SUMMARY_EPS": "Расход аккумулятора ОРУЖ в секунду при стрельбе из всех орудий",
+    "TT_SUMMARY_EPS": "Расход аккумулятора ОРУ в секунду при стрельбе из всех орудий",
-    "TT_SUMMARY_TTD": "Время расхода аккумулятора ОРУЖ при стрельбе из всех орудий и с 4 пунктами в ОРУЖ",
+    "TT_SUMMARY_TTD": "Время расхода аккумулятора ОРУ при стрельбе из всех орудий и с 4 пунктами в ОРУ",
     "TT_SUMMARY_MAX_SINGLE_JUMP": "Самый дальний возможный прыжок без груза и с топливом, достаточным только на сам прыжок",
     "TT_SUMMARY_UNLADEN_SINGLE_JUMP": "Самый дальний возможный прыжок без груза и с полным топливным баком",
     "TT_SUMMARY_LADEN_SINGLE_JUMP": "Самый дальний возможный прыжок с полным грузовым отсеком и с полным топливным баком",
     "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": "Орудие",
+    "c": "Пушка",
-    "cc": "Контроллер магнитного снаряда для сбора",
+    "causres": "Сопротивление едк.урону",
+    "Caustic resistance": "Сопротивление едк.урону",
+    "cc": "Контроллер дронов-сборщиков",
     "ch": "Разбрасыватель дипольных отражателей",
     "cr": "Грузовой стеллаж",
     "cs": "Сканер содержимого",
+    "csl": "Антикор катапульта",
     "dc": "Стыковочный компьютер",
-    "ec": "Электр. противодействие",
+    "ec": "Радиоэлектронное подавление",
     "fc": "Залповое орудие",
     "fh": "Ангар для истребителя",
     "fi": "FSD-перехватчик",
     "fs": "Топливозаборник",
     "fsd": "Рамочно-сместительный двигатель",
     "ft": "Топливный бак",
-    "fx": "Контроллер магнитного снаряда для топлива",
+    "fx": "Контроллер дронов-заправщиков",
-    "hb": "Контроллер магнитного снаряда для взлома трюма",
+    "hb": "Контроллер дронов-взломщиков трюмов",
     "hr": "Набор для усиления корпуса",
     "hs": "Теплоотводная катапульта",
     "kw": "Сканер преступников",
     "ls": "Система жизнеобеспечения",
     "mc": "Многоствольное орудие",
+    "axmc": "Многоствольное орудие АИ",
     "ml": "Проходочный лазер",
-    "mr": "Ракетный лоток",
+    "mr": "Блок ракет",
+    "axmr": "Блок ракет АИ",
+    "ews": "Стабилизатор экспериментального вооружения",
     "mrp": "Набор для усиления модуля",
     "nl": "Мины",
     "pa": "Ускоритель плазмы",
     "pas": "Комплект для сближения с планетой",
-    "pc": "Контроллер магнитного снаряда для геологоразведки",
+    "pc": "Контроллер дронов-геологоразведчиков",
     "pce": "Каюта пассажира эконом-класса",
+    "passenger capacity": "Количество пассажиров",
     "pci": "Каюта пассажира бизнес-класса",
     "pcm": "Каюта пассажира первого класса",
     "pcq": "Каюта пассажира класса люкс",
@@ -113,33 +129,65 @@
     "pl": "Импульсный лазер",
     "po": "Точечная оборона",
     "pp": "Силовая установка",
+    "gpp": "Силовая установка Стражей",
+    "gpd": "Гибридный распределитель питания Стражей",
+    "gpc": "Плазменная пушка Стражей",
+    "ggc": "Пушка Гаусса Стражей",
+    "gsrp": "Набор для усиления щита Стражей",
+    "gfsb": "Ускоритель FSD Стражей",
+    "ghrp": "Набор для усиления корпуса Стражей",
+    "gmrp": "Набор для усиления модуля Стражей",
+    "pwa": "Анализатор импульсных волн",
+    "abl": "Абразивный бластер",
+    "scl": "Пусковая установка для сейсмических снарядов",
+    "sdm": "Вытесняющая ракета для добычи глубинных залежей",
+    "tbsc": "Шоковое орудие",
+    "gsc": "Осколочное орудие Стражей",
     "psg": "Призматический щитогенератор",
     "pv": "Гараж для планетарного транспорта",
-    "rf": "Устройство переработки",
+    "rf": "Очиститель",
-    "rg": "Электромагнитная пушка",
+    "rfl": "Зенитная установка (снаряды с дистанционным подрывом)",
+    "rg": "Рельсотрон",
+    "rsl": "Контроллер дронов-исследователей",
     "s": "Сенсоры",
     "sb": "Усилитель щита",
     "sc": "Сканер обнаружения",
     "scb": "Щитонакопитель",
+    "sfn": "Нейтрализатор отключающего поля",
     "sg": "Щитогенератор",
     "ss": "Сканер поверхностей",
+    "sua": "Помощь в гиперкрейсерском режиме",
     "t": "Маневровые двигатели",
-    "tp": "Торпедная стойка",
+    "tp": "Торпедная установка",
-    "ul": "Пульсирующие лазеры",
+    "ul": "Пульсирующий лазер",
+    "Send To EDEngineer": "Отправить в EDEngineer",
+    "Send To EDOMH": "Отправить в EDOMH",
     "ws": "Сканер следа FSD",
+    "rpl": "Контроллер дронов-ремонтников",
+    "rcpl": "Контроллер дронов-разведчиков",
+    "xs": "Ксено-сканер",
+    "tbem": "Блок энзимных ракет",
+    "tbrfl": "Установка для стрельбы стреловидными снарядами с дистанционным подрывом",
+    "dtl": "Контроллер дронов-очистителей",
+    "mlc": "Мультиконтроллер",
+    "mahr": "Метасплавное усиление корпуса",
     "emptyrestricted": "пусто (ограниченно)",
     "damage dealt to": "Урон нанесён",
     "damage received from": "Урон получен от",
     "against shields": "Против щитов",
     "against hull": "Против корпуса",
-    "total effective shield": "Общие эффективные щиты",
+    "total effective shield": "Общая эффективность щита",
     "ammunition": "Припасы",
     "secs": "с",
-    "rebuildsperbay": "Построек за полосу",
+    "bays": "Ячейки",
+    "rebuildsperbay": "Истребителей в ячейке",
+    "mroll": "Roll",
+    "feature": "Свойство",
     "worst": "Худшее",
     "average": "Среднее",
     "random": "Случайное",
     "best": "Лучшее",
+    "current": "Текущее",
     "extreme": "Экстремальное",
     "reset": "Сброс",
     "dpe": "Урон на МДж энергии",
@@ -148,6 +196,8 @@
     "dpssdps": "Урон в секунду (поддерживаемый урон в секунду)",
     "eps": "Энергия в секунду",
     "epsseps": "Энергия в секунду (поддерживаемая энергия в секунду)",
+    "fallofffromrange": "Спад",
+    "falloff": "Спад",
     "hps": "Нагрев в секунду",
     "hpsshps": "Нагрев в секунду (поддерживаемый нагрев в секунду)",
     "damage by": "Урон",
@@ -155,7 +205,7 @@
     "shield cells": "Щитонакопители",
     "recovery": "включение",
     "recharge": "перезарядка",
-    "engine pips": "Пункты в двигателе",
+    "engine pips": "Ячейки питания на ДВГ",
     "4b": "4 пункта и Форсаж",
     "speed": "скорость",
     "pitch": "Тангаж",
@@ -164,13 +214,15 @@
     "internal protection": "Внутренняя защита",
     "external protection": "Внешняя защита",
     "engagement range": "Боевое расстояние",
+    "boost interval": "Интервал повыш.",
     "total": "Всего",
-    "ammo": "Боекомплект",
+    "ammo": "Макс. боекомплект",
     "boot": "Время загрузки",
+    "hacktime": "Время взлома",
     "brokenregen": "Скорость восстановления при пробое",
     "burst": "Длина очереди",
     "burstrof": "Скорострельность очереди",
-    "clip": "Боекомплект",
+    "clip": "Размер боекомплекта",
     "damage": "Урон",
     "distdraw": "Тяга распределителя",
     "duration": "Продолжительность",
@@ -199,11 +251,16 @@
     "rof": "Скорострельность",
     "angle": "Угол сканера",
     "scanrate": "Скорость сканера",
+    "proberadius": "Радиус зонда",
     "scantime": "Время сканирования",
+    "scan range": "Дальность",
+    "max angle": "Макс. угол",
     "shield": "Щит",
+    "armour": "Броня",
     "shieldboost": "Усиление щитов",
     "shieldreinforcement": "Усилитель щита",
     "shotspeed": "Скорость выстрела",
+    "shotdmg": "Урон за выстрел(DPS)",
     "spinup": "Время раскрутки",
     "syscap": "Ресурс систем",
     "sysrate": "Перезарядка систем",
@@ -234,9 +291,12 @@
     "explosive": "Взрывч.",
     "kinetic": "Механич.",
     "thermal": "Тепл.",
+    "caustic": "Едкий",
     "generator": "Генератор",
     "boosters": "Усилители",
     "cells": "Ячейки",
+    "shield addition": "Добавления к щиту",
+    "jump addition": "Добавления к прыжку",
     "bulkheads": "Переборки",
     "reinforcement": "Усилители",
     "power and costs": "Энергия и стоимость",
@@ -250,7 +310,7 @@
     "damage to opponent's shields": "Урон щиту противника",
     "damage to opponent's hull": "Урон корпусу противника",
     "offence": "Нападение",
-    "defence": "Оборона",
+    "defence": "Защита",
     "shield metrics": "Данные щита",
     "raw shield strength": "Чистая мощность щита",
     "shield sources": "Ресурсы щита",
@@ -265,28 +325,70 @@
     "defence metrics": "Данные обороны",
     "fuel carried": "Топливо на борту",
     "cargo carried": "Груз на борту",
-    "ship control": "Управление кораблём",
+    "ship control": "Управление кораблем",
     "opponent": "Противник",
     "opponent's shields": "Щит противника",
     "opponent's armour": "Броня противника",
+    "overall damage": "общий урон",
+    "overall": "общий",
     "shield damage sources": "источники урона по щиту",
     "armour damage sources": "источники урона по броне",
     "never": "Никогда",
     "stock": "базовый",
     "boost": "форсаж",
+    "tab_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": "Минимальный ранг империи для покупки",
+    "kg": "кг",
+    "kg/s": "кг/с",
+    "km": "км",
+    "m": "м",
+    "MJ": "МДж",
+    "MW": "МВт",
+    "T": "т",
+    "°/s": "°/с",
     "/s": "/с",
+    "/min": "/мин",
     "m/s": "м/с",
-    "Ls": "Св.сек",
+    "Ls": "Св.с",
     "LY": "Св.лет",
-    "CR": "кр.",
+    "CR": "КР.",
-    "S": "M",
+    "S": "М",
     "M": "С",
-    "L": "б",
+    "L": "Б",
-    "H": "O",
+    "H": "О",
-    "U": "B",
+    "U": "В",
     "small": "Малый",
     "medium": "Средний",
-    "large": "большой",
+    "large": "Большой",
     "alpha": "Альфа",
     "beta": "Бета",
     "standard": "Стандартный",
@@ -304,23 +406,24 @@
     "full tank": "Полный бак",
     "internal compartments": "внутренние отсеки",
     "jump range": "Дальность прыжка",
-    "mass lock factor": "Масс. блок",
+    "mass lock factor": "Коэффициент гравитационного захвата",
     "max mass": "Максимальная масса",
+    "minimum mass": "Минимальная масса",
+    "optimal mass": "Оптимальная масса",
     "net cost": "разница в цене",
     "none created": "не создано",
     "refuel time": "Время дозаправки",
     "retrofit from": "модификация от",
     "T-Load": "Тепл.",
     "utility mounts": "Вспомогательное оборудование",
-    "about": "О ...",
+    "about": "О сайте",
     "action": "Действие",
     "added": "Добавлено",
-    "armour": "Броня",
     "available": "доступно",
     "backup": "Резервная копия",
     "bins": "контейнеры",
-    "build": "cборка",
+    "build": "сборка",
-    "builds": "cборки",
+    "builds": "сборки",
     "buy": "купить",
     "cancel": "отменить",
     "cargo": "Груз",
@@ -336,21 +439,21 @@
     "deployed": "Открыты",
     "disabled": "Отключено",
     "discount": "Скидка",
-    "DPS": "УВС",
+    "DPS": "УвС",
     "efficiency": "Эффективность",
     "empty": "пусто",
-    "ENG": "ДВИ",
+    "ENG": "ДВГ",
     "export": "Экспорт",
     "forum": "Форум",
-    "fuel": "Топливо",
+    "fuel": "Топл.",
     "hardpoints": "Орудийные порты",
     "hull": "Корпус",
     "import": "импортировать ",
     "insurance": "Страховка",
     "jumps": "Прыжков",
-    "laden": "Груженый",
+    "laden": "Груж",
     "language": "Язык",
-    "maneuverability": "Маневренность",
+    "maneuverability": "Манёвренность",
     "max": "Макс",
     "no": "Нет",
     "pen": "ПБ",
@@ -361,13 +464,15 @@
     "rate": "скорость",
     "rename": "Переименовать",
     "repair": "Починка",
-    "ret": "Убр.",
+    "ret": "Убр",
     "retracted": "Убрано",
-    "ROF": "В/сек",
+    "ROF": "В\/с",
     "save": "Сохранить",
     "sell": "Продать",
     "settings": "Настройки",
     "shields": "Щиты",
+    "No Shield": "Нет щита",
+    "Never": "Никогда",
     "ship": "Корабль",
     "ships": "Корабли",
     "shortened": "Укороченный",
@@ -377,8 +482,296 @@
     "SYS": "СИС",
     "time": "Время",
     "type": "Тип",
-    "unladen": "Пустой",
+    "unladen": "Пуст",
     "URL": "Ссылка",
-    "WEP": "ОРУЖ",
+    "WEP": "ОРУ",
-    "yes": "Да"
+    "yes": "Да",
+    "crew": "экипаж",
+    "jump": "прыж",
+    "pax": "псж",
+    "RST": "СБР",
+    "grade": "уровень",
+    "total laden": "всего груж",
+    "total unladen": "всего пуст",
+    "module": "модуль",
+    "announcements": "объявления",
+    "resistance": "сопротивление",
+    "Lightweight Alloy": "Лёгкие сплавы",
+    "base": "базовые",
+    "core module classes": "основные модули",
+    "Group highlighted ships": "Сгруппировать выделенные корабли",
+    "tooltips": "всплывающие подсказки",
+    "module resistances": "сопротивление модулей",
+    "power plant": "силовая установка",
+    "thrusters": "маневровые двигатели",
+    "frame shift drive": "рамочно-сместительный двигатель",
+    "life support": "система жизнеобеспечения",
+    "power distributor": "распределитель питания",
+    "sensors": "сенсоры",
+    "fuel tank": "топливный бак",
+    "resting heat (Beta)": "тепло покоя (бета)",
+    "hull hardness": "Прочность корпуса",
+    "weapon": "оружие",
+    "maximum speed": "максимальная скорость",
+    "maximum range": "максимальная дальность",
+    "shortlink": "короткая ссылка",
+    "guardian": "Стражи",
+    "engineers": "инженеры",
+    "component": "компонент",
+    "amount": "кол-во",
+    "core internal": "основное оборуднование",
+    "optional internal": "доп. оборудование",
+    "Heat Sink Launcher": "Теплоотводная катапульта",
+    "scanners": "сканеры",
+    "experimental": "экспериментальное",
+    "mining": "добыча ресурсов",
+    "lasers": "лазеры",
+    "ordnance": "артиллерия",
+    "projectiles": "с боеприпасами",
+    "hangars": "ангары",
+    "limpet controllers": "контроллеры дронов",
+    "passenger cabins": "каюты пассажиров",
+    "structural reinforcement": "усиление конструктива",
+    "flight assists": "помощь в полёте",
+    "modifications": "модификации",
+    "wep_reload": "перезарядка",
+    "optimal multiplier": "оптимальный усилитель",
+    "Cargo Hatch": "Грузовой люк",
+    "Chaff Launcher": "Разбрасыватель дипольных отражателей",
+    "Point Defence": "Точечная оборона",
+    "Electronic Countermeasure": "Радиоэлектронное подавление",
+    "Xeno Scanner": "Ксено-сканер",
+    "Shutdown Field Neutraliser": "Нейтрализатор отключающего поля",
+    "Disruptor": "«Диверсант»",
+    "Pacifier": "«Миротворец»",
+    "Advanced Plasma Accelerator": "Улучшенный ускоритель плазмы",
+    "Cytoscrambler": "«Дезинтегратор»",
+    "Retributor": "«Каратель»",
+    "Enforcer": "«Убийца»",
+    "Imperial Hammer": "«Имперский молот»",
+    "Rocket Propelled FSD Disruptor": "Ракетный FSD-разрушитель",
+    "Pack-Hound": "«Гончие»",
+    "Shock Mine Launcher": "Установщик шоковых мин",
+    "Mining Lance": "«Копьё шахтера»",
+    "Corrosion Resistant": "Коррозийно-устойчивый стеллаж",
+    "Standard Docking Computer": "Стандартный стыковочный компьютер",
+    "Advanced Docking Computer": "Улучшенный стыковочный компьютер",
+    "Detailed Surface Scanner": "Подробный сканер поверхности",
+    "Supercruise Assist": "Помощь в гиперкрейсерском режиме",
+    "Guardian Power Distributor": "Рапределитель питания Стражей",
+    "Enhanced Performance": "Усиленные маневровые двигатели",
+    "Guardian Hybrid Power Plant": "Гибридная силовая установка Стражей",
+    "Reinforced Alloy": "Укреплённые сплавы",
+    "Military Grade Composite": "Композит военного класса",
+    "Mirrored Surface Composite": "Композит с зеркальной поверхностью",
+    "Reactive Surface Composite": "Композит с реактивной поверхностью",
+    "Proto Light Alloys": "Опытные лёгкие сплавы",
+    "Ammo capacity": "Вместимость магазина",
+    "Lightweight": "Облегчённый",
+    "Reinforced": "Усиленный",
+    "Shielded": "Защищённый",
+    "Fast scan": "Быстрое сканирование",
+    "Long range": "Дальнего действия",
+    "Wide angle": "Широкоугольный",
+    "Blast resistant": "Взрывостойкий",
+    "Heavy duty": "Надёжный",
+    "Kinetic resistant": "Противокинетический",
+    "Resistance augmented": "С универсальной защитой",
+    "Thermal resistant": "Термостойкий",
+    "Thermo Block": "Блокировка тепла",
+    "Force Block": "Усиленная блокировка",
+    "Blast Block": "Блокировка взрыва",
+    "Flow Control": "Контроль интенсивности",
+    "Double Braced": "Двойная прочность",
+    "Super Capacitors": "Суперконденсаторы",
+    "Efficient": "Эффективный",
+    "Focused": "Точный",
+    "Overcharged": "Усиленный",
+    "Rapid fire": "Скорострельный",
+    "Short range": "Ближнего действия",
+    "Sturdy": "Прочный",
+    "Oversized": "Сверхразмер",
+    "Stripped Down": "Урезанный вариант",
+    "Phasing sequence": "Последовательность фазирования",
+    "Concordant sequence": "Последовательность координации",
+    "Scramble spectrum": "Отключающая сетка",
+    "Thermal shock": "Тепловой удар",
+    "Emissive munitions": "Эмиссионные припасы",
+    "Multi-servos": "Сервосистема",
+    "Inertial impact": "Инерционный удар",
+    "Thermal vent": "Теплоотдача",
+    "Regeneration sequence": "Последовательность восстановления",
+    "Thermal conduit": "Проводник тепла",
+    "High capacity": "Вместительный магазин",
+    "Incendiary rounds": "Зажигательные припасы",
+    "Auto loader": "Автоматическая система заряжения",
+    "Smart rounds": "Умные боеприпасы",
+    "Corrosive shell": "Разъедающие припасы",
+    "Force shell": "Усиленные снаряды",
+    "High yield shell": "Снаряд большой мощности",
+    "Dispersal field": "Рассеивающее поле",
+    "Thermal cascade": "Термический залп",
+    "Double shot": "Двойной выстрел",
+    "Dazzle shell": "Ослепляющие снаряды",
+    "Screening shell": "Заслоняющие снаряды",
+    "Drag munitions": "Замедляющие боеприпасы",
+    "Target lock breaker": "Генератор помех для системы захвата цели",
+    "Plasma Slug": "Плазменный рельсовый снаряд",
+    "Feedback Cascade": "Ответный запл",
+    "Super Penetrator": "Модуль сверхпробития",
+    "Overload munitions": "Вызывающие перезагрузку боеприпасы",
+    "Penetrator payload": "Бронебойные снаряды",
+    "Penetrator Payload": "Бронебойные снаряды",
+    "FSD interrupt": "Помеха для FSD",
+    "Penetrator Munitions": "Бронебойные боеголовки",
+    "Mass lock munition": "Боеприпасы с гравитационным захватом",
+    "Mass Lock Munition": "Боеприпасы с гравитационным захватом",
+    "Reverberating cascade": "Отражённый залп",
+    "Shift-lock canister": "Рамоблокирующая кассета",
+    "Ion disruptor": "Ионный дестабилизатор",
+    "Radiant Canister": "Светящаяся кассета",
+    "Expanded capture arc": "Расширенная дуга захвата",
+    "Enhanced low power": "Улучшенное энергосбережение",
+    "Fast Charge": "Быстрый заряд",
+    "Multi-weave": "Мультипрошивка",
+    "Hi-Cap": "Высокая ёмкость",
+    "Lo-draw": "Пониженное потребление",
+    "Rapid charge": "Быстрая зарядка",
+    "Specialised": "Адаптивный",
+    "Boss Cells": "Босс-ячейки",
+    "Recycling Cell": "Рециркуляционная ячейка",
+    "Reflective Plating": "Отражающая броня",
+    "Angled Plating": "Угловая броня",
+    "Layered Plating": "Многослойная броня",
+    "Deep Plating": "Утолщённая броня",
+    "Expanded Probe Scanning Radius": "Увеличение радиуса сканирования зондов",
+    "High charge capacity": "Высокоёмкий",
+    "Charge enhanced": "Быстрозаряжающийся",
+    "Engine focused": "Фокус на двигатель",
+    "System focused": "Фокус на систему",
+    "Weapon focused": "Фокус на орудия",
+    "Super Conduits": "Сверхпроводники",
+    "Cluster Capacitors": "Кассетные конденсаторы",
+    "Increased range": "Увеличенная дальность",
+    "Faster boot sequence": "Ускорение запуска",
+    "Deep Charge": "Заряд повышенной мощности",
+    "Thermal Spread": "Рассеивание тепла",
+    "Mass Manager": "Распределитель гравитации",
+    "Dirty": "«Грязная» донастройка",
+    "Clean": "«Чистая» донастройка",
+    "Drag Drives": "Ускорители",
+    "Drive Distributors": "Распределители тяги",
+    "Armoured": "Бронированный",
+    "Low emissions": "Малое излучение",
+    "Monstered": "Монстрация",
+    "roles": "роли",
+    "Maximize Jump Range": "Максимизировать дальность прыжка",
+    "Multi-purpose": "Многоцелевой",
+    "Combat": "Боец",
+    "Trader": "Торговец",
+    "Explorer": "Исследователь",
+    "Planetary Explorer": "Исследователь планет",
+    "Miner": "Старатель",
+    "Racer": "Гонщик",
+
+    "Aberrant Shield Pattern Analysis": "Анализ аномального поведения щита",
+    "Abnormal Compact Emissions Data": "Аномальные компактные данные об излучении",
+    "Aerogel": "Аэрогель",
+    "Adaptive Encryptors Capture": "Захват адаптивного шифровальщика",
+    "Anomalous Bulk Scan Data": "Аномальный массив данных сканирования",
+    "Anomalous FSD Telemetry": "Аномальная телеметрия FSD",
+    "Antimony": "Сурьма",
+    "Arsenic": "Мышьяк",
+    "Atypical Disrupted Wake Echoes": "Атипичное эхо поврежденного следа",
+    "Atypical Encryption Archives": "Нетипичные архивы шифрования",
+    "Basic Conductors": "Простые проводники",
+    "Bio-Mechanical Conduits": "Биомеханические энергопроводники",
+    "Biotech Conductors": "Биотехнические проводники",
+    "Boron": "Бор",
+    "Cadmium": "Кадмий",
+    "Carbon": "Углерод",
+    "Carbon Fibre Plating": "Углеволоконная броня",
+    "Chemical Distillery": "Оборудование для перегонки химикатов",
+    "Chemical Manipulators": "Манипуляторы для работы с химикатами",
+    "Chemical Processors": "Оборудование для химобработки",
+    "Chromium": "Хром",
+    "Classified Scan Databanks": "Засекреченные базы данных сканирования",
+    "Classified Scan Fragment": "Засекреченные фрагменты данных сканирования",
+    "Compound Shielding": "Многоступенчатая защита",
+    "Conductive Ceramics": "Проводящая керамика",
+    "Conductive Components": "Проводящие компоненты",
+    "Conductive Polymers": "Проводящие полимеры",
+    "Configurable Components": "Настраиваемые компоненты",
+    "Core Dynamics Composites": "Композиты Core Dynamics",
+    "Cracked Industrial Firmware": "Взломанные промышленные микропрограммы",
+    "Datamined Wake Exceptions": "Исключения из глубинного анализа данных следа",
+    "Decoded Emission Data": "Расшифрованные данные об излучении",
+    "Distorted Shield Cycle Recordings": "Повреждённые цикличные записи щита",
+    "Divergent Scan Data": "Неформатные данные сканирования",
+    "Eccentric Hyperspace Trajectories": "Аномальные траектории в гиперпространстве",
+    "Electrochemical Arrays": "Электрохимические массивы",
+    "Exceptional Scrambled Emission Data": "Исключительные зашифрованные данные об излучении",
+    "Exquisite Focus Crystals": "Отборные фокусировочные кристаллы",
+    "Flawed Focus Crystals": "Поврежденные фокусировочные кристаллы",
+    "Focus Crystals": "Фокусировочные кристаллы",
+    "Galvanising Alloys": "Сплавы для гальванизации",
+    "Germanium": "Германий",
+    "Grid Resistors": "Наборные резисторы",
+    "Heat Conduction Wiring": "Теплопроводящие провода",
+    "Heat Dispersion Plate": "Теплорассеивающая пластина",
+    "Heat Exchangers": "Теплообменные агрегаты",
+    "Heat Vanes": "Тепловые заслонки",
+    "High Density Composites": "Высокоплотностные композиты",
+    "Hybrid Capacitors": "Гибридные конденсаторы",
+    "Imperial Shielding": "Имперская защита",
+    "Improvised Components": "Кустарные компоненты",
+    "Inconsistent Shield Soak Analysis": "Неполный анализ поглощения щита",
+    "Iron": "Железо",
+    "Irregular Emission Data": "Нестандартные данные об излучении",
+    "Manganese": "Марганец",
+    "Mechanical Components": "Механические компоненты",
+    "Mechanical Equipment": "Механическое оборудование",
+    "Mechanical Scrap": "Механические отходы",
+    "Mercury": "Ртуть",
+    "Military Grade Alloys": "Сплавы военного назначения",
+    "Military Supercapacitors": "Военные суперконденсаторы",
+    "Modified Consumer Firmware": "Изменённые пользовательские микропрограммы",
+    "Modified Embedded Firmware": "Изменённые встроенные микропрограммы",
+    "Molybdenum": "Молибден",
+    "Nickel": "Никель",
+    "Niobium": "Ниобий",
+    "Open Symmetric Keys": "Открытые симметричные ключи",
+    "Pharmaceutical Isolators": "Фармацевтические изоляционные материалы",
+    "Phase Alloys": "Фазовые сплавы",
+    "Phosphorus": "Фосфор",
+    "Polymer Capacitors": "Полимерные конденсаторы",
+    "Precipitated Alloys": "Осаждённые сплавы",
+    "Proprietary Composites": "Патентованные композиты",
+    "Proto Heat Radiators": "Прототипы теплоизлучателей",
+    "Proto Radiolic Alloys": "Сплавы для изготовления зондов",
+    "Refined Focus Crystals": "Обработанные фокусировочные кристаллы",
+    "Ruthenium": "Рутений",
+    "Salvaged Alloys": "Захваченные сплавы",
+    "Security Firmware Patch": "Обновление для защитной микропрограммы",
+    "Selenium": "Селен",
+    "Shield Emitters": "Щитоизлучатели",
+    "Shielding Sensors": "Сенсоры системы экранирования",
+    "Specialised Legacy Firmware": "Специальные микропрограммы предыдущего поколения",
+    "Strange Wake Solutions": "Странные расчёты следа",
+    "Sulphur": "Сера",
+    "Tagged Encryption Codes": "Меченные шифровальные коды",
+    "Technetium": "Технеций",
+    "Tellurium": "Теллур",
+    "Thermic Alloys": "Термические сплавы",
+    "Tin": "Олово",
+    "Tungsten": "Вольфрам",
+    "Unexpected Emission Data": "Неожиданные данные об излучении",
+    "Unidentified Scan Archives": "Неопознанные архивы сканирования",
+    "Untypical Shield Scans": "Нетипичные данные сканирования щитов",
+    "Unusual Encrypted Files": "Особые зашифрованные файлы",
+    "Vanadium": "Ванадий",
+    "Worn Shield Emitters": "Изношенные щитоизлучатели",
+    "Yttrium": "Иттрий",
+    "Zinc": "Цинк",
+    "Zirconium": "Цирконий"
 }

src/app/index.js

@@ -1,12 +1,6 @@
-import '@babel/polyfill';
 import React from 'react';
 import { render } from 'react-dom';
 import '../less/app.less';
 import Coriolis from './Coriolis';
-// import TapEventPlugin from 'react/lib/TapEventPlugin';
-// import EventPluginHub from 'react/lib/EventPluginHub';
-
-// onTouchTap not ready for primetime yet, too many issues with preventing default
-// EventPluginHub.injection.injectEventPluginsByName({ TapEventPlugin });
 
 render(<Coriolis />, document.getElementById('coriolis'));

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>
     );
   }

src/app/pages/ErrorDetails.jsx

@@ -45,6 +45,9 @@ export default class ErrorDetails extends React.Component {
     return <div className='error'>
       <h1>Jameson, we have a problem..</h1>
       <h1><small>{error.message}</small></h1>
+        Import Error handling has been improved, but still isn't perfect. <br/>MOST Import failures are a result of missing modules in Coriolis, <br />OR incorrect import strings generated by third party apps. If you're seeing this page, we may have failed to handle the errors in your import correctly. Please see the data output below, specifically the 'scriptUrl:' section if it's there and then if you feel confident enough, please check the github issues page linked below and see if there is a similar issue already logged. If not, please create a new issue with the data below. If you're not confident, please ask for help on the Coriolis Channel of the EDCD Discord server.
+        <br/>
+        <br/>
       <br/>
         {importerror ? <div>If you are attempting to import a ship from EDDI or EDMC and are seeing a 'Z_BUF_ERROR' it means that the URL has not been provided correctly.  This is a common problem when using Microsoft Internet Explorer or Microsoft Edge, and you should use another browser instead.</div> : null }
       <br/>

src/app/pages/OutfittingPage.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-// import Perf from 'react-addons-perf';
 import { Ships } from 'coriolis-data/dist';
 import cn from 'classnames';
 import Page from './Page';
@@ -19,7 +18,6 @@ import {
   LinkIcon,
   ShoppingIcon,
   MatIcon,
-  OrbisIcon
 } from '../components/SvgIcons';
 import LZString from 'lz-string';
 import ShipSummaryTable from '../components/ShipSummaryTable';
@@ -37,7 +35,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
@@ -60,7 +57,6 @@ export default class OutfittingPage extends Page {
    */
   constructor(props, context) {
     super(props, context);
-    // window.Perf = Perf;
     this.state = this._initState(props, context);
     this._keyDown = this._keyDown.bind(this);
     this._exportBuild = this._exportBuild.bind(this);
@@ -681,26 +677,9 @@ export default class OutfittingPage extends Page {
   }
 
   /**
-   * Generate Orbis link
+   * Open up a window for inara with a shopping list of our components
    */
-  _genOrbis() {
+  _inaraShoppingList() {
-    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
-   */
-  _eddbShoppingList() {
     const ship = this.state.ship;
 
     const shipId = Ships[ship.id].eddbID;
@@ -713,7 +692,7 @@ export default class OutfittingPage extends Page {
 
     // Open up the relevant URL
     window.open(
-      'https://eddb.io/station?s=' + shipId + '&m=' + modIds.join(',')
+      'https://inara.cz/inapi/corisearch.php?s=' + shipId + '&m=' + modIds.join(',')
     );
   }
 
@@ -933,7 +912,7 @@ export default class OutfittingPage extends Page {
               <Download className="lg" />
             </button>
             <button
-              onClick={this._eddbShoppingList}
+              onClick={this._inaraShoppingList}
               onMouseOver={termtip.bind(null, 'PHRASE_SHOPPING_LIST')}
               onMouseOut={hide}
             >
@@ -946,13 +925,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')}

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) {
+
+    }
   }
 
   /**

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}
@@ -552,7 +544,7 @@ export default class ShipyardPage extends Page {
                   </th>
                   <th
                     className="sortable"
-                    onMouseEnter={termtip.bind(null, 'power distriubtor')}
+                    onMouseEnter={termtip.bind(null, 'power distributor')}
                     onMouseLeave={hide}
                     onClick={sortShips('standard', 4)}
                   >
@@ -623,7 +615,7 @@ export default class ShipyardPage extends Page {
           </div>
         </div>
         <div className="table-tools" >
-          <label><input type="checkbox" checked={this.state.groupCompared} onClick={() => this._toggleGroupCompared()}/>Group highlighted ships</label>
+          <label><input type="checkbox" checked={this.state.groupCompared} onClick={() => this._toggleGroupCompared()}/>{translate('Group highlighted ships')}</label>
         </div>
         </div>
       </div>

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) {
@@ -415,7 +383,8 @@ export function shieldMetrics(ship, sys) {
 
     // Our initial regeneration comes from the SYS capacitor store, which is replenished as it goes
     // 0.6 is a magic number from FD: each 0.6 MW of energy from the power distributor recharges 1 MJ/s of regeneration
-    let capacitorDrain = (shieldGenerator.getBrokenRegenerationRate() * 0.6) - sysRechargeRate;
+    let capacitorDrain = (shieldGenerator.getBrokenRegenerationRate() * shieldGenerator.getDistDraw()) - sysRechargeRate;
+    
     let capacitorLifetime = powerDistributor.getSystemsCapacity() / capacitorDrain;
 
     let recover = 16;
@@ -431,7 +400,7 @@ export function shieldMetrics(ship, sys) {
         recover = Math.Infinity;
       } else {
         // Recover remaining shields at the rate of the power distributor's recharge
-        recover += remainingShieldToRecover / (sysRechargeRate / 0.6);
+        recover += remainingShieldToRecover / (sysRechargeRate / shieldGenerator.getDistDraw());
       }
     }
 
@@ -440,7 +409,7 @@ export function shieldMetrics(ship, sys) {
 
     // Our initial regeneration comes from the SYS capacitor store, which is replenished as it goes
     // 0.6 is a magic number from FD: each 0.6 MW of energy from the power distributor recharges 1 MJ/s of regeneration
-    capacitorDrain = (shieldGenerator.getRegenerationRate() * 0.6) - sysRechargeRate;
+    capacitorDrain = (shieldGenerator.getRegenerationRate() * shieldGenerator.getDistDraw()) - sysRechargeRate;
     capacitorLifetime = powerDistributor.getSystemsCapacity() / capacitorDrain;
 
     let recharge = 0;
@@ -456,7 +425,7 @@ export function shieldMetrics(ship, sys) {
         recharge = Math.Inf;
       } else {
         // Recharge remaining shields at the rate of the power distributor's recharge
-        recharge += remainingShieldToRecharge / (sysRechargeRate / 0.6);
+        recharge += remainingShieldToRecharge / (sysRechargeRate / shieldGenerator.getDistDraw());
       }
     }
 
@@ -498,7 +467,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 +479,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 +491,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 +531,20 @@ export function armourMetrics(ship) {
   let moduleArmour = 0;
   let moduleProtection = 1;
   const bulkheads = ship.bulkheads.m;
-  let hullExplDmg = 1;
+  let hullExplDmgs = [];
-  let hullKinDmg = 1;
+  let hullKinDmgs = [];
-  let hullThermDmg = 1;
+  let hullThermDmgs = [];
-  let hullCausDmg = 1;
+  let hullCausDmgs = [];
-  // const dimReturnLine = (res) => 1 - (1 - res) * 0.7;
-  // let res = {
-  //   kin: 0,
-  //   therm: 0,
-  //   expl: 0
-  // };
   // 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();
+      hullExplDmgs.push(1 - slot.m.getExplosiveResistance());
-      // res.kin += slot.m.getKineticResistance();
+      hullKinDmgs.push(1 - slot.m.getKineticResistance());
-      // res.therm += slot.m.getThermalResistance();
+      hullThermDmgs.push(1 - slot.m.getThermalResistance());
-      hullExplDmg = hullExplDmg * (1 - slot.m.getExplosiveResistance());
+      hullCausDmgs.push(1 - slot.m.getCausticResistance());
-      hullKinDmg = hullKinDmg * (1 - slot.m.getKineticResistance());
-      hullThermDmg = hullThermDmg * (1 - slot.m.getThermalResistance());
-      hullCausDmg = hullCausDmg * (1 - slot.m.getCausticResistance());
     }
     if (slot.m && slot.enabled && (slot.m.grp == 'mrp' || slot.m.grp == 'gmrp')) {
       moduleArmour += slot.m.getIntegrity();
@@ -593,27 +553,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 +569,8 @@ export function armourMetrics(ship) {
     total: 1
   };
 
-  let armourExplDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getExplosiveResistance());
+  let armourExplDmg = 1 - ship.bulkheads.m.getExplosiveResistance();
-  let armourReinforcedExplDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getExplosiveResistance()) * hullExplDmg);
+  let armourReinforcedExplDmg = diminishingReturnsArmour(armourExplDmg, ...hullExplDmgs);
   armour.explosive = {
     bulkheads: armourExplDmg,
     reinforcement: armourReinforcedExplDmg / armourExplDmg,
@@ -639,8 +578,8 @@ export function armourMetrics(ship) {
     res: 1 - armourReinforcedExplDmg
   };
 
-  let armourKinDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getKineticResistance());
+  let armourKinDmg = 1 - ship.bulkheads.m.getKineticResistance();
-  let armourReinforcedKinDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getKineticResistance()) * hullKinDmg);
+  let armourReinforcedKinDmg = diminishingReturnsArmour(armourKinDmg, ...hullKinDmgs);
   armour.kinetic = {
     bulkheads: armourKinDmg,
     reinforcement: armourReinforcedKinDmg / armourKinDmg,
@@ -648,8 +587,8 @@ export function armourMetrics(ship) {
     res: 1 - armourReinforcedKinDmg
   };
 
-  let armourThermDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getThermalResistance());
+  let armourThermDmg = 1 - ship.bulkheads.m.getThermalResistance();
-  let armourReinforcedThermDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getThermalResistance()) * hullThermDmg);
+  let armourReinforcedThermDmg = diminishingReturnsArmour(armourThermDmg, ...hullThermDmgs);
   armour.thermal = {
     bulkheads: armourThermDmg,
     reinforcement: armourReinforcedThermDmg / armourThermDmg,
@@ -657,8 +596,8 @@ export function armourMetrics(ship) {
     res: 1 - armourReinforcedThermDmg
   };
 
-  let armourCausDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getCausticResistance());
+  let armourCausDmg = 1 - ship.bulkheads.m.getCausticResistance();
-  let armourReinforcedCausDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getCausticResistance()) * hullCausDmg);
+  let armourReinforcedCausDmg = diminishingReturnsArmour(armourCausDmg, ...hullCausDmgs);
   armour.caustic = {
     bulkheads: armourCausDmg,
     reinforcement: armourReinforcedCausDmg / armourCausDmg,
@@ -904,12 +843,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 +910,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() / m.getSustainedFactor();
+  weapon.effectiveness.armour.dpe =  weapon.damage.armour.total / m.getEps() / m.getSustainedFactor();
+
+
   return weapon;
 }
 
@@ -1037,15 +986,50 @@ export function timeToDeplete(amount, dps, eps, capacity, recharge) {
 }
 
 /**
- * Applies diminishing returns to resistances.
+ * Checks whether diminishing returns should be applied to shield damage
- * @param {number} diminishFrom The base resistance up to which no diminishing returns are applied.
+ * multipliers and does so if necessary.
- * @param {number} damageMult Resistance as damage multiplier
+ * @param {number} shieldMult Damage multiplier of shield generator
- * @returns {number} Actual damage multiplier
+ * @param {number} combinedMult Damage multiplier of shields and shield boosters
+ * @returns {number} Overall damage multiplier
  */
-export function diminishDamageMult(diminishFrom, damageMult) {
+export function diminishingReturnsShields(shieldMult, combinedMult) {
-  if (damageMult > diminishFrom) {
+  let max = shieldMult * 0.7;
-    return damageMult;
+  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);
+}

src/app/shipyard/Constants.js

@@ -58,6 +58,8 @@ export const ModuleGroupToName = {
   gmrp: 'Guardian Module Reinforcement Package',
   mahr: 'Meta Alloy Hull Reinforcement Package',
   sua: 'Supercruise Assist',
+  mlc: "Multi Limpet Controller",
+  rpl: "Repair Limpet Controller",
 
   // Hard Points
   bl: 'Beam Laser',

src/app/shipyard/Module.js

@@ -70,7 +70,7 @@ export default class Module {
 
   /**
    * Set a value for a given modification ID
-   * @param {Number} name                 The name of the modification
+   * @param {String} name                 The name of the modification
    * @param {object} value  The value of the modification. If it is a numeric value then it should be an integer scaled so that -2.34% == -234
    * @param {Boolean}   valueiswithspecial   true if the value includes the special effect (when coming from a UI component)
    */
@@ -81,7 +81,13 @@ export default class Module {
     if (!this.origVals) {
       this.origVals = {};
     }
-    if (valueiswithspecial && this.blueprint && this.blueprint.special) {
+    if (!valueiswithspecial) {
+      // Resistance modifiers scale with the base value.
+      if (name === 'kinres' || name === 'thermres' || name === 'causres' || name === 'explres') {
+        let baseValue = this.get(name, false);
+        value = (1 - baseValue) * value;
+      }
+    } else if (valueiswithspecial && this.blueprint && this.blueprint.special) {
       // This module has a special effect, see if we need to alter the stored value
       const modifierActions = Modifications.modifierActions[this.blueprint.special.edname];
       if (modifierActions && modifierActions[name]) {
@@ -113,7 +119,7 @@ export default class Module {
   /**
    * Helper to obtain a module's value.
    * @param {String} name     The name of the modifier to obtain
-   * @param {Number} modified Whether to return the raw or modified value
+   * @param {Boolean} modified Whether to return the raw or modified value
    * @return {Number} The value queried
    */
   get(name, modified = true) {
@@ -433,6 +439,15 @@ export default class Module {
     return this.get('integrity', modified);
   }
 
+  /**
+   * Get the info of this module
+   * @param {Boolean} [modified=false] Whether to take modifications into account
+   * @return {String} the info of this module
+   */
+  getInfo(modified = false) {
+    return (modified && this.getModValue('info')) || this.info;
+  }
+
   /**
    * Get the mass of this module
    * @param {Boolean} [modified=true] Whether to take modifications into account
@@ -694,7 +709,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); }
       }

src/app/shipyard/ModuleSet.js

@@ -13,6 +13,19 @@ function filter(arr, maxClass, minClass, mass) {
   return arr.filter(m => m.class <= maxClass && m.class >= minClass && (m.maxmass === undefined || mass <= m.maxmass));
 }
 
+/**
+ * Filter SCO Modules to only return legal size.
+ * @param  {Array}  arr        Array of available FSD modules.
+ * @param  {number} maxSize    Maximum allowable size for SCO modules.
+ * @return {Array}             Subset of modules filtered based on legal size amd type.
+ */
+function sco_filter(arr, maxSize) {
+  return arr.filter(module => {
+    return !(module.hasOwnProperty('name') && module['name'] === "Frame Shift Drive (SCO)" && module['class'] < maxSize);
+  });
+}
+
+
 /**
  * The available module set for a specific ship
  */
@@ -41,6 +54,7 @@ export default class ModuleSet {
 
     this.standard[0] = filter(stnd.pp, maxStandardArr[0], 0, mass);  // Power Plant
     this.standard[2] = filter(stnd.fsd, maxStandardArr[2], 0, mass);  // FSD
+    this.standard[2] = sco_filter(this.standard[2], maxStandardArr[2]) // FSD - Filter SCO Modules
     this.standard[4] = filter(stnd.pd, maxStandardArr[4], 0, mass);  // Power Distributor
     this.standard[6] = filter(stnd.ft, maxStandardArr[6], 0, mass);  // Fuel Tank
     // Thrusters, filter modules by class only (to show full list of ratings for that class)

src/app/shipyard/Ship.js

@@ -10,7 +10,7 @@ import { Ships, Modifications } from 'coriolis-data/dist';
 import { chain } from 'lodash';
 const zlib = require('zlib');
 
-const UNIQUE_MODULES = ['psg', 'sg', 'bsg', 'rf', 'fs', 'fh', 'gfsb', 'dc'];
+const UNIQUE_MODULES = ['psg', 'sg', 'bsg', 'rf', 'fs', 'fh', 'gfsb', 'dc', 'ews'];
 
 // Constants for modifications struct
 const SLOT_ID_DONE = -1;
@@ -492,25 +492,18 @@ export default class Ship {
    * @param {Object} m          The module to change
    * @param {Object} name       The name of the modification to change
    * @param {Number} value The new value of the modification.  The value of the modification is scaled to provide two decimal places of precision in an integer.  For example 1.23% is stored as 123
-   * @param {bool}   sentfromui True if this update was sent from the UI
+   * @param {boolean}   isAbsolute True if value is an absolute value and not a modification value
-   * @param {bool}   isAbsolute True if value is an absolute value and not a
-   *                            modification value
    */
-  setModification(m, name, value, sentfromui, isAbsolute) {
+  setModification(m, name, value, isAbsolute = false) {
     if (isNaN(value)) {
       // Value passed is invalid; reset it to 0
       value = 0;
     }
 
     if (isAbsolute) {
-      m.setPretty(name, value, sentfromui);
+      m.setPretty(name, value, isAbsolute);
     } else {
-      // Resistance modifiers scale with the base value
+      m.setModValue(name, value, false);
-      if (name == 'kinres' || name == 'thermres' || name == 'causres' || name == 'explres') {
-        let baseValue = m.get(name, false);
-        value = (1 - baseValue) * value;
-      }
-      m.setModValue(name, value, sentfromui);
     }
 
     // Handle special cases
@@ -543,7 +536,7 @@ export default class Ship {
       this.recalculateArmour();
     } else if (name === 'shieldreinforcement') {
       this.recalculateShieldCells();
-    } else if (name === 'burst' || name == 'burstrof' || name === 'clip' || name === 'damage' || name === 'distdraw' || name === 'jitter' || name === 'piercing' || name === 'range' || name === 'reload' || name === 'rof' || name === 'thermload') {
+    } else if (name === 'burst' || name === 'burstrof' || name === 'clip' || name === 'damage' || name === 'distdraw' || name === 'jitter' || name === 'piercing' || name === 'range' || name === 'reload' || name === 'rof' || name === 'thermload') {
       this.recalculateDps();
       this.recalculateHps();
       this.recalculateEps();

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

src/app/utils/BlueprintFunctions.js

@@ -327,26 +327,43 @@ export function setPercent(ship, m, percent) {
   ship.clearModifications(m);
   // Pick given value as multiplier
   const mult = percent / 100;
-  const features = m.blueprint.grades[m.blueprint.grade].features;
+  setQualityCB(m.blueprint, mult, (featureName, value) => ship.setModification(m, featureName, value));
+}
+
+/**
+ * Sets the blueprint quality and fires a callback for each property affected.
+ * @param {Object}   blueprint  The ship for which to perform the modifications
+ * @param {Number}   quality    The quality to apply - float number 0 to 1.
+ * @param {Function} cb         The Callback to run for each property. Function (featureName, value)
+ */
+export function setQualityCB(blueprint, quality, cb) {
+  // Pick given value as multiplier
+  const features = blueprint.grades[blueprint.grade].features;
   for (const featureName in features) {
     let value;
     if (Modifications.modifications[featureName].higherbetter) {
       // Higher is better, but is this making it better or worse?
       if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
-        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
+        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * quality);
       } else {
-        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
+        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * quality);
       }
     } else {
       // Higher is worse, but is this making it better or worse?
       if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
-        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
+        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * quality);
       } else {
-        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
+        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * quality);
       }
     }
 
-    _setValue(ship, m, featureName, value);
+    if (Modifications.modifications[featureName].type == 'percentage') {
+      value = value * 10000;
+    } else if (Modifications.modifications[featureName].type == 'numeric') {
+      value = value * 100;
+    }
+
+    cb(featureName, value);
   }
 }
 
@@ -360,23 +377,6 @@ export function setRandom(ship, m) {
   setPercent(ship, m, Math.random() * 100);
 }
 
-/**
- * Set a modification feature value
- * @param {Object}      ship          The ship for which to perform the modifications
- * @param {Object}      m             The module for which to perform the modifications
- * @param {string}      featureName   The feature being set
- * @param {number}      value         The value being set for the feature
- */
-function _setValue(ship, m, featureName, value) {
-  if (Modifications.modifications[featureName].type == 'percentage') {
-    ship.setModification(m, featureName, value * 10000);
-  } else if (Modifications.modifications[featureName].type == 'numeric') {
-    ship.setModification(m, featureName, value * 100);
-  } else {
-    ship.setModification(m, featureName, value);
-  }
-}
-
 /**
  * Provide 'percent' primary query
  * @param {Object}      m         The module for which to perform the query

src/app/utils/CompanionApiUtils.js

@@ -34,6 +34,7 @@ export const SHIP_FD_NAME_TO_CORIOLIS_NAME = {
   'Krait_Light': 'krait_phantom',
   'Orca': 'orca',
   'Python': 'python',
+  'Python_nx': 'python_nx',
   'SideWinder': 'sidewinder',
   'Type6': 'type_6_transporter',
   'Type7': 'type_7_transport',

src/app/utils/JournalUtils.js

@@ -4,7 +4,23 @@ import { Ships } from 'coriolis-data/dist';
 import Module from '../shipyard/Module';
 import { Modules } from 'coriolis-data/dist';
 import { Modifications } from 'coriolis-data/dist';
-import { getBlueprint } from './BlueprintFunctions';
+import { getBlueprint, setQualityCB } from './BlueprintFunctions';
+
+/**
+ * Check if an imported module is valid
+ * @param {Object} module the module to check
+ * @param {Object} moduleType the type of module to check
+ * @return {boolean} true if the module is valid
+ */
+function _isValidImportedModule(module, moduleType) {
+  // First of all, has the _moduleFromFdName function returned 'null'?
+  if (!module){
+    return false
+  }
+  else {
+    return true
+  }
+}
 
 /**
  * Obtain a module given its FD Name
@@ -95,52 +111,93 @@ export function shipFromLoadoutJSON(json) {
           throw 'Unknown bulkheads "' + module.Item + '"';
         }
         ship.bulkheads.enabled = true;
-        if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         break;
       case 'powerplant':
-        const powerplant = _moduleFromFdName(module.Item);
+        let powerplant = _moduleFromFdName(module.Item);
+        // Check the powerplant returned is valid
+        if (!_isValidImportedModule(powerplant, 'powerplant'))
+        { 
+          powerplant = _moduleFromFdName('Int_Missing_Powerplant');
+          module.Engineering = null;
+        }
         ship.use(ship.standard[0], powerplant, true);
         ship.standard[0].enabled = module.On;
         ship.standard[0].priority = module.Priority;
-        if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         break;
       case 'mainengines':
-        const thrusters = _moduleFromFdName(module.Item);
+        let thrusters = _moduleFromFdName(module.Item);
+        // Check the thrusters returned is valid
+        if (!_isValidImportedModule(thrusters, 'thrusters'))
+        { 
+          thrusters = _moduleFromFdName('Int_Missing_Engine');
+          module.Engineering = null;
+        }
         ship.use(ship.standard[1], thrusters, true);
         ship.standard[1].enabled = module.On;
         ship.standard[1].priority = module.Priority;
-        if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         break;
       case 'frameshiftdrive':
-        const frameshiftdrive = _moduleFromFdName(module.Item);
+        let frameshiftdrive = _moduleFromFdName(module.Item);
+        // Check the frameshiftdrive returned is valid
+        if (!_isValidImportedModule(frameshiftdrive, 'frameshiftdrive'))
+        { 
+          frameshiftdrive = _moduleFromFdName('Int_Missing_Hyperdrive');
+          module.Engineering = null;
+        }
         ship.use(ship.standard[2], frameshiftdrive, true);
         ship.standard[2].enabled = module.On;
         ship.standard[2].priority = module.Priority;
-        if (module.Engineering)  _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering)  _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         break;
       case 'lifesupport':
-        const lifesupport = _moduleFromFdName(module.Item);
+        let lifesupport = _moduleFromFdName(module.Item);
+        // Check the lifesupport returned is valid
+        if (!_isValidImportedModule(lifesupport, 'lifesupport'))
+        { 
+          lifesupport = _moduleFromFdName('Int_Missing_LifeSupport');
+          module.Engineering = null;
+        }
         ship.use(ship.standard[3], lifesupport, true);
         ship.standard[3].enabled = module.On === true;
         ship.standard[3].priority = module.Priority;
-        if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         break;
       case 'powerdistributor':
-        const powerdistributor = _moduleFromFdName(module.Item);
+        let powerdistributor = _moduleFromFdName(module.Item);
+        // Check the powerdistributor returned is valid
+        if (!_isValidImportedModule(powerdistributor, 'powerdistributor'))
+        { 
+          powerdistributor = _moduleFromFdName('Int_Missing_PowerDistributor'); 
+          module.Engineering = null;
+        }
         ship.use(ship.standard[4], powerdistributor, true);
         ship.standard[4].enabled = module.On;
         ship.standard[4].priority = module.Priority;
-        if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         break;
       case 'radar':
-        const sensors = _moduleFromFdName(module.Item);
+        let sensors = _moduleFromFdName(module.Item);
+        // Check the sensors returned is valid
+        if (!_isValidImportedModule(sensors, 'sensors'))
+        { 
+          sensors = _moduleFromFdName('Int_Missing_Sensors');
+          module.Engineering = null;
+        }
         ship.use(ship.standard[5], sensors, true);
         ship.standard[5].enabled = module.On;
         ship.standard[5].priority = module.Priority;
-        if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         break;
       case 'fueltank':
-        const fueltank = _moduleFromFdName(module.Item);
+        let fueltank = _moduleFromFdName(module.Item);
+        // Check the fueltank returned is valid
+        if (!_isValidImportedModule(fueltank, 'fueltank'))
+        { 
+          fueltank = _moduleFromFdName('Int_Missing_FuelTank');
+        }
         ship.use(ship.standard[6], fueltank, true);
         ship.standard[6].enabled = true;
         ship.standard[6].priority = 0;
@@ -168,15 +225,30 @@ export function shipFromLoadoutJSON(json) {
         const hardpointSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === hardpointName.toLowerCase());
         if (!hardpointSlot) {
           // This can happen with old imports that don't contain new hardpoints
-        } else if (!hardpointSlot) {
-          // No module
         } else {
           hardpoint = _moduleFromFdName(hardpointSlot.Item);
+          // Check the hardpoint module returned is valid
+          if (!_isValidImportedModule(hardpoint, 'hardpoint')){ 
+            // Check if it's a Utility or Hardpoint
+            if (hardpointSlot.Slot.toLowerCase().search(/tiny/))
+            {
+              // Use the missing_hardpoint module 'Missing Hardpoint' which will inform the user that the module is missing
+              hardpoint = _moduleFromFdName('Hpt_Missing_Hardpoint');
+            }
+            else {
+              // Use the missing_hardpoint module 'Missing Utility' which will inform the user that the module is missing
+              hardpoint = _moduleFromFdName('Hpt_Missing_Utility');
+            }
+            ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true);
+            ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On;
+            ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority;
+          } else {
             ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true);
             ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On;
             ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority;
             modsToAdd.push({ coriolisMod: hardpoint, json: hardpointSlot });
           }
+        }
         hardpointArrayNum++;
       }
     }
@@ -189,13 +261,17 @@ export function shipFromLoadoutJSON(json) {
       continue;
     }
     const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name == 'Military' : false;
+    const isPlanetary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name == 'PlanetaryApproachSuite' : false;
 
-    // The internal slot might be a standard or a military slot.  Military slots have a different naming system
+    // The internal slot might be a standard or a military slot, or a planetary slot.  Military and Planetary slots have a different naming system
     let internalSlot = null;
     if (isMilitary) {
       const internalName = 'Military0' + militarySlotNum;
       internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase());
       militarySlotNum++;
+    } else if (isPlanetary) {
+      const internalName = 'PlanetaryApproachSuite';
+      internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase());
     } else {
       // Slot numbers are not contiguous so handle skips.
       for (; internalSlot === null && internalSlotNum < 99; internalSlotNum++) {
@@ -214,17 +290,28 @@ export function shipFromLoadoutJSON(json) {
       // This can happen with old imports that don't contain new slots
     } else {
       const internalJson = internalSlot;
-      const internal = _moduleFromFdName(internalJson.Item);
+      let internal = _moduleFromFdName(internalJson.Item);
+      // Check the internal module returned is valid
+      if (!_isValidImportedModule(internal, 'internal'))
+      { 
+        internal = _moduleFromFdName('Int_Missing_Module');
+        ship.use(ship.internal[i], internal, true);
+        ship.internal[i].enabled = internalJson.On === true;
+        ship.internal[i].priority = internalJson.Priority;
+        //throw 'Unknown internal module: "' + module.Item + '"'; 
+      }
+      else {
         ship.use(ship.internal[i], internal, true);
         ship.internal[i].enabled = internalJson.On === true;
         ship.internal[i].priority = internalJson.Priority;
         modsToAdd.push({ coriolisMod: internal, json: internalSlot });
       }
     }
+  }
 
   for (const i of modsToAdd) {
     if (i.json.Engineering) {
-      _addModifications(i.coriolisMod, i.json.Engineering.Modifiers, i.json.Engineering.BlueprintName, i.json.Engineering.Level, i.json.Engineering.ExperimentalEffect);
+      _addModifications(i.coriolisMod, i.json.Engineering.Modifiers, i.json.Engineering.Quality, i.json.Engineering.BlueprintName, i.json.Engineering.Level, i.json.Engineering.ExperimentalEffect);
     }
   }
   // We don't have any information on it so guess it's priority 5 and disabled
@@ -241,12 +328,13 @@ export function shipFromLoadoutJSON(json) {
  * Add the modifications for a module
  * @param {Module} module the module
  * @param {Object} modifiers the modifiers
+ * @param {float} quality quality of the modifiers 0 to 1
  * @param {Object} blueprint the blueprint of the modification
  * @param {Object} grade the grade of the modification
  * @param {Object} specialModifications special modification
  */
-function _addModifications(module, modifiers, blueprint, grade, specialModifications) {
+function _addModifications(module, modifiers, quality, blueprint, grade, specialModifications) {
-  if (!modifiers) return;
+  if (!modifiers && !quality) return;
   let special;
   if (specialModifications) {
     if (specialModifications == 'special_plasma_slug') {
@@ -268,6 +356,7 @@ function _addModifications(module, modifiers, blueprint, grade, specialModificat
       module.blueprint.special = special;
     }
   }
+  if (modifiers) {
     for (const i in modifiers) {
       // Some special modifications
       // Look up the modifiers to find what we need to do
@@ -300,4 +389,7 @@ function _addModifications(module, modifiers, blueprint, grade, specialModificat
         }
       }
     }
+  } else if (quality) {
+    setQualityCB(module.blueprint, quality, (featureName, value) => module.setModValue(featureName, value, false));
+  }
 }

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

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 %>';
@@ -38,21 +40,12 @@
       window.dataLayer = window.dataLayer || [];
       function gtag(){dataLayer.push(arguments);}
       gtag('js', new Date());
-
       gtag('config', 'UA-55840909-18');
     </script>
-
-
-
-    <!-- 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>
   </head>
   <body style="background-color:#000;">
-        <section id="coriolis"></section>
+    <section id="coriolis">
 
+    </section>
   </body>
-    </html>
+</html>

src/migrate.html

@@ -0,0 +1,98 @@
+<!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"
+    />
+
+    <!-- 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>

src/sw.js

@@ -1,46 +1,54 @@
+import {precacheAndRoute, createHandlerBoundToURL} from 'workbox-precaching';
+import {NavigationRoute, registerRoute} from 'workbox-routing';
+import {StaleWhileRevalidate, CacheFirst} from 'workbox-strategies';
+import {CacheableResponsePlugin} from 'workbox-cacheable-response'
+import {ExpirationPlugin} from 'workbox-expiration';
+
 console.log('Hello from sw.js');
 
-if (workbox) {
+// See https://developer.chrome.com/docs/workbox/migration/migrate-from-v4/ for guide to changes made
-  console.log('Yay! Workbox is loaded 🎉');
+console.log('Yay! Workbox is loaded 🎉');
-  workbox.precaching.precacheAndRoute(self.__precacheManifest);
+precacheAndRoute(self.__WB_MANIFEST || []);
 
-  workbox.routing.registerNavigationRoute('/index.html');
+const handler = createHandlerBoundToURL('/index.html');
+const navigationRoute = new NavigationRoute(handler
+  // , {allowlist: [...], denylist: [...],}
+);
+registerRoute(navigationRoute);
 
-  workbox.routing.registerRoute(
+
+registerRoute(
   /\.(?:png|jpg|jpeg|svg|gif)$/,
-    new workbox.strategies.CacheFirst({
+  new CacheFirst({
     plugins: [
-        new workbox.cacheableResponse.Plugin({
+      new CacheableResponsePlugin({
         statuses: [0, 200]
       })
     ]
   })
-  );
+);
 
-  workbox.routing.registerRoute(
+registerRoute(
   /\.(?:js|css)$/,
-    new workbox.strategies.StaleWhileRevalidate({
+  new StaleWhileRevalidate({
     cacheName: 'static-resources',
   })
-  );
+);
 
-  workbox.routing.registerRoute(
+registerRoute(
   new RegExp('https://fonts.(?:googleapis|gstatic).com/(.*)'),
-    new workbox.strategies.CacheFirst({
+  new CacheFirst({
     cacheName: 'google-fonts',
     plugins: [
-        new workbox.expiration.Plugin({
+      new ExpirationPlugin({
         maxEntries: 30
       }),
-        new workbox.cacheableResponse.Plugin({
+      new CacheableResponsePlugin({
         statuses: [0, 200]
       })
     ]
   })
-  );
+);
-} else {
-  console.log('Boo! Workbox didn\'t load 😬');
-}
 
 self.addEventListener('message', event => {
   if (!event.data) {

webpack.common.js

@@ -0,0 +1,81 @@
+const path = require('path');
+const webpack = require('webpack');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+
+const pkgJson = require('./package');
+const buildDate = new Date();
+
+module.exports = {
+  entry: {
+    main: './src/app/index.js'
+  },
+  resolve: {
+    // When requiring, you don't need to add these extensions
+    extensions: ['.js', '.jsx', '.json', '.less'],
+    fallback: {
+      // Consider replacing brwoserify-zlib-next c. 2016 package with pako, which it's just a wrapper for
+      /* Some of these polyfills may not even be necessary, and were added in an attempt to deal with build issues
+            while upgrading to Webpack v5 */
+      "zlib": require.resolve("browserify-zlib-next"),
+      "assert": require.resolve("assert/"),
+      "buffer": require.resolve("buffer/"),
+      "stream": require.resolve("stream-browserify"),
+      /*
+      "url": require.resolve("url/"),
+      "path": require.resolve("path-browserify"),
+      "crypto": require.resolve("crypto-browserify"),
+      "os": require.resolve("os-browserify/browser"),
+      "https": require.resolve("https-browserify"),
+      "http": require.resolve("stream-http"),
+      "vm": require.resolve("vm-browserify"),
+      "constants": require.resolve("constants-browserify"),
+      // "fs": false
+      */
+    }
+  },
+  optimization: {
+    usedExports: true
+  },
+  output: {
+    path: path.join(__dirname, 'build'),
+    chunkFilename: '[name].bundle.js',
+    // assetModuleFilename: '[contenthash][ext]',
+    publicPath: '/',
+    clean: true // we already do rimraf on the build dir, but this should obviate that
+  },
+  plugins: [
+    // new webpack.optimize.CommonsChunkPlugin({
+    //   name: 'lib',
+    //   filename: 'lib.js'
+    // }),
+    new HtmlWebpackPlugin({
+      inject: true,
+      template: path.join(__dirname, 'src/index.ejs'),
+      version: pkgJson.version,
+      // gapiKey: process.env.CORIOLIS_GAPI_KEY || '',
+      date: buildDate,
+    }),
+    new MiniCssExtractPlugin({
+        filename: 'app.css',
+    }),
+    // Solve missing Buffer polyfill that breaks module engineering
+    new webpack.ProvidePlugin({
+      Buffer: ['buffer', 'Buffer'],
+    }),
+  ],
+  module: {
+    rules: [
+      { test: /\.css$/, use: [MiniCssExtractPlugin.loader, 'css-loader' ]},
+      {
+        test: /\.less$/,
+        use: [MiniCssExtractPlugin.loader, 'css-loader', 'less-loader' ]
+      },
+      { test: /\.(js|jsx)$/, use: ['babel-loader'], include: path.join(__dirname, 'src') },
+      {
+        test: /\.(jpe?g|svg|png|gif|ico|eot|ttf|woff|woff2?)(\?v=\d+\.\d+\.\d+)?$/i,
+        type: 'asset/resource',
+      },
+    ]
+  }
+};

webpack.config.dev.js

@@ -1,69 +1,27 @@
-const path = require('path');
 const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
+const { merge } = require('webpack-merge');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const common = require('./webpack.common.js');
-const WebpackNotifierPlugin = require('webpack-notifier');
-const pkgJson = require('./package');
-const buildDate = new Date();
-const CopyWebpackPlugin = require('copy-webpack-plugin');
 
-module.exports = {
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const WebpackNotifierPlugin = require('webpack-notifier');
+
+module.exports = merge(common, {
   devtool: 'source-map',
   devServer: {
     headers: { 'Access-Control-Allow-Origin': '*' }
   },
   mode: 'development',
-  entry: {
-    main: './src/app/index.js',
-  },
-  resolve: {
-    // When requiring, you don't need to add these extensions
-    extensions: ['.js', '.jsx', '.json', '.less']
-  },
   optimization: {
     minimize: false,
-    usedExports: true
-  },
-  output: {
-    path: path.join(__dirname, 'build'),
-    chunkFilename: '[name].bundle.js',
-    publicPath: '/'
   },
   plugins: [
-    new CopyWebpackPlugin(['src/.htaccess', 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js']),
+    new CopyWebpackPlugin({
-    // new webpack.optimize.CommonsChunkPlugin({
+      patterns: [
-    //   name: 'lib',
+      'src/.htaccess', 
-    //   filename: 'lib.js'
+      'src/iframe.html', 
-    // }),
+      'src/xdLocalStoragePostMessageApi.min.js'
-    new HtmlWebpackPlugin({
+    ]}),
-      inject: true,
-      template: path.join(__dirname, 'src/index.ejs'),
-      version: pkgJson.version,
-      date: buildDate,
-      gapiKey: process.env.CORIOLIS_GAPI_KEY || ''
-    }),
-    new ExtractTextPlugin({
-      filename: 'app.css',
-      disable: false,
-      allChunks: true
-    }),
     new WebpackNotifierPlugin({ alwaysNotify: true }),
-    new webpack.HotModuleReplacementPlugin(),
     new webpack.NoEmitOnErrorsPlugin()
-  ],
-  module: {
-    rules: [
-      { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' }) },
-      {
-        test: /\.less$/,
-        loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' })
-      },
-      { test: /\.(js|jsx)$/, loaders: ['babel-loader'], include: path.join(__dirname, 'src') },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream' },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader' },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml' }
   ]
-  }
+});
-};

webpack.config.prod.js

@@ -1,54 +1,37 @@
-const path = require('path');
+const { merge } = require('webpack-merge');
-const webpack = require('webpack');
+const common = require('./webpack.common.js');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const { InjectManifest } = require('workbox-webpack-plugin');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-const { BugsnagSourceMapUploaderPlugin, BugsnagBuildReporterPlugin } = require('webpack-bugsnag-plugins');
-const pkgJson = require('./package');
-const buildDate = new Date();
 
-module.exports = {
+const path = require('path');
-  devtool: 'source-map',
+const CopyWebpackPlugin = require('copy-webpack-plugin');
-  entry: {
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-    main: './src/app/index.js'
+const { InjectManifest } = require('workbox-webpack-plugin');
-  },
+
-  resolve: {
+module.exports = merge(common, {
-    extensions: ['.js', '.jsx', '.json', '.less']
+  // devtool: 'source-map',
-  },
-  output: {
-    path: path.join(__dirname, 'build'),
-    chunkFilename: '[name].bundle.js',
-    publicPath: '/',
-    globalObject: 'this'
-  },
   mode: 'production',
   optimization: {
     minimize: true,
-    usedExports: true
+  },
+  output: {
+    globalObject: 'this'
   },
   plugins: [
-    new CopyWebpackPlugin(['src/.htaccess', { from: 'src/schemas', to: 'schemas' }, {
+    new CopyWebpackPlugin({
+      patterns: [
+        'src/.htaccess', 
+        'src/iframe.html', 
+        'src/xdLocalStoragePostMessageApi.min.js',  
+        { from: 'src/schemas', to: 'schemas' },
+        {
           from: 'src/images/logo/*',
-      flatten: true,
+          to: '[name][ext]'
-      to: ''
+        }
-    }, 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js']),
+    ]}),
-    // new webpack.optimize.CommonsChunkPlugin({
+    /* new HtmlWebpackPlugin({
-    //  name: 'lib',
+      // uaTracking: process.env.CORIOLIS_UA_TRACKING || '',
-    //  filename: 'lib.[chunkhash:6].js'
+    }), */
-    // }),
+    new MiniCssExtractPlugin({
-    new HtmlWebpackPlugin({
+      filename: '[contenthash:6].css',
-      inject: true,
-      template: path.join(__dirname, 'src/index.ejs'),
-      uaTracking: process.env.CORIOLIS_UA_TRACKING || '',
-      gapiKey: process.env.CORIOLIS_GAPI_KEY || '',
-      date: buildDate,
-      version: pkgJson.version
-    }),
-    new ExtractTextPlugin({
-      filename: '[hash:6].css',
-      disable: false,
-      allChunks: true
     }),
     // new BugsnagBuildReporterPlugin({
     //   apiKey: 'ba9fae819372850fb660755341fa6ef5',
@@ -59,25 +42,11 @@ module.exports = {
     //   overwrite: true,
     //   appVersion: `${pkgJson.version}-${buildDate.toISOString()}`
     // }),
+    
     new InjectManifest({
       swSrc: './src/sw.js',
-      importWorkboxFrom: 'cdn',
       swDest: 'service-worker.js'
     }),
-  ],
+    
-  module: {
-    rules: [
-      { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' }) },
-      {
-        test: /\.less$/,
-        loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' })
-      },
-      { test: /\.(js|jsx)$/, loader: 'babel-loader?cacheDirectory=true', include: path.join(__dirname, 'src') },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream' },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader' },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml' }
   ]
-  }
+});
-};