Migrate changes of 87fc3b6cbb

remove ads, trial didnt work
Merge branch 'master' into develop
2025-12-09 06:43:24 +00:00 · 2019-10-08 14:00:54 +02:00 · 2019-09-27 07:15:13 +10:00 · 2019-09-23 08:47:08 +10:00 · 2019-09-23 08:41:34 +10:00 · 2019-09-23 08:39:53 +10:00
80 changed files with 8864 additions and 1087 deletions
--- a/.docker/.dockerignore
+++ b/.docker/.dockerignore
@@ -1,2 +0,0 @@
-node_modules
-npm-debug.log
--- a/.docker/nginx.conf
+++ b/.docker/nginx.conf
@@ -1,45 +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;
-
-	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)$ {
-			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;
-		}
-	}
-}
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,77 @@
+node_modules
+npm-debug.log
+### Node template
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
+
--- a/.esdoc.json
+++ b/.esdoc.json
@@ -35,7 +35,7 @@
          "title": "Coriolis",
          "description": "Coriolis Shipyard for Elite Dangerous",
          "repository": "https://github.com/EDCD/coriolis",
-          "site": "https://coriolis.edcd.io",
+          "site": "https://coriolis.io",
          "author": "https://github.com/edcd",
          "image": "./src/images/logo/192x192.png"
        }
@@ -81,7 +81,7 @@
          "title": "Coriolis",
          "description": "Coriolis Shipyard for Elite Dangerous",
          "repository": "https://github.com/EDCD/coriolis",
-          "site": "https://coriolis.edcd.io",
+          "site": "https://coriolis.io",
          "author": "https://github.com/edcd",
          "image": "./src/images/logo/192x192.png"
        }
@@ -100,4 +100,4 @@
      }
    }
  ]
-}
+}
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,13 @@
+image: docker:stable
+services:
+  - docker:dind
+
+stages:
+  - Build image
+
+docker build:
+  stage: Build image
+  script:
+  - img build --build-arg branch=$CI_COMMIT_REF_NAME -t edcd/coriolis:$CI_COMMIT_REF_NAME .
+  - echo "$REGISTRY_PASSWORD" | img login --username "$REGISTRY_USER" --password-stdin
+  - img push edcd/coriolis:$CI_COMMIT_REF_NAME
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -6,29 +6,29 @@ WORKDIR /src/app
 RUN mkdir -p /src/app/coriolis
 RUN mkdir -p /src/app/coriolis-data

-COPY ./coriolis/ /src/app/coriolis
-COPY ./coriolis-data/ /src/app/coriolis-data
+RUN apk add --update git

-RUN apk update
-RUN apk add git
+COPY . /src/app/coriolis

 RUN npm i -g npm

 # Set up coriolis-data
 WORKDIR /src/app/coriolis-data
-RUN git fetch --all
+RUN git clone https://github.com/EDCD/coriolis-data.git .
+RUN git checkout ${BRANCH}
 RUN npm install --no-package-lock
 RUN npm start

+# Set up coriolis
 WORKDIR /src/app/coriolis
-RUN git fetch --all
+RUN git checkout ${BRANCH}
 RUN npm install --no-package-lock
 RUN npm run build


 ### STAGE 2: Production Environment ###
-FROM nginx:1.13.12-alpine as web
-COPY coriolis/.docker/nginx.conf /etc/nginx/nginx.conf
+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
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -0,0 +1,24 @@
+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
+[terms and conditions](https://www.frontierstore.net/terms-and-conditions/).
+
+The code (Javascript, CSS, HTML, and SVG files only) specificially for Coriolis.io is released under the MIT License.
+
+Copyright (c) 2015 Coriolis.io, Colin McLeod
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software (Javascript, CSS, HTML, and SVG files only), and associated documentation files (the "Software"), to deal
+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.
--- a/README.md
+++ b/README.md
@@ -29,6 +29,8 @@ Also see [the documentation site.](https://coriolis.willb.info/)

 See the [Data wiki](https://github.com/cmmcleod/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/.
+You might want to load these as depedency instead of reyling on the npm-dependency.

 ## License

--- a/tests/fixtures/anaconda-test-detailed-export-v3.json
+++ b/tests/fixtures/anaconda-test-detailed-export-v3.json
@@ -275,11 +275,11 @@
    "totalCost": 882362060,
    "unladenMass": 1179.2,
    "totalDps": 29,
-    "passengerCapacity": 0,
    "powerAvailable": 36,
    "powerRetracted": 23.33,
    "powerDeployed": 34.76,
    "unladenRange": 18.49,
+    "fullTankRange": 18.12,
    "ladenRange": 16.39,
    "unladenFastestRange": 73.21,
    "ladenFastestRange": 66.15,
--- a/tests/fixtures/anaconda-test-detailed-export-v4.json
+++ b/tests/fixtures/anaconda-test-detailed-export-v4.json
@@ -287,7 +287,6 @@
    "totalThermSDps": 58.64,
    "baseShieldStrength": 350,
    "baseArmour": 945,
-    "hullCausRes": 0,
    "hullExplRes": 0.22,
    "hullKinRes": 0.27,
    "hullMass": 400,
@@ -304,13 +303,13 @@
    "armour": 2227.5,
    "baseArmour": 525,
    "unladenMass": 1163.2,
-    "passengerCapacity": 0,
    "powerAvailable": 39.6,
    "powerRetracted": 23.33,
    "powerDeployed": 34.13,
    "roll": 60,
    "unladenRange": 18.74,
    "yaw": 10,
+    "fullTankRange": 18.36,
    "hardness": 65,
    "ladenRange": 16.59,
    "unladenFastestRange": 74.2,
--- a/tests/fixtures/asp-test-detailed-export-v4.json
+++ b/tests/fixtures/asp-test-detailed-export-v4.json
@@ -237,15 +237,14 @@
    "shieldExplRes": 0.5,
    "shieldKinRes": 0.6,
    "shieldThermRes": 1.2,
-    "hullCausRes": 0,
    "hullExplRes": 1.4,
    "hullKinRes": 1.2,
    "hullThermRes": 1,
-    "passengerCapacity": 0,
    "powerAvailable": 20.41,
    "powerRetracted": 11.91,
    "powerDeployed": 11.91,
    "unladenRange": 50.45,
+    "fullTankRange": 47.03,
    "ladenRange": 42.71,
    "unladenFastestRange": 317.24,
    "ladenFastestRange": 287.02,
--- a/tests/fixtures/courier-test-detailed-export-v4.json
+++ b/tests/fixtures/courier-test-detailed-export-v4.json
@@ -309,15 +309,14 @@
    "shieldExplRes": 0.48,
    "shieldKinRes": 0.55,
    "shieldThermRes": 1.09,
-    "hullCausRes": 0,
    "hullExplRes": 1.4,
    "hullKinRes": 1.2,
    "hullThermRes": 1,
-    "passengerCapacity": 0,
    "powerAvailable": 17.24,
    "powerRetracted": 11.3,
    "powerDeployed": 16.41,
    "unladenRange": 25.57,
+    "fullTankRange": 23.92,
    "ladenRange": 22.09,
    "unladenFastestRange": 116.23,
    "ladenFastestRange": 107,
--- a/tests/fixtures/valid-detailed-export.json
+++ b/tests/fixtures/valid-detailed-export.json
@@ -115,6 +115,7 @@
      "powerRetracted": 7.21,
      "powerDeployed": 7.21,
      "unladenRange": 32.48,
+      "fullTankRange": 30.27,
      "ladenRange": 19.61,
      "unladenFastestRange": 176.71,
      "ladenFastestRange": 112.92,
@@ -248,6 +249,7 @@
      "powerRetracted": 9.33,
      "powerDeployed": 10.33,
      "unladenRange": 30.24,
+      "fullTankRange": 28.32,
      "ladenRange": 19.8,
      "unladenFastestRange": 164.89,
      "ladenFastestRange": 114.03,
@@ -377,6 +379,7 @@
      "powerRetracted": 7.28,
      "powerDeployed": 8.06,
      "unladenRange": 31.71,
+      "fullTankRange": 29.61,
      "ladenRange": 23.58,
      "unladenFastestRange": 172.68,
      "ladenFastestRange": 136.46,
@@ -508,6 +511,7 @@
      "powerRetracted": 8.81,
      "powerDeployed": 8.81,
      "unladenRange": 26.41,
+      "fullTankRange": 24.97,
      "ladenRange": 17.36,
      "unladenFastestRange": 172.04,
      "ladenFastestRange": 118.55,
@@ -649,6 +653,7 @@
      "powerRetracted": 10.66,
      "powerDeployed": 11.66,
      "unladenRange": 25.77,
+      "fullTankRange": 24.39,
      "ladenRange": 17.98,
      "unladenFastestRange": 167.93,
      "ladenFastestRange": 122.84,
@@ -786,6 +791,7 @@
      "powerRetracted": 8.95,
      "powerDeployed": 9.73,
      "unladenRange": 19.27,
+      "fullTankRange": 18.95,
      "ladenRange": 15.43,
      "unladenFastestRange": 67.34,
      "ladenFastestRange": 54.75,
@@ -948,6 +954,7 @@
      "powerRetracted": 15.49,
      "powerDeployed": 19.43,
      "unladenRange": 27.1,
+      "fullTankRange": 25.58,
      "ladenRange": 21.94,
      "unladenFastestRange": 176.39,
      "ladenFastestRange": 150.58,
@@ -1089,6 +1096,7 @@
      "powerRetracted": 10.38,
      "powerDeployed": 12.58,
      "unladenRange": 26.01,
+      "fullTankRange": 25.42,
      "ladenRange": 17.19,
      "unladenFastestRange": 90.67,
      "ladenFastestRange": 61.04,
@@ -1252,6 +1260,7 @@
      "powerRetracted": 19.35,
      "powerDeployed": 25.31,
      "unladenRange": 15.19,
+      "fullTankRange": 14.99,
      "ladenRange": 14.99,
      "unladenFastestRange": 53.15,
      "ladenFastestRange": 53.15,
@@ -1351,6 +1360,7 @@
      "powerRetracted": 10.7,
      "powerDeployed": 10.7,
      "unladenRange": 24.25,
+      "fullTankRange": 23.73,
      "ladenRange": 23.73,
      "unladenFastestRange": 84.56,
      "ladenFastestRange": 84.56,
@@ -1489,6 +1499,7 @@
      "powerRetracted": 13.13,
      "powerDeployed": 13.13,
      "unladenRange": 19.51,
+      "fullTankRange": 18.58,
      "ladenRange": 13.09,
      "unladenFastestRange": 152.32,
      "ladenFastestRange": 106.49,
@@ -1626,6 +1637,7 @@
      "powerRetracted": 10.25,
      "powerDeployed": 10.25,
      "unladenRange": 28.25,
+      "fullTankRange": 26.6,
      "ladenRange": 16.67,
      "unladenFastestRange": 183.67,
      "ladenFastestRange": 113.69,
@@ -1796,6 +1808,7 @@
      "powerRetracted": 19.34,
      "powerDeployed": 26.18,
      "unladenRange": 20.32,
+      "fullTankRange": 19.46,
      "ladenRange": 14.65,
      "unladenFastestRange": 133.17,
      "ladenFastestRange": 99.65,
@@ -1974,6 +1987,7 @@
      "powerRetracted": 22.61,
      "powerDeployed": 29.63,
      "unladenRange": 14.32,
+      "fullTankRange": 13.89,
      "ladenRange": 13.46,
      "unladenFastestRange": 94.42,
      "ladenFastestRange": 91.49,
@@ -2203,6 +2217,7 @@
      "powerRetracted": 25.88,
      "powerDeployed": 37.51,
      "unladenRange": 16.99,
+      "fullTankRange": 16.68,
      "ladenRange": 15.91,
      "unladenFastestRange": 67.35,
      "ladenFastestRange": 64.2,
@@ -2357,6 +2372,7 @@
      "powerRetracted": 11.92,
      "powerDeployed": 11.92,
      "unladenRange": 39.26,
+      "fullTankRange": 37.65,
      "ladenRange": 21.21,
      "unladenFastestRange": 153.79,
      "ladenFastestRange": 85.82,
@@ -2512,6 +2528,7 @@
      "powerRetracted": 12.49,
      "powerDeployed": 12.49,
      "unladenRange": 38.44,
+      "fullTankRange": 36.89,
      "ladenRange": 21.04,
      "unladenFastestRange": 150.62,
      "ladenFastestRange": 85.16,
@@ -2679,6 +2696,7 @@
      "powerRetracted": 13,
      "powerDeployed": 12.4,
      "unladenRange": 38.04,
+      "fullTankRange": 30.11,
      "ladenRange": 23.03,
      "unladenFastestRange": 675.7,
      "ladenFastestRange": 501.97,
@@ -2896,6 +2914,7 @@
      "powerRetracted": 23.93,
      "powerDeployed": 35.56,
      "unladenRange": 18.49,
+      "fullTankRange": 18.12,
      "ladenRange": 16.39,
      "unladenFastestRange": 73.21,
      "ladenFastestRange": 66.15,
@@ -3023,6 +3042,7 @@
      "powerRetracted": 8.48,
      "powerDeployed": 7.88,
      "unladenRange": 35.99,
+      "fullTankRange": 33.36,
      "ladenRange": 33.36,
      "unladenFastestRange": 232.28,
      "ladenFastestRange": 232.28,
@@ -3159,6 +3179,7 @@
      "powerRetracted": 14.87,
      "powerDeployed": 17.51,
      "unladenRange": 15.06,
+      "fullTankRange": 14.86,
      "ladenRange": 14.86,
      "unladenFastestRange": 42.5,
      "ladenFastestRange": 42.5,
@@ -3312,6 +3333,7 @@
      "powerRetracted": 17.71,
      "powerDeployed": 23.14,
      "unladenRange": 12.51,
+      "fullTankRange": 12.38,
      "ladenRange": 12.38,
      "unladenFastestRange": 35.35,
      "ladenFastestRange": 35.35,
@@ -3430,6 +3452,7 @@
      "powerRetracted": 9.46,
      "powerDeployed": 11.17,
      "unladenRange": 17.12,
+      "fullTankRange": 16.71,
      "ladenRange": 16.71,
      "unladenFastestRange": 42.4,
      "ladenFastestRange": 42.4,
@@ -3587,6 +3610,7 @@
      "powerRetracted": 9.31,
      "powerDeployed": 13.91,
      "unladenRange": 8.43,
+      "fullTankRange": 8.09,
      "ladenRange": 7.25,
      "unladenFastestRange": 81.5,
      "ladenFastestRange": 72.9,
--- a/tests/test-persist.js
+++ b/tests/test-persist.js
@@ -6,70 +6,41 @@ import TU from 'react-testutils-additions';

 let origAddEventListener = window.addEventListener;
 let storageListener;
+let ls = {};

-/**
- * Mock local storage
- */
-class LocalStorage {
-  /**
-   * Sets up storage variable
-   */
-  constructor() {
-    this.ls = {};
-  }
-
-  /**
-   * Retrieves a value from local storage
-   * @param {String} key Storage key
-   * @return {*} Storage value
-   */
-  getItem(key) {
-    return this.ls[key];
-  }
-
-  /**
-   * Writes a value to local storage
-   * @param {String} key Storage key
-   * @param {*} value Storage value
-   */
-  setItem(key, value) {
-    this.ls[key] = value;
-  }
-
-  /**
-   * Clears a value from local storage
-   * @param {String} key Storage key
-   */
-  removeItem(key) {
-    delete this.ls[key];
-  }
-
-  /**
-   * Clears local storage
-   */
-  clear() {
-    this.ls = {};
+// Implment mock localStorage
+let localStorage = {
+  getItem: function(key) {
+    return ls[key];
+  },
+  setItem: function(key, value) {
+    ls[key] = value;
+  },
+  removeItem: function(key) {
+    delete ls[key];
+  },
+  clear: function() {
+    ls = {};
  }
 }

-const LOCAL_STORAGE = new LocalStorage();
-
 window.addEventListener = function(eventName, listener) {
+
  if(eventName == 'storage') {
    storageListener = listener; // Keep track of latest storage listener
  } else {
    origAddEventListener.apply(arguments);
  }
-};
+}

 describe('Persist', function() {
+
  const Persist = require('../src/app/stores/Persist').Persist;

  describe('Multi tab/window', function() {
    it("syncs builds", function() {
      window.localStorage = localStorage;
-      localStorage.clear();
-
+      ls = {};
      let p = new Persist();
      let newBuilds = {
        anaconda: { test: '1234' }
@@ -83,8 +54,7 @@ describe('Persist', function() {
  describe('General and Settings', function() {
    it("has defaults", function() {
      window.localStorage = localStorage;
-      localStorage.clear();
-
+      ls = {};
      let p = new Persist();
      expect(p.getLangCode()).toBe('en');
      expect(p.showTooltips()).toBe(true);
@@ -95,14 +65,14 @@ describe('Persist', function() {
    });

    it("loads from localStorage correctly", function() {
-      window.localStorage = LOCAL_STORAGE;
+      window.localStorage = localStorage;
      let savedData = require('./fixtures/valid-backup');
-      LOCAL_STORAGE.clear();
-      LOCAL_STORAGE.setItem('builds', JSON.stringify(savedData.builds));
-      LOCAL_STORAGE.setItem('NG_TRANSLATE_LANG_KEY', 'de');
-      LOCAL_STORAGE.setItem('insurance', 'Standard');
-      LOCAL_STORAGE.setItem('shipDiscount', 0.25);
-      LOCAL_STORAGE.setItem('moduleDiscount', 0.15);
+      ls = {};
+      ls.builds = JSON.stringify(savedData.builds);
+      ls.NG_TRANSLATE_LANG_KEY = 'de';
+      ls.insurance = 'Standard';
+      ls.shipDiscount = 0.25;
+      ls.moduleDiscount = 0.15;
      let p = new Persist();

      expect(p.getInsurance()).toBe('standard');
@@ -116,13 +86,13 @@ describe('Persist', function() {
    });

    it("uses defaults from a corrupted localStorage", function() {
-      window.localStorage = LOCAL_STORAGE;
-      LOCAL_STORAGE.clear();
-      LOCAL_STORAGE.setItem('builds', 'not valid json');
-      LOCAL_STORAGE.setItem('comparisons', '1, 3, 4');
-      LOCAL_STORAGE.setItem('insurance', 'this insurance does not exist');
-      LOCAL_STORAGE.setItem('shipDiscount', 'this is not a number');
-      LOCAL_STORAGE.setItem('moduleDiscount', 10); // Way to big
+      window.localStorage = localStorage;
+      ls = {};
+      ls.builds = "not valid json";
+      ls.comparisons = "1, 3, 4";
+      ls.insurance = 'this insurance does not exist';
+      ls.shipDiscount = 'this is not a number';
+      ls.moduleDiscount = 10; // Way to big

      let p = new Persist();
      expect(p.getLangCode()).toBe('en');
@@ -152,13 +122,13 @@ describe('Persist', function() {
    });

    it("generates the backup", function() {
-      window.localStorage = LOCAL_STORAGE;
+      window.localStorage = localStorage;
      let savedData = require('./fixtures/valid-backup');
-      LOCAL_STORAGE.clear();
-      LOCAL_STORAGE.setItem('builds', JSON.stringify(savedData.builds));
-      LOCAL_STORAGE.setItem('insurance', 'Beta');
-      LOCAL_STORAGE.setItem('shipDiscount', 0.25);
-      LOCAL_STORAGE.setItem('moduleDiscount', 0.15);
+      ls = {};
+      ls.builds = JSON.stringify(savedData.builds);
+      ls.insurance = 'Beta';
+      ls.shipDiscount = 0.25;
+      ls.moduleDiscount = 0.15;

      let p = new Persist();
      let backup = p.getAll();
@@ -170,4 +140,4 @@ describe('Persist', function() {
      expect(backup.comparisons).toEqual({});
    });
  });
-});
+})
--- a/tests/test-ship.js
+++ b/tests/test-ship.js
@@ -3,31 +3,32 @@ import { Ships } from 'coriolis-data/dist';
 import * as ModuleUtils from '../src/app/shipyard/ModuleUtils';

 describe("Ship", function() {
-  for (let s in Ships) {
-    it("can build " + s, function() {
+
+  it("can build all ships", function() {
+    for (let s in Ships) {
      let shipData = Ships[s];
      let ship = new Ship(s, shipData.properties, shipData.slots);

      for (let p in shipData.properties) {
-        expect(ship[p]).toEqual(shipData.properties[p]);
+        expect(ship[p]).toEqual(shipData.properties[p], s + ' property [' + p + '] does not match when built');
      }

      ship.buildWith(shipData.defaults);

-      expect(ship.totalCost).toEqual(shipData.retailCost);
+      expect(ship.totalCost).toEqual(shipData.retailCost, s + ' retail cost does not match default build cost');
      expect(ship.cargoCapacity).toBeDefined();
-      expect(ship.priorityBands[0].retracted).toBeGreaterThan(0);
-      expect(ship.powerAvailable).toBeGreaterThan(0);
-      expect(ship.unladenRange).toBeGreaterThan(0);
-      expect(ship.ladenRange).toBeGreaterThan(0);
-      expect(ship.fuelCapacity).toBeGreaterThan(0);
-      expect(ship.unladenFastestRange).toBeGreaterThan(0);
-      expect(ship.ladenFastestRange).toBeGreaterThan(0);
-      expect(ship.shield).toBeGreaterThan(0);
-      expect(ship.armour).toBeGreaterThan(0);
-      expect(ship.topSpeed).toBeGreaterThan(0);
-    });
-  }
+      expect(ship.priorityBands[0].retracted).toBeGreaterThan(0, s + ' priorityBands');
+      expect(ship.powerAvailable).toBeGreaterThan(0, s + ' powerAvailable');
+      expect(ship.unladenRange).toBeGreaterThan(0, s + ' unladenRange');
+      expect(ship.ladenRange).toBeGreaterThan(0, s + ' ladenRange');
+      expect(ship.fuelCapacity).toBeGreaterThan(0, s + ' fuelCapacity');
+      expect(ship.unladenFastestRange).toBeGreaterThan(0, s + ' unladenFastestRange');
+      expect(ship.ladenFastestRange).toBeGreaterThan(0, s + ' ladenFastestRange');
+      expect(ship.shield).toBeGreaterThan(0, s + ' shield');
+      expect(ship.armour).toBeGreaterThan(0, s + ' armour');
+      expect(ship.topSpeed).toBeGreaterThan(0, s + ' topSpeed');
+    }
+  });

  it("resets and rebuilds properly", function() {
    var id = 'cobra_mk_iii';
--- a/d3.js
+++ b/d3.js
--- a/d3.min.js
+++ b/d3.min.js
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -3,6 +3,10 @@ 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
@@ -17,6 +21,10 @@ services:

  coriolis_dev:
    image: edcd/coriolis:develop
+    build:
+      dockerfile: Dockerfile
+      args:
+        branch: develop
    restart: always
    volumes:
      - ./nginx.conf:/etc/nginx/nginx.conf
@@ -29,6 +37,20 @@ services:
    - "traefik.basic.port=80"
    - "traefik.basic.protocol=http"

+  coriolis_dw2:
+    image: edcd/coriolis:dw2
+    restart: always
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf
+    networks:
+    - web
+    labels:
+    - "traefik.docker.network=web"
+    - "traefik.enable=true"
+    - "traefik.basic.frontend.rule=Host:dw2.coriolis.io"
+    - "traefik.basic.port=80"
+    - "traefik.basic.protocol=http"
+
 networks:
  web:
    external: true
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,59 +1,96 @@
-worker_processes      2;
-error_log             ./nginx.error.log;
-worker_rlimit_nofile  8192;
-pid                   nginx.pid;
+worker_processes 1;
+user nobody nobody;
+error_log /tmp/error.log;
+pid /tmp/nginx.pid;

 events {
-  worker_connections  1024;
-  multi_accept        on;
+
+	worker_connections 1024;
 }

 http {

-  access_log  off;
-  charset UTF-8;
+    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;

-  types {
-    text/html                             html htm shtml;
-    text/css                              css;
-    text/xml                              xml rss;
-    image/gif                             gif;
-    image/jpeg                            jpeg jpg;
-    application/x-javascript              js;
-    text/plain                            txt;
-    image/png                             png;
-    image/svg+xml                         svg;
-    image/x-icon                          ico;
-    application/pdf                       pdf;
-    text/cache-manifest                   appcache;
-  }
+    # https://nginx.org/en/docs/http/ngx_http_gzip_module.html
+    # Enable gzip compression.
+    # Default: off
+    gzip off;

-  gzip on;
-  gzip_vary on;
-  gzip_proxied any;
-  gzip_comp_level 6;
-  gzip_buffers 16 8k;
-  gzip_http_version 1.1;
-  gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+    # 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;

-  server {
-    listen       3301;
-    server_name  localhost;
-    root   ./build/;
-    index  index.html;
+    # 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;

-    location ~* \.(?:manifest|appcache|html?|xml|json|css|js|map|jpg|jpeg|gif|png|ico|svg|eot|ttf|woff|woff2)$ {
-            expires -1;
-            add_header Access-Control-Allow-Origin *;
+    # 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;
-    }
-  }
+            access_log off;
+		}
+		location / {
+            try_files $uri $uri/ /index.html =404;
+		}
+		location /iframe.html {
+            try_files $uri $uri/ /iframe.html =404;
+        }
+	}
 }
-
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
    "type": "git",
    "url": "https://github.com/EDCD/coriolis"
  },
-  "homepage": "https://coriolis.edcd.io",
+  "homepage": "https://coriolis.io",
  "bugs": "https://github.com/EDCD/coriolis/issues",
  "private": true,
  "engine": "node >= 4.8.1",
@@ -120,6 +120,7 @@
    "webpack-notifier": "^1.6.0",
    "workbox-webpack-plugin": "^3.6.1"
  },
+  "sideEffects": false,
  "dependencies": {
    "@babel/polyfill": "^7.0.0",
    "browserify-zlib-next": "^1.0.1",
@@ -135,6 +136,7 @@
    "react": "^15.5.4",
    "react-dom": "^15.5.4",
    "react-extras": "^0.7.1",
+    "react-fuzzy": "^0.5.2",
    "react-ga": "^2.5.3",
    "react-number-editor": "Athanasius/react-number-editor.git#miggy",
    "recharts": "^1.2.0",
--- a/src/app/Coriolis.jsx
+++ b/src/app/Coriolis.jsx
@@ -1,11 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Router from './Router';
-import { register } from 'register-service-worker'
+import { register } from 'register-service-worker';
 import { EventEmitter } from 'fbemitter';
 import { getLanguage } from './i18n/Language';
 import Persist from './stores/Persist';

+import Announcement from './components/Announcement';
 import Header from './components/Header';
 import Tooltip from './components/Tooltip';
 import ModalExport from './components/ModalExport';
@@ -14,7 +15,6 @@ import ModalImport from './components/ModalImport';
 import ModalPermalink from './components/ModalPermalink';
 import * as CompanionApiUtils from './utils/CompanionApiUtils';
 import * as JournalUtils from './utils/JournalUtils';
-
 import AboutPage from './pages/AboutPage';
 import NotFoundPage from './pages/NotFoundPage';
 import OutfittingPage from './pages/OutfittingPage';
@@ -72,7 +72,7 @@ export default class Coriolis extends React.Component {
      route: {},
      sizeRatio: Persist.getSizeRatio()
    };
-    this._getAnnouncements()
+    this._getAnnouncements();
    Router('', (r) => this._setPage(ShipyardPage, r));
    Router('/import?', (r) => this._importBuild(r));
    Router('/import/:data', (r) => this._importBuild(r));
@@ -105,18 +105,20 @@ export default class Coriolis extends React.Component {
      }
      r.params.ship = ship.id;
      r.params.code = ship.toString();
-      this._setPage(OutfittingPage, r);
+      this._setPage(OutfittingPage, r)
    } catch (err) {
      this._onError('Failed to import ship', r.path, 0, 0, err);
    }
  }

-  _getAnnouncements() {
-    return request.get('https://orbis.zone/api/announcement')
-    .query({showInCoriolis: true})
-    .then(announces => {
-      this.setState({ announcements: announces.body })
-    })
+  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)
+    }
  }

  /**
@@ -344,37 +346,37 @@ export default class Coriolis extends React.Component {
      });
    }
    if ('serviceWorker' in navigator) {
-      window.addEventListener('load', () => {
-        // Your service-worker.js *must* be located at the top-level directory relative to your site.
-        // It won't be able to control pages unless it's located at the same level or higher than them.
-        // *Don't* register service worker file in, e.g., a scripts/ sub-directory!
-        // See https://github.com/slightlyoff/ServiceWorker/issues/468
-        const self = this;
+      // Your service-worker.js *must* be located at the top-level directory relative to your site.
+      // It won't be able to control pages unless it's located at the same level or higher than them.
+      // *Don't* register service worker file in, e.g., a scripts/ sub-directory!
+      // See https://github.com/slightlyoff/ServiceWorker/issues/468
+      const self = this;
+      if (process.env.NODE_ENV === 'production') {
        register('/service-worker.js', {
-          ready (registration) {
-            console.log('Service worker is active.')
+          ready(registration) {
+            console.log('Service worker is active.');
          },
-          registered (registration) {
-            console.log('Service worker has been registered.')
+          registered(registration) {
+            console.log('Service worker has been registered.');
          },
-          cached (registration) {
-            console.log('Content has been cached for offline use.')
+          cached(registration) {
+            console.log('Content has been cached for offline use.');
          },
-          updatefound (registration) {
-            console.log('New content is downloading.')
+          updatefound(registration) {
+            console.log('New content is downloading.');
          },
-          updated (registration) {
+          updated(registration) {
            self.setState({ appCacheUpdate: true });
-            console.log('New content is available; please refresh.')
+            console.log('New content is available; please refresh.');
          },
-          offline () {
-            console.log('No internet connection found. App is running in offline mode.')
+          offline() {
+            console.log('No internet connection found. App is running in offline mode.');
          },
-          error (error) {
-            console.error('Error during service worker registration:', error)
+          error(error) {
+            console.error('Error during service worker registration:', error);
          }
        });
-      });
+      }
    }
    window.onerror = this._onError.bind(this);
    window.addEventListener('resize', () => this.emitter.emit('windowResize'));
@@ -394,20 +396,24 @@ export default class Coriolis extends React.Component {
    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}/>
+                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>
      {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"
-            title="Coriolis Github Project">{window.CORIOLIS_VERSION} - {window.CORIOLIS_DATE}</a>
+          <a href="https://github.com/EDCD/coriolis" target="_blank" rel="noopener noreferrer"
+             title="Coriolis Github Project">{window.CORIOLIS_VERSION} - {window.CORIOLIS_DATE}</a>
          <br/>
          <a
            href={'https://github.com/EDCD/coriolis/compare/edcd:develop@{' + window.CORIOLIS_DATE + '}...edcd:develop'}
-            target="_blank" title={'Coriolis Commits since' + window.CORIOLIS_DATE}>Commits since last release
+            target="_blank" rel="noopener noreferrer" title={'Coriolis Commits since' + window.CORIOLIS_DATE}>Commits
+            since last release
            ({window.CORIOLIS_DATE})</a>
        </div>
      </footer>
--- a/src/app/Router.js
+++ b/src/app/Router.js
@@ -1,13 +1,5 @@
-// Check whether a test is run because then we need to
-// initialize ReactGA in test mode
-let isTest = false;
-try {
-  isTest = process.env.node_env === 'test';
-} catch (e) {}
-
 import Persist from './stores/Persist';
-import ReactGA from 'react-ga';
-ReactGA.initialize('UA-55840909-18', { testMode: isTest });
+
 let standalone = undefined;

 /**
@@ -265,16 +257,8 @@ Route.prototype.match = function(path, params) {
 * @param  {string} path Path to track
 */
 function gaTrack(path) {
-  const match = path.match(/\/outfit\/(.*)(\?code=.*)/);
-  if (match) {
-    if (match[1]) {
-      ReactGA.ga('set', 'contentGroup1', match[1]);
-    }
-    if (match[2]) {
-      ReactGA.ga('set', 'contentGroup2', match[2]);
-    }
-  }
-  ReactGA.pageview(path);
+  const _paq = window._paq || [];
+  _paq.push(['trackPageView']);
 }

 /**
--- a/src/app/components/Announcement.jsx
+++ b/src/app/components/Announcement.jsx
@@ -25,7 +25,7 @@ export default class Announcement extends React.Component {
   * @return {React.Component} A href element
   */
  render() {
-    return <p>{this.props.text}</p>;
+    return <div className="announcement" >{this.props.text}</div>;
  }

 }
--- a/src/app/components/AvailableModulesMenu.jsx
+++ b/src/app/components/AvailableModulesMenu.jsx
@@ -5,6 +5,7 @@ import TranslatedComponent from './TranslatedComponent';
 import { stopCtxPropagation } from '../utils/UtilityFunctions';
 import cn from 'classnames';
 import { MountFixed, MountGimballed, MountTurret } from './SvgIcons';
+import FuzzySearch from 'react-fuzzy';

 const PRESS_THRESHOLD = 500; // mouse/touch down threshold

@@ -39,7 +40,7 @@ const GRPCAT = {
  'mc': 'projectiles',
  'axmc': 'experimental',
  'fc': 'projectiles',
-  'rfl':  'experimental',
+  'rfl': 'experimental',
  'pa': 'projectiles',
  'rg': 'projectiles',
  'mr': 'ordnance',
@@ -72,7 +73,16 @@ const GRPCAT = {
  'gfsb': 'guardian',
  'gmrp': 'guardian',
  'gsc': 'guardian',
-  'ghrp': 'guardian'
+  'ghrp': 'guardian',
+
+  // Mining
+  'scl': 'mining',
+  'pwa': 'mining',
+  'sdm': 'mining',
+
+  // Assists
+  'dc': 'flight assists',
+  'sua': 'flight assists',
 };
 // Order here is the order in which items will be shown in the modules menu
 const CATEGORIES = {
@@ -87,9 +97,10 @@ const CATEGORIES = {
  'rf': ['rf'],
  'shields': ['sg', 'bsg', 'psg', 'scb'],
  'structural reinforcement': ['hr', 'mrp'],
-  'dc': ['dc'],
+  'flight assists': ['dc', 'sua'],
+
  // Hardpoints
-  'lasers': ['pl', 'ul', 'bl', 'ml'],
+  'lasers': ['pl', 'ul', 'bl'],
  'projectiles': ['mc', 'c', 'fc', 'pa', 'rg'],
  'ordnance': ['mr', 'tp', 'nl'],
  // Utilities
@@ -101,7 +112,9 @@ const CATEGORIES = {
  'experimental': ['axmc', 'axmr', 'rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn', 'rcpl', 'dtl', 'rsl', 'mahr',],

  // Guardian
-  'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc']
+  'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc'],
+
+  'mining': ['ml', 'scl', 'pwa', 'sdm', 'abl'],
 };

 /**
@@ -113,7 +126,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
    onSelect: PropTypes.func.isRequired,
    diffDetails: PropTypes.func,
    m: PropTypes.object,
-    shipMass: PropTypes.number,
+    ship: PropTypes.object.isRequired,
    warning: PropTypes.func,
    firstSlotId: PropTypes.string,
    lastSlotId: PropTypes.string,
@@ -121,10 +134,6 @@ export default class AvailableModulesMenu extends TranslatedComponent {
    slotDiv: PropTypes.object
  };

-  static defaultProps = {
-    shipMass: 0
-  };
-
  /**
   * Constructor
   * @param  {Object} props   React Component properties
@@ -133,6 +142,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
  constructor(props, context) {
    super(props);
    this._hideDiff = this._hideDiff.bind(this);
+    this._showSearch = this._showSearch.bind(this);
    this.state = this._initState(props, context);
    this.slotItems = [];// Array to hold <li> refs.
  }
@@ -145,21 +155,21 @@ export default class AvailableModulesMenu extends TranslatedComponent {
   */
  _initState(props, context) {
    let translate = context.language.translate;
-    let { m, warning, shipMass, onSelect, modules, firstSlotId, lastSlotId } = props;
+    let { m, warning, onSelect, modules, ship } = props;
    let list, currentGroup;

    let buildGroup = this._buildGroup.bind(
      this,
+      ship,
      translate,
      m,
      warning,
-      shipMass - (m && m.mass ? m.mass : 0),
      (m, event) => {
        this._hideDiff(event);
        onSelect(m);
      }
    );
-
+    let fuzzy = [];
    if (modules instanceof Array) {
      list = buildGroup(modules[0].grp, modules);
    } else {
@@ -167,9 +177,11 @@ export default class AvailableModulesMenu extends TranslatedComponent {
      // At present time slots with grouped options (Hardpoints and Internal) can be empty
      if (m) {
        let emptyId = 'empty';
-        if(this.firstSlotId == null) this.firstSlotId = emptyId;
+        if (this.firstSlotId == null) this.firstSlotId = emptyId;
        let keyDown = this._keyDown.bind(this, onSelect);
-        list.push(<div className='empty-c upp' key={emptyId} data-id={emptyId} onClick={onSelect.bind(null, null)} onKeyDown={keyDown} tabIndex="0" ref={slotItem => this.slotItems[emptyId] = slotItem} >{translate('empty')}</div>);
+        list.push(<div className='empty-c upp' key={emptyId} data-id={emptyId} onClick={onSelect.bind(null, null)}
+                       onKeyDown={keyDown} tabIndex="0"
+                       ref={slotItem => this.slotItems[emptyId] = slotItem}>{translate('empty')}</div>);
      }

      // Need to regroup the modules by our own categorisation
@@ -197,7 +209,8 @@ export default class AvailableModulesMenu extends TranslatedComponent {
              if (categories.length === 1) {
                // Show category header instead of group header
                if (m && grp == m.grp) {
-                  list.push(<div ref={(elem) => this.groupElem = elem} key={category} className={'select-category upp'}>{translate(category)}</div>);
+                  list.push(<div ref={(elem) => this.groupElem = elem} key={category}
+                                 className={'select-category upp'}>{translate(category)}</div>);
                } else {
                  list.push(<div key={category} className={'select-category upp'}>{translate(category)}</div>);
                }
@@ -208,43 +221,56 @@ export default class AvailableModulesMenu extends TranslatedComponent {
                  categoryHeader = true;
                }
                if (m && grp == m.grp) {
-                  list.push(<div ref={(elem) => this.groupElem = elem} key={grp} className={'select-group cap'}>{translate(grp)}</div>);
+                  list.push(<div ref={(elem) => this.groupElem = elem} key={grp}
+                                 className={'select-group cap'}>{translate(grp)}</div>);
                } else {
                  list.push(<div key={grp} className={'select-group cap'}>{translate(grp)}</div>);
                }
              }
              list.push(buildGroup(grp, modules[grp]));
+              for (const i of modules[grp]) {
+                let mount = '';
+                if (i.mount === 'F') {
+                  mount = 'Fixed';
+                } else if (i.mount === 'G') {
+                  mount = 'Gimballed';
+                } else if (i.mount === 'T') {
+                  mount = 'Turreted';
+                }
+                const fuzz = { grp, m: i, name: `${i.class}${i.rating}${mount ? ' '  + mount : ''} ${translate(grp)}` };
+                fuzzy.push(fuzz);
+              }
            }
          }
        }
      }
    }
    let trackingFocus = false;
-    return { list, currentGroup, trackingFocus };
+    return { list, currentGroup, fuzzy, trackingFocus };
  }

  /**
   * Generate React Components for Module Group
+   * @param  {Ship} ship            Ship the selection is for
   * @param  {Function} translate   Translate function
   * @param  {Object} mountedModule Mounted Module
   * @param  {Function} warningFunc Warning function
-   * @param  {number} mass          Mass
   * @param  {function} onSelect    Select/Mount callback
   * @param  {string} grp           Group name
   * @param  {Array} modules        Available modules
-   * @param  {string} firstSlotId   id of first slot item
-   * @param  {string} lastSlotId    id of last slot item
   * @return {React.Component}      Available Module Group contents
   */
-  _buildGroup(translate, mountedModule, warningFunc, mass, onSelect, grp, modules, firstSlotId, lastSlotId) {
+  _buildGroup(ship, translate, mountedModule, warningFunc, onSelect, grp, modules) {
    let prevClass = null, prevRating = null, prevName;
    let elems = [];

    const sortedModules = modules.sort(this._moduleOrder);

-
    // Calculate the number of items per class.  Used so we don't have long lists with only a few items in each row
-    const tmp = sortedModules.map((v, i) => v['class']).reduce((count, cls) => { count[cls] = ++count[cls] || 1; return count; }, {});
+    const tmp = sortedModules.map((v, i) => v['class']).reduce((count, cls) => {
+      count[cls] = ++count[cls] || 1;
+      return count;
+    }, {});
    const itemsPerClass = Math.max.apply(null, Object.keys(tmp).map(key => tmp[key]));

    let itemsOnThisRow = 0;
@@ -255,10 +281,11 @@ export default class AvailableModulesMenu extends TranslatedComponent {
      prevName = m.name;
      if (ModuleUtils.isShieldGenerator(m.grp)) {
        // Shield generators care about maximum hull mass
-        disabled = mass > m.maxmass;
-      } else if (m.maxmass) {
-        // Thrusters care about total mass
-        disabled = mass + m.mass > m.maxmass;
+        disabled = ship.hullMass > m.maxmass;
+      // 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;
      }
      let active = mountedModule && mountedModule.id === m.id;
      let classes = cn(m.name ? 'lc' : 'c', {
@@ -297,22 +324,29 @@ export default class AvailableModulesMenu extends TranslatedComponent {
        };
      }

-      switch(m.mount) {
-        case 'F': mount = <MountFixed className={'lg'} />; break;
-        case 'G': mount = <MountGimballed className={'lg'}/>; break;
-        case 'T': mount = <MountTurret className={'lg'}/>; break;
+      switch (m.mount) {
+        case 'F':
+          mount = <MountFixed className={'lg'}/>;
+          break;
+        case 'G':
+          mount = <MountGimballed className={'lg'}/>;
+          break;
+        case 'T':
+          mount = <MountTurret className={'lg'}/>;
+          break;
      }
      if (m.name && m.name === prevName) {
        // elems.push(<br key={'b' + m.grp + i} />);
        itemsOnThisRow = 0;
      }
      if (itemsOnThisRow == 6 || i > 0 && sortedModules.length > 3 && itemsPerClass > 2 && m.class != prevClass && (m.rating != prevRating || m.mount)) {
-        elems.push(<br key={'b' + m.grp + i} />);
+        elems.push(<br key={'b' + m.grp + i}/>);
        itemsOnThisRow = 0;
      }
      let tbIdx = (classes.indexOf('disabled') < 0) ? 0 : undefined;
      elems.push(
-        <li key={m.id} data-id={m.id} className={classes} {...eventHandlers} tabIndex={tbIdx} ref={slotItem => this.slotItems[m.id] = slotItem}>
+        <li key={m.id} data-id={m.id} className={classes} {...eventHandlers} tabIndex={tbIdx}
+            ref={slotItem => this.slotItems[m.id] = slotItem}>
          {mount}
          {(mount ? ' ' : '') + m.class + m.rating + (m.missile ? '/' + m.missile : '') + (m.name ? ' ' + translate(m.name) : '')}
        </li>
@@ -340,6 +374,40 @@ export default class AvailableModulesMenu extends TranslatedComponent {
    }
  }

+  /**
+   * Generate tooltip content for the difference between the
+   * mounted module and the hovered modules
+   */
+  _showSearch() {
+    if (this.props.modules instanceof Array) {
+      return;
+    }
+    return (
+      <FuzzySearch
+        list={this.state.fuzzy}
+        keys={['grp', 'name']}
+        tokenize={true}
+        className={'input'}
+        width={'100%'}
+        style={{ padding: 0 }}
+        onSelect={e => this.props.onSelect.bind(null, e.m)()}
+        resultsTemplate={(props, state, styles, clickHandler) => {
+          return state.results.map((val, i) => {
+            return (
+              <div
+                key={i}
+                className={'lc'}
+                onClick={() => clickHandler(i)}
+              >
+                {val.name}
+              </div>
+            );
+          });
+        }}
+      />
+    );
+  }
+
  /**
   * Mouse over diff handler
   * @param  {Function} showDiff diff tooltip callback
@@ -405,7 +473,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
   * @param {Function}  select Select module callback
   * @param {SytheticEvent} event Event
   */
-  _keyUp(select,event) {
+  _keyUp(select, event) {
    // nothing here yet
  }

@@ -475,12 +543,13 @@ export default class AvailableModulesMenu extends TranslatedComponent {
      this.slotItems[this.firstSlotId].focus();
    }
  }
+
  /**
   * Handle focus if the component updates
   *
   */
  componentWillUnmount() {
-    if(this.props.slotDiv) {
+    if (this.props.slotDiv) {
      this.props.slotDiv.focus();
    }
  }
@@ -501,11 +570,12 @@ export default class AvailableModulesMenu extends TranslatedComponent {
  render() {
    return (
      <div ref={node => this.node = node}
-        className={cn('select', this.props.className)}
-        onScroll={this._hideDiff}
-        onClick={(e) => e.stopPropagation() }
-        onContextMenu={stopCtxPropagation}
+           className={cn('select', this.props.className)}
+           onScroll={this._hideDiff}
+           onClick={(e) => e.stopPropagation()}
+           onContextMenu={stopCtxPropagation}
      >
+        {this._showSearch()}
        {this.state.list}
      </div>
    );
--- a/src/app/components/Defence.jsx
+++ b/src/app/components/Defence.jsx
@@ -52,12 +52,12 @@ export default class Defence extends TranslatedComponent {
   * @return {React.Component} contents
   */
  render() {
-    const { ship, sys, opponentWep } = this.props;
+    const { opponent, sys, opponentWep } = this.props;
    const { language, tooltip, termtip } = this.context;
    const { formats, translate, units } = language;
    const { shield, armour, shielddamage, armourdamage } = this.state;

-    const pd = ship.standard[4].m;
+    const pd = opponent.standard[4].m;

    const shieldSourcesData = [];
    const effectiveShieldData = [];
--- a/src/app/components/HardpointSlot.jsx
+++ b/src/app/components/HardpointSlot.jsx
@@ -2,12 +2,21 @@ import React from 'react';
 import cn from 'classnames';
 import Slot from './Slot';
 import Persist from '../stores/Persist';
-import { DamageAbsolute, DamageKinetic, DamageThermal, DamageExplosive, MountFixed, MountGimballed, MountTurret, ListModifications, Modified } from './SvgIcons';
+import {
+  DamageAbsolute,
+  DamageKinetic,
+  DamageThermal,
+  DamageExplosive,
+  MountFixed,
+  MountGimballed,
+  MountTurret,
+  ListModifications,
+  Modified
+} from './SvgIcons';
 import { Modifications } from 'coriolis-data/dist';
 import { stopCtxPropagation } from '../utils/UtilityFunctions';
 import { blueprintTooltip } from '../utils/BlueprintFunctions';

-
 /**
 * Hardpoint / Utility Slot
 */
@@ -27,7 +36,7 @@ export default class HardpointSlot extends Slot {
   * @return {string}               Label
   */
  _getMaxClassLabel(translate) {
-    return translate(['U','S','M','L','H'][this.props.maxClass]);
+    return translate(['U', 'S', 'M', 'L', 'H'][this.props.maxClass]);
  }

  /**
@@ -66,42 +75,76 @@ export default class HardpointSlot extends Slot {
      return <div className={className} draggable='true' onDragStart={drag} onDragEnd={drop}>
        <div className={'cb'}>
          <div className={'l'}>
-          {m.mount && m.mount == 'F' ? <span onMouseOver={termtip.bind(null, 'fixed')} onMouseOut={tooltip.bind(null, null)}><MountFixed /></span> : ''}
-          {m.mount && m.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')} onMouseOut={tooltip.bind(null, null)}><MountGimballed /></span> : ''}
-          {m.mount && m.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')} onMouseOut={tooltip.bind(null, null)}><MountTurret /></span> : ''}
-          {m.getDamageDist() && m.getDamageDist().K ? <span onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /></span> : ''}
-          {m.getDamageDist() && m.getDamageDist().T ? <span onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /></span> : ''}
-          {m.getDamageDist() && m.getDamageDist().E ? <span onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /></span> : ''}
-          {m.getDamageDist() && m.getDamageDist().A ? <span onMouseOver={termtip.bind(null, 'absolute')} onMouseOut={tooltip.bind(null, null)}><DamageAbsolute /></span> : ''}
-          {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 }
+            {m.mount && m.mount == 'F' ? <span onMouseOver={termtip.bind(null, 'fixed')}
+                                               onMouseOut={tooltip.bind(null, null)}><MountFixed/></span> : ''}
+            {m.mount && m.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')}
+                                               onMouseOut={tooltip.bind(null, null)}><MountGimballed/></span> : ''}
+            {m.mount && m.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')}
+                                               onMouseOut={tooltip.bind(null, null)}><MountTurret/></span> : ''}
+            {m.getDamageDist() && m.getDamageDist().K ? <span onMouseOver={termtip.bind(null, 'kinetic')}
+                                                              onMouseOut={tooltip.bind(null, null)}><DamageKinetic/></span> : ''}
+            {m.getDamageDist() && m.getDamageDist().T ? <span onMouseOver={termtip.bind(null, 'thermal')}
+                                                              onMouseOut={tooltip.bind(null, null)}><DamageThermal/></span> : ''}
+            {m.getDamageDist() && m.getDamageDist().E ? <span onMouseOver={termtip.bind(null, 'explosive')}
+                                                              onMouseOut={tooltip.bind(null, null)}><DamageExplosive/></span> : ''}
+            {m.getDamageDist() && m.getDamageDist().A ? <span onMouseOver={termtip.bind(null, 'absolute')}
+                                                              onMouseOut={tooltip.bind(null, null)}><DamageAbsolute/></span> : ''}
+            {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={'r'}>{formats.round(m.getMass())}{u.T}</div>
        </div>
        <div className={'cb'}>
-          { m.getDps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'dpssdps' : 'dps')} onMouseOut={tooltip.bind(null, null)}>{translate('DPS')}: {formats.round1(m.getDps())} { m.getClip() ? <span>({formats.round1(m.getSDps()) })</span> : null }</div> : null }
-          { m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'epsseps' : 'eps')} onMouseOut={tooltip.bind(null, null)}>{translate('EPS')}: {formats.round1(m.getEps())}{u.MW} { m.getClip() ? <span>({formats.round1((m.getClip() * m.getEps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload())) }{u.MW})</span> : null }</div> : null }
-          { m.getHps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'hpsshps' : 'hps')} onMouseOut={tooltip.bind(null, null)}>{translate('HPS')}: {formats.round1(m.getHps())} { m.getClip() ? <span>({formats.round1((m.getClip() * m.getHps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload())) })</span> : null }</div> : null }
-          { m.getDps() && m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, 'dpe')} onMouseOut={tooltip.bind(null, null)}>{translate('DPE')}: {formats.f1(m.getDps() / m.getEps())}</div> : null }
-          { m.getRoF() ? <div className={'l'} onMouseOver={termtip.bind(null, 'rof')} onMouseOut={tooltip.bind(null, null)}>{translate('ROF')}: {formats.f1(m.getRoF())}{u.ps}</div> : null }
-          { m.getRange() ? <div className={'l'}>{translate('range', m.grp)} {formats.f1(m.getRange() / 1000)}{u.km}</div> : null }
-          { m.getScanTime() ? <div className={'l'}>{translate('scantime')} {formats.f1(m.getScanTime())}{u.s}</div> : null }
-          { m.getFalloff() ? <div className={'l'}>{translate('falloff')} {formats.round(m.getFalloff() / 1000)}{u.km}</div> : null }
-          { m.getShieldBoost() ? <div className={'l'}>+{formats.pct1(m.getShieldBoost())}</div> : null }
-          { m.getAmmo() ? <div className={'l'}>{translate('ammunition')}: {formats.int(m.getClip())}/{formats.int(m.getAmmo())}</div> : null }
-          { m.getReload() ? <div className={'l'}>{translate('reload')}: {formats.round(m.getReload())}{u.s}</div> : null }
-          { m.getShotSpeed() ? <div className={'l'}>{translate('shotspeed')}: {formats.int(m.getShotSpeed())}{u.mps}</div> : null }
-          { m.getPiercing() ? <div className={'l'}>{translate('piercing')}: {formats.int(m.getPiercing())}</div> : null }
-          { m.getJitter() ? <div className={'l'}>{translate('jitter')}: {formats.f2(m.getJitter())}°</div> : null }
-          { showModuleResistances && m.getExplosiveResistance() ? <div className='l'>{translate('explres')}: {formats.pct(m.getExplosiveResistance())}</div> : null }
-          { 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 }
-          { 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 }
+          {m.getDps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'dpssdps' : 'dps')}
+                             onMouseOut={tooltip.bind(null, null)}>{translate('DPS')}: {formats.round1(m.getDps())} {m.getClip() ?
+            <span>({formats.round1(m.getSDps())})</span> : null}</div> : null}
+          {m.getDamage() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getDamage() ? 'shotdmg' : 'shotdmg')}
+                                onMouseOut={tooltip.bind(null, null)}>{translate('shotdmg')}: {formats.round1(m.getDamage())}</div> : null}
+          {m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'epsseps' : 'eps')}
+                             onMouseOut={tooltip.bind(null, null)}>{translate('EPS')}: {formats.round1(m.getEps())}{u.MW} {m.getClip() ?
+            <span>({formats.round1(m.getEps() * m.getSustainedFactor())}{u.MW})</span> : null}</div> : null}
+          {m.getHps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'hpsshps' : 'hps')}
+                             onMouseOut={tooltip.bind(null, null)}>{translate('HPS')}: {formats.round1(m.getHps())} {m.getClip() ?
+            <span>({formats.round1(m.getHps() * m.getSustainedFactor())})</span> : null}</div> : null}
+          {m.getDps() && m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, 'dpe')}
+                                           onMouseOut={tooltip.bind(null, null)}>{translate('DPE')}: {formats.f1(m.getDps() / m.getEps())}</div> : null}
+          {m.getRoF() ? <div className={'l'} onMouseOver={termtip.bind(null, 'rof')}
+                             onMouseOut={tooltip.bind(null, null)}>{translate('ROF')}: {formats.f1(m.getRoF())}{u.ps}</div> : null}
+          {m.getRange() ? <div
+            className={'l'}>{translate('range', m.grp)} {formats.f1(m.getRange() / 1000)}{u.km}</div> : null}
+          {m.getScanTime() ? <div
+            className={'l'}>{translate('scantime')} {formats.f1(m.getScanTime())}{u.s}</div> : null}
+          {m.getFalloff() ? <div
+            className={'l'}>{translate('falloff')} {formats.round(m.getFalloff() / 1000)}{u.km}</div> : null}
+          {m.getShieldBoost() ? <div className={'l'}>+{formats.pct1(m.getShieldBoost())}</div> : null}
+          {m.getAmmo() ? <div
+            className={'l'}>{translate('ammunition')}: {formats.int(m.getClip())}/{formats.int(m.getAmmo())}</div> : null}
+          {m.getReload() ? <div className={'l'}>{translate('wep_reload')}: {formats.round(m.getReload())}{u.s}</div> : null}
+          {m.getShotSpeed() ? <div
+            className={'l'}>{translate('shotspeed')}: {formats.int(m.getShotSpeed())}{u.mps}</div> : null}
+          {m.getPiercing() ? <div className={'l'}>{translate('piercing')}: {formats.int(m.getPiercing())}</div> : null}
+          {m.getJitter() ? <div className={'l'}>{translate('jitter')}: {formats.f2(m.getJitter())}°</div> : null}
+          {m.getScanAngle() ? <div className={'l'}>{translate('scan angle')}: {formats.f2(m.getScanAngle())}°</div> : null}
+          {m.getScanRange() ? <div className={'l'}>{translate('scan range')}: {formats.int(m.getScanRange())}{u.m}</div> : null}
+          {m.getMaxAngle() ? <div className={'l'}>{translate('max angle')}: {formats.f2(m.getMaxAngle())}°</div> : null}
+          {showModuleResistances && m.getExplosiveResistance() ? <div
+            className='l'>{translate('explres')}: {formats.pct(m.getExplosiveResistance())}</div> : null}
+          {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}
+          {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>;
    } else {
-      return  <div className={'empty'}>{translate('empty')}</div>;
+      return <div className={'empty'}>{translate('empty')}</div>;
    }
  }

--- a/src/app/components/HardpointSlotSection.jsx
+++ b/src/app/components/HardpointSlotSection.jsx
@@ -149,10 +149,19 @@ export default class HardpointSlotSection extends SlotSection {
      <ul>
        <li className='lc' tabIndex='0'  onClick={_fill.bind(this, 'pa', 'F')} onKeyDown={this._keyDown} ref={smRef => this.sectionRefArr['pa-F'] = smRef}>{translate('pa')}</li>
      </ul>
+      <div className='select-group cap'>{translate('rg')}</div>
+      <ul>
+        <li className='lc' tabIndex='0'  onClick={_fill.bind(this, 'rg', 'F')} onKeyDown={this._keyDown} ref={smRef => this.sectionRefArr['rg-F'] = smRef}>{translate('rg')}</li>
+      </ul>
      <div className='select-group cap'>{translate('nl')}</div>
      <ul>
        <li className='lc' tabIndex='0' onClick={_fill.bind(this, 'nl', 'F')} onKeyDown={this._keyDown} ref={smRef => this.sectionRefArr['nl-F'] = smRef}>{translate('nl')}</li>
      </ul>
+      <div className='select-group cap'>{translate('rfl')}</div>
+      <ul>
+        <li className='c' tabIndex='0' onClick={_fill.bind(this, 'rfl', 'F')} onKeyDown={this._keyDown} ref={smRef => this.sectionRefArr['rfl-F'] = smRef}><MountFixed className='lg'/></li>
+        <li className='c' tabIndex='0' onClick={_fill.bind(this, 'rfl', 'T')} onKeyDown={this._keyDown} ref={smRef => this.sectionRefArr['rfl-T'] = smRef}><MountTurret className='lg'/></li>
+      </ul>
    </div>;
  }

--- a/src/app/components/Header.jsx
+++ b/src/app/components/Header.jsx
@@ -349,7 +349,7 @@ export default class Header extends TranslatedComponent {
  _getShipsMenu() {
    let shipList = [];

-    for (let s in Ships) {
+    for (let s of this.shipOrder) {
      shipList.push(<ActiveLink key={s} href={outfitURL(s)} className='block'>{Ships[s].properties.name}</ActiveLink>);
    }

--- a/src/app/components/InternalSlot.jsx
+++ b/src/app/components/InternalSlot.jsx
@@ -78,7 +78,6 @@ export default class InternalSlot extends Slot {
          { m.rangeLS ? <div className={'l'}>{translate('range')}: {m.rangeLS}{u.Ls}</div> : null }
          { m.rangeLS === null ? <div className={'l'}>∞{u.Ls}</div> : null }
          { m.rangeRating ? <div className={'l'}>{translate('range')}: {m.rangeRating}</div> : null }
-          { m.maximum ? <div className={'l'}>{translate('max')}: {(m.maximum)}</div> : null }
          { m.passengers ? <div className={'l'}>{translate('passengers')}: {m.passengers}</div> : null }
          { m.getRegenerationRate() ? <div className='l'>{translate('regen')}: {formats.round1(m.getRegenerationRate())}{u.ps}</div> : null }
          { m.getBrokenRegenerationRate() ? <div className='l'>{translate('brokenregen')}: {formats.round1(m.getBrokenRegenerationRate())}{u.ps}</div> : null }
--- a/src/app/components/ModalImport.jsx
+++ b/src/app/components/ModalImport.jsx
@@ -13,6 +13,8 @@ import { Download } from './SvgIcons';
 import { outfitURL } from '../utils/UrlGenerators';
 import * as CompanionApiUtils from '../utils/CompanionApiUtils';

+const zlib = require('pako');
+
 const textBuildRegex = new RegExp('^\\[([\\w \\-]+)\\]\n');
 const lineRegex = new RegExp('^([\\dA-Z]{1,2}): (\\d)([A-I])[/]?([FGT])?([SD])? ([\\w\\- ]+)');
 const mountMap = { 'H': 4, 'L': 3, 'M': 2, 'S': 1, 'U': 0 };
@@ -99,6 +101,7 @@ export default class ModalImport extends TranslatedComponent {
    this.state = {
      builds: props.builds,
      canEdit: !props.builds,
+      loadoutEvent: null,
      comparisons: null,
      shipDiscount: null,
      moduleDiscount: null,
@@ -111,12 +114,28 @@ export default class ModalImport extends TranslatedComponent {
    this._process = this._process.bind(this);
    this._import = this._import.bind(this);
    this._importBackup = this._importBackup.bind(this);
+    this._importLoadout = this._importLoadout.bind(this);
    this._importDetailedArray = this._importDetailedArray.bind(this);
    this._importTextBuild = this._importTextBuild.bind(this);
    this._importCompanionApiBuild = this._importCompanionApiBuild.bind(this);
    this._validateImport = this._validateImport.bind(this);
  }

+  /**
+   * Import a Loadout event from Elite: Dangerous journal files
+   * @param  {Object} data Loadout event
+   * @throws {string} If import fails
+   */
+  _importLoadout(data) {
+    if (data && data.Ship && data.Modules) {
+      const deflated = zlib.deflate(JSON.stringify(data), { to: 'string' });
+      let compressed = btoa(deflated);
+      this.setState({loadoutEvent: compressed});
+    } else {
+      throw 'Loadout event must contain Ship and Modules';
+    }
+  }
+
  /**
   * Import a Coriolis backup
   * @param  {Object} importData Backup Data
@@ -159,7 +178,7 @@ export default class ModalImport extends TranslatedComponent {
    }
    // Check for module discount
    if (!isNaN(importData.moduleDiscount)) {
-      this.setState({ shipDiscount: importData.moduleDiscount * 1 });
+      this.setState({ moduleDiscount: importData.moduleDiscount * 1 });
    }

    if (typeof importData.insurance == 'string') {
@@ -345,12 +364,14 @@ export default class ModalImport extends TranslatedComponent {
        } else if (importData.ship && typeof importData.name !== undefined) { // Using JSON from a single ship build export
          this._importDetailedArray([importData]); // Convert to array with singleobject
          this.setState({ singleBuild: true });
+        } else if (importData.Modules != null && importData.Modules[0] != null) {
+          this._importLoadout(importData);
        } else { // Using Backup JSON
          this._importBackup(importData);
        }
      }
    } catch (e) {
-      // console.log(e.stack);
+      console.log(e);
      this.setState({ errorMsg: (typeof e == 'string') ? e : 'Cannot Parse the data!' });
      return;
    }
@@ -364,6 +385,10 @@ export default class ModalImport extends TranslatedComponent {
  _process() {
    let builds = null, comparisons = null;

+    if (this.state.loadoutEvent) {
+      return Router.go(`/import?data=${this.state.loadoutEvent}`);
+    }
+
    // If only importing a single build go straight to the outfitting page
    if (this.state.singleBuild) {
      builds = this.state.builds;
@@ -480,7 +505,7 @@ export default class ModalImport extends TranslatedComponent {
    if (!state.processed) {
      importStage = (
        <div>
-          <textarea className='cb json' ref={node => this.importField = node} onChange={this._validateImport} defaultValue={this.state.importString} placeholder={translate('PHRASE_IMPORT')} />
+          <textarea spellCheck={false} className='cb json' ref={node => this.importField = node} onChange={this._validateImport} defaultValue={this.state.importString} placeholder={translate('PHRASE_IMPORT')} />
          <button id='proceed' className='l cap' onClick={this._process} disabled={!state.importValid} >{translate('proceed')}</button>
          <div className='l warning' style={{ marginLeft:'3em' }}>{state.errorMsg}</div>
        </div>
--- a/src/app/components/ModalOrbis.jsx
+++ b/src/app/components/ModalOrbis.jsx
@@ -23,8 +23,10 @@ export default class ModalOrbis extends TranslatedComponent {
    this.state = {
      orbisCreds: Persist.getOrbisCreds(),
      orbisUrl: '...',
+      ship: this.props.ship,
      authenticatedStatus: 'Checking...'
    };
+    this.orbisCategory = this.orbisCategory.bind(this);
  }

  /**
@@ -88,6 +90,17 @@ export default class ModalOrbis extends TranslatedComponent {
    });
  }

+  /**
+   * 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
@@ -106,6 +119,17 @@ export default class ModalOrbis extends TranslatedComponent {
      <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/>
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -109,17 +109,18 @@ export default class ModalShoppingList extends TranslatedComponent {
   */
  sendToEDEng(event) {
    event.preventDefault();
+    let translate = this.context.language.translate;
    const target = event.target;
    target.disabled = this.state.blueprints.length > 0;
    if (this.state.blueprints.length === 0) {
-      target.innerText = 'No modded components.';
+      target.innerText = translate('No modded components.');
      target.disabled = true;
      setTimeout(() => {
-        target.innerText = 'Send to EDEngineer';
+        target.innerText = translate('Send to EDEngineer');
        target.disabled = false;
      }, 3000);
    } else {
-      target.innerText = 'Sending...';
+      target.innerText = translate('Sending...');
    }
    let countSent = 0;
    let countTotal = this.state.blueprints.length;
@@ -139,7 +140,7 @@ export default class ModalShoppingList extends TranslatedComponent {
          countSent++;
          if (countSent === countTotal) {
            target.disabled = false;
-            target.innerText = 'Send to EDEngineer';
+            target.innerText = translate('Send to EDEngineer');
          }
        });
    }
@@ -230,32 +231,32 @@ export default class ModalShoppingList extends TranslatedComponent {
    this.sendToEDEng = this.sendToEDEng.bind(this);
    return <div className='modal' onClick={ (e) => e.stopPropagation() }>
      <h2>{translate('PHRASE_SHOPPING_MATS')}</h2>
-      <label>Grade 1 rolls </label>
+      <label>{translate('Grade 1 rolls ')}</label>
      <input id={1} type={'number'} min={0} defaultValue={this.state.matsPerGrade[1]} onChange={this.changeHandler} />
      <br/>
-      <label>Grade 2 rolls </label>
+      <label>{translate('Grade 2 rolls ')}</label>
      <input id={2} type={'number'} min={0} defaultValue={this.state.matsPerGrade[2]} onChange={this.changeHandler} />
      <br/>
-      <label>Grade 3 rolls </label>
+      <label>{translate('Grade 3 rolls ')}</label>
      <input id={3} type={'number'} min={0} value={this.state.matsPerGrade[3]} onChange={this.changeHandler} />
      <br/>
-      <label>Grade 4 rolls </label>
+      <label>{translate('Grade 4 rolls ')}</label>
      <input id={4} type={'number'} min={0} value={this.state.matsPerGrade[4]} onChange={this.changeHandler} />
      <br/>
-      <label>Grade 5 rolls </label>
+      <label>{translate('Grade 5 rolls ')}</label>
      <input id={5} type={'number'} min={0} value={this.state.matsPerGrade[5]} onChange={this.changeHandler} />
      <div>
        <textarea className='cb json' readOnly value={this.state.matsList} />
      </div>
-      <label hidden={!compatible} className={'l cap'}>CMDR Name </label>
+      <label hidden={!compatible} className={'l cap'}>{translate('CMDR Name')}</label>
      <br/>
      <select hidden={!compatible} className={'cmdr-select l cap'} onChange={this.cmdrChangeHandler} defaultValue={this.state.cmdrName}>
        {this.state.cmdrs.map(e => <option key={e}>{e}</option>)}
      </select>
      <br/>
-      <p hidden={!this.state.failed} id={'failed'} className={'l'}>Failed to send to EDEngineer (Launch EDEngineer and make sure the API is started then refresh the page.)</p>
-      <p hidden={compatible} id={'browserbad'} className={'l'}>Sending to EDEngineer is not compatible with Firefox's security settings. Please try again with Chrome.</p>
-      <button className={'l cb dismiss cap'} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send To EDEngineer')}</button>
+      <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 className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
    </div>;
  }
--- a/src/app/components/Modification.jsx
+++ b/src/app/components/Modification.jsx
@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import TranslatedComponent from './TranslatedComponent';
 import cn from 'classnames';
 import NumberEditor from 'react-number-editor';
-import { isValueBeneficial } from '../utils/BlueprintFunctions';
+import { isChangeValueBeneficial } from '../utils/BlueprintFunctions';
+import { Modifications } from 'coriolis-data/dist';

 /**
 * Modification
@@ -79,6 +80,7 @@ export default class Modification extends TranslatedComponent {
    let { translate, formats, units } = this.context.language;
    let { m, name } = this.props;
    let modValue = m.getChange(name);
+    let isOverwrite = Modifications.modifications[name].method === 'overwrite';

    if (name === 'damagedist') {
      // We don't show damage distribution
@@ -117,10 +119,10 @@ export default class Modification extends TranslatedComponent {
              </td>
              <td style={{ textAlign: 'center' }} className={
                modValue ?
-                  isValueBeneficial(name, modValue) ? 'secondary' : 'warning' :
+                  isChangeValueBeneficial(name, modValue) ? 'secondary' : 'warning' :
                  ''
              }>
-                {formats.f2(modValue / 100) || 0}%
+                {formats.f2(modValue / 100) || 0}{isOverwrite ? '' : '%'}
              </td>
            </tr>
          </tbody>
--- a/src/app/components/ModificationsMenu.jsx
+++ b/src/app/components/ModificationsMenu.jsx
@@ -178,7 +178,7 @@ export default class ModificationsMenu extends TranslatedComponent {
          continue;
        }
        const classes = cn('button-inline-menu', {
-          active: m.blueprint && m.blueprint.special && m.blueprint.special.edname == specialName
+          active: m.blueprint && m.blueprint.special && m.blueprint.special.key == specialName
        });
        if (classes.indexOf('active') >= 0) this.selectedSpecialId = specialName;
        const close = this._specialSelected.bind(this, specialName);
@@ -437,7 +437,7 @@ export default class ModificationsMenu extends TranslatedComponent {
    let specialTt;
    if (m.blueprint && m.blueprint.special) {
      specialLabel = m.blueprint.special.name;
-      specialTt = specialToolTip(translate, m.blueprint.grades[m.blueprint.grade], m.grp, m, m.blueprint.special.edname);
+      specialTt = specialToolTip(translate, m.blueprint.grades[m.blueprint.grade], m.grp, m, m.blueprint.special.key);
    } else {
      specialLabel = translate('PHRASE_SELECT_SPECIAL');
    }
@@ -478,7 +478,7 @@ export default class ModificationsMenu extends TranslatedComponent {
            <tbody>
              { showRolls ?
                <tr>
-                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: false }) }> { translate('roll') }: </td>
+                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: false }) }> { translate('mroll') }: </td>
                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: blueprintCv ===    0 }) } style={{ cursor: 'pointer' }} onClick={_rollWorst} onKeyDown={ this._keyDown } onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_WORST')} onMouseOut={tooltip.bind(null, null)}> { translate('0%') } </td>
                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: blueprintCv ===   50 })} style={{ cursor: 'pointer' }} onClick={_rollFifty} onKeyDown={ this._keyDown } onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_FIFTY')} onMouseOut={tooltip.bind(null, null)}> { translate('50%') } </td>
                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: blueprintCv ===  100 })} style={{ cursor: 'pointer' }} onClick={_rollFull} onKeyDown={ this._keyDown } onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_BEST')} onMouseOut={tooltip.bind(null, null)}> { translate('100%') } </td>
--- a/src/app/components/OutfittingSubpages.jsx
+++ b/src/app/components/OutfittingSubpages.jsx
@@ -174,7 +174,7 @@ export default class OutfittingSubpages extends TranslatedComponent {
              <th style={{ width:'25%' }} className={cn({ active: tab == 'power' })} onClick={this._showTab.bind(this, 'power')} >{translate('power and costs')}</th>
              <th style={{ width:'25%' }} className={cn({ active: tab == 'profiles' })} onClick={this._showTab.bind(this, 'profiles')} >{translate('profiles')}</th>
              <th style={{ width:'25%' }} className={cn({ active: tab == 'offence' })} onClick={this._showTab.bind(this, 'offence')} >{translate('offence')}</th>
-              <th style={{ width:'25%' }} className={cn({ active: tab == 'defence' })} onClick={this._showTab.bind(this, 'defence')} >{translate('defence')}</th>
+              <th style={{ width:'25%' }} className={cn({ active: tab == 'defence' })} onClick={this._showTab.bind(this, 'defence')} >{translate('tab_defence')}</th>
            </tr>
          </thead>
        </table>
--- a/src/app/components/ShipSummaryTable.jsx
+++ b/src/app/components/ShipSummaryTable.jsx
@@ -50,8 +50,10 @@ export default class ShipSummaryTable extends TranslatedComponent {
    const speedTooltip = canThrust ? 'TT_SUMMARY_SPEED' : 'TT_SUMMARY_SPEED_NONFUNCTIONAL';
    const canBoost = ship.canBoost(cargo, ship.fuelCapacity);
    const boostTooltip = canBoost ? 'TT_SUMMARY_BOOST' : canThrust ? 'TT_SUMMARY_BOOST_NONFUNCTIONAL' : 'TT_SUMMARY_SPEED_NONFUNCTIONAL';
+    const canJump = ship.getSlotStatus(ship.standard[2]) == 3;
    const sgMetrics = Calc.shieldMetrics(ship, pips.sys);
    const shipBoost = canBoost ?  Calc.calcBoost(ship) : 'No Boost';
+    const restingHeat = Math.sqrt(((ship.standard[0].m.pgen * ship.standard[0].m.eff) / ship.heatCapacity) / 0.2);
    const armourMetrics = Calc.armourMetrics(ship);
    let shieldColour = 'blue';
    if (shieldGenerator && shieldGenerator.m.grp === 'psg') {
@@ -70,7 +72,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
              <tr className='main'>
                <th rowSpan={2} className={ cn({ 'bg-warning-disabled': !canThrust }) }>{translate('speed')}</th>
                <th rowSpan={2} className={ cn({ 'bg-warning-disabled': !canBoost }) }>{translate('boost')}</th>
-                <th colSpan={5}>{translate('jump range')}</th>
+                <th colSpan={5} className={ cn({ 'bg-warning-disabled': !canJump }) }>{translate('jump range')}</th>
                <th rowSpan={2}>{translate('shield')}</th>
                <th rowSpan={2}>{translate('integrity')}</th>
                <th rowSpan={2}>{translate('DPS')}</th>
@@ -78,20 +80,21 @@ export default class ShipSummaryTable extends TranslatedComponent {
                <th rowSpan={2}>{translate('TTD')}</th>
                {/* <th onMouseEnter={termtip.bind(null, 'heat per second')} onMouseLeave={hide} rowSpan={2}>{translate('HPS')}</th> */}
                <th rowSpan={2}>{translate('cargo')}</th>
-                <th rowSpan={2}>{translate('pax')}</th>
+                <th rowSpan={2} onMouseEnter={termtip.bind(null, 'passenger capacity', { cap: 0 })} onMouseLeave={hide}>{translate('pax')}</th>
                <th rowSpan={2}>{translate('fuel')}</th>
                <th colSpan={3}>{translate('mass')}</th>
                <th onMouseEnter={termtip.bind(null, 'hull hardness', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('hrd')}</th>
                <th rowSpan={2}>{translate('crew')}</th>
                <th onMouseEnter={termtip.bind(null, 'mass lock factor', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('MLF')}</th>
-                <th onMouseEnter={termtip.bind(null, 'TT_SUMMARY_BOOST_TIME', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('boost time')}</th>
+                <th onMouseEnter={termtip.bind(null, 'TT_SUMMARY_BOOST_INTERVAL', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('boost interval')}</th>
+                <th rowSpan={2}>{translate('resting heat (Beta)')}</th>
              </tr>
              <tr>
-                <th className='lft'>{translate('max')}</th>
-                <th>{translate('unladen')}</th>
-                <th>{translate('laden')}</th>
-                <th>{translate('total unladen')}</th>
-                <th>{translate('total laden')}</th>
+                <th className={ cn({ 'lft': true, 'bg-warning-disabled': !canJump }) }>{translate('max')}</th>
+                <th className={ cn({ 'bg-warning-disabled': !canJump }) }>{translate('unladen')}</th>
+                <th className={ cn({ 'bg-warning-disabled': !canJump }) }>{translate('laden')}</th>
+                <th className={ cn({ 'bg-warning-disabled': !canJump }) }>{translate('total unladen')}</th>
+                <th className={ cn({ 'bg-warning-disabled': !canJump }) }>{translate('total laden')}</th>
                <th className='lft'>{translate('hull')}</th>
                <th>{translate('unladen')}</th>
                <th>{translate('laden')}</th>
@@ -101,11 +104,11 @@ export default class ShipSummaryTable extends TranslatedComponent {
              <tr>
                <td onMouseEnter={termtip.bind(null, speedTooltip, { cap: 0 })} onMouseLeave={hide}>{ canThrust ? <span>{int(ship.calcSpeed(4, ship.fuelCapacity, 0, false))}{u['m/s']}</span> : <span className='warning'>0 <Warning/></span> }</td>
                <td onMouseEnter={termtip.bind(null, boostTooltip, { cap: 0 })} onMouseLeave={hide}>{ canBoost ? <span>{int(ship.calcSpeed(4, ship.fuelCapacity, 0, true))}{u['m/s']}</span> : <span className='warning'>0 <Warning/></span> }</td>
-                <td><span onMouseEnter={termtip.bind(null, 'TT_SUMMARY_MAX_SINGLE_JUMP', { cap: 0 })} onMouseLeave={hide}>{f2(Calc.jumpRange(ship.unladenMass + ship.standard[2].m.getMaxFuelPerJump(), ship.standard[2].m, ship.standard[2].m.getMaxFuelPerJump(), ship))}{u.LY}</span></td>
-                <td><span onMouseEnter={termtip.bind(null, 'TT_SUMMARY_UNLADEN_SINGLE_JUMP', { cap: 0 })} onMouseLeave={hide}>{f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}</span></td>
-                <td><span onMouseEnter={termtip.bind(null, 'TT_SUMMARY_LADEN_SINGLE_JUMP', { cap: 0 })} onMouseLeave={hide}>{f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}</span></td>
-                <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_UNLADEN_TOTAL_JUMP', { cap: 0 })} onMouseLeave={hide}>{f2(Calc.totalJumpRange(ship.unladenMass + ship.fuelCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}</td>
-                <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_LADEN_TOTAL_JUMP', { cap: 0 })} onMouseLeave={hide}>{f2(Calc.totalJumpRange(ship.unladenMass + ship.fuelCapacity + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}</td>
+                <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_MAX_SINGLE_JUMP', { cap: 0 })} onMouseLeave={hide}>{ canJump ? <span>{ f2(Calc.jumpRange(ship.unladenMass + ship.standard[2].m.getMaxFuelPerJump(), ship.standard[2].m, ship.standard[2].m.getMaxFuelPerJump(), ship))}{u.LY}</span> : <span className='warning'>0 <Warning/></span> }</td>
+                <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_UNLADEN_SINGLE_JUMP', { cap: 0 })} onMouseLeave={hide}>{ canJump ? <span>{f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}</span> : <span className='warning'>0 <Warning/></span> }</td>
+                <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_LADEN_SINGLE_JUMP', { cap: 0 })} onMouseLeave={hide}>{ canJump ? <span>{f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}</span> : <span className='warning'>0 <Warning/></span> }</td>
+                <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_UNLADEN_TOTAL_JUMP', { cap: 0 })} onMouseLeave={hide}>{ canJump ? <span>{f2(Calc.totalJumpRange(ship.unladenMass + ship.fuelCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}</span> : <span className='warning'>0 <Warning/></span> }</td>
+                <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_LADEN_TOTAL_JUMP', { cap: 0 })} onMouseLeave={hide}>{ canJump ? <span>{f2(Calc.totalJumpRange(ship.unladenMass + ship.fuelCapacity + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}</span> : <span className='warning'>0 <Warning/></span> }</td>
                <td className={sgClassNames} onMouseEnter={termtip.bind(null, sgTooltip, { cap: 0 })} onMouseLeave={hide}>{int(ship.shield)}{u.MJ}</td>
                <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_INTEGRITY', { cap: 0 })} onMouseLeave={hide}>{int(ship.armour)}</td>
                <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_DPS', { cap: 0 })} onMouseLeave={hide}>{f1(ship.totalDps)}</td>
@@ -122,6 +125,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
                <td>{ship.crew}</td>
                <td>{ship.masslock}</td>
                <td>{shipBoost !== 'No Boost' ? formats.time(shipBoost) : 'No Boost'}</td>
+                <td>{formats.pct(restingHeat)}</td>
              </tr>
            </tbody>
          </table>
@@ -156,10 +160,10 @@ export default class ShipSummaryTable extends TranslatedComponent {
              <td>{formats.pct1(ship.shieldThermRes)}</td>
              <td></td>

-              <td>{int(ship && ship.shield > 0 ? ship.shield : 0)}{u.MJ}</td>
-              <td>{int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldExplRes)))) : 0)}{u.MJ}</td>
-              <td>{int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldKinRes)))) : 0)}{u.MJ}</td>
-              <td>{int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldThermRes)))) : 0)}{u.MJ}</td>
+              <td>{int(ship && sgMetrics.summary > 0 ? sgMetrics.summary : 0)}{u.MJ}</td>
+              <td>{int(ship && sgMetrics.summary > 0 ? sgMetrics.summary / sgMetrics.explosive.base : 0)}{u.MJ}</td>
+              <td>{int(ship && sgMetrics.summary ? sgMetrics.summary / sgMetrics.kinetic.base : 0)}{u.MJ}</td>
+              <td>{int(ship && sgMetrics.summary ? sgMetrics.summary / sgMetrics.thermal.base : 0)}{u.MJ}</td>
              <td></td>
              <td>{sgMetrics && sgMetrics.recover === Math.Inf ? translate('Never') : formats.time(sgMetrics.recover)}</td>
              <td>{sgMetrics && sgMetrics.recharge === Math.Inf ? translate('Never') : formats.time(sgMetrics.recharge)}</td>
@@ -194,11 +198,11 @@ export default class ShipSummaryTable extends TranslatedComponent {
                <td>{formats.pct1(ship.hullKinRes)}</td>
                <td>{formats.pct1(ship.hullThermRes)}</td>
                <td>{formats.pct1(ship.hullCausRes)}</td>
-                <td>{int(ship.armour)}</td>
-                <td>{int(ship.armour * ((1 / (1 - (ship.hullExplRes)))))}</td>
-                <td>{int(ship.armour * ((1 / (1 - (ship.hullKinRes)))))}</td>
-                <td>{int(ship.armour * ((1 / (1 - (ship.hullThermRes)))))}</td>
-                <td>{int(ship.armour * ((1 / (1 - (ship.hullCausRes)))))}</td>
+                <td>{int(armourMetrics.total)}</td>
+                <td>{int(armourMetrics.total / armourMetrics.explosive.total)}</td>
+                <td>{int(armourMetrics.total/ armourMetrics.kinetic.total)}</td>
+                <td>{int(armourMetrics.total / armourMetrics.thermal.total)}</td>
+                <td>{int(armourMetrics.total/ armourMetrics.caustic.total)}</td>
                <td>{int(armourMetrics.modulearmour)}</td>
                <td>{int(armourMetrics.moduleprotection * 100) + '%'}</td>

--- a/src/app/components/Slot.jsx
+++ b/src/app/components/Slot.jsx
@@ -127,8 +127,8 @@ export default class Slot extends TranslatedComponent {
        menu = <AvailableModulesMenu
          className={this._getClassNames()}
          modules={availableModules()}
-          shipMass={ship.hullMass}
          m={m}
+          ship={ship}
          onSelect={onSelect}
          warning={warning}
          diffDetails={diffDetails.bind(ship, this.context.language)}
--- a/src/app/components/SlotSection.jsx
+++ b/src/app/components/SlotSection.jsx
@@ -195,6 +195,15 @@ export default class SlotSection extends TranslatedComponent {
        if (targetSlot && canMount(this.props.ship, targetSlot, m.grp, m.class)) {
          const mCopy = m.clone();
          this.props.ship.use(targetSlot, mCopy, false);
+          let experimentalNum = this.props.ship.hardpoints
+            .filter(s => s.m && s.m.experimental).length;
+          // Remove the module on the last slot if we now exceed the number of
+          // experimentals allowed
+          if (m.experimental && 4 < experimentalNum) {
+            this.props.ship.updateStats(originSlot, null, originSlot.m);
+            originSlot.m = null;  // Empty the slot
+            originSlot.discountedCost = 0;
+          }
          // Copy power info
          targetSlot.enabled = originSlot.enabled;
          targetSlot.priority = originSlot.priority;
--- a/src/app/components/StandardSlot.jsx
+++ b/src/app/components/StandardSlot.jsx
@@ -109,8 +109,8 @@ export default class StandardSlot extends TranslatedComponent {
        menu = <AvailableModulesMenu
          className='standard'
          modules={modules}
-          shipMass={ModuleUtils.isShieldGenerator(m.grp) ? ship.hullMass : ship.unladenMass}
          m={m}
+          ship={ship}
          onSelect={onSelect}
          warning={warning}
          diffDetails={diffDetails.bind(ship, this.context.language)}
--- a/src/app/components/VerticalBarChart.jsx
+++ b/src/app/components/VerticalBarChart.jsx
@@ -1,7 +1,7 @@
 import TranslatedComponent from './TranslatedComponent';
 import React, { PropTypes } from 'react';
 import ContainerDimensions from 'react-container-dimensions';
-import { BarChart, Bar, XAxis, YAxis } from 'recharts';
+import { BarChart, Bar, XAxis, YAxis, LabelList } from 'recharts';

 const CORIOLIS_COLOURS = ['#FF8C0D', '#1FB0FF', '#71A052', '#D5D54D'];
 const LABEL_COLOUR = '#000000';
@@ -53,7 +53,9 @@ export default class VerticalBarChart extends TranslatedComponent {
            <BarChart width={width} height={width * ASPECT} data={this.props.data} margin={{ top: 5, right: 5, left: 5, bottom: 5 }}>
              <XAxis interval={0} fontSize='0.8em' stroke={AXIS_COLOUR} dataKey='label' />
              <YAxis interval={'preserveStart'} tickCount={11} fontSize='0.8em' stroke={AXIS_COLOUR} type='number' domain={[0, localMax]}/>
-              <Bar dataKey='value' label={<ValueLabel />} fill={CORIOLIS_COLOURS[0]} isAnimationActive={false} onMouseOver={this._termtip} onMouseOut={tooltip.bind(null, null)}/>
+              <Bar dataKey='value' fill={CORIOLIS_COLOURS[0]} isAnimationActive={false} onMouseOver={this._termtip} onMouseOut={tooltip.bind(null, null)}>
+                <LabelList dataKey='value' position='insideTop'/>
+              </Bar>
            </BarChart>
          </div>
        )}
@@ -76,29 +78,3 @@ export default class VerticalBarChart extends TranslatedComponent {
    }
  }
 }
-
-/**
- * A label that displays the value within the bar of the chart
- */
-class ValueLabel extends React.Component {
-  static propTypes = {
-    x: PropTypes.number,
-    y: PropTypes.number,
-    payload: PropTypes.object,
-    value: PropTypes.number
-  };
-
-  /**
-   * Render offence
-   * @return {React.Component} contents
-   */
-  render() {
-    const { x, y, payload, value } = this.props;
-
-    const em = value < 1000 ? '1em' : value < 1000 ? '0.8em' : '0.7em';
-
-    return (
-      <text x={x} y={y} fill="#000000" textAnchor="middle" dy={20} style={{ fontSize: em }}>{value}</text>
-    );
-  }
-};
--- a/src/app/i18n/Language.jsx
+++ b/src/app/i18n/Language.jsx
@@ -7,6 +7,7 @@ import * as IT from './it';
 import * as RU from './ru';
 import * as PL from './pl';
 import * as PT from './pt';
+import * as CN from './cn';
 import * as d3 from 'd3';

 let fallbackTerms = EN.terms;
@@ -27,6 +28,7 @@ export function getLanguage(langCode) {
    case 'ru': lang = RU; break;
    case 'pl': lang = PL; break;
    case 'pt': lang = PT; break;
+    case 'cn': lang = CN; break;
    default:
      lang = EN;
  }
@@ -94,5 +96,6 @@ export const Languages = {
  fr: 'Français',
  ru: 'ру́сский',
  pl: 'polski',
-  pt: 'português'
+  pt: 'português',
+  cn: '中文'
 };
--- a/src/app/i18n/cn.js
+++ b/src/app/i18n/cn.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: ['AM', 'PM'],
+  days: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
+  shortDays: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+  months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+  shortMonths: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
+};
+
+export { default as terms } from './cn.json';
--- a/src/app/i18n/cn.json
+++ b/src/app/i18n/cn.json
--- a/src/app/i18n/de.json
+++ b/src/app/i18n/de.json
--- a/src/app/i18n/en.json
+++ b/src/app/i18n/en.json
--- a/src/app/i18n/fr.json
+++ b/src/app/i18n/fr.json
@@ -59,7 +59,7 @@
    "empty all": "vide tout",
    "Enter Name": "Entrer nom",
    "Explorer": "explorateur",
-    "fastest range": "gamme la plus rapide",
+    "farthest range": "gamme la plus rapide",
    "fuel": "carburant",
    "fuel level": "niveau de carburant",
    "full tank": "Réservoir plein",
--- a/src/app/i18n/ru.json
+++ b/src/app/i18n/ru.json
@@ -299,7 +299,7 @@
    "edit data": "Редактирование",
    "empty all": "пусто все",
    "Enter Name": "Введите имя",
-    "fastest range": "быстрый диапазон",
+    "farthest range": "быстрый диапазон",
    "fuel level": "уровень топлива",
    "full tank": "Полный бак",
    "internal compartments": "внутренние отсеки",
--- a/src/app/pages/AboutPage.jsx
+++ b/src/app/pages/AboutPage.jsx
@@ -6,7 +6,6 @@ import { CoriolisLogo, GitHub } from '../components/SvgIcons';
 * About Page
 */
 export default class AboutPage extends Page {
-
  /**
   * Constructor
   * @param  {Object} props   React Component properties
@@ -23,33 +22,112 @@ export default class AboutPage extends Page {
   * @return {React.Component} The page contents
   */
  renderPage() {
-    return <div className={'page'} style={{ textAlign: 'left', maxWidth: 800, margin: '0 auto' }}>
-      <h1><CoriolisLogo style={{ marginRight: '0.4em' }} className='xl'/><span className='warning'>Coriolis EDCD Edition</span></h1>
+    return (
+      <div
+        className={'page'}
+        style={{ textAlign: 'left', maxWidth: 800, margin: '0 auto' }}
+      >
+        <h1>
+          <CoriolisLogo style={{ marginRight: '0.4em' }} className="xl" />
+          <span className="warning">Coriolis EDCD Edition</span>
+        </h1>

-      <p>This is a clone of the Coriolis project, whose original author is currently unable to maintain it. This clone is maintained by the <a href="http://edcd.github.io/">EDCD community</a>.</p>
-      <p>To recover your builds, go to <a href='https://coriolis.io/' target='_blank'>https://coriolis.io/</a>, backup your builds (Settings / Backup), copy the text, return here and import (Settings / Import).</p>
-      <p>The Coriolis project was inspired by <a href='http://www.edshipyard.com/' target='_blank'>E:D Shipyard</a> and, of course, <a href='http://www.elitedangerous.com' target='_blank'>Elite Dangerous</a>. The ultimate goal of Coriolis is to provide rich features to support in-game play and planning while engaging the E:D community to support its development.</p>
-      <p>Coriolis was created using assets and imagery from Elite: Dangerous, with the permission of Frontier Developments plc, for non-commercial purposes. It is not endorsed by nor reflects the views or opinions of Frontier Developments.  A number of assets were sourced from <a href='http://edassets.org' target='_blank'>ED Assets</a></p>
+        <p>
+          This is a clone of the Coriolis project, whose original author is
+          currently unable to maintain it. This clone is maintained by the{' '}
+          <a href="http://edcd.github.io/">EDCD community</a>.
+        </p>
+        <p>
+          To recover your builds, go to{' '}
+          <a href="https://coriolis.io/" target="_blank">
+            https://coriolis.io/
+          </a>
+          , backup your builds (Settings / Backup), copy the text, return here
+          and import (Settings / Import).
+        </p>
+        <p>
+          The Coriolis project was inspired by{' '}
+          <a href="http://www.edshipyard.com/" target="_blank">
+            E:D Shipyard
+          </a>{' '}
+          and, of course,{' '}
+          <a href="http://www.elitedangerous.com" target="_blank">
+            Elite Dangerous
+          </a>
+          . The ultimate goal of Coriolis is to provide rich features to support
+          in-game play and planning while engaging the E:D community to support
+          its development.
+        </p>
+        <p>
+          Coriolis was created using assets and imagery from Elite: Dangerous,
+          with the permission of Frontier Developments plc, for non-commercial
+          purposes. It is not endorsed by nor reflects the views or opinions of
+          Frontier Developments. A number of assets were sourced from{' '}
+          <a href="http://edassets.org" target="_blank">
+            ED Assets
+          </a>
+        </p>

-      <a style={{ display: 'block', textDecoration: 'none' }} href='https://github.com/EDCD/coriolis' target='_blank' title='Coriolis Github Project'>
-        <GitHub style={{ margin: '0.4em' }} className='l fg xl'/>
-        <h2 style={{ margin: 0, textDecoration: 'none' }}>Github</h2>
-        github.com/EDCD/coriolis
-      </a>
+        <a
+          style={{ display: 'block', textDecoration: 'none' }}
+          href="https://github.com/EDCD/coriolis"
+          target="_blank"
+          title="Coriolis Github Project"
+        >
+          <GitHub style={{ margin: '0.4em' }} className="l fg xl" />
+          <h2 style={{ margin: 0, textDecoration: 'none' }}>Github</h2>
+          github.com/EDCD/coriolis
+        </a>

-      <p>Coriolis is an open source project. Checkout the list of upcoming features and to-do list on github. Any and all contributions and feedback are welcome. If you encounter any bugs please report them and provide as much detail as possible.</p>
+        <p>
+          Coriolis is an open source project. Checkout the list of upcoming
+          features and to-do list on github. Any and all contributions and
+          feedback are welcome. If you encounter any bugs please report them and
+          provide as much detail as possible.
+        </p>

-      <h3>Chat</h3>
-      <p>You can chat to us on our <a href='https://discord.gg/0uwCh6R62aPRjk9w' target='_blank'>EDCD Discord server</a>.</p>
+        <h3>Chat</h3>
+        <p>
+          You can chat to us on our{' '}
+          <a href="https://discord.gg/0uwCh6R62aPRjk9w" target="_blank">
+            EDCD Discord server
+          </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" />
+        <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>;
+      </div>
+    );
  }
 }
--- a/src/app/pages/ComparisonPage.jsx
+++ b/src/app/pages/ComparisonPage.jsx
@@ -13,7 +13,14 @@ import ModalCompare from '../components/ModalCompare';
 import ModalExport from '../components/ModalExport';
 import ModalPermalink from '../components/ModalPermalink';
 import ModalImport from '../components/ModalImport';
-import { FloppyDisk, Bin, Download, Embed, Rocket, LinkIcon } from '../components/SvgIcons';
+import {
+  FloppyDisk,
+  Bin,
+  Download,
+  Embed,
+  Rocket,
+  LinkIcon
+} from '../components/SvgIcons';
 import ShortenUrl from '../utils/ShortenUrl';
 import { comparisonBBCode } from '../utils/BBCode';
 const browser = require('detect-browser');
@@ -42,7 +49,6 @@ function sortBy(predicate) {
 * Comparison Page
 */
 export default class ComparisonPage extends Page {
-
  /**
   * Constructor
   * @param  {Object} props   React Component properties
@@ -81,7 +87,13 @@ export default class ComparisonPage extends Page {
        for (let shipId in allBuilds) {
          for (let buildName in allBuilds[shipId]) {
            if (buildName && allBuilds[shipId][buildName]) {
-              builds.push(this._createBuild(shipId, buildName, allBuilds[shipId][buildName]));
+              builds.push(
+                this._createBuild(
+                  shipId,
+                  buildName,
+                  allBuilds[shipId][buildName]
+                )
+              );
            }
          }
        }
@@ -89,7 +101,9 @@ export default class ComparisonPage extends Page {
        let comparisonData = Persist.getComparison(name);
        if (comparisonData) {
          defaultFacets = comparisonData.facets;
-          comparisonData.builds.forEach((b) => builds.push(this._createBuild(b.shipId, b.buildName)));
+          comparisonData.builds.forEach(b =>
+            builds.push(this._createBuild(b.shipId, b.buildName))
+          );
          saved = true;
          newName = name;
        }
@@ -101,7 +115,7 @@ export default class ComparisonPage extends Page {
        newName = name = comparisonData.n;
        predicate = comparisonData.p;
        desc = comparisonData.d;
-        comparisonData.b.forEach((build) => {
+        comparisonData.b.forEach(build => {
          builds.push(this._createBuild(build.s, build.n, build.c));
          if (!importObj[build.s]) {
            importObj[build.s] = {};
@@ -118,9 +132,9 @@ export default class ComparisonPage extends Page {
    let selectedFacets = new Array(selectedLength);

    for (let i = 0; i < ShipFacets.length; i++) {
-      let facet = Object.assign({ }, ShipFacets[i]);
+      let facet = Object.assign({}, ShipFacets[i]);
      let defaultIndex = defaultFacets.indexOf(facet.i);
-      if(defaultIndex == -1) {
+      if (defaultIndex == -1) {
        facets.push(facet);
      } else {
        facet.active = true;
@@ -155,17 +169,18 @@ export default class ComparisonPage extends Page {
  _createBuild(id, name, code) {
    code = code ? code : Persist.getBuild(id, name); // Retrieve build code if not passed

-    if (!code) {  // No build found
+    if (!code) {
+      // No build found
      return;
    }

-    let data = Ships[id];   // Get ship properties
+    let data = Ships[id]; // Get ship properties
    let b = new Ship(id, data.properties, data.slots); // Create a new Ship instance
-    b.buildFrom(code);  // Populate components from code
+    b.buildFrom(code); // Populate components from code
    b.buildName = name;
    b.applyDiscounts(Persist.getShipDiscount(), Persist.getModuleDiscount());
    return b;
-  };
+  }

  /**
   * Update state with the specified sort predicates
@@ -184,13 +199,18 @@ export default class ComparisonPage extends Page {
    }

    this.setState({ predicate, desc });
-  };
+  }

  /**
   * Show selected builds modal
   */
  _selectBuilds() {
-    this.context.showModal(<ModalCompare onSelect={this._buildsSelected} builds={this.state.builds} />);
+    this.context.showModal(
+      <ModalCompare
+        onSelect={this._buildsSelected}
+        builds={this.state.builds}
+      />
+    );
  }

  /**
@@ -224,7 +244,7 @@ export default class ComparisonPage extends Page {
  _facetDrag(e) {
    this.nodeAfter = false;
    this.dragged = e.currentTarget;
-    let placeholder = this.placeholder = document.createElement('li');
+    let placeholder = (this.placeholder = document.createElement('li'));
    placeholder.style.width = Math.round(this.dragged.offsetWidth) + 'px';
    placeholder.className = 'facet-placeholder';
    if (!browser || (browser.name !== 'edge' && browser.name !== 'ie')) {
@@ -262,7 +282,7 @@ export default class ComparisonPage extends Page {
  _facetDragOver(e) {
    e.preventDefault();

-    if(e.target.className == 'facet-placeholder') {
+    if (e.target.className == 'facet-placeholder') {
      return;
    } else if (e.target != e.currentTarget) {
      this.over = e.target;
@@ -272,7 +292,7 @@ export default class ComparisonPage extends Page {
      let parent = e.target.parentNode;

      if (parent == e.currentTarget) {
-        if(relX > width && this.dragged != e.target) {
+        if (relX > width && this.dragged != e.target) {
          this.nodeAfter = true;
          parent.insertBefore(this.placeholder, e.target.nextElementSibling);
        } else {
@@ -321,7 +341,7 @@ export default class ComparisonPage extends Page {
    let { newName, builds, facets } = this.state;
    let selectedFacets = [];

-    facets.forEach((f) => {
+    facets.forEach(f => {
      if (f.active) {
        selectedFacets.unshift(f.i);
      }
@@ -348,14 +368,20 @@ export default class ComparisonPage extends Page {

    let code = fromComparison(name, builds, selectedFacets, predicate, desc);
    let loc = window.location;
-    return loc.protocol + '//' + loc.host + '/comparison?code=' + encodeURIComponent(code);
+    return (
+      loc.protocol +
+      '//' +
+      loc.host +
+      '/comparison?code=' +
+      encodeURIComponent(code)
+    );
  }

  /**
   * Generates the long permalink URL
   */
  _genPermalink() {
-    this.context.showModal(<ModalPermalink url={this._buildUrl()}/>);
+    this.context.showModal(<ModalPermalink url={this._buildUrl()} />);
  }

  /**
@@ -365,18 +391,25 @@ export default class ComparisonPage extends Page {
    let { translate, formats } = this.context.language;
    let { facets, builds } = this.state;

-    let generator = (callback) => {
+    let generator = callback => {
      let url = this._buildUrl();
-      ShortenUrl(url,
-        (shortenedUrl) => callback(comparisonBBCode(translate, formats, facets, builds, shortenedUrl)),
-        (error) => callback(comparisonBBCode(translate, formats, facets, builds, url))
+      ShortenUrl(
+        url,
+        shortenedUrl =>
+          callback(
+            comparisonBBCode(translate, formats, facets, builds, shortenedUrl)
+          ),
+        error =>
+          callback(comparisonBBCode(translate, formats, facets, builds, url))
      );
    };

-    this.context.showModal(<ModalExport
-      title={translate('forum') + ' BBCode'}
-      generator={generator}
-    />);
+    this.context.showModal(
+      <ModalExport
+        title={translate('forum') + ' BBCode'}
+        generator={generator}
+      />
+    );
  }

  /**
@@ -409,7 +442,8 @@ export default class ComparisonPage extends Page {
   * @param  {Object} nextContext Incoming/Next conext
   */
  componentWillReceiveProps(nextProps, nextContext) {
-    if (this.context.route !== nextContext.route) {  // Only reinit state if the route has changed
+    if (this.context.route !== nextContext.route) {
+      // Only reinit state if the route has changed
      this.setState(this._initState(nextContext));
    }
  }
@@ -419,7 +453,10 @@ export default class ComparisonPage extends Page {
   */
  componentWillMount() {
    this.resizeListener = this.context.onWindowResize(this._updateDimensions);
-    this.persistListener = Persist.addListener('discounts', this._updateDiscounts);
+    this.persistListener = Persist.addListener(
+      'discounts',
+      this._updateDiscounts
+    );
  }

  /**
@@ -444,65 +481,132 @@ export default class ComparisonPage extends Page {
  renderPage() {
    let translate = this.context.language.translate;
    let compareHeader;
-    let { newName, name, saved, builds, facets, predicate, desc, chartWidth } = this.state;
+    let {
+      newName,
+      name,
+      saved,
+      builds,
+      facets,
+      predicate,
+      desc,
+      chartWidth
+    } = this.state;

    if (this.state.compareMode) {
-      compareHeader = <tr>
-        <td className='head'>{translate('comparison')}</td>
-        <td>
-          <input value={newName} onChange={this._onNameChange} placeholder={translate('Enter Name')} maxLength='50' />
-          <button onClick={this._save} disabled={!newName || newName == 'all' || saved}>
-            <FloppyDisk  className='lg'/><span className='button-lbl'>{translate('save')}</span>
-          </button>
-          <button onClick={this._delete} disabled={name == 'all' || !saved}><Bin className='lg warning'/></button>
-          <button onClick={this._selectBuilds}>
-            <Rocket className='lg'/><span className='button-lbl'>{translate('builds')}</span>
-          </button>
-          <button className='r' onClick={this._genPermalink} disabled={builds.length == 0}>
-            <LinkIcon className='lg'/><span className='button-lbl'>{translate('permalink')}</span>
-          </button>
-          <button className='r' onClick={this._genBBcode} disabled={builds.length == 0}>
-            <Embed className='lg'/><span className='button-lbl'>{translate('forum')}</span>
-          </button>
-        </td>
-      </tr>;
+      compareHeader = (
+        <tr>
+          <td className="head">{translate('comparison')}</td>
+          <td>
+            <input
+              value={newName}
+              onChange={this._onNameChange}
+              placeholder={translate('Enter Name')}
+              maxLength="50"
+            />
+            <button
+              onClick={this._save}
+              disabled={!newName || newName == 'all' || saved}
+            >
+              <FloppyDisk className="lg" />
+              <span className="button-lbl">{translate('save')}</span>
+            </button>
+            <button onClick={this._delete} disabled={name == 'all' || !saved}>
+              <Bin className="lg warning" />
+            </button>
+            <button onClick={this._selectBuilds}>
+              <Rocket className="lg" />
+              <span className="button-lbl">{translate('builds')}</span>
+            </button>
+            <button
+              className="r"
+              onClick={this._genPermalink}
+              disabled={builds.length == 0}
+            >
+              <LinkIcon className="lg" />
+              <span className="button-lbl">{translate('permalink')}</span>
+            </button>
+            <button
+              className="r"
+              onClick={this._genBBcode}
+              disabled={builds.length == 0}
+            >
+              <Embed className="lg" />
+              <span className="button-lbl">{translate('forum')}</span>
+            </button>
+          </td>
+        </tr>
+      );
    } else {
-      compareHeader = <tr>
-        <td className='head'>{translate('comparison')}</td>
-        <td>
-          <h3>{name}</h3>
-          <button className='r' onClick={this._import}><Download className='lg'/>{translate('import')}</button>
-        </td>
-      </tr>;
+      compareHeader = (
+        <tr>
+          <td className="head">{translate('comparison')}</td>
+          <td>
+            <h3>{name}</h3>
+            <button className="r" onClick={this._import}>
+              <Download className="lg" />
+              {translate('import')}
+            </button>
+          </td>
+        </tr>
+      );
    }

    return (
-      <div className={'page'} style={{ fontSize: this.context.sizeRatio + 'em' }}>
-        <table id='comparison'>
+      <div
+        className={'page'}
+        style={{ fontSize: this.context.sizeRatio + 'em' }}
+      >
+        <table id="comparison">
          <tbody>
            {compareHeader}
-            <tr key='facets'>
-              <td className='head'>{translate('compare')}</td>
+            <tr key="facets">
+              <td className="head">{translate('compare')}</td>
              <td>
-                <ul id='facet-container' onDragOver={this._facetDragOver}>
-                  {facets.map((f, i) =>
-                    <li key={f.title} data-i={i} draggable='true' onDragStart={this._facetDrag} onDragEnd={this._facetDrop} className={cn('facet', { active: f.active })} onClick={this._toggleFacet.bind(this, f)}>
+                <ul id="facet-container" onDragOver={this._facetDragOver}>
+                  {facets.map((f, i) => (
+                    <li
+                      key={f.title}
+                      data-i={i}
+                      draggable="true"
+                      onDragStart={this._facetDrag}
+                      onDragEnd={this._facetDrop}
+                      className={cn('facet', { active: f.active })}
+                      onClick={this._toggleFacet.bind(this, f)}
+                    >
                      {'↔  ' + translate(f.title)}
                    </li>
-                  )}
+                  ))}
                </ul>
              </td>
            </tr>
          </tbody>
        </table>

-        <ComparisonTable builds={builds} facets={facets} onSort={this._sortShips} predicate={predicate} desc={desc} />
+        <ComparisonTable
+          builds={builds}
+          facets={facets}
+          onSort={this._sortShips}
+          predicate={predicate}
+          desc={desc}
+        />

-        {!builds.length ?
-          <div className='chart' ref={node => this.chartRef = node}>{translate('PHRASE_NO_BUILDS')}</div> :
-          facets.filter((f) => f.active).map((f, i) =>
-            <div key={f.title} className='chart' ref={ i == 0 ? node => this.chartRef = node : null}>
-              <h3 className='ptr' onClick={this._sortShips.bind(this, f.props[0])}>{translate(f.title)}</h3>
+        {!builds.length ? (
+          <div className="chart" ref={node => (this.chartRef = node)}>
+            {translate('PHRASE_NO_BUILDS')}
+          </div>
+        ) : (
+          facets.filter(f => f.active).map((f, i) => (
+            <div
+              key={f.title}
+              className="chart"
+              ref={i == 0 ? node => (this.chartRef = node) : null}
+            >
+              <h3
+                className="ptr"
+                onClick={this._sortShips.bind(this, f.props[0])}
+              >
+                {translate(f.title)}
+              </h3>
              <BarChart
                width={chartWidth}
                data={builds}
@@ -515,8 +619,8 @@ export default class ComparisonPage extends Page {
                desc={desc}
              />
            </div>
+          ))
        )}
-
      </div>
    );
  }
--- a/src/app/pages/NotFoundPage.jsx
+++ b/src/app/pages/NotFoundPage.jsx
@@ -5,7 +5,6 @@ import Page from './Page';
 * 404 Page
 */
 export default class NotFoundPage extends Page {
-
  /**
   * Constructor
   * @param  {Object} props   React Component properties
@@ -22,6 +21,10 @@ export default class NotFoundPage extends Page {
   * @return {React.Component} The page contents
   */
  renderPage() {
-    return <div className='page' style={{ marginTop: 30 }}>Page <small>{this.context.route.path}</small> Not Found</div>;
+    return (
+      <div className="page" style={{ marginTop: 30 }}>
+        Page <small>{this.context.route.path}</small> Not Found
+      </div>
+    );
  }
 }
--- a/src/app/pages/OutfittingPage.jsx
+++ b/src/app/pages/OutfittingPage.jsx
@@ -53,7 +53,6 @@ function getTitle(shipName, buildName) {
 * The Outfitting Page
 */
 export default class OutfittingPage extends Page {
-
  /**
   * Constructor
   * @param  {Object} props   React Component properties
@@ -85,22 +84,38 @@ export default class OutfittingPage extends Page {
    let shipId = params.ship;
    let code = params.code;
    let buildName = params.bn;
-    let data = Ships[shipId];   // Retrieve the basic ship properties, slots and defaults
+    let data = Ships[shipId]; // Retrieve the basic ship properties, slots and defaults
    let savedCode = Persist.getBuild(shipId, buildName);
    if (!data) {
      return { error: { message: 'Ship not found: ' + shipId } };
    }
-    let ship = new Ship(shipId, data.properties, data.slots);          // Create a new Ship instance
+    let ship = new Ship(shipId, data.properties, data.slots); // Create a new Ship instance
    if (code) {
-      ship.buildFrom(code);  // Populate modules from serialized 'code' URL param
+      ship.buildFrom(code); // Populate modules from serialized 'code' URL param
    } else {
-      ship.buildWith(data.defaults);  // Populate with default components
+      ship.buildWith(data.defaults); // Populate with default components
    }

    this._getTitle = getTitle.bind(this, data.properties.name);

    // Obtain ship control from code
-    const { sys, eng, wep, mcSys, mcEng, mcWep, boost, fuel, cargo, opponent, opponentBuild, opponentSys, opponentEng, opponentWep, engagementRange } = this._obtainControlFromCode(ship, code);
+    const {
+      sys,
+      eng,
+      wep,
+      mcSys,
+      mcEng,
+      mcWep,
+      boost,
+      fuel,
+      cargo,
+      opponent,
+      opponentBuild,
+      opponentSys,
+      opponentEng,
+      opponentWep,
+      engagementRange
+    } = this._obtainControlFromCode(ship, code);
    return {
      error: null,
      title: this._getTitle(buildName),
@@ -139,7 +154,10 @@ export default class OutfittingPage extends Page {
    };

    if (Persist.hasBuild(this.state.shipId, stateChanges.newBuildName)) {
-      stateChanges.savedCode = Persist.getBuild(this.state.shipId, stateChanges.newBuildName);
+      stateChanges.savedCode = Persist.getBuild(
+        this.state.shipId,
+        stateChanges.newBuildName
+      );
    } else {
      stateChanges.savedCode = null;
    }
@@ -165,7 +183,9 @@ export default class OutfittingPage extends Page {
   * @returns {string}        the code for this ship
   */
  _fullCode(ship, fuel, cargo) {
-    return `${ship.toString()}.${LZString.compressToBase64(this._controlCode(fuel, cargo))}`;
+    return `${ship.toString()}.${LZString.compressToBase64(
+      this._controlCode(fuel, cargo)
+    )}`;
  }

  /**
@@ -185,7 +205,11 @@ export default class OutfittingPage extends Page {
    let boost = false;
    let fuel = ship.fuelCapacity;
    let cargo = ship.cargoCapacity;
-    let opponent = new Ship('eagle', Ships['eagle'].properties, Ships['eagle'].slots).buildWith(Ships['eagle'].defaults);
+    let opponent = new Ship(
+      'eagle',
+      Ships['eagle'].properties,
+      Ships['eagle'].slots
+    ).buildWith(Ships['eagle'].defaults);
    let opponentSys = 2;
    let opponentEng = 2;
    let opponentWep = 2;
@@ -197,16 +221,25 @@ export default class OutfittingPage extends Page {
      const parts = code.split('.');
      if (parts.length >= 5) {
        // We have control information in the code
-        const control = LZString.decompressFromBase64(Utils.fromUrlSafe(parts[4])).split('/');
-        sys = parseFloat(control[0]) || sys;
-        eng = parseFloat(control[1]) || eng;
-        wep = parseFloat(control[2]) || wep;
+        const control = LZString.decompressFromBase64(
+          Utils.fromUrlSafe(parts[4])
+        ).split('/');
+        sys = parseFloat(control[0]);
+        eng = parseFloat(control[1]);
+        wep = parseFloat(control[2]);
+        if (sys + eng + wep > 6) {
+          sys = eng = wep = 2;
+        }
        boost = control[3] == 1 ? true : false;
        fuel = parseFloat(control[4]) || fuel;
        cargo = parseInt(control[5]) || cargo;
        if (control[6]) {
          const shipId = control[6];
-          opponent = new Ship(shipId, Ships[shipId].properties, Ships[shipId].slots);
+          opponent = new Ship(
+            shipId,
+            Ships[shipId].properties,
+            Ships[shipId].slots
+          );
          if (control[7] && Persist.getBuild(shipId, control[7])) {
            // Ship is a particular build
            const opponentCode = Persist.getBuild(shipId, control[7]);
@@ -216,7 +249,9 @@ export default class OutfittingPage extends Page {
              // Obtain opponent's sys/eng/wep pips from their code
              const opponentParts = opponentCode.split('.');
              if (opponentParts.length >= 5) {
-                const opponentControl = LZString.decompressFromBase64(Utils.fromUrlSafe(opponentParts[4])).split('/');
+                const opponentControl = LZString.decompressFromBase64(
+                  Utils.fromUrlSafe(opponentParts[4])
+                ).split('/');
                opponentSys = parseFloat(opponentControl[0]) || opponentSys;
                opponentEng = parseFloat(opponentControl[1]) || opponentEng;
                opponentWep = parseFloat(opponentControl[2]) || opponentWep;
@@ -237,7 +272,23 @@ export default class OutfittingPage extends Page {
      }
    }

-    return { sys, eng, wep, mcSys, mcEng, mcWep, boost, fuel, cargo, opponent, opponentBuild, opponentSys, opponentEng, opponentWep, engagementRange };
+    return {
+      sys,
+      eng,
+      wep,
+      mcSys,
+      mcEng,
+      mcWep,
+      boost,
+      fuel,
+      cargo,
+      opponent,
+      opponentBuild,
+      opponentSys,
+      opponentEng,
+      opponentWep,
+      engagementRange
+    };
  }

  /**
@@ -252,7 +303,9 @@ export default class OutfittingPage extends Page {
   * @param {number} mcWep  WEP pips from multi-crew
   */
  _pipsUpdated(sys, eng, wep, mcSys, mcEng, mcWep) {
-    this.setState({ sys, eng, wep, mcSys, mcEng, mcWep }, () =>  this._updateRouteOnControlChange());
+    this.setState({ sys, eng, wep, mcSys, mcEng, mcWep }, () =>
+      this._updateRouteOnControlChange()
+    );
  }

  /**
@@ -260,7 +313,7 @@ export default class OutfittingPage extends Page {
   * @param {boolean} boost true if boosting
   */
  _boostUpdated(boost) {
-    this.setState({ boost }, () =>  this._updateRouteOnControlChange());
+    this.setState({ boost }, () => this._updateRouteOnControlChange());
  }

  /**
@@ -268,7 +321,7 @@ export default class OutfittingPage extends Page {
   * @param {number} fuel the amount of fuel, in T
   */
  _fuelUpdated(fuel) {
-    this.setState({ fuel }, () =>  this._updateRouteOnControlChange());
+    this.setState({ fuel }, () => this._updateRouteOnControlChange());
  }

  /**
@@ -276,7 +329,7 @@ export default class OutfittingPage extends Page {
   * @param {number} cargo the amount of cargo, in T
   */
  _cargoUpdated(cargo) {
-    this.setState({ cargo }, () =>  this._updateRouteOnControlChange());
+    this.setState({ cargo }, () => this._updateRouteOnControlChange());
  }

  /**
@@ -284,7 +337,9 @@ export default class OutfittingPage extends Page {
   * @param {number} engagementRange the engagement range, in m
   */
  _engagementRangeUpdated(engagementRange) {
-    this.setState({ engagementRange }, () =>  this._updateRouteOnControlChange());
+    this.setState({ engagementRange }, () =>
+      this._updateRouteOnControlChange()
+    );
  }

  /**
@@ -293,7 +348,11 @@ export default class OutfittingPage extends Page {
   * @param {string} opponentBuild  the name of the opponent's build
   */
  _opponentUpdated(opponent, opponentBuild) {
-    const opponentShip  = new Ship(opponent, Ships[opponent].properties, Ships[opponent].slots);
+    const opponentShip = new Ship(
+      opponent,
+      Ships[opponent].properties,
+      Ships[opponent].slots
+    );
    let opponentSys = this.state.opponentSys;
    let opponentEng = this.state.opponentEng;
    let opponentWep = this.state.opponentWep;
@@ -301,9 +360,13 @@ export default class OutfittingPage extends Page {
      // Ship is a particular build
      opponentShip.buildFrom(Persist.getBuild(opponent, opponentBuild));
      // Set pips for opponent
-      const opponentParts = Persist.getBuild(opponent, opponentBuild).split('.');
+      const opponentParts = Persist.getBuild(opponent, opponentBuild).split(
+        '.'
+      );
      if (opponentParts.length >= 5) {
-        const opponentControl = LZString.decompressFromBase64(Utils.fromUrlSafe(opponentParts[4])).split('/');
+        const opponentControl = LZString.decompressFromBase64(
+          Utils.fromUrlSafe(opponentParts[4])
+        ).split('/');
        opponentSys = parseFloat(opponentControl[0]);
        opponentEng = parseFloat(opponentControl[1]);
        opponentWep = parseFloat(opponentControl[2]);
@@ -316,7 +379,16 @@ export default class OutfittingPage extends Page {
      opponentWep = 2;
    }

-    this.setState({ opponent: opponentShip, opponentBuild, opponentSys, opponentEng, opponentWep }, () =>  this._updateRouteOnControlChange());
+    this.setState(
+      {
+        opponent: opponentShip,
+        opponentBuild,
+        opponentSys,
+        opponentEng,
+        opponentWep
+      },
+      () => this._updateRouteOnControlChange()
+    );
  }

  /**
@@ -326,8 +398,22 @@ export default class OutfittingPage extends Page {
   * @returns {string}        The control code
   */
  _controlCode(fuel, cargo) {
-    const { sys, eng, wep, mcSys, mcEng, mcWep, boost, opponent, opponentBuild, engagementRange } = this.state;
-    const code = `${sys}/${eng}/${wep}/${boost ? 1 : 0}/${fuel || this.state.fuel}/${cargo || this.state.cargo}/${opponent.id}/${opponentBuild ? opponentBuild : ''}/${engagementRange}/${mcSys}/${mcEng}/${mcWep}`;
+    const {
+      sys,
+      eng,
+      wep,
+      mcSys,
+      mcEng,
+      mcWep,
+      boost,
+      opponent,
+      opponentBuild,
+      engagementRange
+    } = this.state;
+    const code = `${sys}/${eng}/${wep}/${boost ? 1 : 0}/${fuel ||
+      this.state.fuel}/${cargo || this.state.cargo}/${opponent.id}/${
+      opponentBuild ? opponentBuild : ''
+    }/${engagementRange}/${mcSys}/${mcEng}/${mcWep}`;
    return code;
  }

@@ -338,27 +424,44 @@ export default class OutfittingPage extends Page {
    const { ship, buildName, newBuildName, shipId } = this.state;

    // If this is a stock ship the code won't be set, so ensure that we have it
-    const code =  this.state.code || ship.toString();
+    const code = this.state.code || ship.toString();

    Persist.saveBuild(shipId, newBuildName, code);
    this._updateRoute(shipId, newBuildName, code);

    let opponent, opponentBuild, opponentSys, opponentEng, opponentWep;
-    if (shipId === this.state.opponent.id && buildName === this.state.opponentBuild) {
+    if (
+      shipId === this.state.opponent.id &&
+      buildName === this.state.opponentBuild
+    ) {
      // This is a save of our current opponent build; update it
      opponentBuild = newBuildName;
-      opponent  = new Ship(shipId, Ships[shipId].properties, Ships[shipId].slots).buildFrom(code);
+      opponent = new Ship(
+        shipId,
+        Ships[shipId].properties,
+        Ships[shipId].slots
+      ).buildFrom(code);
      opponentSys = this.state.sys;
      opponentEng = this.state.eng;
      opponentWep = this.state.wep;
    } else {
      opponentBuild = this.state.opponentBuild;
-      opponent  = this.state.opponent;
+      opponent = this.state.opponent;
      opponentSys = this.state.opponentSys;
      opponentEng = this.state.opponentEng;
      opponentWep = this.state.opponentWep;
    }
-    this.setState({ buildName: newBuildName, code, savedCode: code, opponent, opponentBuild, opponentSys, opponentEng, opponentWep, title: this._getTitle(newBuildName) });
+    this.setState({
+      buildName: newBuildName,
+      code,
+      savedCode: code,
+      opponent,
+      opponentBuild,
+      opponentSys,
+      opponentEng,
+      opponentWep,
+      title: this._getTitle(newBuildName)
+    });
  }

  /**
@@ -370,7 +473,12 @@ export default class OutfittingPage extends Page {
      Persist.deleteBuild(shipId, buildName);
      Persist.saveBuild(shipId, newBuildName, code);
      this._updateRoute(shipId, newBuildName, code);
-      this.setState({ buildName: newBuildName, code, savedCode: code, opponentBuild: newBuildName });
+      this.setState({
+        buildName: newBuildName,
+        code,
+        savedCode: code,
+        opponentBuild: newBuildName
+      });
    }
  }

@@ -390,9 +498,7 @@ export default class OutfittingPage extends Page {
    ship.buildWith(Ships[shipId].defaults);
    // Reset controls
    const code = ship.toString();
-    const { sys, eng, wep, mcSys, mcEng, mcWep, boost, fuel, cargo, opponent, opponentBuild, engagementRange } = this._obtainControlFromCode(ship, code);
-    // Update state, and refresh the ship
-    this.setState({
+    const {
      sys,
      eng,
      wep,
@@ -405,7 +511,25 @@ export default class OutfittingPage extends Page {
      opponent,
      opponentBuild,
      engagementRange
-    }, () => this._updateRoute(shipId, buildName, code));
+    } = this._obtainControlFromCode(ship, code);
+    // Update state, and refresh the ship
+    this.setState(
+      {
+        sys,
+        eng,
+        wep,
+        mcSys,
+        mcEng,
+        mcWep,
+        boost,
+        fuel,
+        cargo,
+        opponent,
+        opponentBuild,
+        engagementRange
+      },
+      () => this._updateRoute(shipId, buildName, code)
+    );
  }

  /**
@@ -416,7 +540,10 @@ export default class OutfittingPage extends Page {
    Persist.deleteBuild(shipId, buildName);

    let opponentBuild;
-    if (shipId === this.state.opponent.id && buildName === this.state.opponentBuild) {
+    if (
+      shipId === this.state.opponent.id &&
+      buildName === this.state.opponentBuild
+    ) {
      // Our current opponent has been deleted; revert to stock
      opponentBuild = null;
    } else {
@@ -433,11 +560,13 @@ export default class OutfittingPage extends Page {
  _exportBuild() {
    let translate = this.context.language.translate;
    let { buildName, ship } = this.state;
-    this.context.showModal(<ModalExport
-      title={(buildName || ship.name) + ' ' + translate('export')}
-      description={translate('PHRASE_EXPORT_DESC')}
-      data={toDetailedBuild(buildName, ship, ship.toString())}
-    />);
+    this.context.showModal(
+      <ModalExport
+        title={(buildName || ship.name) + ' ' + translate('export')}
+        description={translate('PHRASE_EXPORT_DESC')}
+        data={toDetailedBuild(buildName, ship, ship.toString())}
+      />
+    );
  }

  /**
@@ -450,9 +579,7 @@ export default class OutfittingPage extends Page {
    this.state.ship.buildFrom(code);

    // Obtain controls from the code
-    const { sys, eng, wep, mcSys, mcEng, mcWep, boost, fuel, cargo, opponent, opponentBuild, engagementRange } = this._obtainControlFromCode(ship, code);
-    // Update state, and refresh the route when complete
-    this.setState({
+    const {
      sys,
      eng,
      wep,
@@ -465,7 +592,25 @@ export default class OutfittingPage extends Page {
      opponent,
      opponentBuild,
      engagementRange
-    }, () => this._updateRoute(shipId, buildName, code));
+    } = this._obtainControlFromCode(ship, code);
+    // Update state, and refresh the route when complete
+    this.setState(
+      {
+        sys,
+        eng,
+        wep,
+        mcSys,
+        mcEng,
+        mcWep,
+        boost,
+        fuel,
+        cargo,
+        opponent,
+        opponentBuild,
+        engagementRange
+      },
+      () => this._updateRoute(shipId, buildName, code)
+    );
  }

  /**
@@ -481,8 +626,14 @@ export default class OutfittingPage extends Page {
    }
    const code = this._fullCode(ship, fuel, cargo);
    // Only update the state if this really has been updated
-    if (this.state.code != code || this.state.cargo != cargo || this.state.fuel != fuel) {
-      this.setState({ code, cargo, fuel }, () => this._updateRoute(shipId, buildName, code));
+    if (
+      this.state.code != code ||
+      this.state.cargo != cargo ||
+      this.state.fuel != fuel
+    ) {
+      this.setState({ code, cargo, fuel }, () =>
+        this._updateRoute(shipId, buildName, code)
+      );
    }
  }

@@ -502,7 +653,8 @@ export default class OutfittingPage extends Page {
   * @param  {Object} nextContext Incoming/Next conext
   */
  componentWillReceiveProps(nextProps, nextContext) {
-    if (this.context.route !== nextContext.route) {  // Only reinit state if the route has changed
+    if (this.context.route !== nextContext.route) {
+      // Only reinit state if the route has changed
      this.setState(this._initState(nextProps, nextContext));
    }
  }
@@ -525,7 +677,7 @@ export default class OutfittingPage extends Page {
   * Generates the short URL
   */
  _genShortlink() {
-    this.context.showModal(<ModalPermalink url={window.location.href}/>);
+    this.context.showModal(<ModalPermalink url={window.location.href} />);
  }

  /**
@@ -542,7 +694,7 @@ export default class OutfittingPage extends Page {
    data.ShipName = ship.id;
    data.Ship = ship.id;
    console.log(data);
-    this.context.showModal(<ModalOrbis ship={data}/>);
+    this.context.showModal(<ModalOrbis ship={data} />);
  }

  /**
@@ -553,17 +705,23 @@ export default class OutfittingPage extends Page {

    const shipId = Ships[ship.id].eddbID;
    // Provide unique list of non-PP module EDDB IDs
-    const modIds = ship.internal.concat(ship.bulkheads, ship.standard, ship.hardpoints).filter(slot => slot !== null && slot.m !== null && !slot.m.pp).map(slot => slot.m.eddbID).filter((v, i, a) => a.indexOf(v) === i);
+    const modIds = ship.internal
+      .concat(ship.bulkheads, ship.standard, ship.hardpoints)
+      .filter(slot => slot !== null && slot.m !== null && !slot.m.pp)
+      .map(slot => slot.m.eddbID)
+      .filter((v, i, a) => a.indexOf(v) === i);

    // Open up the relevant URL
-    window.open('https://eddb.io/station?s=' + shipId + '&m=' + modIds.join(','));
+    window.open(
+      'https://eddb.io/station?s=' + shipId + '&m=' + modIds.join(',')
+    );
  }

  /**
   * Generates the shopping list
   */
  _genShoppingList() {
-    this.context.showModal(<ModalShoppingList ship={this.state.ship}/>);
+    this.context.showModal(<ModalShoppingList ship={this.state.ship} />);
  }

  /**
@@ -573,8 +731,9 @@ export default class OutfittingPage extends Page {
  _keyDown(e) {
    // .keyCode will eventually be replaced with .key
    switch (e.keyCode) {
-      case 69:     // 'e'
-        if (e.ctrlKey || e.metaKey) { // CTRL/CMD + e
+      case 69: // 'e'
+        if (e.ctrlKey || e.metaKey) {
+          // CTRL/CMD + e
          e.preventDefault();
          this._exportBuild();
        }
@@ -590,7 +749,28 @@ export default class OutfittingPage extends Page {
    let state = this.state,
        { language, termtip, tooltip, sizeRatio, onWindowResize } = this.context,
        { translate, units, formats } = language,
-        { ship, code, savedCode, buildName, newBuildName, sys, eng, wep, mcSys, mcEng, mcWep, boost, fuel, cargo, opponent, opponentBuild, opponentSys, opponentEng, opponentWep, engagementRange } = state,
+        {
+          ship,
+          code,
+          savedCode,
+          buildName,
+          newBuildName,
+          sys,
+          eng,
+          wep,
+          mcSys,
+          mcEng,
+          mcWep,
+          boost,
+          fuel,
+          cargo,
+          opponent,
+          opponentBuild,
+          opponentSys,
+          opponentEng,
+          opponentWep,
+          engagementRange
+        } = state,
        hide = tooltip.bind(null, null),
        menu = this.props.currentMenu,
        shipUpdated = this._shipUpdated,
@@ -608,11 +788,15 @@ export default class OutfittingPage extends Page {
    const _pStr = `${ship.getPowerEnabledString()}${ship.getPowerPrioritiesString()}`;
    const _mStr = ship.getModificationsString();

-    const standardSlotMarker = `${ship.name}${_sStr}${_pStr}${_mStr}${ship.ladenMass}${cargo}${fuel}`;
+    const standardSlotMarker = `${ship.name}${_sStr}${_pStr}${_mStr}${
+      ship.ladenMass
+    }${cargo}${fuel}`;
    const internalSlotMarker = `${ship.name}${_iStr}${_pStr}${_mStr}`;
    const hardpointsSlotMarker = `${ship.name}${_hStr}${_pStr}${_mStr}`;
    const boostMarker = `${ship.canBoost(cargo, fuel)}`;
-    const shipSummaryMarker = `${ship.name}${_sStr}${_iStr}${_hStr}${_pStr}${_mStr}${ship.ladenMass}${cargo}${fuel}`;
+    const shipSummaryMarker = `${
+      ship.name
+    }${_sStr}${_iStr}${_hStr}${_pStr}${_mStr}${ship.ladenMass}${cargo}${fuel}`;

    const requirements = Ships[ship.id].requirements;
    let requirementElements = [];
@@ -624,94 +808,275 @@ export default class OutfittingPage extends Page {
     */
    function renderRequirement(className, textKey, tooltipTextKey) {
      if (textKey.startsWith('empire') || textKey.startsWith('federation')) {
-        requirementElements.push(<div key={textKey} className={className} onMouseEnter={termtip.bind(null, tooltipTextKey)} onMouseLeave={hide}><a href={textKey.startsWith('empire') ? 'http://elite-dangerous.wikia.com/wiki/Empire/Ranks' : 'http://elite-dangerous.wikia.com/wiki/Federation/Ranks'} target="_blank" rel="noopener">{translate(textKey)}</a></div>);
+        requirementElements.push(
+          <div
+            key={textKey}
+            className={className}
+            onMouseEnter={termtip.bind(null, tooltipTextKey)}
+            onMouseLeave={hide}
+          >
+            <a
+              href={
+                textKey.startsWith('empire') ?
+                  'http://elite-dangerous.wikia.com/wiki/Empire/Ranks' :
+                  'http://elite-dangerous.wikia.com/wiki/Federation/Ranks'
+              }
+              target="_blank"
+              rel="noopener"
+            >
+              {translate(textKey)}
+            </a>
+          </div>
+        );
      } else {
-        requirementElements.push(<div key={textKey} className={className} onMouseEnter={termtip.bind(null, tooltipTextKey)} onMouseLeave={hide}>{translate(textKey)}</div>);
+        requirementElements.push(
+          <div
+            key={textKey}
+            className={className}
+            onMouseEnter={termtip.bind(null, tooltipTextKey)}
+            onMouseLeave={hide}
+          >
+            {translate(textKey)}
+          </div>
+        );
      }
    }

    if (requirements) {
-      requirements.federationRank && renderRequirement('federation', 'federation rank ' + requirements.federationRank, 'federation rank required');
-      requirements.empireRank && renderRequirement('empire', 'empire rank ' + requirements.empireRank, 'empire rank required');
-      requirements.horizons && renderRequirement('horizons', 'horizons', 'horizons required');
-      requirements.horizonsEarlyAdoption && renderRequirement('horizons', 'horizons early adoption', 'horizons early adoption required');
+      requirements.federationRank &&
+        renderRequirement(
+          'federation',
+          'federation rank ' + requirements.federationRank,
+          'federation rank required'
+        );
+      requirements.empireRank &&
+        renderRequirement(
+          'empire',
+          'empire rank ' + requirements.empireRank,
+          'empire rank required'
+        );
+      requirements.horizons &&
+        renderRequirement('horizons', 'horizons', 'horizons required');
+      requirements.horizonsEarlyAdoption &&
+        renderRequirement(
+          'horizons',
+          'horizons early adoption',
+          'horizons early adoption required'
+        );
    }

    return (
-      <div id='outfit' className={'page'} style={{ fontSize: (sizeRatio * 0.9) + 'em' }}>
-        <div id='overview'>
+      <div
+        id="outfit"
+        className={'page'}
+        style={{ fontSize: sizeRatio * 0.9 + 'em' }}
+      >
+        <div id="overview">
          <h1>{ship.name}</h1>
-          <div id='requirements'>{requirementElements}</div>
-          <div id='build'>
-            <input value={newBuildName || ''} onChange={this._buildNameChange} placeholder={translate('Enter Name')} maxLength={50} />
-            <button onClick={canSave && this._saveBuild} disabled={!canSave} onMouseOver={termtip.bind(null, 'save')} onMouseOut={hide}>
-              <FloppyDisk className='lg' />
+          <div id="requirements">{requirementElements}</div>
+          <div id="build">
+            <input
+              value={newBuildName || ''}
+              onChange={this._buildNameChange}
+              placeholder={translate('Enter Name')}
+              maxLength={50}
+            />
+            <button
+              onClick={canSave && this._saveBuild}
+              disabled={!canSave}
+              onMouseOver={termtip.bind(null, 'save')}
+              onMouseOut={hide}
+            >
+              <FloppyDisk className="lg" />
            </button>
-            <button onClick={canRename && this._renameBuild} disabled={!canRename} onMouseOver={termtip.bind(null, 'rename')} onMouseOut={hide}>
-            <span style={{ textTransform: 'none', fontSize: '1.8em' }}>a|</span>
+            <button
+              onClick={canRename && this._renameBuild}
+              disabled={!canRename}
+              onMouseOver={termtip.bind(null, 'rename')}
+              onMouseOut={hide}
+            >
+              <span style={{ textTransform: 'none', fontSize: '1.8em' }}>
+                a|
+              </span>
            </button>
-            <button onClick={canReload && this._reloadBuild} disabled={!canReload} onMouseOver={termtip.bind(null, 'reload')} onMouseOut={hide}>
-              <Reload className='lg'/>
+            <button
+              onClick={canReload && this._reloadBuild}
+              disabled={!canReload}
+              onMouseOver={termtip.bind(null, 'reload')}
+              onMouseOut={hide}
+            >
+              <Reload className="lg" />
            </button>
-            <button className={'danger'} onClick={savedCode && this._deleteBuild} disabled={!savedCode} onMouseOver={termtip.bind(null, 'delete')} onMouseOut={hide}>
-              <Bin className='lg'/>
+            <button
+              className={'danger'}
+              onClick={savedCode && this._deleteBuild}
+              disabled={!savedCode}
+              onMouseOver={termtip.bind(null, 'delete')}
+              onMouseOut={hide}
+            >
+              <Bin className="lg" />
            </button>
-            <button onClick={code && this._resetBuild} disabled={!code} onMouseOver={termtip.bind(null, 'reset')} onMouseOut={hide}>
-              <Switch className='lg'/>
+            <button
+              onClick={code && this._resetBuild}
+              disabled={!code}
+              onMouseOver={termtip.bind(null, 'reset')}
+              onMouseOut={hide}
+            >
+              <Switch className="lg" />
            </button>
-            <button onClick={buildName && this._exportBuild} disabled={!buildName} onMouseOver={termtip.bind(null, 'export')} onMouseOut={hide}>
-              <Download className='lg'/>
+            <button
+              onClick={buildName && this._exportBuild}
+              disabled={!buildName}
+              onMouseOver={termtip.bind(null, 'export')}
+              onMouseOut={hide}
+            >
+              <Download className="lg" />
            </button>
-            <button onClick={this._eddbShoppingList} onMouseOver={termtip.bind(null, 'PHRASE_SHOPPING_LIST')} onMouseOut={hide}>
-              <ShoppingIcon className='lg' />
+            <button
+              onClick={this._eddbShoppingList}
+              onMouseOver={termtip.bind(null, 'PHRASE_SHOPPING_LIST')}
+              onMouseOut={hide}
+            >
+              <ShoppingIcon className="lg" />
            </button>
-            <button onClick={this._genShortlink} onMouseOver={termtip.bind(null, 'shortlink')} onMouseOut={hide}>
-              <LinkIcon className='lg' />
+            <button
+              onClick={this._genShortlink}
+              onMouseOver={termtip.bind(null, 'shortlink')}
+              onMouseOut={hide}
+            >
+              <LinkIcon className="lg" />
            </button>
-            <button onClick={this._genOrbis} onMouseOver={termtip.bind(null, 'PHASE_UPLOAD_ORBIS')} onMouseOut={hide}>
-              <OrbisIcon className='lg' />
+            <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')} onMouseOut={hide}>
-              <MatIcon className='lg' />
+            <button
+              onClick={this._genShoppingList}
+              onMouseOver={termtip.bind(null, 'PHRASE_SHOPPING_MATS')}
+              onMouseOut={hide}
+            >
+              <MatIcon className="lg" />
            </button>
          </div>
        </div>

        {/* Main tables */}
-        <ShipSummaryTable ship={ship} fuel={fuel} cargo={cargo} marker={shipSummaryMarker} pips={{ sys: this.state.sys, wep: this.state.wep, eng: this.state.eng }} />
-        <StandardSlotSection ship={ship} fuel={fuel} cargo={cargo} code={standardSlotMarker} onChange={shipUpdated} onCargoChange={this._cargoUpdated} onFuelChange={this._fuelUpdated} currentMenu={menu} sectionMenuRefs={this._sectionMenuRefs}/>
-        <InternalSlotSection ship={ship} code={internalSlotMarker} onChange={shipUpdated} onCargoChange={this._cargoUpdated} onFuelChange={this._fuelUpdated} currentMenu={menu} sectionMenuRefs={this._sectionMenuRefs}/>
-        <HardpointSlotSection ship={ship} code={hardpointsSlotMarker} onChange={shipUpdated} onCargoChange={this._cargoUpdated} onFuelChange={this._fuelUpdated} currentMenu={menu} sectionMenuRefs={this._sectionMenuRefs}/>
-        <UtilitySlotSection ship={ship} code={hardpointsSlotMarker} onChange={shipUpdated} onCargoChange={this._cargoUpdated} onFuelChange={this._fuelUpdated} currentMenu={menu} sectionMenuRefs={this._sectionMenuRefs}/>
+        <ShipSummaryTable
+          ship={ship}
+          fuel={fuel}
+          cargo={cargo}
+          marker={shipSummaryMarker}
+          pips={{
+            sys: this.state.sys,
+            wep: this.state.wep,
+            eng: this.state.eng
+          }}
+        />
+        <StandardSlotSection
+          ship={ship}
+          fuel={fuel}
+          cargo={cargo}
+          code={standardSlotMarker}
+          onChange={shipUpdated}
+          onCargoChange={this._cargoUpdated}
+          onFuelChange={this._fuelUpdated}
+          currentMenu={menu}
+          sectionMenuRefs={this._sectionMenuRefs}
+        />
+        <InternalSlotSection
+          ship={ship}
+          code={internalSlotMarker}
+          onChange={shipUpdated}
+          onCargoChange={this._cargoUpdated}
+          onFuelChange={this._fuelUpdated}
+          currentMenu={menu}
+          sectionMenuRefs={this._sectionMenuRefs}
+        />
+        <HardpointSlotSection
+          ship={ship}
+          code={hardpointsSlotMarker}
+          onChange={shipUpdated}
+          onCargoChange={this._cargoUpdated}
+          onFuelChange={this._fuelUpdated}
+          currentMenu={menu}
+          sectionMenuRefs={this._sectionMenuRefs}
+        />
+        <UtilitySlotSection
+          ship={ship}
+          code={hardpointsSlotMarker}
+          onChange={shipUpdated}
+          onCargoChange={this._cargoUpdated}
+          onFuelChange={this._fuelUpdated}
+          currentMenu={menu}
+          sectionMenuRefs={this._sectionMenuRefs}
+        />

        {/* Control of ship and opponent */}
-        <div className='group quarter'>
-          <div className='group half'>
-            <h2 style={{ verticalAlign: 'middle', textAlign: 'left' }}>{translate('ship control')}</h2>
+        <div className="group quarter">
+          <div className="group half">
+            <h2 style={{ verticalAlign: 'middle', textAlign: 'left' }}>
+              {translate('ship control')}
+            </h2>
          </div>
-          <div className='group half'>
-            <Boost marker={boostMarker} ship={ship} boost={boost} onChange={this._boostUpdated} />
+          <div className="group half">
+            <Boost
+              marker={boostMarker}
+              ship={ship}
+              boost={boost}
+              onChange={this._boostUpdated}
+            />
          </div>
        </div>
-        <div className='group quarter'>
-          <Pips sys={sys} eng={eng} wep={wep} mcSys={mcSys} mcEng={mcEng} mcWep={mcWep} onChange={this._pipsUpdated} />
+        <div className="group quarter">
+          <Pips
+            sys={sys}
+            eng={eng}
+            wep={wep}
+            mcSys={mcSys}
+            mcEng={mcEng}
+            mcWep={mcWep}
+            onChange={this._pipsUpdated}
+          />
        </div>
-        <div className='group quarter'>
-          <Fuel fuelCapacity={ship.fuelCapacity} fuel={fuel} onChange={this._fuelUpdated}/>
+        <div className="group quarter">
+          <Fuel
+            fuelCapacity={ship.fuelCapacity}
+            fuel={fuel}
+            onChange={this._fuelUpdated}
+          />
        </div>
-        <div className='group quarter'>
-          { ship.cargoCapacity > 0 ? <Cargo cargoCapacity={ship.cargoCapacity} cargo={cargo} onChange={this._cargoUpdated}/> : null }
+        <div className="group quarter">
+          {ship.cargoCapacity > 0 ? (
+            <Cargo
+              cargoCapacity={ship.cargoCapacity}
+              cargo={cargo}
+              onChange={this._cargoUpdated}
+            />
+          ) : null}
        </div>
-        <div className='group half'>
-          <div className='group quarter'>
-            <h2 style={{ verticalAlign: 'middle', textAlign: 'left' }}>{translate('opponent')}</h2>
+        <div className="group half">
+          <div className="group quarter">
+            <h2 style={{ verticalAlign: 'middle', textAlign: 'left' }}>
+              {translate('opponent')}
+            </h2>
          </div>
-          <div className='group threequarters'>
-            <ShipPicker ship={opponent.id} build={opponentBuild} onChange={this._opponentUpdated}/>
+          <div className="group threequarters">
+            <ShipPicker
+              ship={opponent.id}
+              build={opponentBuild}
+              onChange={this._opponentUpdated}
+            />
          </div>
        </div>
-        <div className='group half'>
-          <EngagementRange ship={ship} engagementRange={engagementRange} onChange={this._engagementRangeUpdated}/>
+        <div className="group half">
+          <EngagementRange
+            ship={ship}
+            engagementRange={engagementRange}
+            onChange={this._engagementRangeUpdated}
+          />
        </div>

        {/* Tabbed subpages */}
--- a/src/app/pages/Page.jsx
+++ b/src/app/pages/Page.jsx
@@ -51,22 +51,16 @@ export default class Page extends React.Component {
  }

  /**
-   * Pages are 'pure' components that only render when props, state, or context changes.
-   * This method performs a shallow comparison to determine change.
-   *
-   * @param  {Object} np  Next/Incoming properties
-   * @param  {Object} ns  Next/Incoming state
-   * @param  {Object} nc  Next/Incoming context
-   * @return {Boolean}    True if props, state, or context has changed
+   * Update the window title upon mount
   */
-  shouldComponentUpdate(np, ns, nc) {
-    return !shallowEqual(this.props, np) || !shallowEqual(this.state, ns) || !shallowEqual(this.context, nc);
+  componentWillMount() {
+    document.title = this.state.title || 'Coriolis';
  }

  /**
   * Update the window title upon mount
   */
-  componentWillMount() {
+  componentDidMount() {
    document.title = this.state.title || 'Coriolis';
  }

--- a/src/app/pages/ShipyardPage.jsx
+++ b/src/app/pages/ShipyardPage.jsx
@@ -22,9 +22,11 @@ function countHp(slot) {
 */
 function countInt(slot) {
  let crEligible = !slot.eligible || slot.eligible.cr;
-  this.int[slot.maxClass - 1]++;  // Subtract 1 since there is no Class 0 Internal compartment
+  this.int[slot.maxClass - 1]++; // Subtract 1 since there is no Class 0 Internal compartment
  this.intCount++;
-  this.maxCargo += crEligible ? ModuleUtils.findInternal('cr', slot.maxClass, 'E').cargo : 0;
+  this.maxCargo += crEligible ?
+    ModuleUtils.findInternal('cr', slot.maxClass, 'E').cargo :
+    0;

  // if no eligiblity, then assume pce
  let passSlotType = null;
@@ -42,7 +44,9 @@ function countInt(slot) {
    passSlotType = 'pcq';
    passSlotRating = 'B';
  }
-  let passengerBay = passSlotType ? ModuleUtils.findMaxInternal(passSlotType, slot.maxClass, passSlotRating) : null;
+  let passengerBay = passSlotType ?
+    ModuleUtils.findMaxInternal(passSlotType, slot.maxClass, passSlotRating) :
+    null;
  this.maxPassengers += passengerBay ? passengerBay.passengers : 0;
 }

@@ -57,23 +61,27 @@ function shipSummary(shipId, shipData) {
    id: shipId,
    hpCount: 0,
    intCount: 0,
+    beta: shipData.beta,
    maxCargo: 0,
    maxPassengers: 0,
    hp: [0, 0, 0, 0, 0], // Utility, Small, Medium, Large, Huge
    int: [0, 0, 0, 0, 0, 0, 0, 0], // Sizes 1 - 8
    standard: shipData.slots.standard,
-    agility: shipData.properties.pitch + shipData.properties.yaw + shipData.properties.roll
+    agility:
+      shipData.properties.pitch +
+      shipData.properties.yaw +
+      shipData.properties.roll
  };
  Object.assign(summary, shipData.properties);
  let ship = new Ship(shipId, shipData.properties, shipData.slots);

  // Build Ship
-  ship.buildWith(shipData.defaults);              // Populate with stock/default components
+  ship.buildWith(shipData.defaults); // Populate with stock/default components
  ship.hardpoints.forEach(countHp.bind(summary)); // Count Hardpoints by class
-  ship.internal.forEach(countInt.bind(summary));  // Count Internal Compartments by class
-  summary.retailCost = ship.totalCost;            // Record Stock/Default/retail cost
-  ship.optimizeMass({ pd: '1D' });                // Optimize Mass with 1D PD for maximum possible jump range
-  summary.maxJumpRange = ship.unladenRange;       // Record Jump Range
+  ship.internal.forEach(countInt.bind(summary)); // Count Internal Compartments by class
+  summary.retailCost = ship.totalCost; // Record Stock/Default/retail cost
+  ship.optimizeMass({ pd: '1D' }); // Optimize Mass with 1D PD for maximum possible jump range
+  summary.maxJumpRange = ship.unladenRange; // Record Jump Range

  // Best thrusters
  let th;
@@ -97,7 +105,6 @@ function shipSummary(shipId, shipData) {
 * The Shipyard summary page
 */
 export default class ShipyardPage extends Page {
-
  static cachedShipSummaries = null;

  /**
@@ -119,12 +126,14 @@ export default class ShipyardPage extends Page {
      title: 'Coriolis EDCD Edition - Shipyard',
      shipPredicate: 'name',
      shipDesc: true,
-      shipSummaries: ShipyardPage.cachedShipSummaries
+      shipSummaries: ShipyardPage.cachedShipSummaries,
+      compare: {},
+      groupCompared: false,
    };
  }

  /**
-   * Higlight the current ship in the table
+   * Higlight the current ship in the table on mouse over
   * @param  {String} shipId Ship Id
   * @param  {SyntheticEvent} event  Event
   */
@@ -133,6 +142,24 @@ export default class ShipyardPage extends Page {
    this.setState({ shipId });
  }

+  /**
+   * Toggle compare highlighting for ships in the table
+   * @param {String} shipId Ship Id
+   */
+  _toggleCompare(shipId) {
+    let compare = this.state.compare;
+    compare[shipId] = !compare[shipId];
+    this.setState({ compare });
+  }
+
+  /**
+   * Toggle grouping of compared ships in the table
+   * @private
+   */
+  _toggleGroupCompared() {
+    this.setState({groupCompared: !this.state.groupCompared})
+  }
+
  /**
   * Update state with the specified sort predicates
   * @param  {String} shipPredicate      Sort predicate - property name
@@ -145,12 +172,15 @@ export default class ShipyardPage extends Page {
      shipPredicateIndex = undefined;
    }

-    if (this.state.shipPredicate == shipPredicate && this.state.shipPredicateIndex == shipPredicateIndex) {
+    if (
+      this.state.shipPredicate == shipPredicate &&
+      this.state.shipPredicateIndex == shipPredicateIndex
+    ) {
      shipDesc = !shipDesc;
    }

    this.setState({ shipPredicate, shipDesc, shipPredicateIndex });
-  };
+  }

  /**
   * Generate the table row summary for the ship
@@ -159,56 +189,61 @@ export default class ShipyardPage extends Page {
   * @param  {Object} u           Localized unit map
   * @param  {Function} fInt      Localized integer formatter
   * @param  {Function} fRound    Localized round formatter
-   * @param  {Boolean} highlight  Should this row be highlighted
   * @return {React.Component}    Table Row
   */
-  _shipRowElement(s, translate, u, fInt, fRound, highlight) {
+  _shipRowElement(s, translate, u, fInt, fRound) {
    let noTouch = this.context.noTouch;

-    return <tr
+    return (
+      <tr
        key={s.id}
        style={{ height: '1.5em' }}
-        className={cn({ highlighted: noTouch && this.state.shipId === s.id, alt: highlight })}
+        className={cn({
+          highlighted: noTouch && this.state.shipId === s.id,
+          comparehighlight: this.state.compare[s.id],
+        })}
        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>
-      <td className='ri'>{s.masslock}</td>
-      <td className='ri'>{fInt(s.agility)}</td>
-      <td className='ri'>{fInt(s.hardness)}</td>
-      <td className='ri'>{fInt(s.hullMass)}</td>
-      <td className='ri'>{fInt(s.speed)}</td>
-      <td className='ri'>{fInt(s.boost)}</td>
-      <td className='ri'>{fInt(s.baseArmour)}</td>
-      <td className='ri'>{fInt(s.baseShieldStrength)}</td>
-      <td className='ri'>{fInt(s.topSpeed)}</td>
-      <td className='ri'>{fInt(s.topBoost)}</td>
-      <td className='ri'>{fRound(s.maxJumpRange)}</td>
-      <td className='ri'>{fInt(s.maxCargo)}</td>
-      <td className='ri'>{fInt(s.maxPassengers)}</td>
-      <td className='cn'>{s.standard[0]}</td>
-      <td className='cn'>{s.standard[1]}</td>
-      <td className='cn'>{s.standard[2]}</td>
-      <td className='cn'>{s.standard[3]}</td>
-      <td className='cn'>{s.standard[4]}</td>
-      <td className='cn'>{s.standard[5]}</td>
-      <td className='cn'>{s.standard[6]}</td>
-      <td className={cn({ disabled: !s.hp[1] })}>{s.hp[1]}</td>
-      <td className={cn({ disabled: !s.hp[2] })}>{s.hp[2]}</td>
-      <td className={cn({ disabled: !s.hp[3] })}>{s.hp[3]}</td>
-      <td className={cn({ disabled: !s.hp[4] })}>{s.hp[4]}</td>
-      <td className={cn({ disabled: !s.hp[0] })}>{s.hp[0]}</td>
-      <td className={cn({ disabled: !s.int[0] })}>{s.int[0]}</td>
-      <td className={cn({ disabled: !s.int[1] })}>{s.int[1]}</td>
-      <td className={cn({ disabled: !s.int[2] })}>{s.int[2]}</td>
-      <td className={cn({ disabled: !s.int[3] })}>{s.int[3]}</td>
-      <td className={cn({ disabled: !s.int[4] })}>{s.int[4]}</td>
-      <td className={cn({ disabled: !s.int[5] })}>{s.int[5]}</td>
-      <td className={cn({ disabled: !s.int[6] })}>{s.int[6]}</td>
-      <td className={cn({ disabled: !s.int[7] })}>{s.int[7]}</td>
-    </tr>;
+        <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>
+        <td className="ri">{s.masslock}</td>
+        <td className="ri">{fInt(s.agility)}</td>
+        <td className="ri">{fInt(s.hardness)}</td>
+        <td className="ri">{fInt(s.hullMass)}</td>
+        <td className="ri">{fInt(s.speed)}</td>
+        <td className="ri">{fInt(s.boost)}</td>
+        <td className="ri">{fInt(s.baseArmour)}</td>
+        <td className="ri">{fInt(s.baseShieldStrength)}</td>
+        <td className="ri">{fInt(s.topSpeed)}</td>
+        <td className="ri">{fInt(s.topBoost)}</td>
+        <td className="ri">{fRound(s.maxJumpRange)}</td>
+        <td className="ri">{fInt(s.maxCargo)}</td>
+        <td className="ri">{fInt(s.maxPassengers)}</td>
+        <td className="cn">{s.standard[0]}</td>
+        <td className="cn">{s.standard[1]}</td>
+        <td className="cn">{s.standard[2]}</td>
+        <td className="cn">{s.standard[3]}</td>
+        <td className="cn">{s.standard[4]}</td>
+        <td className="cn">{s.standard[5]}</td>
+        <td className="cn">{s.standard[6]}</td>
+        <td className={cn({ disabled: !s.hp[1] })}>{s.hp[1]}</td>
+        <td className={cn({ disabled: !s.hp[2] })}>{s.hp[2]}</td>
+        <td className={cn({ disabled: !s.hp[3] })}>{s.hp[3]}</td>
+        <td className={cn({ disabled: !s.hp[4] })}>{s.hp[4]}</td>
+        <td className={cn({ disabled: !s.hp[0] })}>{s.hp[0]}</td>
+        <td className={cn({ disabled: !s.int[0] })}>{s.int[0]}</td>
+        <td className={cn({ disabled: !s.int[1] })}>{s.int[1]}</td>
+        <td className={cn({ disabled: !s.int[2] })}>{s.int[2]}</td>
+        <td className={cn({ disabled: !s.int[3] })}>{s.int[3]}</td>
+        <td className={cn({ disabled: !s.int[4] })}>{s.int[4]}</td>
+        <td className={cn({ disabled: !s.int[5] })}>{s.int[5]}</td>
+        <td className={cn({ disabled: !s.int[6] })}>{s.int[6]}</td>
+        <td className={cn({ disabled: !s.int[7] })}>{s.int[7]}</td>
+      </tr>
+    );
  }

  /**
@@ -221,8 +256,9 @@ export default class ShipyardPage extends Page {
    let hide = this.context.tooltip.bind(null, null);
    let fInt = formats.int;
    let fRound = formats.round;
-    let { shipSummaries, shipPredicate, shipPredicateIndex } = this.state;
-    let sortShips = (predicate, index) => this._sortShips.bind(this, predicate, index);
+    let { shipSummaries, shipPredicate, shipPredicateIndex, compare, groupCompared } = this.state;
+    let sortShips = (predicate, index) =>
+      this._sortShips.bind(this, predicate, index);

    let filters = {
      // 'class': { 1: 1, 2: 1}
@@ -239,7 +275,8 @@ export default class ShipyardPage extends Page {

    // Sort shipsOverview
    shipSummaries.sort((a, b) => {
-      let valA = a[shipPredicate], valB = b[shipPredicate];
+      let valA = a[shipPredicate],
+          valB = b[shipPredicate];

      if (shipPredicateIndex != undefined) {
        valA = valA[shipPredicateIndex];
@@ -252,7 +289,16 @@ export default class ShipyardPage extends Page {
        valB = val;
      }

-      if(valA == valB) {
+      if (groupCompared) {
+        if (compare[a.id] && !compare[b.id]) {
+          return -1;
+        }
+        if (!compare[a.id] && compare[b.id]) {
+          return 1;
+        }
+      }
+
+      if (valA == valB) {
        if (a.name > b.name) {
          return 1;
        } else {
@@ -269,130 +315,317 @@ export default class ShipyardPage extends Page {
    let shipRows = new Array(shipSummaries.length);
    let detailRows = new Array(shipSummaries.length);

-    let lastShipSortValue = null;
-    let backgroundHighlight = false;
-
    for (let s of shipSummaries) {
-      let shipSortValue = s[shipPredicate];
-      if(shipPredicateIndex != undefined) {
-        shipSortValue = shipSortValue[shipPredicateIndex];
-      }
-
-      if(shipSortValue != lastShipSortValue) {
-        backgroundHighlight = !backgroundHighlight;
-        lastShipSortValue = shipSortValue;
-      }
-
-      detailRows[i] = this._shipRowElement(s, translate, units, fInt, formats.f1, backgroundHighlight);
+      detailRows[i] = this._shipRowElement(
+        s,
+        translate,
+        units,
+        fInt,
+        formats.f1,
+      );
      shipRows[i] = (
        <tr
          key={i}
          style={{ height: '1.5em' }}
-          className={cn({ highlighted: noTouch && this.state.shipId === s.id, alt: backgroundHighlight })}
+          className={cn({
+            highlighted: noTouch && this.state.shipId === s.id,
+            comparehighlight: this.state.compare[s.id],
+          })}
          onMouseEnter={noTouch && this._highlightShip.bind(this, s.id)}
+          onClick={() => this._toggleCompare(s.id)}
        >
-          <td className='le'><Link href={'/outfit/' + s.id}>{s.name}</Link></td>
+          <td className="le">
+            <Link href={'/outfit/' + s.id}>{s.name} {s.beta === true ? '(Beta)' : null}</Link>
+          </td>
        </tr>
      );
      i++;
    }

    return (
-      <div className='page' style={{ fontSize: sizeRatio + 'em' }}>
-        <div style={{ whiteSpace: 'nowrap', margin: '0 auto', fontSize: '0.8em', position: 'relative', display: 'inline-block', maxWidth: '100%' }}>
-          <table style={{ width: '12em', position: 'absolute', zIndex: 1 }}>
+      <div className="page" style={{fontSize: sizeRatio + 'em'}}>
+        <div className="content-wrapper">
+        <div className="shipyard-table-wrapper">
+          <table style={{width: '12em', position: 'absolute', zIndex: 1}} className="shipyard-table">
            <thead>
              <tr>
-                <th className='le rgt'>&nbsp;</th>
+                <th className="le rgt">&nbsp;</th>
              </tr>
-              <tr className='main'>
-                <th className='sortable le rgt' onClick={sortShips('name')}>{translate('ship')}</th>
+              <tr className="main">
+                <th className="sortable le rgt" onClick={sortShips('name')}>
+                  {translate('ship')}
+                </th>
              </tr>
              <tr>
-                <th className='le rgt invisible'>{units['m/s']}</th>
+                <th className="le rgt invisible">{units['m/s']}</th>
              </tr>
            </thead>
            <tbody onMouseLeave={this._highlightShip.bind(this, null)}>
              {shipRows}
            </tbody>
          </table>
-          <div style={{ overflowX: 'scroll', maxWidth: '100%' }}>
-          <table style={{ marginLeft: 'calc(12em - 1px)', zIndex: 0 }}>
-            <thead>
-              <tr className='main'>
-                <th rowSpan={3} className='sortable' onClick={sortShips('manufacturer')}>{translate('manufacturer')}</th>
-                <th>&nbsp;</th>
-                <th rowSpan={3} className='sortable' onClick={sortShips('class')}>{translate('size')}</th>
-                <th rowSpan={3} className='sortable' onClick={sortShips('crew')}>{translate('crew')}</th>
-                <th rowSpan={3} className='sortable' onMouseEnter={termtip.bind(null, 'mass lock factor')} onMouseLeave={hide} onClick={sortShips('masslock')} >{translate('MLF')}</th>
-                <th rowSpan={3} className='sortable' onClick={sortShips('agility')}>{translate('agility')}</th>
-                <th rowSpan={3} className='sortable' onMouseEnter={termtip.bind(null, 'hardness')} onMouseLeave={hide} onClick={sortShips('hardness')}>{translate('hrd')}</th>
-                <th>&nbsp;</th>
-                <th colSpan={4}>{translate('base')}</th>
-                <th colSpan={5}>{translate('max')}</th>
-                <th className='lft' colSpan={7}></th>
-                <th className='lft' colSpan={5}></th>
-                <th className='lft' colSpan={8}></th>
-              </tr>
-              <tr>
-                <th className='sortable lft' onClick={sortShips('retailCost')}>{translate('cost')}</th>
-                <th className='sortable lft' onClick={sortShips('hullMass')}>{translate('hull')}</th>
-                <th className='sortable lft' onClick={sortShips('speed')}>{translate('speed')}</th>
-                <th className='sortable' onClick={sortShips('boost')}>{translate('boost')}</th>
-                <th className='sortable' onClick={sortShips('baseArmour')}>{translate('armour')}</th>
-                <th className='sortable' onClick={sortShips('baseShieldStrength')}>{translate('shields')}</th>
+          <div style={{ overflowX: 'auto', maxWidth: '100%' }}>
+            <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}
+                    className="sortable"
+                    onClick={sortShips('class')}
+                  >
+                    {translate('size')}
+                  </th>
+                  <th
+                    rowSpan={3}
+                    className="sortable"
+                    onClick={sortShips('crew')}
+                  >
+                    {translate('crew')}
+                  </th>
+                  <th
+                    rowSpan={3}
+                    className="sortable"
+                    onMouseEnter={termtip.bind(null, 'mass lock factor')}
+                    onMouseLeave={hide}
+                    onClick={sortShips('masslock')}
+                  >
+                    {translate('MLF')}
+                  </th>
+                  <th
+                    rowSpan={3}
+                    className="sortable"
+                    onClick={sortShips('agility')}
+                  >
+                    {translate('agility')}
+                  </th>
+                  <th
+                    rowSpan={3}
+                    className="sortable"
+                    onMouseEnter={termtip.bind(null, 'hardness')}
+                    onMouseLeave={hide}
+                    onClick={sortShips('hardness')}
+                  >
+                    {translate('hrd')}
+                  </th>
+                  <th>&nbsp;</th>
+                  <th colSpan={4}>{translate('base')}</th>
+                  <th colSpan={5}>{translate('max')}</th>
+                  <th className="lft" colSpan={7} />
+                  <th className="lft" colSpan={5} />
+                  <th className="lft" colSpan={8} />
+                </tr>
+                <tr>
+                  <th
+                    className="sortable lft"
+                    onClick={sortShips('retailCost')}
+                  >
+                    {translate('cost')}
+                  </th>
+                  <th className="sortable lft" onClick={sortShips('hullMass')}>
+                    {translate('hull')}
+                  </th>
+                  <th className="sortable lft" onClick={sortShips('speed')}>
+                    {translate('speed')}
+                  </th>
+                  <th className="sortable" onClick={sortShips('boost')}>
+                    {translate('boost')}
+                  </th>
+                  <th className="sortable" onClick={sortShips('baseArmour')}>
+                    {translate('armour')}
+                  </th>
+                  <th
+                    className="sortable"
+                    onClick={sortShips('baseShieldStrength')}
+                  >
+                    {translate('shields')}
+                  </th>

-                <th className='sortable lft' onClick={sortShips('topSpeed')}>{translate('speed')}</th>
-                <th className='sortable' onClick={sortShips('topBoost')}>{translate('boost')}</th>
-                <th className='sortable' onClick={sortShips('maxJumpRange')}>{translate('jump')}</th>
-                <th className='sortable' onClick={sortShips('maxCargo')}>{translate('cargo')}</th>
-                <th className='sortable' onClick={sortShips('maxPassengers')}>{translate('pax')}</th>
+                  <th className="sortable lft" onClick={sortShips('topSpeed')}>
+                    {translate('speed')}
+                  </th>
+                  <th className="sortable" onClick={sortShips('topBoost')}>
+                    {translate('boost')}
+                  </th>
+                  <th className="sortable" onClick={sortShips('maxJumpRange')}>
+                    {translate('jump')}
+                  </th>
+                  <th className="sortable" onClick={sortShips('maxCargo')}>
+                    {translate('cargo')}
+                  </th>
+                  <th className="sortable" onClick={sortShips('maxPassengers')} onMouseEnter={termtip.bind(null, 'passenger capacity')}
+                    onMouseLeave={hide}>
+                    {translate('pax')}
+                  </th>
+                  <th className="lft" colSpan={7}>
+                    {translate('core module classes')}
+                  </th>
+                  <th
+                    colSpan={5}
+                    className="sortable lft"
+                    onClick={sortShips('hpCount')}
+                  >
+                    {translate('hardpoints')}
+                  </th>
+                  <th
+                    colSpan={8}
+                    className="sortable lft"
+                    onClick={sortShips('intCount')}
+                  >
+                    {translate('internal compartments')}
+                  </th>
+                </tr>
+                <tr>
+                  <th
+                    className="sortable lft"
+                    onClick={sortShips('retailCost')}
+                  >
+                    {units.CR}
+                  </th>
+                  <th className="sortable lft" onClick={sortShips('hullMass')}>
+                    {units.T}
+                  </th>
+                  <th className="sortable lft" onClick={sortShips('speed')}>
+                    {units['m/s']}
+                  </th>
+                  <th className="sortable" onClick={sortShips('boost')}>
+                    {units['m/s']}
+                  </th>
+                  <th>&nbsp;</th>
+                  <th
+                    className="sortable"
+                    onClick={sortShips('baseShieldStrength')}
+                  >
+                    {units.MJ}
+                  </th>
+                  <th className="sortable lft" onClick={sortShips('topSpeed')}>
+                    {units['m/s']}
+                  </th>
+                  <th className="sortable" onClick={sortShips('topBoost')}>
+                    {units['m/s']}
+                  </th>
+                  <th className="sortable" onClick={sortShips('maxJumpRange')}>
+                    {units.LY}
+                  </th>
+                  <th className="sortable" onClick={sortShips('maxCargo')}>
+                    {units.T}
+                  </th>
+                  <th>&nbsp;</th>
+                  <th
+                    className="sortable lft"
+                    onMouseEnter={termtip.bind(null, 'power plant')}
+                    onMouseLeave={hide}
+                    onClick={sortShips('standard', 0)}
+                  >
+                    {'pp'}
+                  </th>
+                  <th
+                    className="sortable"
+                    onMouseEnter={termtip.bind(null, 'thrusters')}
+                    onMouseLeave={hide}
+                    onClick={sortShips('standard', 1)}
+                  >
+                    {'th'}
+                  </th>
+                  <th
+                    className="sortable"
+                    onMouseEnter={termtip.bind(null, 'frame shift drive')}
+                    onMouseLeave={hide}
+                    onClick={sortShips('standard', 2)}
+                  >
+                    {'fsd'}
+                  </th>
+                  <th
+                    className="sortable"
+                    onMouseEnter={termtip.bind(null, 'life support')}
+                    onMouseLeave={hide}
+                    onClick={sortShips('standard', 3)}
+                  >
+                    {'ls'}
+                  </th>
+                  <th
+                    className="sortable"
+                    onMouseEnter={termtip.bind(null, 'power distriubtor')}
+                    onMouseLeave={hide}
+                    onClick={sortShips('standard', 4)}
+                  >
+                    {'pd'}
+                  </th>
+                  <th
+                    className="sortable"
+                    onMouseEnter={termtip.bind(null, 'sensors')}
+                    onMouseLeave={hide}
+                    onClick={sortShips('standard', 5)}
+                  >
+                    {'s'}
+                  </th>
+                  <th
+                    className="sortable"
+                    onMouseEnter={termtip.bind(null, 'fuel tank')}
+                    onMouseLeave={hide}
+                    onClick={sortShips('standard', 6)}
+                  >
+                    {'ft'}
+                  </th>
+                  <th className="sortable lft" onClick={sortShips('hp', 1)}>
+                    {translate('S')}
+                  </th>
+                  <th className="sortable" onClick={sortShips('hp', 2)}>
+                    {translate('M')}
+                  </th>
+                  <th className="sortable" onClick={sortShips('hp', 3)}>
+                    {translate('L')}
+                  </th>
+                  <th className="sortable" onClick={sortShips('hp', 4)}>
+                    {translate('H')}
+                  </th>
+                  <th className="sortable" onClick={sortShips('hp', 0)}>
+                    {translate('U')}
+                  </th>

-                <th className='lft' colSpan={7}>{translate('core module classes')}</th>
-                <th colSpan={5} className='sortable lft' onClick={sortShips('hpCount')}>{translate('hardpoints')}</th>
-                <th colSpan={8} className='sortable lft' onClick={sortShips('intCount')}>{translate('internal compartments')}</th>
-              </tr>
-              <tr>
-                <th className='sortable lft' onClick={sortShips('retailCost')}>{units.CR}</th>
-                <th className='sortable lft' onClick={sortShips('hullMass')}>{units.T}</th>
-                <th className='sortable lft' onClick={sortShips('speed')}>{units['m/s']}</th>
-                <th className='sortable'  onClick={sortShips('boost')}>{units['m/s']}</th>
-                <th>&nbsp;</th>
-                <th className='sortable' onClick={sortShips('baseShieldStrength')}>{units.MJ}</th>
-                <th className='sortable lft' onClick={sortShips('topSpeed')}>{units['m/s']}</th>
-                <th className='sortable' onClick={sortShips('topBoost')}>{units['m/s']}</th>
-                <th className='sortable' onClick={sortShips('maxJumpRange')}>{units.LY}</th>
-                <th className='sortable' onClick={sortShips('maxCargo')}>{units.T}</th>
-                <th>&nbsp;</th>
-                <th className='sortable lft' onMouseEnter={termtip.bind(null, 'power plant')} onMouseLeave={hide} onClick={sortShips('standard', 0)}>{'pp'}</th>
-                <th className='sortable' onMouseEnter={termtip.bind(null, 'thrusters')} onMouseLeave={hide} onClick={sortShips('standard', 1)}>{'th'}</th>
-                <th className='sortable' onMouseEnter={termtip.bind(null, 'frame shift drive')} onMouseLeave={hide} onClick={sortShips('standard', 2)}>{'fsd'}</th>
-                <th className='sortable' onMouseEnter={termtip.bind(null, 'life support')} onMouseLeave={hide} onClick={sortShips('standard', 3)}>{'ls'}</th>
-                <th className='sortable' onMouseEnter={termtip.bind(null, 'power distriubtor')} onMouseLeave={hide} onClick={sortShips('standard', 4)}>{'pd'}</th>
-                <th className='sortable' onMouseEnter={termtip.bind(null, 'sensors')} onMouseLeave={hide} onClick={sortShips('standard', 5)}>{'s'}</th>
-                <th className='sortable' onMouseEnter={termtip.bind(null, 'fuel tank')} onMouseLeave={hide} onClick={sortShips('standard', 6)}>{'ft'}</th>
-                <th className='sortable lft' onClick={sortShips('hp',1)}>{translate('S')}</th>
-                <th className='sortable' onClick={sortShips('hp', 2)}>{translate('M')}</th>
-                <th className='sortable' onClick={sortShips('hp', 3)}>{translate('L')}</th>
-                <th className='sortable' onClick={sortShips('hp', 4)}>{translate('H')}</th>
-                <th className='sortable' onClick={sortShips('hp', 0)}>{translate('U')}</th>
-
-                <th className='sortable lft' onClick={sortShips('int', 0)} >1</th>
-                <th className='sortable' onClick={sortShips('int', 1)} >2</th>
-                <th className='sortable' onClick={sortShips('int', 2)} >3</th>
-                <th className='sortable' onClick={sortShips('int', 3)} >4</th>
-                <th className='sortable' onClick={sortShips('int', 4)} >5</th>
-                <th className='sortable' onClick={sortShips('int', 5)} >6</th>
-                <th className='sortable' onClick={sortShips('int', 6)} >7</th>
-                <th className='sortable' onClick={sortShips('int', 7)} >8</th>
-              </tr>
-            </thead>
-            <tbody onMouseLeave={this._highlightShip.bind(this, null)}>
-              {detailRows}
-            </tbody>
-          </table>
+                  <th className="sortable lft" onClick={sortShips('int', 0)}>
+                    1
+                  </th>
+                  <th className="sortable" onClick={sortShips('int', 1)}>
+                    2
+                  </th>
+                  <th className="sortable" onClick={sortShips('int', 2)}>
+                    3
+                  </th>
+                  <th className="sortable" onClick={sortShips('int', 3)}>
+                    4
+                  </th>
+                  <th className="sortable" onClick={sortShips('int', 4)}>
+                    5
+                  </th>
+                  <th className="sortable" onClick={sortShips('int', 5)}>
+                    6
+                  </th>
+                  <th className="sortable" onClick={sortShips('int', 6)}>
+                    7
+                  </th>
+                  <th className="sortable" onClick={sortShips('int', 7)}>
+                    8
+                  </th>
+                </tr>
+              </thead>
+              <tbody onMouseLeave={this._highlightShip.bind(this, null)}>
+                {detailRows}
+              </tbody>
+            </table>
          </div>
        </div>
+        <div className="table-tools" >
+          <label><input type="checkbox" checked={this.state.groupCompared} onClick={() => this._toggleGroupCompared()}/>Group highlighted ships</label>
+        </div>
+        </div>
      </div>
    );
  }
--- a/src/app/shipyard/Calculations.js
+++ b/src/app/shipyard/Calculations.js
@@ -15,7 +15,7 @@ export function jumpRange(mass, fsd, fuel, ship) {
  let jumpAddition = 0;
  if (ship) {
    for (const module of ship.internal) {
-      if (module && module.m && module.m.grp === 'gfsb') {
+      if (module && module.m && module.m.grp === 'gfsb' && ship.getSlotStatus(module) == 3) {
        jumpAddition += module.m.getJumpBoost();
      }
    }
@@ -400,7 +400,7 @@ export function shieldMetrics(ship, sys) {
    let shieldAddition = 0;
    if (ship) {
      for (const module of ship.internal) {
-        if (module && module.m && module.m.grp === 'gsrp') {
+        if (module && module.m && module.m.grp === 'gsrp' && module.enabled) {
          shieldAddition += module.m.getShieldAddition();
        }
      }
@@ -465,6 +465,7 @@ export function shieldMetrics(ship, sys) {
      boosters: boostersStrength,
      addition: shieldAddition,
      cells: ship.shieldCells,
+      summary: generatorStrength + boostersStrength + shieldAddition,
      total: generatorStrength + boostersStrength + ship.shieldCells + shieldAddition,
      recover,
      recharge,
@@ -573,7 +574,7 @@ export function armourMetrics(ship) {
  // };
  // Armour from HRPs and module armour from MRPs
  for (let slot of ship.internal) {
-    if (slot.m && (slot.m.grp === 'hr' || slot.m.grp === 'ghrp' || slot.m.grp == 'mahr')) {
+    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;
@@ -585,7 +586,7 @@ export function armourMetrics(ship) {
      hullThermDmg = hullThermDmg * (1 - slot.m.getThermalResistance());
      hullCausDmg = hullCausDmg * (1 - slot.m.getCausticResistance());
    }
-    if (slot.m && (slot.m.grp == 'mrp' || slot.m.grp == 'gmrp')) {
+    if (slot.m && slot.enabled && (slot.m.grp == 'mrp' || slot.m.grp == 'gmrp')) {
      moduleArmour += slot.m.getIntegrity();
      moduleProtection = moduleProtection * (1 - slot.m.getProtection());
    }
@@ -1014,7 +1015,10 @@ export function timeToDrainWep(ship, wep) {
 */
 export function timeToDeplete(amount, dps, eps, capacity, recharge) {
  const drainPerSecond = eps - recharge;
-  if (drainPerSecond <= 0) {
+  // If there is nothing to remove, we're don instantly
+  if (!amount) {
+    return 0;
+  } if (drainPerSecond <= 0) {
    // Simple result
    return amount / dps;
  } else {
--- a/src/app/shipyard/Constants.js
+++ b/src/app/shipyard/Constants.js
@@ -57,6 +57,7 @@ export const ModuleGroupToName = {
  ghrp: 'Guardian Hull Reinforcement Package',
  gmrp: 'Guardian Module Reinforcement Package',
  mahr: 'Meta Alloy Hull Reinforcement Package',
+  sua: 'Supercruise Assist',

  // Hard Points
  bl: 'Beam Laser',
@@ -94,6 +95,10 @@ export const ModuleGroupToName = {
  gsc: 'Guardian Shard Cannon',
  tbem: 'Enzyme Missile Rack',
  tbrfl: 'Remote Release Flechette Launcher',
+  pwa: 'Pulse Wave Analyser',
+  abl: 'Abrasion Blaster',
+  scl: 'Seismic Charge Launcher',
+  sdm: 'Sub-Surface Displacement Missile',
 };

 let GrpNameToCodeMap = {};
@@ -202,7 +207,7 @@ export const ShipFacets = [
    i: 9
  },
  {                   // 10
-    title: 'fastest range',
+    title: 'farthest range',
    props: ['unladenFastestRange', 'ladenFastestRange'],
    lbls: ['unladen', 'laden'],
    unit: 'LY',
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -41,49 +41,29 @@ export default class Module {
   * @return {object}     The value of the modification. If it is a numeric value then it is returned as an integer value scaled so that 1.23% == 123
   */
  getModValue(name, raw) {
+    let baseVal = this[name];
    let result = this.mods  && this.mods[name] ? this.mods[name] : null;

    if ((!raw) && this.blueprint && this.blueprint.special) {
      // This module has a special effect, see if we need to alter our returned value
-      const modifierActions = Modifications.modifierActions[this.blueprint.special.edname];
+      const modifierActions = Modifications.modifierActions[this.blueprint.special.key];
      if (modifierActions && modifierActions[name]) {
        // this special effect modifies our returned value
        const modification = Modifications.modifications[name];
        const multiplier = modification.type === 'percentage' ? 10000 : 100;
        if (name === 'explres' || name === 'kinres' || name === 'thermres' || name === 'causres') {
-          // Resistance modifications in itself are additive, however their
-          // special effects are multiplicative. They affect the overall result
-          // by (special effect resistance) * (damage mult after modification),
-          // i. e. we need to apply the special effect as a multiplier to the
-          // overall result and then calculate the difference.
-          let baseMult = this[name] ? 1 - this[name] : 1;
-          result = (baseMult - (baseMult - result / multiplier) * (1 - modifierActions[name] / 100)) * multiplier;
+          // Apply resistance modding mechanisms to special effects subsequently
+          result = result + modifierActions[name] * (1 - (this[name] + result / multiplier)) * 100;
        } else if (modification.method === 'additive') {
          result = result + modifierActions[name] * 100;
        } else if (modification.method === 'overwrite') {
          result = modifierActions[name];
        } else {
-          // rate of fire is special, as it's really burst interval.  Handle that here
-          let mod = null;
-          if (name === 'rof') {
-            mod = 1 / (1 + modifierActions[name]) - 1;
-          } else {
-            mod = modifierActions[name];
-          }
-          result = (((1 + result / multiplier) * (1 + mod)) - 1) * multiplier;
+          result = (((1 + result / multiplier) * (1 + modifierActions[name])) - 1) * multiplier;
        }
      }
    }

-    // Resistance modding for hull reinforcement packages has additional
-    // diminishing returns implemented. The mod value gets lowered by
-    // the amount of base resistance the hrp has.
-    if (!isNaN(result) && this.grp === 'hr' &&
-      (name === 'kinres' || name === 'thermres' || name === 'explres')) {
-      let baseRes = this[name];
-      result = result * (1 - baseRes);
-    }
-
    // Sanitise the resultant value to 4dp equivalent
    return isNaN(result) ? result : Math.round(result);
  }
@@ -103,29 +83,22 @@ export default class Module {
    }
    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];
+      const modifierActions = Modifications.modifierActions[this.blueprint.special.key];
      if (modifierActions && modifierActions[name]) {
        // This special effect modifies the value being set, so we need to revert it prior to storing the value
        const modification = Modifications.modifications[name];
        if (name === 'explres' || name === 'kinres' || name === 'thermres' || name === 'causres') {
-          // Resistance modifications in itself are additive but their
-          // experimentals are applied multiplicatively therefor we must handle
-          // them differently here (cf. documentation in getModValue).
-          let baseMult = (this[name] ? 1 - this[name] : 1);
-          value = ((baseMult - value / 10000) / (1 - modifierActions[name] / 100) - baseMult) * -10000;
+          let res = (this[name] ? this[name] : 0) + value / 10000;
+          let experimental = modifierActions[name] / 100;
+          value = (experimental - res) / (experimental - 1) - this[name];
+          value *= 10000;
+          // value = ((baseMult - value / 10000) / (1 - modifierActions[name] / 100) - baseMult) * -10000;
        } else if (modification.method === 'additive') {
          value = value - modifierActions[name];
        } else if (modification.method === 'overwrite') {
          value = null;
        } else {
-          // rate of fire is special, as it's really burst interval.  Handle that here
-          let mod = null;
-          if (name === 'rof') {
-            mod = 1 / (1 + modifierActions[name]) - 1;
-          } else {
-            mod = modifierActions[name];
-          }
-          value = ((value / 10000 + 1) / (1 + mod) - 1) * 10000;
+          value = ((value / 10000 + 1) / (1 + modifierActions[name]) - 1) * 10000;
        }
      }
    }
@@ -144,6 +117,13 @@ export default class Module {
   * @return {Number} The value queried
   */
  get(name, modified = true) {
+    if (name == 'rof' && isNaN(this[name])) {
+      let fireint = this['fireint'];
+      if (!isNaN(fireint)) {
+        this['rof'] = 1 / fireint;
+      }
+    }
+
    let val;
    if (modified) {
      val = this._getModifiedValue(name);
@@ -177,20 +157,22 @@ export default class Module {
        baseValue = 0;
      }
      modValue = value - baseValue;
-      if (this.grp === 'hr' &&
-        (name === 'kinres' || name === 'thermres' || name === 'explres')) {
-        modValue = modValue / (1 - baseValue);
-      }
    } else if (name === 'shieldboost' || name === 'hullboost') {
      modValue = (1 + value) / (1 + baseValue) - 1;
+    } else if (name === 'rof') {
+      let burst = this.get('burst', true) || 1;
+      let burstInt = 1 / (this.get('burstrof', true) / 1);
+
+      let interval = burst / value;
+      let newFireint = (interval - (burst - 1) * burstInt);
+      modValue = newFireint / this['fireint'] - 1;
    } else { // multiplicative
-      modValue = value / baseValue - 1;
+      modValue = baseValue == 0 ? 0 : value / baseValue - 1;
    }

    if (modification.type === 'percentage') {
      modValue = modValue * 10000;
-    } else if (modification.type === 'numeric' && name !== 'burst' &&
-      name !== 'burstrof') {
+    } else if (modification.type === 'numeric') {
      modValue = modValue * 100;
    }

@@ -208,7 +190,14 @@ export default class Module {
   */
  getPretty(name, modified = true, places = 2) {
    const formattingOptions = STATS_FORMATTING[name];
-    let val = this.get(name, modified) || 0;
+    let val;
+    if (formattingOptions && formattingOptions.synthetic) {
+      val = (this[formattingOptions.synthetic]).call(this, modified);
+    } else {
+      val = this.get(name, modified);
+    }
+    val = val || 0;
+
    if (formattingOptions && formattingOptions.format.startsWith('pct')) {
      return 100 * val;
    }
@@ -267,12 +256,17 @@ export default class Module {
          } else if (name === 'shieldboost' || name === 'hullboost') {
            result = (1 + result) * (1 + modValue) - 1;
          } else {
+            // Rate of fire modifiers are special as they actually are modifiers
+            // for fire interval. Translate them accordingly here:
+            if (name == 'rof') {
+              modValue = 1 / (1 + modValue) - 1;
+            }
            result = result * (1 + modValue);
          }
-        } else if (name === 'burstrof') {
+        } else if (name === 'burstrof' || name === 'burst') {
          // Burst and burst rate of fire are special, as it can not exist but
          // have a modification
-          result = modValue / 100;
+          result = modValue;
        }
      }
    }
@@ -294,11 +288,7 @@ export default class Module {
  formatModifiedValue(name, language, unit, val) {
    const formattingOptions = STATS_FORMATTING[name];
    if (val === undefined) {
-      if (formattingOptions && formattingOptions.synthetic) {
-        val = (this[formattingOptions.synthetic]).call(this, true);
-      } else {
-        val = this._getModifiedValue(name);
-      }
+      val = this.getPretty(name, true);
    }

    val = val || 0;
@@ -368,14 +358,18 @@ export default class Module {

    if (formattingOptions && formattingOptions.change) {
      let changeFormatting = formattingOptions.change;
-      let baseVal = this[name];
+      let baseVal = this[name] || 0;
      let absVal = this._getModifiedValue(name);
      if (changeFormatting === 'additive') {
        val = absVal - baseVal;
      } else if (changeFormatting === 'multiplicative') {
        val = absVal / baseVal - 1;
      }
-      val *= 10000;
+      if (Modifications.modifications[name].method === 'overwrite') {
+        val *= 100;
+      } else {
+        val *= 10000;
+      }
    }
    return val;
  }
@@ -589,20 +583,9 @@ export default class Module {
   * @return {Number} the falloff of this module
   */
  getFalloff(modified = true) {
-    if (!modified) {
-      const range = this.getRange(false);
-      const falloff = this.get('falloff', false);
-      return (falloff > range ? range : falloff);
-    }
-
    // Falloff from range is mapped to range
-    if (this.mods && this.mods['fallofffromrange']) {
+    if (modified && this.mods && this.mods['fallofffromrange']) {
      return this.getRange();
-    // Need to find out if we have a focused modification, in which case our
-    // falloff is scaled to range
-    } else if (this.blueprint && this.blueprint.name === 'Focused') {
-      const rangeMod = this.getModValue('range') / 10000;
-      return this.falloff * (1 + rangeMod);
    // Standard falloff calculation
    } else {
      const range = this.getRange();
@@ -656,15 +639,6 @@ export default class Module {
    return this.get('protection', modified);
  }

-  /**
-   * Get the delay for this module
-   * @param {Boolean} [modified=true] Whether to take modifications into account
-   * @return {Number} the delay of this module
-   */
-  getDelay(modified = true) {
-    return this.get('delay', modified);
-  }
-
  /**
   * Get the duration for this module
   * @param {Boolean} [modified=true] Whether to take modifications into account
@@ -720,8 +694,7 @@ export default class Module {
    let result = 0;
    if (this['maxmass']) {
      result = this['maxmass'];
-      // max mass is only modified for non-shield boosters
-      if (result && modified && this.grp !== 'sg') {
+      if (result && modified) {
        let mult = this.getModValue('optmass') / 10000;
        if (mult) { result = result * (1 + mult); }
      }
@@ -810,24 +783,6 @@ export default class Module {
    return this.get('distdraw', modified);
  }

-  /**
-   * Get the thermal load for this module
-   * @param {Boolean} [modified=true] Whether to take modifications into account
-   * @return {Number} the thermal load of this module
-   */
-  getThermalLoad(modified = true) {
-    return this.get('thermload', modified);
-  }
-
-  /**
-   * Get the rounds per shot for this module
-   * @param {Boolean} [modified=true] Whether to take modifications into account
-   * @return {Number} the rounds per shot of this module
-   */
-  getRoundsPerShot(modified = true) {
-    return this.get('roundspershot', modified);
-  }
-
  /**
   * Get the DPS for this module
   * @param {Boolean} [modified=true] Whether to take modifications into account
@@ -851,25 +806,39 @@ export default class Module {
    return this.getDps(modified) / this.getEps(modified);
  }

+  /**
+   * Return the factor that gets applied when calculating certain "sustained"
+   * values, e.g. `SDPS = this.getSustainedFactor() * DPS`.
+   * @param {Boolean} [modified=true] Whether to take modifications into account
+   */
+  getSustainedFactor(modified = true) {
+    let clipSize = this.getClip(modified);
+    if (clipSize) {
+      // If auto-loader is applied, effective clip size will be nearly doubled
+      // as you get one reload for every two shots fired.
+      if (this.blueprint && this.blueprint.special && this.blueprint.special.key === 'special_auto_loader' && modified) {
+        clipSize += clipSize - 1;
+      }
+
+      let burstSize = this.get('burst', modified) || 1;
+      let rof = this.getRoF(modified);
+      // rof averages burstfire + pause until next interval but for sustained
+      // rof we need to take another burst without pause into account
+      let burstOverhead = (burstSize - 1) / (this.get('burstrof', modified) || 1);
+      let srof = clipSize / ((clipSize - burstSize) / rof + burstOverhead + this.getReload(modified));
+      return srof / rof;
+    } else {
+      return 1;
+    }
+  }
+
  /**
   * Get the SDPS for this module
   * @param {Boolean} [modified=true] Whether to take modifications into account
   * @return {Number} The SDPS of this module
   */
  getSDps(modified = true) {
-    let dps = this.getDps(modified);
-    if (this.getClip(modified)) {
-      let clipSize = this.getClip(modified);
-      // If auto-loader is applied, effective clip size will be nearly doubled
-      // as you get one reload for every two shots fired.
-      if (this.blueprint && this.blueprint.special && this.blueprint.special.edname === 'special_auto_loader' && modified) {
-        clipSize += clipSize - 1;
-      }
-      let timeToDeplete = clipSize / this.getRoF(modified);
-      return dps * timeToDeplete / (timeToDeplete + this.getReload(modified));
-    } else {
-      return dps;
-    }
+    return this.getDps(modified) * this.getSustainedFactor(modified);
  }

  /**
@@ -893,7 +862,7 @@ export default class Module {
   */
  getHps(modified = true) {
    // HPS is a synthetic value
-    let heat = this.getThermalLoad(modified);
+    let heat = this.get('thermload', modified);
    // We don't use rpshot here as dist draw is per combined shot
    let rof = this.getRoF(modified) || 1;

@@ -930,24 +899,6 @@ export default class Module {
    return this.get('reload', modified);
  }

-  /**
-   * Get the burst size for this module
-   * @param {Boolean} [modified=true] Whether to take modifications into account
-   * @return {Number} the burst size of this module
-   */
-  getBurst(modified = true) {
-    return this.get('burst', modified);
-  }
-
-  /**
-   * Get the burst rate of fire for this module
-   * @param {Boolean} [modified=true] Whether to take modifications into account
-   * @return {Number} the burst rate of fire of this module
-   */
-  getBurstRoF(modified = true) {
-    return this.get('burstrof', modified);
-  }
-
  /**
   * Get the rate of fire for this module.
   * The rate of fire is a combination value, and needs to take in to account
@@ -958,8 +909,8 @@ export default class Module {
   * @return {Number} the rate of fire for this module
   */
  getRoF(modified = true) {
-    const burst = this.getBurst(modified) || 1;
-    const burstRoF = this.getBurstRoF(modified) || 1;
+    const burst = this.get('burst', modified) || 1;
+    const burstRoF = this.get('burstrof', modified) || 1;
    const intRoF = this.get('rof', modified);

    return burst / (((burst - 1) / burstRoF) + 1 / intRoF);
@@ -1090,4 +1041,31 @@ export default class Module {
  getHackTime(modified = true) {
    return this.get('hacktime', modified);
  }
+
+  /**
+   * Get the scan range for this module
+   * @param {Boolean} [modified=true] Whether to take modifications into account
+   * @return {string} the time for this module
+   */
+  getScanRange(modified = true) {
+    return this.get('scanrange', modified);
+  }
+
+  /**
+   * Get the scan angle for this module
+   * @param {Boolean} [modified=true] Whether to take modifications into account
+   * @return {string} the time for this module
+   */
+  getScanAngle(modified = true) {
+    return this.get('scanangle', modified);
+  }
+
+  /**
+   * Get the max angle for this module
+   * @param {Boolean} [modified=true] Whether to take modifications into account
+   * @return {string} the time for this module
+   */
+  getMaxAngle(modified = true) {
+    return this.get('maxangle', modified);
+  }
 }
--- a/src/app/shipyard/ModuleUtils.js
+++ b/src/app/shipyard/ModuleUtils.js
@@ -63,7 +63,10 @@ export function standard(type, id) {
  if (!isNaN(type)) {
    type = StandardArray[type];
  }
-  let s = Modules.standard[type].find(e => e.id == id || (e.class == id.charAt(0) && e.rating == id.charAt(1)));
+  let s = Modules.standard[type].find(e => e.id === id);
+  if (!s) {
+    s = Modules.standard[type].find(e => (e.class == id.charAt(0) && e.rating == id.charAt(1)));
+  }
  if (s) {
    s = new Module({ template: s });
  }
--- a/src/app/shipyard/Serializer.js
+++ b/src/app/shipyard/Serializer.js
@@ -85,12 +85,12 @@ export function toDetailedBuild(buildName, ship) {
      code = ship.toString();

  let data = {
-    $schema: 'https://coriolis.edcd.io/schemas/ship-loadout/4.json#',
+    $schema: 'https://coriolis.io/schemas/ship-loadout/4.json#',
    name: buildName,
    ship: ship.name,
    references: [{
      name: 'Coriolis.io',
-      url: 'https://coriolis.edcd.io' + outfitURL(ship.id, code, buildName),
+      url: 'https://coriolis.io' + outfitURL(ship.id, code, buildName),
      code,
      shipId: ship.id
    }],
--- a/src/app/shipyard/Ship.js
+++ b/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'];
+const UNIQUE_MODULES = ['psg', 'sg', 'bsg', 'rf', 'fs', 'fh', 'gfsb', 'dc'];

 // Constants for modifications struct
 const SLOT_ID_DONE = -1;
@@ -505,6 +505,11 @@ export default class Ship {
    if (isAbsolute) {
      m.setPretty(name, value, sentfromui);
    } else {
+      // Resistance modifiers scale with the base value
+      if (name == 'kinres' || name == 'thermres' || name == 'causres' || name == 'explres') {
+        let baseValue = m.get(name, false);
+        value = (1 - baseValue) * value;
+      }
      m.setModValue(name, value, sentfromui);
    }

@@ -1303,7 +1308,7 @@ export default class Ship {
    let fsd = this.standard[2].m;   // Frame Shift Drive;
    let { unladenMass, fuelCapacity } = this;
    this.unladenRange = this.calcUnladenRange(); // Includes fuel weight for jump
-    this.fullTankRange = Calc.jumpRange(unladenMass + fuelCapacity, fsd, this); // Full Tank
+    this.fullTankRange = Calc.jumpRange(unladenMass + fuelCapacity, fsd, fuelCapacity, this); // Full Tank
    this.ladenRange = this.calcLadenRange(); // Includes full tank and caro
    this.unladenFastestRange = Calc.totalJumpRange(unladenMass + this.fuelCapacity, fsd, fuelCapacity, this);
    this.ladenFastestRange = Calc.totalJumpRange(unladenMass + this.fuelCapacity + this.cargoCapacity, fsd, fuelCapacity, this);
@@ -1501,7 +1506,7 @@ export default class Ship {
            } else {
              buffer.writeInt32LE(slotMod.value, curpos);
            }
-            // const modification = _.find(Modifications.modifications, function(o) { return o.id === slotMod.id; });
+            const modification = _.find(Modifications.modifications, function(o) { return o.id === slotMod.id; });
            // console.log('ENCODE Slot ' + i + ': ' + modification.name + ' = ' + slotMod.value);
            curpos += 4;
          }
@@ -1514,6 +1519,7 @@ export default class Ship {
      }

      this.serialized.modifications = zlib.gzipSync(buffer).toString('base64');
+      // console.log(this.serialized.modifications)
    } else {
      this.serialized.modifications = null;
    }
--- a/src/app/shipyard/StatsFormatting.js
+++ b/src/app/shipyard/StatsFormatting.js
@@ -26,8 +26,8 @@ export const STATS_FORMATTING = {
  'ammo': { 'format': 'int', },
  'boot': { 'format': 'int', 'unit': 'secs' },
  'brokenregen': { 'format': 'round1', 'unit': 'ps' },
-  'burst': { 'format': 'int' },
-  'burstrof': { 'format': 'round1', 'unit': 'ps' },
+  'burst': { 'format': 'int', 'change': 'additive' },
+  'burstrof': { 'format': 'round1', 'unit': 'ps', 'change': 'additive' },
  'causres': { 'format': 'pct' },
  'clip': { 'format': 'int' },
  'damage': { 'format': 'round' },
@@ -61,7 +61,7 @@ export const STATS_FORMATTING = {
  'ranget': { 'format': 'f1', 'unit': 's' },
  'regen': { 'format': 'round1', 'unit': 'ps' },
  'reload': { 'format': 'int', 'unit': 's' },
-  'rof': { 'format': 'round1', 'unit': 'ps' },
+  'rof': { 'format': 'round1', 'unit': 'ps', 'synthetic': 'getRoF', 'higherbetter': true },
  'angle': { 'format': 'round1', 'unit': 'ang' },
  'scanrate': { 'format': 'int' },
  'scantime': { 'format': 'round1', 'unit': 's' },
@@ -78,5 +78,6 @@ export const STATS_FORMATTING = {
  'thermres': { 'format': 'pct' },
  'wepcap': { 'format': 'round1', 'unit': 'MJ' },
  'weprate': { 'format': 'round1', 'unit': 'MW' },
-  'jumpboost': { 'format': 'round1', 'unit': 'LY' }
+  'jumpboost': { 'format': 'round1', 'unit': 'LY' },
+  'proberadius': { 'format': 'pct1', 'unit': 'pct' },
 };
--- a/src/app/utils/BlueprintFunctions.js
+++ b/src/app/utils/BlueprintFunctions.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Modifications } from 'coriolis-data/dist';
+import { STATS_FORMATTING } from '../shipyard/StatsFormatting';

 /**
 * Generate a tooltip with details of a blueprint's specials
@@ -155,7 +156,7 @@ export function blueprintTooltip(translate, blueprint, engineers, grp, m) {

    // We also add in any benefits from specials that aren't covered above
    if (m.blueprint && m.blueprint.special) {
-      for (const feature in Modifications.modifierActions[m.blueprint.special.edname]) {
+      for (const feature in Modifications.modifierActions[m.blueprint.special.key]) {
        if (!blueprint.features[feature] && !m.mods.feature) {
          const featureDef = Modifications.modifications[feature];
          if (featureDef && !featureDef.hidden) {
@@ -280,6 +281,25 @@ export function isValueBeneficial(feature, value) {
  }
 }

+/**
+ * Is the change as shown beneficial?
+ * @param {string} feature The name of the feature
+ * @param {number} value The value of the feature as percentage change
+ * @returns True if the value is beneficial
+ */
+export function isChangeValueBeneficial(feature, value) {
+  let changeHigherBetter = STATS_FORMATTING[feature].higherbetter;
+  if (changeHigherBetter === undefined) {
+    return isValueBeneficial(feature, value);
+  }
+
+  if (changeHigherBetter) {
+    return value > 0;
+  } else {
+    return value < 0;
+  }
+}
+
 /**
 * Get a blueprint with a given name and an optional module
 * @param   {string} name    The name of the blueprint
@@ -372,9 +392,7 @@ export function getPercent(m) {

    let value = _getValue(m, featureName);
    let mult;
-    if (featureName == 'shieldboost') {
-      mult = ((1 + value) * (1 + m.shieldboost)) - 1 - m.shieldboost;
-    } else if (Modifications.modifications[featureName].higherbetter) {
+    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)) {
        mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
--- a/src/app/utils/CompanionApiUtils.js
+++ b/src/app/utils/CompanionApiUtils.js
@@ -30,6 +30,8 @@ export const SHIP_FD_NAME_TO_CORIOLIS_NAME = {
  'Hauler': 'hauler',
  'Independant_Trader': 'keelback',
  'Krait_MkII': 'krait_mkii',
+  'Mamba': 'mamba',
+  'Krait_Light': 'krait_phantom',
  'Orca': 'orca',
  'Python': 'python',
  'SideWinder': 'sidewinder',
--- a/src/app/utils/JournalUtils.js
+++ b/src/app/utils/JournalUtils.js
@@ -249,6 +249,13 @@ function _addModifications(module, modifiers, blueprint, grade, specialModificat
  if (!modifiers) return;
  let special;
  if (specialModifications) {
+    if (specialModifications == 'special_plasma_slug') {
+      if (module.symbol.match(/PlasmaAccelerator/i)) {
+        specialModifications = 'special_plasma_slug_pa';
+      } else {
+        specialModifications = 'special_plasma_slug_cooled';
+      }
+    }
    special = Modifications.specials[specialModifications];
  }
  // Add the blueprint definition, grade and special
@@ -274,6 +281,9 @@ function _addModifications(module, modifiers, blueprint, grade, specialModificat
    if (value === Infinity) {
      value = modifiers[i].Value * 100;
    }
+    if (modifiers[i].Label.search('DamageFalloffRange') >= 0) {
+      value = (modifiers[i].Value / module.range - 1) * 100;
+    }
    if (modifiers[i].Label.search('Resistance') >= 0) {
      value = (modifiers[i].Value * 100) - (modifiers[i].OriginalValue * 100);
    }
--- a/src/app/utils/SlotFunctions.js
+++ b/src/app/utils/SlotFunctions.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import Persist from '../stores/Persist';
 import * as ModuleUtils from '../shipyard/ModuleUtils';
+import Module from '../shipyard/Module';

 /**
 * Determine if a slot on a ship can mount a module of a particular class and group
@@ -139,20 +140,21 @@ function diff(format, mVal, mmVal) {
 export function diffDetails(language, m, mm) {
  let { formats, translate, units } = language;
  let propDiffs = [];
+  m = new Module(m);

  // Module-specific items

  if (m.grp === 'pp') {
-    let mPowerGeneration = m.pgen || 0;
+    let mPowerGeneration = m.getPowerGeneration() || 0;
    let mmPowerGeneration = mm ? mm.getPowerGeneration() : 0;
-    if (mPowerGeneration != mmPowerGeneration) propDiffs.push(<div key='pgen'>{translate('pgen')}: <span className={diffClass(mPowerGeneration, mmPowerGeneration)}>{diff(formats.round, mPowerGeneration, mmPowerGeneration)}{units.MJ}</span></div>);
+    if (mPowerGeneration != mmPowerGeneration) propDiffs.push(<div key='pgen'>{translate('pgen')}: <span className={diffClass(mPowerGeneration, mmPowerGeneration)}>{diff(formats.round, mPowerGeneration, mmPowerGeneration)}{units.MW}</span></div>);
  } else {
-    let mPowerUsage = m.power || 0;
+    let mPowerUsage = m.getPowerUsage() || 0;
    let mmPowerUsage = mm ? mm.getPowerUsage() || 0 : 0;
-    if (mPowerUsage != mmPowerUsage) propDiffs.push(<div key='power'>{translate('power')}: <span className={diffClass(mPowerUsage, mmPowerUsage, true)}>{diff(formats.round, mPowerUsage, mmPowerUsage)}{units.MJ}</span></div>);
+    if (mPowerUsage != mmPowerUsage) propDiffs.push(<div key='power'>{translate('power')}: <span className={diffClass(mPowerUsage, mmPowerUsage, true)}>{diff(formats.round, mPowerUsage, mmPowerUsage)}{units.MW}</span></div>);
  }

-  let mDps = m.damage * (m.rpshot || 1) * (m.rof || 1);
+  let mDps = m.getDps() || 0;
  let mmDps = mm ? mm.getDps() || 0 : 0;
  if (mDps && mDps != mmDps) propDiffs.push(<div key='dps'>{translate('dps')}: <span className={diffClass(mmDps, mDps, true)}>{diff(formats.round, mDps, mmDps)}</span></div>);

@@ -164,7 +166,7 @@ export function diffDetails(language, m, mm) {

    if (mAffectsShield) {
      if (m.grp == 'sb') {  // Both m and mm must be utility modules if this is true
-        newShield = this.calcShieldStrengthWith(null, m.shieldboost - (mm ? mm.getShieldBoost() || 0 : 0));
+        newShield = this.calcShieldStrengthWith(null, m.getShieldBoost() - (mm ? mm.getShieldBoost() || 0 : 0));
      } else {
        newShield = this.calcShieldStrengthWith(m);
      }
@@ -179,7 +181,7 @@ export function diffDetails(language, m, mm) {
  }

  if (m.grp === 'mrp') {
-    let mProtection = m.protection;
+    let mProtection = m.getProtection();
    let mmProtection = mm ? mm.getProtection() || 0 : 0;
    if (mProtection != mmProtection) {
      propDiffs.push(<div key='protection'>{translate('protection')}: <span className={diffClass(mmProtection, mProtection, true)}>{diff(formats.pct, mProtection, mmProtection)}</span></div>);
@@ -187,7 +189,7 @@ export function diffDetails(language, m, mm) {
  }

  if (m.grp === 'hr') {
-    let mHullReinforcement = m.hullreinforcement;
+    let mHullReinforcement = m.getHullReinforcement();
    let mmHullReinforcement = mm ? mm.getHullReinforcement() || 0 : 0;
    if (mHullReinforcement && mHullReinforcement != mmHullReinforcement) propDiffs.push(<div key='hullreinforcement'>{translate('hullreinforcement')}: <span className={diffClass(mmHullReinforcement, mHullReinforcement, true)}>{diff(formats.round, mHullReinforcement, mmHullReinforcement)}</span></div>);
  }
@@ -219,7 +221,7 @@ export function diffDetails(language, m, mm) {
  let mmCost = mm ? mm.cost : 0;
  if (mCost != mmCost) propDiffs.push(<div key='cost'>{translate('cost')}: <span className={diffClass(mCost, mmCost, true) }>{formats.int(mCost ? Math.round(mCost * (1 - Persist.getModuleDiscount())) : 0)}{units.CR}</span></div>);

-  let mMass = m.mass || 0;
+  let mMass = m.getMass() || 0;
  let mmMass = mm ? mm.getMass() : 0;
  if (mMass != mmMass) propDiffs.push(<div key='mass'>{translate('mass')}: <span className={diffClass(mMass, mmMass, true)}>{diff(formats.round, mMass, mmMass)}{units.T}</span></div>);

@@ -240,7 +242,7 @@ export function diffDetails(language, m, mm) {
    }
  }

-  let mIntegrity = m.integrity || 0;
+  let mIntegrity = m.getIntegrity() || 0;
  let mmIntegrity = mm ? mm.getIntegrity() || 0 : 0;
  if (mIntegrity != mmIntegrity) {
    propDiffs.push(<div key='integrity'>{translate('integrity')}: <span className={diffClass(mmIntegrity, mIntegrity, true)}>{diff(formats.round, mIntegrity, mmIntegrity)}</span></div>);
--- a/src/iframe.html
+++ b/src/iframe.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script src="xdLocalStoragePostMessageApi.min.js"></script>
+</head>
+<body>
+    This is the magical iframe
+</body>
+</html>
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -1,16 +1,19 @@
 <!DOCTYPE html>
-<html manifest="/">
+<html>
  <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="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">
+    <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">
+    <link rel="icon" sizes="152x152 192x192" type="image/png"
+      href="/192x192.png">

    <!-- Apple/iOS headers -->
    <meta name="apple-mobile-web-app-capable" content="yes">
@@ -29,42 +32,27 @@
      window.CORIOLIS_DATE = '<%- htmlWebpackPlugin.options.date.toISOString().slice(0, 10)  %>';
      window.BUGSNAG_VERSION = '<%- htmlWebpackPlugin.options.version + '-' + htmlWebpackPlugin.options.date.toISOString()  %>';
    </script>
-    <% if (htmlWebpackPlugin.options.uaTracking) { %>
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-55840909-18"></script>
    <script>
-      window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
-      ga('create', '<%- htmlWebpackPlugin.options.uaTracking %>', 'auto');
-      ga('send', 'pageview');
-    </script>
-    <script async src='https://www.google-analytics.com/analytics.js'></script>
-    <% } %>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'UA-55840909-18');
+    </script>
+

-    <!-- Piwik -->
-   <!-- <script type="text/javascript">
-      var _paq = _paq || [];
-      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-      _paq.push(["setCookieDomain", "*.coriolis.edcd.io"]);
-      _paq.push(['trackPageView']);
-      _paq.push(['enableLinkTracking']);
-      (function() {
-        var u="//stats.isadankme.me/";
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
-        _paq.push(['setSiteId', '4']);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-      })();
-    </script>-->
-    <!-- End Piwik Code -->

    <!-- Bugsnag -->
-    <script src="//d2wy8f7a9ursnm.cloudfront.net/v4/bugsnag.min.js"></script>
-    <script src="//d2wy8f7a9ursnm.cloudfront.net/bugsnag-plugins/v1/bugsnag-react.min.js"></script>
-    <script>
+        <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>
+      </head>
+      <body style="background-color:#000;">
+        <section id="coriolis"></section>

-  </body>
-</html>
+      </body>
+    </html>
--- a/src/less/app.less
+++ b/src/less/app.less
@@ -171,3 +171,16 @@ footer {
    text-align: right;
  }
 }
+
+.announcement-container {
+  display: flex;
+  align-items: center;
+  padding-top: 10px;
+  justify-content: center;
+  flex-flow: row wrap;
+}
+
+.announcement {
+  border: 1px @secondary solid;
+  padding: 10px;
+}
--- a/src/less/colors.less
+++ b/src/less/colors.less
@@ -2,6 +2,8 @@
@bgDarken: 40%;
@disabledDarken: 15%;
@bgTransparency: 10%;
+@bgHighlight: 5%;
+@fgHighlight: 10%;

 // Foreground colors
@fg: #CCC;
@@ -21,9 +23,14 @@
@bgBlack: #000;
@primary-bg: fadeout(darken(@primary, 47%), 15%);
@alt-primary-bg: fadeout(darken(@primary, 42%), 15%); // Lighter brown background
-@secondary-bg: fadeout(darken(@secondary, @bgDarken), @bgTransparency); // Brown background
+@secondary-bg: fadeout(darken(@secondary, @bgDarken), @bgTransparency); // Blue background
@warning-bg: fadeout(darken(@warning, @bgDarken), @bgTransparency); // Dark Red

+@alt-primary-bg-highlighted: lighten(@alt-primary-bg, @bgHighlight);
+@fg-highlighted: lighten(@fg, @fgHighlight);
+@primary-darker: darken(@primary, 30%);
+
+

 .fg {
  color: @fg;
--- a/src/less/modal.less
+++ b/src/less/modal.less
@@ -54,7 +54,7 @@ textarea {
    width:100%;
    min-height: 10em;
    resize: vertical;
-    user-select: auto;
+    user-select: text;
    margin:2em 0;
  }
 }
--- a/src/less/select.less
+++ b/src/less/select.less
@@ -22,6 +22,15 @@ select {
  }
 }

+.react-fuzzy-search > * {
+  padding: 0 !important;
+  color: @primary;
+  & > input {
+    border: 1px solid @primary !important;
+    color: @primary-bg;
+  }
+}
+
 .cmdr-select {
  border: 1px solid @primary;
  padding: 0.5em 0.5em;
--- a/src/less/shipyard.less
+++ b/src/less/shipyard.less
@@ -49,4 +49,45 @@ a.ship {
    font-size: 0.7em;
    float: right;
  }
-}
+}
+
+.shipyard-table-wrapper {
+  white-space: nowrap;
+  margin: 0 auto;
+  font-size: 0.8em;
+  position: relative;
+  display: inline-block;
+  max-width: 100%;
+}
+
+table.shipyard-table{
+  tbody tr.comparehighlight{
+    background-color: @secondary-bg;
+    color: @fg-highlighted;
+  }
+}
+
+.shipyard-table-wrapper {
+  border-bottom: 1px solid @primary-darker;
+}
+
+.shipyard-table-wrapper div .shipyard-table td:last-child {
+  border-right: 1px solid @primary-darker;
+}
+.shipyard-table-wrapper > .shipyard-table td:first-child {
+  border-left: 1px solid @primary-darker;
+}
+
+.content-wrapper{
+  display: inline-block;
+  margin: 0 auto;
+  max-width: 100%;
+}
+
+.table-tools{
+  text-align: left;
+  color: @primary;
+  label{
+    cursor: pointer;
+  }
+}
--- a/src/less/table.less
+++ b/src/less/table.less
@@ -52,10 +52,10 @@ tbody tr {
  }

  .no-touch &.highlight:hover, .no-touch &.highlighted {
-    background-color: @warning-bg;
+    background-color: @alt-primary-bg-highlighted; //@warning-bg;
  }

-  &.alt {
+  &:nth-child(odd){
    background-color: @alt-primary-bg;
  }
 }
@@ -84,3 +84,5 @@ td {
    text-align: center;
  }
 }
+
+
--- a/src/schemas/ship-loadout/1.json
+++ b/src/schemas/ship-loadout/1.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/1.json#",
+  "id":                 "https://coriolis.io/schemas/ship-loadout/1.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3",
@@ -227,6 +227,11 @@
          "type":         "integer",
          "minimum":      1
        },
+        "fullTankRange": {
+          "description":  "Single Jump range with a full tank (unladenMass + fuel)",
+          "type":         "number",
+          "minimum":      0
+        },
        "ladenMass": {
          "description":  "Mass of the Ship + fuel + cargo (hull + all components + fuel tank + cargo capacity)",
          "type":         "number",
--- a/src/schemas/ship-loadout/2.json
+++ b/src/schemas/ship-loadout/2.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/2.json#",
+  "id":                 "https://coriolis.io/schemas/ship-loadout/2.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3",
@@ -254,6 +254,11 @@
          "type":         "integer",
          "minimum":      1
        },
+        "fullTankRange": {
+          "description":  "Single Jump range with a full tank (unladenMass + fuel)",
+          "type":         "number",
+          "minimum":      0
+        },
        "ladenMass": {
          "description":  "Mass of the Ship + fuel + cargo (hull + all components + fuel tank + cargo capacity)",
          "type":         "number",
--- a/src/schemas/ship-loadout/3.json
+++ b/src/schemas/ship-loadout/3.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/3.json#",
+  "id":                 "https://coriolis.io/schemas/ship-loadout/3.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout",
@@ -258,6 +258,11 @@
          "type":         "integer",
          "minimum":      1
        },
+        "fullTankRange": {
+          "description":  "Single Jump range with a full tank (unladenMass + fuel)",
+          "type":         "number",
+          "minimum":      0
+        },
        "ladenMass": {
          "description":  "Mass of the Ship + fuel + cargo (hull + all components + fuel tank + cargo capacity)",
          "type":         "number",
--- a/src/schemas/ship-loadout/4.json
+++ b/src/schemas/ship-loadout/4.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/4.json#",
+  "id":                 "https://coriolis.io/schemas/ship-loadout/4.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout",
@@ -300,6 +300,11 @@
          "type":         "integer",
          "minimum":      1
        },
+        "fullTankRange": {
+          "description":  "Single Jump range with a full tank (unladenMass + fuel)",
+          "type":         "number",
+          "minimum":      0
+        },
        "ladenMass": {
          "description":  "Mass of the Ship + fuel + cargo (hull + all components + fuel tank + cargo capacity)",
          "type":         "number",
--- a/src/sw.js
+++ b/src/sw.js
@@ -2,9 +2,31 @@ console.log('Hello from sw.js');

 if (workbox) {
  console.log('Yay! Workbox is loaded 🎉');
+  workbox.precaching.precacheAndRoute(self.__precacheManifest);
+
+  workbox.routing.registerNavigationRoute('/index.html');
+
+  workbox.routing.registerRoute(
+    /\.(?:png|jpg|jpeg|svg|gif)$/,
+    new workbox.strategies.CacheFirst({
+      plugins: [
+        new workbox.cacheableResponse.Plugin({
+          statuses: [0, 200]
+        })
+      ]
+    })
+  );
+
+  workbox.routing.registerRoute(
+    /\.(?:js|css)$/,
+    new workbox.strategies.StaleWhileRevalidate({
+      cacheName: 'static-resources',
+    })
+  );
+
  workbox.routing.registerRoute(
    new RegExp('https://fonts.(?:googleapis|gstatic).com/(.*)'),
-    workbox.strategies.cacheFirst({
+    new workbox.strategies.CacheFirst({
      cacheName: 'google-fonts',
      plugins: [
        new workbox.expiration.Plugin({
@@ -16,65 +38,21 @@ if (workbox) {
      ]
    })
  );
-  workbox.routing.registerRoute(
-    /\.(?:png|gif|jpg|jpeg|svg)$/,
-    workbox.strategies.cacheFirst({
-      cacheName: 'images',
-      plugins: [
-        new workbox.expiration.Plugin({
-          maxEntries: 60,
-          maxAgeSeconds: 30 * 24 * 60 * 60 // 30 Days
-        })
-      ]
-    })
-  );
-  workbox.routing.registerRoute(
-    /\.(?:js|css)$/,
-    workbox.strategies.staleWhileRevalidate({
-      cacheName: 'static-resources'
-    })
-  );
-  try {
-    workbox.googleAnalytics.initialize();
-  } catch (e) {
-    console.log('Probably an ad-blocker');
-  }
 } else {
  console.log('Boo! Workbox didn\'t load 😬');
 }

-
 self.addEventListener('message', event => {
-	if (!event.data) {
-		return;
-	}
+  if (!event.data) {
+    return;
+  }

-	switch (event.data) {
-		case 'skipWaiting':
-			self.skipWaiting();
-			break;
-		default:
-			// NOOP
-			break;
-	}
-});
-
-self.addEventListener('fetch', function(event) {
-	console.log('Handling fetch event for', event.request.url);
-
-	event.respondWith(
-		caches.match(event.request).then(function(response) {
-			if (response) {
-				return response;
-			}
-
-			return fetch(event.request)
-				.then(function(response) {
-					return response;
-				})
-				.catch(function(error) {
-					return caches.match(OFFLINE_URL);
-				});
-		})
-	);
+  switch (event.data) {
+    case 'skipWaiting':
+      self.skipWaiting();
+      break;
+    default:
+      // NOOP
+      break;
+  }
 });
--- a/src/xdLocalStoragePostMessageApi.min.js
+++ b/src/xdLocalStoragePostMessageApi.min.js
@@ -0,0 +1 @@
+"use strict";window.XdUtils=window.XdUtils||function(){function a(a,b){var c,d=b||{};for(c in a)a.hasOwnProperty(c)&&(d[c]=a[c]);return d}return{extend:a}}(),function(){function a(a,b){var c=XdUtils.extend(b,l);c.id=a,parent.postMessage(JSON.stringify(c),"*")}function b(b,c){a(b,{key:c,value:localStorage.getItem(c)})}function c(b,c,d){localStorage.setItem(c,d),a(b,{success:localStorage.getItem(c)===d})}function d(b,c){localStorage.removeItem(c),a(b,{})}function e(b,c){a(b,{key:localStorage.key(c)})}function f(b){a(b,{size:JSON.stringify(localStorage).length})}function g(b){a(b,{length:localStorage.length})}function h(b){localStorage.clear(),a(b,{})}function i(a){var i;try{i=JSON.parse(a.data)}catch(a){}i&&i.namespace===k&&("set"===i.action?c(i.id,i.key,i.value):"get"===i.action?b(i.id,i.key):"remove"===i.action?d(i.id,i.key):"key"===i.action?e(i.id,i.key):"size"===i.action?f(i.id):"length"===i.action?g(i.id):"clear"===i.action&&h(i.id))}function j(){var a={namespace:k,id:"iframe-ready"};parent.postMessage(JSON.stringify(a),"*")}var k="cross-domain-local-message",l={namespace:k};window.addEventListener?window.addEventListener("message",i,!1):window.attachEvent("onmessage",i),j()}();
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -14,7 +14,7 @@ module.exports = {
  },
  mode: 'development',
  entry: {
-    main: './src/app/index.js'
+    main: './src/app/index.js',
  },
  resolve: {
    // When requiring, you don't need to add these extensions
@@ -22,17 +22,15 @@ module.exports = {
  },
  optimization: {
    minimize: false,
-    splitChunks: {
-      chunks: 'all'
-    }
+    usedExports: true
  },
  output: {
    path: path.join(__dirname, 'build'),
-    filename: 'app.js',
+    chunkFilename: '[name].bundle.js',
    publicPath: '/'
  },
  plugins: [
-    new CopyWebpackPlugin(['src/.htaccess']),
+    new CopyWebpackPlugin(['src/.htaccess', 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js']),
    // new webpack.optimize.CommonsChunkPlugin({
    //   name: 'lib',
    //   filename: 'lib.js'
@@ -56,7 +54,10 @@ module.exports = {
  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: /\.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' },
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -4,33 +4,35 @@ 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 } = require('webpack-bugsnag-plugins');
+const { BugsnagSourceMapUploaderPlugin, BugsnagBuildReporterPlugin } = require('webpack-bugsnag-plugins');
 const pkgJson = require('./package');
 const buildDate = new Date();

 module.exports = {
  devtool: 'source-map',
  entry: {
-    main: ['./src/app/index.js']
+    main: './src/app/index.js'
  },
  resolve: {
    extensions: ['.js', '.jsx', '.json', '.less']
  },
  output: {
    path: path.join(__dirname, 'build'),
-    filename: '[name].[hash].js',
+    chunkFilename: '[name].bundle.js',
    publicPath: '/',
    globalObject: 'this'
  },
  mode: 'production',
  optimization: {
    minimize: true,
-    splitChunks: {
-      chunks: 'all'
-    }
+    usedExports: true
  },
  plugins: [
-    new CopyWebpackPlugin(['src/.htaccess', { from: 'src/schemas', to: 'schemas' }, {from: 'src/images/logo/*', flatten: true, to: ''}]),
+    new CopyWebpackPlugin(['src/.htaccess', { from: 'src/schemas', to: 'schemas' }, {
+      from: 'src/images/logo/*',
+      flatten: true,
+      to: ''
+    }, 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js']),
    // new webpack.optimize.CommonsChunkPlugin({
    //  name: 'lib',
    //  filename: 'lib.[chunkhash:6].js'
@@ -48,8 +50,13 @@ module.exports = {
      disable: false,
      allChunks: true
    }),
+    // new BugsnagBuildReporterPlugin({
+    //   apiKey: 'ba9fae819372850fb660755341fa6ef5',
+    //   appVersion: `${pkgJson.version}-${buildDate.toISOString()}`
+    // }, { /* opts */ }),
    // new BugsnagSourceMapUploaderPlugin({
    //   apiKey: 'ba9fae819372850fb660755341fa6ef5',
+    //   overwrite: true,
    //   appVersion: `${pkgJson.version}-${buildDate.toISOString()}`
    // }),
    new InjectManifest({
@@ -61,7 +68,10 @@ module.exports = {
  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: /\.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' },
Author	SHA1	Message	Date
felixlinker	934593fe2a	Migrate changes of `87fc3b6cbb`	2019-10-08 14:00:54 +02:00
willyb321	e4a826592f	remove ads, trial didnt work	2019-09-27 07:15:13 +10:00
willyb321	cee4c32551	Merge branch 'master' into develop	2019-09-23 08:47:08 +10:00
willyb321	081d8fb86a	google analytics	2019-09-23 08:41:34 +10:00
willyb321	3dfd563d90	testing ads again	2019-09-23 08:39:53 +10:00
William	fd08cd219c	Merge pull request #546 from EDCD/fix/bugs Various bug fixes	2019-09-18 05:59:58 +10:00
sascha-dev	6a15326d31	Wrong translation corrected.	2019-09-15 12:46:41 +02:00
sascha-dev	608ecc51b7	german translation extended	2019-09-15 12:46:41 +02:00
sascha-dev	fcef26ebbb	german translation extended. fixed some typos.	2019-09-15 12:46:41 +02:00
Felix Linker	ba6d758ed5	Import plasma slug correctly References #450	2019-09-13 22:36:56 +02:00
Felix Linker	43aa3e4e79	Merge pull request #541 from monopoint/export_select bugfix: unable to copy from export textarea (#540)	2019-09-11 22:27:23 +02:00
Unknown	18f0e060a7	fix for scrollbar on demand	2019-09-11 22:16:55 +02:00
EspenMH	c7547e8baf	shipyard: group compared, scrollbar on demand, borders	2019-09-11 22:16:55 +02:00
spinmh	ffff242abe	userselect: auto does not resove correct if parent has user-select: none (it has) set explicitly to "text"	2019-09-07 18:42:48 +02:00
Felix Linker	b44c66b986	Merge pull request #536 from monopoint/develop 448: compare highlights in shipyard	2019-08-25 13:32:08 +02:00
Felix Linker	ae77ec6256	Implement blueprint changes to focused weapon	2019-08-24 15:36:51 +02:00
Felix Linker	4f1e32b154	Move sustained factor calculation into own function Closes #517	2019-08-24 14:16:50 +02:00
Felix Linker	af37c2bfc5	Fix import falloff References #535	2019-08-24 14:16:50 +02:00
felixlinker	5d4ab6f2ad	Disabling guardian shield/module/hull reinforcement packages has an effect now Closes #523	2019-08-24 14:16:49 +02:00
felixlinker	0c9db53057	Use shield and armour metrics in ship summary table	2019-08-24 14:16:49 +02:00
felixlinker	b689605ac2	Maximum active limpets does not show twice now Closes #532	2019-08-19 18:59:11 +02:00
felixlinker	baab91e371	Rename "Boost Time" to "Boost Interval" Closes #537	2019-08-19 18:52:15 +02:00
EspenMH	70e69c7099	448: removed double quotes in js. slight text highlight on compared ships in shipyard	2019-08-15 15:06:37 +02:00
spinmh	f4534fd3eb	Remove manual ShouldComponentUpdate eval	2019-08-15 02:19:38 +02:00
spinmh	93594e1a65	Compare Highlight in Shipyard	2019-08-15 02:18:00 +02:00
William	b5e449ea54	Merge pull request #525 from TranslucentSabre/feature/fix_module_discount_import Fix backup import to properly handle module discount.	2019-07-01 08:18:07 +10:00
William	0ff4b849aa	Update Header.jsx	2019-06-29 11:34:58 +10:00
William	b99e38043f	Update Header.jsx	2019-06-29 11:34:03 +10:00
Timothy Myers	28e3a59473	Fix backup import to properly handle module discount.	2019-06-24 11:22:10 -05:00
Felix Linker	b20290fb60	Add mention of compiled and hosted coriolis-data-files in README	2019-05-27 21:18:54 +02:00
willyb321	2734beb6f8	Merge remote-tracking branch 'origin/master'	2019-05-23 16:59:02 +10:00
willyb321	345eec528c	RIP	2019-05-23 16:58:14 +10:00
Felix Linker	7a17e18a76	Remove undefined variable	2019-05-19 23:22:07 +02:00
willyb321	4697677457	Merge branch 'develop'	2019-05-20 06:36:43 +10:00
felixlinker	7d8a5a1368	Clear original slot if an experimental is copied and exceeds the allowed number References #367	2019-05-19 16:01:48 +02:00
felixlinker	dd7402bd0e	Allow experimental modules to be replaced with such even if 4 are present References #367	2019-05-19 16:00:16 +02:00
felixlinker	65592b0fc6	Allow any thruster to be applied Closes #512	2019-05-19 15:59:33 +02:00
felixlinker	0ab66023a6	Update calculation of SHPS/SEPS to match DPS~SDPS References #504	2019-05-19 01:25:51 +02:00
felixlinker	d6fad098ee	Restrict experimental weapons to at 4 at max Closes #367	2019-05-19 01:12:50 +02:00
felixlinker	1b5730d337	Revert "Max 4 items per row when selecting modules" This reverts commit `9b6b1d328c`.	2019-05-19 00:49:09 +02:00
felixlinker	439b615b1b	Revert "Don't allow more than four experimental weapons at once" This reverts commit `ac2e2e4d69`.	2019-05-19 00:41:12 +02:00
Felix Linker	a8b30594dc	Merge pull request #511 from EDCD/fix/data Not more than 4 experimentals	2019-05-18 12:48:44 +02:00
felixlinker	9b6b1d328c	Max 4 items per row when selecting modules	2019-05-18 12:16:39 +02:00
felixlinker	ac2e2e4d69	Don't allow more than four experimental weapons at once Closes https://github.com/EDCD/coriolis/issues/367	2019-05-18 12:01:31 +02:00
Felix Linker	3a5fb31860	Merge pull request #508 from EDCD/fix/dps Fixes to DPS and ROF calculations	2019-05-17 22:57:32 +02:00
felixlinker	c610eb8627	Fix burst(rof) modding and burst sdps calculation References #504 #388	2019-05-17 21:02:17 +02:00
felixlinker	94980270c4	Fix SDPS calculations Closes #504	2019-05-17 20:22:57 +02:00
felixlinker	c685e002e3	Fastest range is farthest range Closes #471	2019-05-17 19:43:12 +02:00
felixlinker	1f665eed9e	We don't need any time to remove no shields Closes #426	2019-05-17 18:51:09 +02:00
felixlinker	0c4fc1fd9a	Correctly update jump range for turned off modules Closes #506	2019-05-17 18:40:20 +02:00
felixlinker	0fc033363e	Don't handle inverting rof twice Closes #500	2019-05-17 17:42:51 +02:00
willyb321	fb6e9538bc	change service worker caching	2019-04-29 06:44:03 +10:00
willyb321	95b98fc4ed	remove google analytics	2019-04-29 06:33:11 +10:00
Felix Linker	1840dafed0	Fix rate of fire modification (#497 ) * Fix absolute setting of burst/burstrof * Improve change display for stats with overwrite * Module.getPretty takes synthetic getters into account * Allow custom higherbetter for changes of stats when formatted * Fix rof modding	2019-04-29 06:05:43 +10:00
willyb321	1ad82b116c	Merge branch 'develop'	2019-04-27 10:31:37 +10:00
Felix Linker	7bdd17504b	Fixes (#495 ) * Create class-child module for selection when comparing Closes #198 * Remove broken exception for shieldboost in getPercent Closes #274 * Remove barely used functions	2019-04-27 10:29:49 +10:00
willyb321	2d820bb5d5	test	2019-04-27 10:22:21 +10:00
willyb321	2e14512ed8	Merge branch 'develop'	2019-04-24 07:33:52 +10:00
willyb321	48ed583c6d	Merge branch 'feature/3.4' into develop	2019-04-24 07:32:35 +10:00
willyb321	dd444a17f3	handle journal-style imports Closes #391	2019-04-17 11:06:48 +10:00
willyb321	2ea63c711e	docking computer is now a unique module you cannot have more than 1 standard dc, or a standard and an advanced dc, nor more than 1 advanced	2019-04-15 07:01:08 +10:00
willyb321	6d6d31db25	rename assists to flight assists	2019-04-15 07:00:48 +10:00
willyb321	e9273dcb9b	move dc to assists category, 3.4 prep	2019-04-15 06:43:55 +10:00
willyb321	2bdc4562c6	add rg to autofill	2019-04-05 08:51:37 +11:00
willyb321	9e8a5323e9	Merge branch 'develop'	2019-03-31 10:34:37 +11:00
willyb321	8e001063b3	fix regex	2019-03-31 10:34:22 +11:00
willyb321	dc88fab4c5	Merge branch 'develop'	2019-03-31 10:24:03 +11:00
willyb321	dfca917e50	build image in docker compose	2019-03-31 10:23:41 +11:00
willyb321	ef7dfd6ca1	checkout branch in docker build	2019-03-31 10:17:58 +11:00
Mingming Cui	435c1b6d45	Chinese translation (#481 ) * Chinese translation * Added Chinese translation for UI * Made some strings translatable. Changed the translation ID of certain words which were used with different meanings in difference places in order to achieve a more accurate translation. * fixed en format * Fixed one capitalization mistake * removed vs folder	2019-03-05 08:31:29 +11:00
willyb321	c5c9abe588	Merge branch 'master' into develop	2019-02-27 08:24:25 +11:00
opl-	363735d36b	Fix ships menu not sorted by name (#477 )	2019-02-26 08:00:09 +11:00
William	2741e7701b	Update .gitlab-ci.yml	2019-02-18 12:38:40 +11:00
neilser	3be442ea60	Fix wrong units for pgen and power in pop-ups (#468 )	2019-01-31 08:14:35 +11:00
Willyb321	34cbeca201	Merge branch 'develop'	2019-01-24 07:40:39 +11:00
Willyb321	b37e73ead6	one build stage	2019-01-23 08:58:12 +11:00
Willyb321	ee775521d6	Merge branch 'develop' of gitlab.willb.info:coriolis/coriolis into develop	2019-01-23 08:57:33 +11:00
Willyb321	5f84aaef1b	add redirect from .edcd.io to .io	2019-01-23 08:57:17 +11:00
William	99ac58d999	Update .gitlab-ci.yml	2019-01-22 19:53:07 +11:00
William	f128a1e87d	Create .gitlab-ci.yml	2019-01-22 19:45:28 +11:00
William	8c0768b451	Add license file using license from README	2019-01-22 09:30:20 +11:00
Felix Linker	319307136c	Remove constraints for modification of maxmass	2019-01-15 19:17:45 +01:00
Felix Linker	a498452943	Multiple bug fixes (#463 ) * Don't allow manually modifying multiplicative mods with base value zero * Add missing argument when calculating fullTankRange * Use opponent PD when calculating how long shields will hold Closes #430 * Allow modifying max mass ONLY for shield generators Closes #453	2019-01-15 10:32:33 +11:00
Willyb321	4b854b8305	Search tweaks	2019-01-04 09:28:21 +11:00
William Blythe	b400db8216	only cache if not 404	2019-01-04 08:01:02 +11:00
Willyb321	fb811faf5e	Merge branch 'develop'	2019-01-03 08:54:49 +11:00
Willyb321	deeb525433	Remove dynamic import for pages Closes #441	2019-01-03 08:54:22 +11:00
Willyb321	1cb88115f6	Merge branch 'develop'	2019-01-03 08:46:29 +11:00
Willyb321	a181791500	We don't run ads now.	2019-01-03 08:45:20 +11:00
William Blythe	94eec120da	Merge branch 'develop'	2019-01-02 12:13:46 +11:00
William Blythe	48092d4395	trycatch announcements check	2019-01-02 12:13:27 +11:00
William Blythe	2457c30b94	Merge branch 'develop'	2018-12-31 08:19:07 +11:00
William Blythe	593f069806	Fix title being page not found even after page has loaded	2018-12-31 08:18:36 +11:00
William Blythe	a073692632	add probe radius	2018-12-27 08:18:38 +11:00
William Blythe	7752d5c9db	Fix #445	2018-12-26 09:23:44 +11:00
William Blythe	544e5acaef	remove snow	2018-12-26 09:14:45 +11:00
William Blythe	9ab35bbaf9	Merge branch 'develop'	2018-12-26 09:07:21 +11:00
William Blythe	98782da200	make shipyardpage not dynamic import	2018-12-26 09:07:05 +11:00
William Blythe	2936364934	prep for abl	2018-12-26 08:50:00 +11:00
William Blythe	01e1609a9f	Merge branch 'develop'	2018-12-26 08:30:00 +11:00
William Blythe	f85a03a9ae	remove christmas theme its 8:30am in sydney ok	2018-12-26 08:29:45 +11:00
William Blythe	2703c2aa23	move mining laser to new mining group	2018-12-25 09:35:01 +11:00
William Blythe	954921c231	probably fix scrolling	2018-12-25 09:07:39 +11:00
William Blythe	8bed35a8ba	probably fix scrolling	2018-12-25 09:06:00 +11:00
William Blythe	9f4ae60577	add christmas snow Credit: https://codepen.io/keithclark/pen/yBcsr	2018-12-25 08:53:50 +11:00
William Blythe	ee3c50e27d	add christmas snow Credit: https://codepen.io/keithclark/pen/yBcsr	2018-12-25 08:53:05 +11:00
Willyb321	03020743b3	some docker adjustments, fix brotli comprpession	2018-12-23 07:51:42 +11:00
William Blythe	001fed67b7	change order of compression	2018-12-23 06:51:50 +11:00
William Blythe	3894915740	fix nginx conf	2018-12-23 06:39:32 +11:00
William Blythe	68fd13e8dc	/shrgu	2018-12-22 08:25:53 +11:00
William Blythe	fdf16cd959	maybe	2018-12-22 08:25:10 +11:00
William Blythe	d916c67fe0	f	2018-12-22 08:13:06 +11:00
William Blythe	d8a8e224f4	enable brotli	2018-12-22 08:07:20 +11:00
William Blythe	e1c115747c	nginx compression	2018-12-22 08:03:35 +11:00
William Blythe	e9b6d71606	dynamically import pages, should make things a bit faster	2018-12-22 07:48:35 +11:00
William Blythe	e03e249d2f	probably fix .dockerignore	2018-12-22 07:19:53 +11:00
monopoint	0cfb0b6878	Fix background highlight on sort in shipyard (#447 ) * Fix background highlight on sort in shipyard * removed docs line	2018-12-21 12:14:43 -08:00
William Blythe	600df162aa	Prep for sub surface displacement missile	2018-12-22 06:45:52 +11:00
Willyb321	94141aa3c5	mining tools in their own section, prep for scl	2018-12-19 08:21:13 +11:00
Willyb321	aca90d7077	prep for pulse wave analysers	2018-12-18 08:25:30 +11:00
felixlinker	a66fa8e83f	Merge branch 'develop'	2018-12-05 20:32:55 +00:00
felixlinker	194db07057	Hotfix pip parsing in control code	2018-12-05 20:31:46 +00:00
William Blythe	307886d4ae	Merge branch 'develop'	2018-12-04 12:02:02 +11:00
willyb321	bbba048129	update to bugsnag 5	2018-11-30 06:56:01 +11:00
willyb321	222173b388	add category select to orbis modal	2018-11-25 07:54:16 +11:00
willyb321	ec0d05e081	add beta resting heat	2018-11-22 07:31:45 +11:00
Willyb321	b3be0bd639	remove logs	2018-11-21 09:00:50 +11:00
Willyb321	529d80682c	Merge branch 'develop' of github.com:edcd/coriolis into develop	2018-11-21 08:51:32 +11:00
Willyb321	934de01803	add announcements to actual page	2018-11-21 08:50:53 +11:00
William	3367580d78	Apply diminishing returns for hull resistance modding to all modules (#425 ) References #396	2018-11-21 08:38:46 +11:00
felixlinker	fbf59219d0	Apply diminishing returns for hull resistance modding to all modules	2018-11-20 20:57:39 +00:00
William Blythe	77401a3b3f	get ready for dw2 site	2018-11-19 09:21:18 +11:00
willyb321	7c587c29aa	add build reporter plugin	2018-11-19 07:12:36 +11:00
willyb321	2295dccd82	re-enable bugsnag	2018-11-19 07:10:05 +11:00
willyb321	cc4ad6d132	and a bit moree	2018-11-19 06:58:53 +11:00
willyb321	8a2d27290a	add some logging to assist DWE2 people (temp)	2018-11-19 06:58:12 +11:00
willyb321	eda61a8e06	in theory fix guardian pds Closes #339	2018-11-17 09:26:57 +11:00
William Blythe	3987c4e681	maybe an actually good service worker for once	2018-11-13 09:23:29 +11:00
William Blythe	71b90eb6f4	maybe an actually good service worker for once	2018-11-13 09:11:43 +11:00
willyb321	4e891f382c	prep for import	2018-11-13 06:25:17 +11:00
willyb321	3d3f9e44b5	add damage per shot	2018-11-11 01:57:06 +11:00
willyb321	dd7a133caa	add search bar initial why am i awake its like 2am	2018-11-11 01:31:30 +11:00
willyb321	ae247c4812	support beta flag	2018-11-10 09:39:22 +11:00
William Blythe	6c932f96a6	add fill weapons for AX weps	2018-11-09 11:28:37 +11:00
William Blythe	0ea25692d3	work on sw	2018-11-07 13:09:04 +11:00
William Blythe	e129e1da39	work on sw	2018-11-07 13:08:35 +11:00
William Blythe	8acd32b0fc	Merge branch 'develop'	2018-11-05 11:59:25 +11:00
William Blythe	8e5dd9fb8d	add iframe to allow posting builds	2018-11-05 11:51:50 +11:00
William Blythe	97ce2828e0	mamba prep	2018-11-02 09:57:48 +11:00
William Blythe	f8f99a5aaa	Merge branch 'develop'	2018-11-01 10:12:02 +11:00
William Blythe	70cfa58896	remove halloween	2018-11-01 07:30:07 +11:00
William Blythe	6e79ced51e	remove halloween	2018-11-01 07:28:54 +11:00
William Blythe	56571f9c1f	halloween	2018-10-31 09:20:35 +11:00
William Blythe	0b10cac85c	halloween	2018-10-31 09:20:05 +11:00
Stratos Gerakakis	34c04a6354	Fixed Typo on "Armour Tactics" (#414 ) * fix sw not registered * Fix/no adsense (#412) * Fixed Type on "Armour Tactics"	2018-10-29 09:14:32 +11:00
William Blythe	4e337c4ca1	add pax tooltip to outfitting too	2018-10-26 09:28:33 +11:00
William Blythe	5048b7e094	add pax tooltip	2018-10-26 09:05:33 +11:00
William Blythe	27fbc1ad66	remove file	2018-10-25 10:36:35 +11:00
William Blythe	4ab376d9ed	Fix/no adsense (#412 )	2018-10-24 09:08:13 +11:00
William	dfffc3a268	Fix/no adsense (#412 ) * No adsense * remove script tag	2018-10-24 09:06:24 +11:00
William	b59fa15e00	Merge pull request #411 from EDCD/fix/chart-labels Fix VerticalBarchart labels	2018-10-24 07:52:58 +11:00
felixlinker	12bca4c44e	Fix VerticalBarchart labels	2018-10-23 21:48:07 +01:00
William Blythe	2858ef3e93	Merge branch 'develop'	2018-10-23 13:03:58 +11:00
William Blythe	7d99471f89	sw	2018-10-23 12:41:56 +11:00
William Blythe	a2ab708ac9	format	2018-10-23 12:14:28 +11:00
William Blythe	a34a9c355f	fix sw not registered	2018-10-23 11:57:07 +11:00
William Blythe	3215b3942d	fix sw not registered	2018-10-23 11:56:33 +11:00
William Blythe	557c0afd9b	Merge branch 'master' into develop	2018-10-23 11:50:58 +11:00
William Blythe	d52365a204	/shrug	2018-10-23 09:55:42 +11:00
felixlinker	14b2a14e58	Merge branch 'master' into develop	2018-10-22 23:52:09 +01:00
William Blythe	7f24904f77	various bits	2018-10-23 09:46:50 +11:00
William Blythe	da07790594	various bits	2018-10-23 09:40:13 +11:00
William	5008c7cd74	Update sw.js	2018-10-23 08:15:54 +11:00
willyb321	a778b1b6e1	update	2018-10-22 17:15:09 +11:00
William Blythe	bd9771f9ba	test run	2018-10-22 11:49:15 +11:00
William Blythe	600c244f9b	test run	2018-10-22 11:44:14 +11:00
willyb321	3e0a5e22b1	Merge branch 'develop'	2018-10-21 10:21:04 +11:00
				`@@ -0,0 +1 @@`
				"use strict";window.XdUtils=window.XdUtils\|\|function(){function a(a,b){var c,d=b\|\|{};for(c in a)a.hasOwnProperty(c)&&(d[c]=a[c]);return d}return{extend:a}}(),function(){function a(a,b){var c=XdUtils.extend(b,l);c.id=a,parent.postMessage(JSON.stringify(c),"")}function b(b,c){a(b,{key:c,value:localStorage.getItem(c)})}function c(b,c,d){localStorage.setItem(c,d),a(b,{success:localStorage.getItem(c)===d})}function d(b,c){localStorage.removeItem(c),a(b,{})}function e(b,c){a(b,{key:localStorage.key(c)})}function f(b){a(b,{size:JSON.stringify(localStorage).length})}function g(b){a(b,{length:localStorage.length})}function h(b){localStorage.clear(),a(b,{})}function i(a){var i;try{i=JSON.parse(a.data)}catch(a){}i&&i.namespace===k&&("set"===i.action?c(i.id,i.key,i.value):"get"===i.action?b(i.id,i.key):"remove"===i.action?d(i.id,i.key):"key"===i.action?e(i.id,i.key):"size"===i.action?f(i.id):"length"===i.action?g(i.id):"clear"===i.action&&h(i.id))}function j(){var a={namespace:k,id:"iframe-ready"};parent.postMessage(JSON.stringify(a),"")}var k="cross-domain-local-message",l={namespace:k};window.addEventListener?window.addEventListener("message",i,!1):window.attachEvent("onmessage",i),j()}();