2.9.11

just update everything when applying a special
2.9.10
2025-12-08 14:33:22 +00:00 · 2018-04-26 09:19:57 +10:00 · 2018-04-26 09:06:18 +10:00 · 2018-04-25 20:00:36 +10:00 · 2018-04-25 19:55:05 +10:00 · 2018-04-25 18:45:24 +10:00
31 changed files with 1918 additions and 413 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+root = true
+
+
+[*]
+
+# change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# we recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[{package,bower}.json]
+indent_style = space
+indent_size = 2
--- a/devServer.js
+++ b/devServer.js
@@ -5,6 +5,7 @@ var config = require('./webpack.config.dev');
 new WebpackDevServer(webpack(config), {
  publicPath: config.output.publicPath,
  hot: true,
+  disableHostCheck: true,
  headers: { "Access-Control-Allow-Origin": "*" },
  historyApiFallback: {
    rewrites: [
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis_shipyard",
-  "version": "2.5.0",
+  "version": "2.9.11",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1810,6 +1810,260 @@
      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
      "dev": true
    },
+    "bugsnag-build-reporter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bugsnag-build-reporter/-/bugsnag-build-reporter-1.0.0.tgz",
+      "integrity": "sha512-uYhbiTOEahw9+ewR4GYxHsBL7OSCbA8EtBnugtT27ZTU3dDZRPJWptzrlEe7O4blTSz7YcFCmTnaG+c5Ng04Jg==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.3.2",
+        "concat-stream": "1.6.0",
+        "find-nearest-file": "1.1.0",
+        "meow": "4.0.0",
+        "minimist": "1.2.0",
+        "pino": "4.16.1",
+        "run-parallel": "1.1.8"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0",
+            "map-obj": "2.0.0",
+            "quick-lru": "1.1.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "indent-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+          "dev": true
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz",
+          "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "4.2.0",
+            "decamelize-keys": "1.1.0",
+            "loud-rejection": "1.6.0",
+            "minimist": "1.2.0",
+            "minimist-options": "3.0.2",
+            "normalize-package-data": "2.4.0",
+            "read-pkg-up": "3.0.0",
+            "redent": "2.0.0",
+            "trim-newlines": "2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.2"
+          }
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "3.0.0"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "3.2.0",
+            "strip-indent": "2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        }
+      }
+    },
+    "bugsnag-sourcemaps": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/bugsnag-sourcemaps/-/bugsnag-sourcemaps-1.0.3.tgz",
+      "integrity": "sha512-QZNG948Qh2qgcZI9pTE3mN6/Do5JVj+VzZkziNw0K6aqzijIvJQc0LDQYlrX0IEvPDuiOu+jAqd8fa0MfitbwA==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "listr": "0.12.0",
+        "meow": "3.7.0",
+        "rc": "1.2.6",
+        "read-pkg-up": "2.0.0",
+        "request": "2.83.0"
+      },
+      "dependencies": {
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "2.3.0"
+          }
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
    "builtin-modules": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
@@ -2011,6 +2265,22 @@
        "restore-cursor": "1.0.1"
      }
    },
+    "cli-spinners": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
+      "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
+      "dev": true
+    },
+    "cli-truncate": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
+      "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=",
+      "dev": true,
+      "requires": {
+        "slice-ansi": "0.0.4",
+        "string-width": "1.0.2"
+      }
+    },
    "cli-width": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
@@ -3496,6 +3766,16 @@
        "object-assign": "4.1.1"
      }
    },
+    "cross-env": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.4.tgz",
+      "integrity": "sha512-Mx8mw6JWhfpYoEk7PGvHxJMLQwQHORAs8+2bX+C1lGQ4h3GkDb1zbzC2Nw85YH9ZQMlO0BHZxMacgrfPmMFxbg==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "5.1.0",
+        "is-windows": "1.0.2"
+      }
+    },
    "cross-spawn": {
      "version": "5.1.0",
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -3969,6 +4249,12 @@
        "assert-plus": "1.0.0"
      }
    },
+    "date-fns": {
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz",
+      "integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==",
+      "dev": true
+    },
    "date-now": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
@@ -3989,12 +4275,28 @@
      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
      "dev": true
    },
+    "decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "dev": true,
+      "requires": {
+        "decamelize": "1.2.0",
+        "map-obj": "1.0.1"
+      }
+    },
    "deep-equal": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
      "dev": true
    },
+    "deep-extend": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
+      "dev": true
+    },
    "deep-is": {
      "version": "0.1.3",
      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -4233,6 +4535,12 @@
      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
      "dev": true
    },
+    "elegant-spinner": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
+      "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
+      "dev": true
+    },
    "elliptic": {
      "version": "6.4.0",
      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
@@ -4268,6 +4576,15 @@
        "iconv-lite": "0.4.19"
      }
    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
    "enhanced-resolve": {
      "version": "3.4.1",
      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
@@ -4788,6 +5105,12 @@
      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
      "dev": true
    },
+    "fast-json-parse": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+      "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==",
+      "dev": true
+    },
    "fast-json-stable-stringify": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -4800,6 +5123,12 @@
      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
      "dev": true
    },
+    "fast-safe-stringify": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.3.tgz",
+      "integrity": "sha512-QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw==",
+      "dev": true
+    },
    "fastparse": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
@@ -4948,6 +5277,12 @@
        "pkg-dir": "2.0.0"
      }
    },
+    "find-nearest-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-nearest-file/-/find-nearest-file-1.1.0.tgz",
+      "integrity": "sha512-NMsS0ITOwpBPrHOyO7YUtDhaVEGUKS0kBJDVaWZPuCzO7JMW+uzFQQVts/gPyIV9ioyNWDb5LjhHWXVf1OnBDA==",
+      "dev": true
+    },
    "find-up": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
@@ -4969,6 +5304,12 @@
        "write": "0.2.1"
      }
    },
+    "flatstr": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/flatstr/-/flatstr-1.0.5.tgz",
+      "integrity": "sha1-W0UbCMvUji6sVKK74L9GFlqhS+M=",
+      "dev": true
+    },
    "flatten": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
@@ -6586,6 +6927,12 @@
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
    "inquirer": {
      "version": "0.12.0",
      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
@@ -6829,6 +7176,12 @@
      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
      "dev": true
    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
    "is-property": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
@@ -6885,6 +7238,12 @@
      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
      "dev": true
    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
    "is-wsl": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
@@ -8099,6 +8458,12 @@
      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
      "dev": true
    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
    "json-schema": {
      "version": "0.2.3",
      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -8400,6 +8765,72 @@
        "type-check": "0.3.2"
      }
    },
+    "listr": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
+      "integrity": "sha1-a84sD1YD+klYDqF81qAMwOX6RRo=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-truncate": "0.2.1",
+        "figures": "1.7.0",
+        "indent-string": "2.1.0",
+        "is-promise": "2.1.0",
+        "is-stream": "1.1.0",
+        "listr-silent-renderer": "1.1.1",
+        "listr-update-renderer": "0.2.0",
+        "listr-verbose-renderer": "0.4.1",
+        "log-symbols": "1.0.2",
+        "log-update": "1.0.2",
+        "ora": "0.2.3",
+        "p-map": "1.2.0",
+        "rxjs": "5.5.10",
+        "stream-to-observable": "0.1.0",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "listr-silent-renderer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz",
+      "integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=",
+      "dev": true
+    },
+    "listr-update-renderer": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz",
+      "integrity": "sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-truncate": "0.2.1",
+        "elegant-spinner": "1.0.1",
+        "figures": "1.7.0",
+        "indent-string": "3.2.0",
+        "log-symbols": "1.0.2",
+        "log-update": "1.0.2",
+        "strip-ansi": "3.0.1"
+      },
+      "dependencies": {
+        "indent-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+          "dev": true
+        }
+      }
+    },
+    "listr-verbose-renderer": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz",
+      "integrity": "sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-cursor": "1.0.2",
+        "date-fns": "1.29.0",
+        "figures": "1.7.0"
+      }
+    },
    "load-json-file": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -8463,6 +8894,25 @@
      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
      "dev": true
    },
+    "log-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3"
+      }
+    },
+    "log-update": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
+      "integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "1.4.0",
+        "cli-cursor": "1.0.2"
+      }
+    },
    "loglevel": {
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.5.1.tgz",
@@ -8729,6 +9179,16 @@
      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
      "dev": true
    },
+    "minimist-options": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
+      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "is-plain-obj": "1.1.0"
+      }
+    },
    "mkdirp": {
      "version": "0.5.1",
      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -9064,6 +9524,18 @@
        "wordwrap": "1.0.0"
      }
    },
+    "ora": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
+      "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-cursor": "1.0.2",
+        "cli-spinners": "0.1.2",
+        "object-assign": "4.1.1"
+      }
+    },
    "original": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz",
@@ -9297,6 +9769,65 @@
        "pinkie": "2.0.4"
      }
    },
+    "pino": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/pino/-/pino-4.16.1.tgz",
+      "integrity": "sha512-ST/IC5RMyqrOZL+Hq6LDwz5h4fGKABXzx2/5Ze7rz5TjuPvE8uI72dzj409xkq9JjyWsKoOOApgXn8kEjJ73yg==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.3.2",
+        "fast-json-parse": "1.0.3",
+        "fast-safe-stringify": "1.2.3",
+        "flatstr": "1.0.5",
+        "pino-std-serializers": "2.0.0",
+        "pump": "3.0.0",
+        "quick-format-unescaped": "1.1.2",
+        "split2": "2.2.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "pino-std-serializers": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.0.0.tgz",
+      "integrity": "sha512-8OtC69pAB3wixI521iDkdBkmWAGuNwSbUGAOaIK99whgusDm3/ST5EUlTSluBW2jsvjx3Khk5eBcm3CVl2IGMg==",
+      "dev": true
+    },
    "pkg-dir": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
@@ -10015,6 +10546,16 @@
        "randombytes": "2.0.5"
      }
    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
+      }
+    },
    "punycode": {
      "version": "1.4.1",
      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -10060,6 +10601,21 @@
      "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=",
      "dev": true
    },
+    "quick-format-unescaped": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.2.tgz",
+      "integrity": "sha1-DKWB3jF0vs7yWsPC6JVjQjgdtpg=",
+      "dev": true,
+      "requires": {
+        "fast-safe-stringify": "1.2.3"
+      }
+    },
+    "quick-lru": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
+      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
+      "dev": true
+    },
    "raf": {
      "version": "3.4.0",
      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
@@ -10146,6 +10702,26 @@
        "unpipe": "1.0.0"
      }
    },
+    "rc": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz",
+      "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=",
+      "dev": true,
+      "requires": {
+        "deep-extend": "0.4.2",
+        "ini": "1.3.5",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
    "react": {
      "version": "15.6.2",
      "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
@@ -10710,6 +11286,18 @@
        "once": "1.4.0"
      }
    },
+    "run-parallel": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.8.tgz",
+      "integrity": "sha512-e5t1NVhr5VWmD9V9U4KjjSGkf5w6CcTPgw11A3CfIvkkQxlAKzX3usPUp1NUQTmpOOjU+f9QRICU3tMbKwn9ZQ==",
+      "dev": true
+    },
+    "run-parallel-limit": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.4.tgz",
+      "integrity": "sha512-zpNZCoIA+x0fWw2tiD15lrGecycMbao/n4uBER53pcW5GB9TUEu4pZxd5CTgXLBh2MwI0E4nhRv7xymfo592vA==",
+      "dev": true
+    },
    "rw": {
      "version": "1.3.3",
      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
@@ -10721,6 +11309,15 @@
      "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
      "dev": true
    },
+    "rxjs": {
+      "version": "5.5.10",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz",
+      "integrity": "sha512-SRjimIDUHJkon+2hFo7xnvNC4ZEHGzCRwh9P7nzX3zPkCGFEg/tuElrNR7L/rZMagnK2JeH2jQwPRpmyXyLB6A==",
+      "dev": true,
+      "requires": {
+        "symbol-observable": "1.0.1"
+      }
+    },
    "safe-buffer": {
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
@@ -11099,6 +11696,15 @@
        }
      }
    },
+    "split2": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
+      "dev": true,
+      "requires": {
+        "through2": "2.0.3"
+      }
+    },
    "sprintf-js": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -11150,6 +11756,12 @@
        "xtend": "4.0.1"
      }
    },
+    "stream-to-observable": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/stream-to-observable/-/stream-to-observable-0.1.0.tgz",
+      "integrity": "sha1-Rb8dny19wJvtgfHDB8Qw5ouEz/4=",
+      "dev": true
+    },
    "strict-uri-encode": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
@@ -11294,6 +11906,12 @@
        "whet.extend": "0.9.9"
      }
    },
+    "symbol-observable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
+      "dev": true
+    },
    "symbol-tree": {
      "version": "3.2.2",
      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
@@ -11384,6 +12002,16 @@
      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
      "dev": true
    },
+    "through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3",
+        "xtend": "4.0.1"
+      }
+    },
    "thunky": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz",
@@ -11861,6 +12489,17 @@
        }
      }
    },
+    "webpack-bugsnag-plugins": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/webpack-bugsnag-plugins/-/webpack-bugsnag-plugins-1.1.1.tgz",
+      "integrity": "sha512-QMjpQSBn4Et0q3OWVLEFTMuFrAwisKwpamq9bGG47ruRupBiiJC6n81pdUn3JYyRvMRDCviKvAO6P/0qs2179A==",
+      "dev": true,
+      "requires": {
+        "bugsnag-build-reporter": "1.0.0",
+        "bugsnag-sourcemaps": "1.0.3",
+        "run-parallel-limit": "1.0.4"
+      }
+    },
    "webpack-dev-middleware": {
      "version": "1.12.0",
      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
@@ -11961,6 +12600,17 @@
        }
      }
    },
+    "webpack-notifier": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/webpack-notifier/-/webpack-notifier-1.6.0.tgz",
+      "integrity": "sha1-/6yOVf+MRpdSuMG7sBGhbxCYbgI=",
+      "dev": true,
+      "requires": {
+        "node-notifier": "5.1.2",
+        "object-assign": "4.1.1",
+        "strip-ansi": "3.0.1"
+      }
+    },
    "webpack-sources": {
      "version": "0.1.5",
      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis_shipyard",
-  "version": "2.5.1",
+  "version": "2.9.11",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis"
@@ -19,7 +19,7 @@
    "test": "jest",
    "prod-serve": "nginx -p $(pwd) -c nginx.conf",
    "prod-stop": "kill -QUIT $(cat nginx.pid)",
-    "build": "npm run clean && NODE_ENV=production webpack -p --config webpack.config.prod.js",
+    "build": "npm run clean && cross-env NODE_ENV=production webpack -p --config webpack.config.prod.js",
    "rsync": "rsync -ae \"ssh -i $CORIOLIS_PEM\" --delete build/ $CORIOLIS_USER@$CORIOLIS_HOST:~/wwws",
    "deploy": "npm run lint && npm test && npm run build && npm run rsync"
  },
@@ -66,6 +66,7 @@
    "babel-preset-stage-0": "*",
    "create-react-class": "^15.6.2",
    "css-loader": "^0.28.0",
+    "cross-env": "^5.1.4",
    "d3-selection": "1",
    "eslint": "3.19.0",
    "eslint-plugin-react": "^6.10.3",
@@ -87,10 +88,12 @@
    "rollup": "0.41",
    "rollup-plugin-node-resolve": "3",
    "style-loader": "^0.16.1",
+    "uglify-js": "^2.4.11",
    "url-loader": "^0.5.8",
    "webpack": "^2.4.1",
    "webpack-dev-server": "^2.4.4",
-    "uglify-js": "^2.4.11"
+    "webpack-notifier": "^1.6.0",
+    "webpack-bugsnag-plugins": "^1.1.1"
  },
  "dependencies": {
    "babel-polyfill": "*",
--- a/src/app/Coriolis.jsx
+++ b/src/app/Coriolis.jsx
@@ -12,6 +12,7 @@ import ModalHelp from './components/ModalHelp';
 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';
@@ -92,7 +93,14 @@ export default class Coriolis extends React.Component {
      // Need to decode and gunzip the data, then build the ship
      const data = zlib.inflate(new Buffer(r.params.data, 'base64'), { to: 'string' });
      const json = JSON.parse(data);
-      const ship = CompanionApiUtils.shipFromJson(json);
+      console.log('Ship import data: ');
+      console.log(json);
+      let ship;
+      if (json && json.modules) {
+        ship = CompanionApiUtils.shipFromJson(json);
+      } else if (json && json.Modules) {
+        ship = JournalUtils.shipFromLoadoutJSON(json);
+      }
      r.params.ship = ship.id;
      r.params.code = ship.toString();
      this._setPage(OutfittingPage, r);
@@ -126,9 +134,9 @@ export default class Coriolis extends React.Component {
    console && console.error && console.error(arguments); // eslint-disable-line no-console
    if (errObj) {
      if (errObj instanceof Error) {
-        Bugsnag.notifyException(errObj) // eslint-disable-line
+        bugsnagClient.notify(errObj) // eslint-disable-line
      } else if (errObj instanceof String) {
-        Bugsnag.notify(msg, errObj) // eslint-disable-line
+        bugsnagClient.notify(msg, errObj) // eslint-disable-line
      }
    }
    this.setState({
--- a/src/app/components/AvailableModulesMenu.jsx
+++ b/src/app/components/AvailableModulesMenu.jsx
@@ -56,7 +56,11 @@ const GRPCAT = {
  'ch': 'defence',
  'po': 'defence',
  'ec': 'defence',
-  'sfn': 'defence'
+  'sfn': 'defence',
+  // Standard
+  'gpp': 'guardian',
+  'gpc': 'guardian',
+  'ggc': 'guardian'
 };
 // Order here is the order in which items will be shown in the modules menu
 const CATEGORIES = {
@@ -82,7 +86,10 @@ const CATEGORIES = {
  'defence': ['ch', 'po', 'ec'],
  'scanners': ['sc', 'ss', 'cs', 'kw', 'ws'], // Overloaded with internal scanners
  // Experimental
-  'experimental': ['axmc', 'axmr', 'rfl', 'xs', 'sfn']
+  'experimental': ['axmc', 'axmr', 'rfl', 'xs', 'sfn'],
+
+  // Guardian
+  'guardian': ['gpp', 'gpc', 'ggc']
 };

 /**
@@ -199,8 +206,8 @@ export default class AvailableModulesMenu extends TranslatedComponent {
  /**
   * Generate React Components for Module Group
   * @param  {Function} translate   Translate function
-   * @param  {Objecy} mountedModule Mounted Module
-   * @param  {Funciton} warningFunc Warning 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
@@ -208,7 +215,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
   * @return {React.Component}      Available Module Group contents
   */
  _buildGroup(translate, mountedModule, warningFunc, mass, onSelect, grp, modules) {
-    let prevClass = null, prevRating = null;
+    let prevClass = null, prevRating = null, prevName;
    let elems = [];

    const sortedModules = modules.sort(this._moduleOrder);
@@ -223,6 +230,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
      let m = sortedModules[i];
      let mount = null;
      let disabled = false;
+      prevName = m.name
      if (ModuleUtils.isShieldGenerator(m.grp)) {
        // Shield generators care about maximum hull mass
        disabled = mass > m.maxmass;
@@ -258,7 +266,10 @@ export default class AvailableModulesMenu extends TranslatedComponent {
        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} />);
        itemsOnThisRow = 0;
@@ -273,6 +284,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
      itemsOnThisRow++;
      prevClass = m.class;
      prevRating = m.rating;
+      prevName = m.name;
    }

    return <ul key={'modules' + grp} >{elems}</ul>;
--- a/src/app/components/InternalSlot.jsx
+++ b/src/app/components/InternalSlot.jsx
@@ -33,6 +33,9 @@ export default class InternalSlot extends Slot {
      let modTT = translate('modified');
      if (m && m.blueprint && m.blueprint.name) {
        modTT = translate(m.blueprint.name) + ' ' + translate('grade') + ' ' + m.blueprint.grade;
+        if (m.blueprint.special && m.blueprint.special.id >= 0) {
+          modTT += ', ' + translate(m.blueprint.special.name);
+        }
        modTT = (
          <div>
            <div>{modTT}</div>
--- a/src/app/components/ModificationsMenu.jsx
+++ b/src/app/components/ModificationsMenu.jsx
@@ -6,7 +6,14 @@ import { isEmpty, stopCtxPropagation } from '../utils/UtilityFunctions';
 import cn from 'classnames';
 import { Modifications } from 'coriolis-data/dist';
 import Modification from './Modification';
-import { getBlueprint, blueprintTooltip, setWorst, setBest, setExtreme, setRandom } from '../utils/BlueprintFunctions';
+import {
+  getBlueprint,
+  blueprintTooltip,
+  setPercent,
+  getPercent,
+  setRandom,
+  specialToolTip
+} from '../utils/BlueprintFunctions'

 /**
 * Modifications menu
@@ -30,14 +37,14 @@ export default class ModificationsMenu extends TranslatedComponent {

    this._toggleBlueprintsMenu = this._toggleBlueprintsMenu.bind(this);
    this._toggleSpecialsMenu = this._toggleSpecialsMenu.bind(this);
-    this._rollWorst = this._rollWorst.bind(this);
+    this._rollFifty = this._rollFifty.bind(this);
    this._rollRandom = this._rollRandom.bind(this);
    this._rollBest = this._rollBest.bind(this);
-    this._rollExtreme = this._rollExtreme.bind(this);
+    this._rollWorst = this._rollWorst.bind(this);
    this._reset = this._reset.bind(this);

    this.state = {
-      blueprintMenuOpened: false,
+      blueprintMenuOpened: !(props.m.blueprint && props.m.blueprint.name),
      specialMenuOpened: false
    };
  }
@@ -86,15 +93,33 @@ export default class ModificationsMenu extends TranslatedComponent {
    const { m } = props;
    const { language, tooltip, termtip } = context;
    const translate = language.translate;
-
    const specials = [];
    const specialsId = m.missile && Modifications.modules[m.grp]['specials_' + m.missile] ? 'specials_' + m.missile : 'specials';
    if (Modifications.modules[m.grp][specialsId] && Modifications.modules[m.grp][specialsId].length > 0) {
      const close = this._specialSelected.bind(this, null);
-      specials.push(<div style={{ cursor: 'pointer' }} key={ 'none' } onClick={ close }>{translate('PHRASE_NO_SPECIAL')}</div>);
+      specials.push(<div style={{ cursor: 'pointer', fontWeight: 'bold' }} className={ 'button-inline-menu warning' } key={ 'none' } onClick={ close }>{translate('PHRASE_NO_SPECIAL')}</div>);
      for (const specialName of Modifications.modules[m.grp][specialsId]) {
+        if (Modifications.specials[specialName].name.search('Legacy') >= 0) {
+          continue;
+        }
+        const classes = cn('button-inline-menu', {
+          active: m.blueprint && m.blueprint.special && m.blueprint.special.edname == specialName 
+        });
        const close = this._specialSelected.bind(this, specialName);
-        specials.push(<div style={{ cursor: 'pointer' }} key={ specialName } onClick={ close }>{translate(Modifications.specials[specialName].name)}</div>);
+        if (m.blueprint && m.blueprint.name) {
+          let tmp = {};
+          if (m.blueprint.special) {
+            tmp = m.blueprint.special;
+          } else {
+            tmp = undefined;
+          }
+          m.blueprint.special = Modifications.specials[specialName];
+          let specialTt = specialToolTip(translate, m.blueprint.grades[m.blueprint.grade], m.grp, m, specialName);
+          m.blueprint.special = tmp;
+          specials.push(<div style={{ cursor: 'pointer' }} className={classes} key={ specialName } onMouseOver={termtip.bind(null, specialTt)} onMouseOut={tooltip.bind(null, null)} onClick={ close }>{translate(Modifications.specials[specialName].name)}</div>);
+        } else {
+          specials.push(<div style={{ cursor: 'pointer' }} className={classes} key={ specialName } onClick={ close }>{translate(Modifications.specials[specialName].name)}</div>);
+        }
      }
    }
    return specials;
@@ -136,8 +161,9 @@ export default class ModificationsMenu extends TranslatedComponent {
    const blueprint = getBlueprint(fdname, m);
    blueprint.grade = grade;
    ship.setModuleBlueprint(m, blueprint);
+    setPercent(ship, m, 100);

-    this.setState({ blueprintMenuOpened: false });
+    this.setState({ blueprintMenuOpened: false, specialMenuOpened: true });
    this.props.onChange();
  }

@@ -168,11 +194,11 @@ export default class ModificationsMenu extends TranslatedComponent {
  }

  /**
-   * Provide a 'worst' roll within the information we have
+   * Provide a '50%' roll within the information we have
   */
-  _rollWorst() {
+  _rollFifty() {
    const { m, ship } = this.props;
-    setWorst(ship, m);
+    setPercent(ship, m, 50);
    this.props.onChange();
  }

@@ -190,16 +216,16 @@ export default class ModificationsMenu extends TranslatedComponent {
   */
  _rollBest() {
    const { m, ship } = this.props;
-    setBest(ship, m);
+    setPercent(ship, m, 100);
    this.props.onChange();
  }

  /**
-   * Provide an 'extreme' roll within the information we have
+   * Provide a 'worst' roll within the information we have
   */
-  _rollExtreme() {
+  _rollWorst() {
    const { m, ship } = this.props;
-    setExtreme(ship, m);
+    setPercent(ship, m, 0);
    this.props.onChange();
  }

@@ -226,24 +252,28 @@ export default class ModificationsMenu extends TranslatedComponent {

    const _toggleBlueprintsMenu = this._toggleBlueprintsMenu;
    const _toggleSpecialsMenu = this._toggleSpecialsMenu;
-    const _rollBest = this._rollBest;
-    const _rollExtreme = this._rollExtreme;
+    const _rollFull = this._rollBest;
    const _rollWorst = this._rollWorst;
+    const _rollFifty = this._rollFifty;
    const _rollRandom = this._rollRandom;
    const _reset = this._reset;

    let blueprintLabel;
    let haveBlueprint = false;
    let blueprintTt;
+    let blueprintCv;
    if (m.blueprint && m.blueprint.name) {
      blueprintLabel = translate(m.blueprint.name) + ' ' + translate('grade') + ' ' + m.blueprint.grade;
      haveBlueprint = true;
      blueprintTt  = blueprintTooltip(translate, m.blueprint.grades[m.blueprint.grade], Modifications.modules[m.grp].blueprints[m.blueprint.fdname].grades[m.blueprint.grade].engineers, m.grp);
+      blueprintCv = getPercent(m);
    }

    let specialLabel;
+    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);
    } else {
      specialLabel = translate('PHRASE_SELECT_SPECIAL');
    }
@@ -254,8 +284,8 @@ export default class ModificationsMenu extends TranslatedComponent {
    const showSpecial = haveBlueprint && specials.length && !blueprintMenuOpened;
    const showSpecialsMenu = specialMenuOpened;
    const showRolls = haveBlueprint && !blueprintMenuOpened && !specialMenuOpened;
-    const showReset = !blueprintMenuOpened && !specialMenuOpened;
-    const showMods = !blueprintMenuOpened && !specialMenuOpened;
+    const showReset = !blueprintMenuOpened && !specialMenuOpened && haveBlueprint;
+    const showMods = !blueprintMenuOpened && !specialMenuOpened && haveBlueprint;

    return (
      <div
@@ -263,29 +293,28 @@ export default class ModificationsMenu extends TranslatedComponent {
          onClick={(e) => e.stopPropagation() }
          onContextMenu={stopCtxPropagation}
      >
-        { showBlueprintsMenu ? '' : haveBlueprint ? 
-          <div className={ cn('section-menu', { selected: blueprintMenuOpened })} style={{ cursor: 'pointer' }} onMouseOver={termtip.bind(null, blueprintTt)} onMouseOut={tooltip.bind(null, null)} onClick={_toggleBlueprintsMenu}>{blueprintLabel}</div> : 
-          <div className={ cn('section-menu', { selected: blueprintMenuOpened })} style={{ cursor: 'pointer' }} onClick={_toggleBlueprintsMenu}>{translate('PHRASE_SELECT_BLUEPRINT')}</div> }
+        { showBlueprintsMenu | showSpecialsMenu ? '' : haveBlueprint ? 
+          <div className={ cn('section-menu button-inline-menu', { selected: blueprintMenuOpened })} style={{ cursor: 'pointer' }} onMouseOver={termtip.bind(null, blueprintTt)} onMouseOut={tooltip.bind(null, null)} onClick={_toggleBlueprintsMenu}>{blueprintLabel}</div> : 
+          <div className={ cn('section-menu button-inline-menu', { selected: blueprintMenuOpened })} style={{ cursor: 'pointer' }} onClick={_toggleBlueprintsMenu}>{translate('PHRASE_SELECT_BLUEPRINT')}</div> }
        { showBlueprintsMenu ? this._renderBlueprints(this.props, this.context) : null }
-        { showSpecial ? <div className={ cn('section-menu', { selected: specialMenuOpened })} style={{ cursor: 'pointer' }} onClick={_toggleSpecialsMenu}>{specialLabel}</div> : null }
+        { showSpecial & !showSpecialsMenu ? <div className={ cn('section-menu button-inline-menu', { selected: specialMenuOpened })} style={{ cursor: 'pointer' }} onMouseOver={specialTt ? termtip.bind(null, specialTt) : null} onMouseOut={specialTt ? tooltip.bind(null, null) : null}  onClick={_toggleSpecialsMenu}>{specialLabel}</div> : null }
        { showSpecialsMenu ? specials : null }
-        { showRolls || showReset ?
+        { showReset ? <div className={'section-menu button-inline-menu warning'} style={{ cursor: 'pointer' }} onClick={_reset} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RESET')} onMouseOut={tooltip.bind(null, null)}> { translate('reset') } </div> : null }
+		{ showRolls ?
+            
            <table style={{ width: '100%', backgroundColor: 'transparent' }}>
              <tbody>
          { showRolls ?
                <tr>
-                  <td> { translate('roll') }: </td>
-                  <td style={{ cursor: 'pointer' }} onClick={_rollWorst} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_WORST')} onMouseOut={tooltip.bind(null, null)}> { translate('worst') } </td>
-                  <td style={{ cursor: 'pointer' }} onClick={_rollBest}onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_BEST')} onMouseOut={tooltip.bind(null, null)}> { translate('best') } </td>
-                  <td style={{ cursor: 'pointer' }} onClick={_rollExtreme}onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_EXTREME')} onMouseOut={tooltip.bind(null, null)}> { translate('extreme') } </td>
-                  <td style={{ cursor: 'pointer' }} onClick={_rollRandom} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RANDOM')} onMouseOut={tooltip.bind(null, null)}> { translate('random') } </td>
-                </tr> : null }
-          { showReset ?
-                <tr>
-                  <td colSpan={'5'} style={{ cursor: 'pointer' }} onClick={_reset}onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RESET')} onMouseOut={tooltip.bind(null, null)}> { translate('reset') } </td>
+                  <td className={ cn('section-menu button-inline-menu', {active: false})}> { translate('roll') }: </td>
+                  <td className={ cn('section-menu button-inline-menu', { active: blueprintCv ===    0 })} style={{ cursor: 'pointer' }} onClick={_rollWorst} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_WORST')} onMouseOut={tooltip.bind(null, null)}> { translate('0%') } </td>
+                  <td className={ cn('section-menu button-inline-menu', { active: blueprintCv ===   50 })} style={{ cursor: 'pointer' }} onClick={_rollFifty} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_FIFTY')} onMouseOut={tooltip.bind(null, null)}> { translate('50%') } </td>
+                  <td className={ cn('section-menu button-inline-menu', { active: blueprintCv ===  100 })} style={{ cursor: 'pointer' }} onClick={_rollFull} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_BEST')} onMouseOut={tooltip.bind(null, null)}> { translate('100%') } </td>
+                  <td className={ cn('section-menu button-inline-menu', { active: blueprintCv === null || blueprintCv % 50 != 0 })} style={{ cursor: 'pointer' }} onClick={_rollRandom} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RANDOM')} onMouseOut={tooltip.bind(null, null)}> { translate('random') } </td>
                </tr> : null }
              </tbody>
          </table> : null }
+        { showMods ? <hr /> : null }
        { showMods ?
          <span onMouseOver={termtip.bind(null, 'HELP_MODIFICATIONS_MENU')} onMouseOut={tooltip.bind(null, null)} >
            { this._renderModifications(this.props) }
--- a/src/app/components/ShipSummaryTable.jsx
+++ b/src/app/components/ShipSummaryTable.jsx
@@ -53,6 +53,7 @@ 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}>{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>
@@ -86,6 +87,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
            <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_TTD', { cap: 0 })} onMouseLeave={hide}>{timeToDrain === Infinity ? '∞' : time(timeToDrain)}</td>
            {/* <td>{f1(ship.totalHps)}</td> */}
            <td>{round(ship.cargoCapacity)}{u.T}</td>
+            <td>{ship.passengerCapacity}</td>
            <td>{round(ship.fuelCapacity)}{u.T}</td>
            <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_HULL_MASS', { cap: 0 })} onMouseLeave={hide}>{ship.hullMass}{u.T}</td>
            <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_UNLADEN_MASS', { cap: 0 })} onMouseLeave={hide}>{int(ship.unladenMass)}{u.T}</td>
--- a/src/app/components/StandardSlot.jsx
+++ b/src/app/components/StandardSlot.jsx
@@ -48,7 +48,7 @@ export default class StandardSlot extends TranslatedComponent {
    let m = slot.m;
    let classRating = m.class + m.rating;
    let menu;
-    let validMods = m == null ? [] : (Modifications.modules[m.grp].modifications || []);
+    let validMods = m == null || !Modifications.modules[m.grp] ? [] : (Modifications.modules[m.grp].modifications || []);
    let showModuleResistances = Persist.showModuleResistances();
    let mass = m.getMass() || m.cargo || m.fuel || 0;

@@ -56,6 +56,9 @@ export default class StandardSlot extends TranslatedComponent {
    let modTT = translate('modified');
    if (m && m.blueprint && m.blueprint.name) {
      modTT = translate(m.blueprint.name) + ' ' + translate('grade') + ' ' + m.blueprint.grade;
+      if (m.blueprint.special && m.blueprint.special.id >= 0) {
+        modTT += ', ' + translate(m.blueprint.special.name);
+      }
      modTT = (
          <div>
            <div>{modTT}</div>
@@ -96,7 +99,7 @@ export default class StandardSlot extends TranslatedComponent {
    return (
      <div className={cn('slot', { selected: this.props.selected })} onClick={this.props.onOpen} onContextMenu={stopCtxPropagation}>
        <div className={cn('details-container', { warning: warning && warning(slot.m), disabled: m.grp !== 'bh' && !slot.enabled })}>
-          <div className={'sz'}>{slot.maxClass}</div>
+          <div className={'sz'}>{m.grp == 'bh' ? m.name.charAt(0) : slot.maxClass}</div>
          <div>
            <div className={'l'}>{classRating} {translate(m.name || m.grp)}{m.mods && Object.keys(m.mods).length > 0 ? <span className='r' onMouseOver={termtip.bind(null, modTT)} onMouseOut={tooltip.bind(null, null)}><Modified /></span> : null }</div>
            <div className={'r'}>{formats.round(mass)}{units.T}</div>
--- a/src/app/components/StandardSlotSection.jsx
+++ b/src/app/components/StandardSlotSection.jsx
@@ -235,12 +235,10 @@ export default class StandardSlotSection extends SlotSection {
      <ul>
        <li className='lc' onClick={this._multiPurpose.bind(this, false, 0)}>{translate('Multi-purpose')}</li>
        <li className='lc' onClick={this._multiPurpose.bind(this, true, 2)}>{translate('Combat')}</li>
-        <li className='lc' onClick={this._optimizeCargo.bind(this, false)}>{translate('Trader')}</li>
-        <li className='lc' onClick={this._optimizeCargo.bind(this, true)}>{translate('Shielded Trader')}</li>
+        <li className='lc' onClick={this._optimizeCargo.bind(this, true)}>{translate('Trader')}</li>
        <li className='lc' onClick={this._optimizeExplorer.bind(this, false)}>{translate('Explorer')}</li>
        <li className={cn('lc', { disabled:  planetaryDisabled })} onClick={!planetaryDisabled && this._optimizeExplorer.bind(this, true)}>{translate('Planetary Explorer')}</li>
-        <li className='lc' onClick={this._optimizeMiner.bind(this, false)}>{translate('Miner')}</li>
-        <li className='lc' onClick={this._optimizeMiner.bind(this, true)}>{translate('Shielded Miner')}</li>
+        <li className='lc' onClick={this._optimizeMiner.bind(this, true)}>{translate('Miner')}</li>
        <li className='lc' onClick={this._optimizeRacer.bind(this)}>{translate('Racer')}</li>
      </ul>
    </div>;
--- a/src/app/i18n/Language.jsx
+++ b/src/app/i18n/Language.jsx
@@ -6,6 +6,7 @@ import * as FR from './fr';
 import * as IT from './it';
 import * as RU from './ru';
 import * as PL from './pl';
+import * as PT from './pt';
 import * as d3 from 'd3';

 let fallbackTerms = EN.terms;
@@ -25,6 +26,7 @@ export function getLanguage(langCode) {
    case 'it': lang = IT; break;
    case 'ru': lang = RU; break;
    case 'pl': lang = PL; break;
+    case 'pt': lang = PT; break;
    default:
      lang = EN;
  }
@@ -88,5 +90,6 @@ export const Languages = {
  es: 'Español',
  fr: 'Français',
  ru: 'ру́сский',
-  pl: 'polski'
+  pl: 'polski',
+  pt: 'português'
 };
--- a/src/app/i18n/en.json
+++ b/src/app/i18n/en.json
@@ -16,6 +16,8 @@
    "PHRASE_ENGAGEMENT_RANGE": "The distance between your ship and its target",
    "PHRASE_SELECT_BLUEPRINT": "Click to select a blueprint",
    "PHRASE_BLUEPRINT_WORST": "Worst primary values for this blueprint",
+    "PHRASE_BLUEPRINT_FIFTY": "50% of full values for this blueprint",
+    "PHRASE_BLUEPRINT_SEVEN_FIVE": "75% of full values for this blueprint",
    "PHRASE_BLUEPRINT_RANDOM": "Random selection between worst and best primary values for this blueprint",
    "PHRASE_BLUEPRINT_BEST": "Best primary values for this blueprint",
    "PHRASE_BLUEPRINT_EXTREME": "Best beneficial and worst detrimental primary values for this blueprint",
@@ -115,6 +117,10 @@
    "pl": "Pulse Laser",
    "po": "Point Defence",
    "pp": "Power Plant",
+    "gpp": "Guardian Hybrid Power Plant",
+    "gpd": "Guardian Hybrid Power Distributor",
+    "gpc": "Guardian Plasma Charger",
+    "ggc": "Guardian Gauss Cannon",
    "psg": "Prismatic Shield Generator",
    "pv": "Planetary Vehicle Hangar",
    "rf": "Refinery",
--- a/src/app/i18n/pt.js
+++ b/src/app/i18n/pt.js
@@ -0,0 +1,16 @@
+export const formats = {
+  decimal: ',',
+  thousands: '.',
+  grouping: [3],
+  currency: ['', ' €'],
+  dateTime: '%A, %e de %B de %Y, %X',
+  date: '%d/%m/%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'],
+  days: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes', 'sábado'],
+  shortDays: ['dom', 'lun', 'mar', 'mié', 'jue', 'vie', 'sáb'],
+  months: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
+  shortMonths: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sep', 'oct', 'nov', 'dic']
+};
+
+export { default as terms } from './pt.json';
--- a/src/app/i18n/pt.json
+++ b/src/app/i18n/pt.json
--- a/src/app/pages/AboutPage.jsx
+++ b/src/app/pages/AboutPage.jsx
@@ -41,6 +41,9 @@ export default class AboutPage extends Page {

      <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>
    </div>;
  }
 }
--- a/src/app/pages/OutfittingPage.jsx
+++ b/src/app/pages/OutfittingPage.jsx
@@ -73,13 +73,10 @@ export default class OutfittingPage extends Page {
    let buildName = params.bn;
    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
-
    if (code) {
      ship.buildFrom(code);  // Populate modules from serialized 'code' URL param
    } else {
--- a/src/app/pages/ShipyardPage.jsx
+++ b/src/app/pages/ShipyardPage.jsx
@@ -42,7 +42,7 @@ function countInt(slot) {
    passSlotType = 'pcq';
    passSlotRating = 'B';
  }
-  let passengerBay = passSlotType ? ModuleUtils.findInternal(passSlotType, slot.maxClass, passSlotRating) : null;
+  let passengerBay = passSlotType ? ModuleUtils.findMaxInternal(passSlotType, slot.maxClass, passSlotRating) : null;
  this.maxPassengers += passengerBay ? passengerBay.passengers : 0;
 }

@@ -194,6 +194,7 @@ export default class ShipyardPage extends Page {
      <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>
@@ -329,7 +330,7 @@ export default class ShipyardPage extends Page {
                <th>&nbsp;</th>
                <th colSpan={4}>{translate('base')}</th>
                <th colSpan={5}>{translate('max')}</th>
-                <th className='lft' colSpan={6}></th>
+                <th className='lft' colSpan={7}></th>
                <th className='lft' colSpan={5}></th>
                <th className='lft' colSpan={8}></th>
              </tr>
@@ -345,9 +346,9 @@ export default class ShipyardPage extends Page {
                <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('passengers')}</th>
+                <th className='sortable' onClick={sortShips('maxPassengers')}>{translate('pax')}</th>

-                <th className='lft' colSpan={6}>{translate('core module classes')}</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>
@@ -369,7 +370,7 @@ export default class ShipyardPage extends Page {
                <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>
@@ -395,4 +396,4 @@ export default class ShipyardPage extends Page {
      </div>
    );
  }
-}
+}
--- a/src/app/shipyard/Constants.js
+++ b/src/app/shipyard/Constants.js
@@ -9,12 +9,16 @@ export const StandardArray = [
  'pd', // Power Distributor
  's',  // Sensors
  'ft', // Fuel Tank
+  'gpp', // Guardian Hybrid Power Plant
+  'gpd' // Guardian Hybrid Power Distributor
 ];

 // Map to lookup group labels/names for component grp, used for JSON Serialization
 export const ModuleGroupToName = {
  // Standard
  pp: 'Power Plant',
+  gpp: 'Guardian Hybrid Power Plant',
+  gpd: 'Guardian Hybrid Power Distributor',
  t: 'Thrusters',
  fsd: 'Frame Shift Drive',
  ls: 'Life Support',
@@ -75,7 +79,9 @@ export const ModuleGroupToName = {
  sb: 'Shield Booster',
  tp: 'Torpedo Pylon',
  sfn: 'Shutdown Field Neutraliser',
-  xs: 'Xeno Scanner'
+  xs: 'Xeno Scanner',
+  gpc: 'Guardian Plasma Charger',
+  ggc: 'Guardian Gauss Cannon',
 };

 let GrpNameToCodeMap = {};
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -64,7 +64,6 @@ export default class Module {
        }
      }
    }
-
    // Sanitise the resultant value to 4dp equivalent
    return isNaN(result) ? result : Math.round(result);
  }
@@ -79,6 +78,9 @@ export default class Module {
    if (!this.mods) {
      this.mods = {};
    }
+    if (!this.origVals) {
+      this.origVals = {};
+    }
    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];
@@ -117,7 +119,6 @@ export default class Module {
  _getModifiedValue(name) {
    const modification = Modifications.modifications[name];
    let result = this[name];
-
    if (!result) {
      if (modification && modification.method === 'additive') {
        // Additive modifications start at 0 rather than NULL
@@ -135,7 +136,7 @@ export default class Module {
        if (modification.type === 'percentage') {
          modValue = this.getModValue(name) / 10000;
        } else if (modification.type === 'numeric') {
-          modValue = this.getModValue(name) / 100;
+          modValue = this.getModValue(name)/ 100;
        } else {
          modValue = this.getModValue(name);
        }
--- a/src/app/shipyard/ModuleUtils.js
+++ b/src/app/shipyard/ModuleUtils.js
@@ -63,7 +63,6 @@ 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)));
  if (s) {
    s = new Module({ template: s });
@@ -196,6 +195,29 @@ export function findInternal(groupName, clss, rating, name) {
  return null;
 }

+/**
+ * Finds an internal module based on Class, Rating, Group and/or name.
+ * At least one of Group name or unique module name must be provided.
+ * will start searching at specified class and proceed lower until a
+ * module is found or 0 is hit
+ * Uses findInternal internally
+ *
+ * @param  {String} groupName [Optional] Full name or abbreviated name for module group
+ * @param  {integer} clss     module Class
+ * @param  {String} rating    module Rating
+ * @param  {String} name      [Optional] Long/unique name for module -e.g. 'Advanced Discover Scanner'
+ * @return {Object}           The module if found, null if not found
+ */
+export function findMaxInternal(groupName, clss, rating, name) {
+  let foundModule = null;
+  let currentClss = clss;
+  while (currentClss > 0 && foundModule == null) {
+    foundModule = findInternal(groupName, currentClss, rating, name);
+    currentClss = currentClss - 1;
+  }
+  return foundModule;
+}
+
 /**
 * Finds an internal Module ID based on Class, Rating, Group and/or name.
 * At least one ofGroup name or unique module name must be provided
--- a/src/app/shipyard/Ship.js
+++ b/src/app/shipyard/Ship.js
@@ -464,7 +464,17 @@ export default class Ship {
    if (m.blueprint) {
      m.blueprint.special = special;
    }
-    this.recalculateDps().recalculateHps().recalculateEps();
+    this.updatePowerGenerated()
+      .updatePowerUsed()
+      .recalculateMass()
+      .updateJumpStats()
+      .recalculateShield()
+      .recalculateShieldCells()
+      .recalculateArmour()
+      .recalculateDps()
+      .recalculateEps()
+      .recalculateHps()
+      .updateMovement();
  }

  /**
@@ -490,7 +500,6 @@ export default class Ship {
      // Value passed is invalid; reset it to 0
      value = 0;
    }
-
    // Handle special cases
    if (name === 'pgen') {
      // Power generation
@@ -569,6 +578,7 @@ export default class Ship {
    // Reset Cumulative stats
    this.fuelCapacity = 0;
    this.cargoCapacity = 0;
+    this.passengerCapacity = 0;
    this.ladenMass = 0;
    this.armour = this.baseArmour;
    this.shield = this.baseShieldStrength;
@@ -616,7 +626,7 @@ export default class Ship {
      standard[i].cat = 0;
      standard[i].priority = priorities && priorities[i + 1] ? priorities[i + 1] * 1 : 0;
      standard[i].type = 'SYS';
-      standard[i].m = null; // Resetting 'old' modul if there was one
+      standard[i].m = null; // Resetting 'old' module if there was one
      standard[i].discountedCost = 0;
      if (comps) {
        let module = ModuleUtils.standard(i, comps.standard[i]);
@@ -770,7 +780,7 @@ export default class Ship {
      // Alter as required due to changes in the (build) code from one version to the next
      this.upgradeInternals(internal, 1 + this.standard.length + this.hardpoints.length, priorities, enabled, modifications, blueprints, version);
    }
-    
+
    return this.buildWith(
      {
        bulkheads: code.charAt(0) * 1,
@@ -1188,6 +1198,7 @@ export default class Ship {
    let unladenMass = this.hullMass;
    let cargoCapacity = 0;
    let fuelCapacity = 0;
+    let passengerCapacity = 0;

    unladenMass += this.bulkheads.m.getMass();

@@ -1209,6 +1220,10 @@ export default class Ship {
          fuelCapacity += slot.m.fuel;
        } else if (slot.m.grp === 'cr') {
          cargoCapacity += slot.m.cargo;
+        } else if (slot.m.grp.slice(0,2) === 'pc') {
+          if (slot.m.passengers) {
+            passengerCapacity += slot.m.passengers;
+          }
        }
      }
    }
@@ -1224,6 +1239,7 @@ export default class Ship {
    this.unladenMass = unladenMass;
    this.cargoCapacity = cargoCapacity;
    this.fuelCapacity = fuelCapacity;
+    this.passengerCapacity = passengerCapacity;
    this.ladenMass = unladenMass + fuelCapacity + cargoCapacity;

    return this;
--- a/src/app/shipyard/ShipRoles.js
+++ b/src/app/shipyard/ShipRoles.js
@@ -1,5 +1,5 @@
-import * as ModuleUtils from './ModuleUtils';
-import { canMount } from '../utils/SlotFunctions';
+import * as ModuleUtils from './ModuleUtils'
+import { canMount } from '../utils/SlotFunctions'

 /**
 * Standard / typical role for multi-purpose or combat (if shielded with better bulkheads)
@@ -7,20 +7,20 @@ import { canMount } from '../utils/SlotFunctions';
 * @param {Boolean} shielded      True if shield generator should be included
 * @param {integer} bulkheadIndex Bulkhead to use see Constants.BulkheadNames
 */
-export function multiPurpose(ship, shielded, bulkheadIndex) {
+export function multiPurpose (ship, shielded, bulkheadIndex) {
  ship.useStandard('A')
-      .use(ship.standard[3], ModuleUtils.standard(3, ship.standard[3].maxClass + 'D'))  // D Life Support
-      .use(ship.standard[5], ModuleUtils.standard(5, ship.standard[5].maxClass + 'D'))  // D Sensors
-      .useBulkhead(bulkheadIndex);
+    .use(ship.standard[3], ModuleUtils.standard(3, ship.standard[3].maxClass + 'D'))  // D Life Support
+    .use(ship.standard[5], ModuleUtils.standard(5, ship.standard[5].maxClass + 'D'))  // D Sensors
+    .useBulkhead(bulkheadIndex)

  if (shielded) {
-    ship.internal.some(function(slot) {
+    ship.internal.some(function (slot) {
      if (canMount(ship, slot, 'sg')) { // Assuming largest slot can hold an eligible shield
-        ship.use(slot, ModuleUtils.findInternal('sg', slot.maxClass, 'A'));
-        ship.setSlotEnabled(slot, true);
-        return true;
+        ship.use(slot, ModuleUtils.findInternal('sg', slot.maxClass, 'A'))
+        ship.setSlotEnabled(slot, true)
+        return true
      }
-    });
+    })
  }
 }

@@ -30,40 +30,55 @@ export function multiPurpose(ship, shielded, bulkheadIndex) {
 * @param  {Boolean} shielded     True if shield generator should be included
 * @param  {Object} standardOpts  [Optional] Standard module optional overrides
 */
-export function trader(ship, shielded, standardOpts) {
-  let usedSlots = [],
-      sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass);
- 
-  // Shield generator if required
-  if (shielded) {
-    const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8];
-    const shieldInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                         .filter(a => (!a.eligible) || a.eligible.sg)
-                                         .filter(a => a.maxClass >= sg.class)
-                                         .sort((a,b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass));
-    for (let i = 0; i < shieldInternals.length; i++) {
-      if (canMount(ship, shieldInternals[i], 'sg')) {
-        ship.use(shieldInternals[i], sg);
-        usedSlots.push(shieldInternals[i]);
-        break;
+export function trader (ship, shielded, standardOpts) {
+  let usedSlots = []
+  let bstCount = 2
+  let sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass)
+  ship.useStandard('A')
+    .use(ship.standard[3], ModuleUtils.standard(3, ship.standard[3].maxClass + 'D'))  // D Life Support
+    .use(ship.standard[1], ModuleUtils.standard(1, ship.standard[1].maxClass + 'D'))  // D Life Support
+    .use(ship.standard[4], ModuleUtils.standard(4, ship.standard[4].maxClass + 'D'))  // D Life Support
+    .use(ship.standard[5], ModuleUtils.standard(5, ship.standard[5].maxClass + 'D'))  // D Sensors
+
+  const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8]
+  const shieldInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
+    .filter(a => (!a.eligible) || a.eligible.sg)
+    .filter(a => a.maxClass >= sg.class)
+    .sort((a, b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass))
+  shieldInternals.some(function (slot) {
+    if (canMount(ship, slot, 'sg')) { // Assuming largest slot can hold an eligible shield
+      const shield = ModuleUtils.findInternal('sg', slot.maxClass, 'A')
+      if (shield && shield.maxmass > ship.hullMass) {
+        console.log(shield)
+        ship.use(slot, shield)
+        ship.setSlotEnabled(slot, true)
+        usedSlots.push(slot)
+        return true
      }
    }
-  }
+  })

  // Fill the empty internals with cargo racks
  for (let i = ship.internal.length; i--;) {
-    let slot = ship.internal[i];
+    let slot = ship.internal[i]
    if (usedSlots.indexOf(slot) == -1 && canMount(ship, slot, 'cr')) {
-      ship.use(slot, ModuleUtils.findInternal('cr', slot.maxClass, 'E'));
+      ship.use(slot, ModuleUtils.findInternal('cr', slot.maxClass, 'E'))
    }
  }

  // Empty the hardpoints
  for (let s of ship.hardpoints) {
-    ship.use(s, null);
+    ship.use(s, null)
  }
-
-  ship.useLightestStandard(standardOpts);
+  for (let s of ship.hardpoints) {
+    if (s.maxClass == 0 && bstCount) {       // Mount up to 2 boosters
+      ship.use(s, ModuleUtils.hardpoints('04'))
+      bstCount--
+    } else {
+      ship.use(s, null)
+    }
+  }
+  // ship.useLightestStandard(standardOpts);
 }

 /**
@@ -71,127 +86,127 @@ export function trader(ship, shielded, standardOpts) {
 * @param  {Ship} ship         Ship instance
 * @param  {Boolean} planetary True if Planetary Vehicle Hangar (PVH) should be included
 */
-export function explorer(ship, planetary) {
-  let standardOpts = { ppRating: 'A' },
-      heatSinkCount = 2,  // Fit 2 heat sinks if possible
-      usedSlots = [],
-      sgSlot,
-      fuelScoopSlot,
-      sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass);
+export function explorer (ship, planetary) {
+  let standardOpts = {ppRating: 'A'},
+    heatSinkCount = 2,  // Fit 2 heat sinks if possible
+    usedSlots = [],
+    sgSlot,
+    fuelScoopSlot,
+    sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass)

  if (!planetary) { // Non-planetary explorers don't really need to boost
-    standardOpts.pd = '1D';
+    standardOpts.pd = '1D'
  }

  // Cargo hatch can be disabled
-  ship.setSlotEnabled(ship.cargoHatch, false);
+  ship.setSlotEnabled(ship.cargoHatch, false)

  // Advanced Discovery Scanner - class 1 or higher
-  const adsOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+  const adsOrder = [1, 2, 3, 4, 5, 6, 7, 8]
  const adsInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                    .filter(a => (!a.eligible) || a.eligible.sc)
-                                    .sort((a,b) => adsOrder.indexOf(a.maxClass) - adsOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.sc)
+    .sort((a, b) => adsOrder.indexOf(a.maxClass) - adsOrder.indexOf(b.maxClass))
  for (let i = 0; i < adsInternals.length; i++) {
    if (canMount(ship, adsInternals[i], 'sc')) {
-      ship.use(adsInternals[i], ModuleUtils.internal('2f'));
-      usedSlots.push(adsInternals[i]);
-      break;
+      ship.use(adsInternals[i], ModuleUtils.internal('2f'))
+      usedSlots.push(adsInternals[i])
+      break
    }
  }

  if (planetary) {
    // Planetary Vehicle Hangar - class 2 or higher
-    const pvhOrder = [2, 3, 4, 5, 6, 7, 8, 1];
+    const pvhOrder = [2, 3, 4, 5, 6, 7, 8, 1]
    const pvhInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                      .filter(a => (!a.eligible) || a.eligible.pv)
-                                      .sort((a,b) => pvhOrder.indexOf(a.maxClass) - pvhOrder.indexOf(b.maxClass));
+      .filter(a => (!a.eligible) || a.eligible.pv)
+      .sort((a, b) => pvhOrder.indexOf(a.maxClass) - pvhOrder.indexOf(b.maxClass))
    for (let i = 0; i < pvhInternals.length; i++) {
      if (canMount(ship, pvhInternals[i], 'pv')) {
        // Planetary Vehical Hangar only has even classes
-        const pvhClass = pvhInternals[i].maxClass % 2 === 1 ? pvhInternals[i].maxClass - 1 : pvhInternals[i].maxClass;
-        ship.use(pvhInternals[i], ModuleUtils.findInternal('pv', pvhClass, 'G')); // G is lower mass
-        ship.setSlotEnabled(pvhInternals[i], false);   // Disable power for Planetary Vehical Hangar
-        usedSlots.push(pvhInternals[i]);
-        break;
+        const pvhClass = pvhInternals[i].maxClass % 2 === 1 ? pvhInternals[i].maxClass - 1 : pvhInternals[i].maxClass
+        ship.use(pvhInternals[i], ModuleUtils.findInternal('pv', pvhClass, 'G')) // G is lower mass
+        ship.setSlotEnabled(pvhInternals[i], false)   // Disable power for Planetary Vehical Hangar
+        usedSlots.push(pvhInternals[i])
+        break
      }
    }
  }

  // Shield generator
-  const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+  const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8]
  const shieldInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                       .filter(a => (!a.eligible) || a.eligible.sg)
-                                       .filter(a => a.maxClass >= sg.class)
-                                       .sort((a,b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.sg)
+    .filter(a => a.maxClass >= sg.class)
+    .sort((a, b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass))
  for (let i = 0; i < shieldInternals.length; i++) {
    if (canMount(ship, shieldInternals[i], 'sg')) {
-      ship.use(shieldInternals[i], sg);
-      usedSlots.push(shieldInternals[i]);
-      sgSlot = shieldInternals[i];
-      break;
+      ship.use(shieldInternals[i], sg)
+      usedSlots.push(shieldInternals[i])
+      sgSlot = shieldInternals[i]
+      break
    }
  }

  // Detailed Surface Scanner
-  const dssOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+  const dssOrder = [1, 2, 3, 4, 5, 6, 7, 8]
  const dssInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                    .filter(a => (!a.eligible) || a.eligible.sc)
-                                    .sort((a,b) => dssOrder.indexOf(a.maxClass) - dssOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.sc)
+    .sort((a, b) => dssOrder.indexOf(a.maxClass) - dssOrder.indexOf(b.maxClass))
  for (let i = 0; i < dssInternals.length; i++) {
    if (canMount(ship, dssInternals[i], 'sc')) {
-      ship.use(dssInternals[i], ModuleUtils.internal('2i'));
-      usedSlots.push(dssInternals[i]);
-      break;
+      ship.use(dssInternals[i], ModuleUtils.internal('2i'))
+      usedSlots.push(dssInternals[i])
+      break
    }
  }

  // Fuel scoop - best possible
-  const fuelScoopOrder = [8, 7, 6, 5, 4, 3, 2, 1];
+  const fuelScoopOrder = [8, 7, 6, 5, 4, 3, 2, 1]
  const fuelScoopInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                       .filter(a => (!a.eligible) || a.eligible.fs)
-                                       .sort((a,b) => fuelScoopOrder.indexOf(a.maxClass) - fuelScoopOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.fs)
+    .sort((a, b) => fuelScoopOrder.indexOf(a.maxClass) - fuelScoopOrder.indexOf(b.maxClass))
  for (let i = 0; i < fuelScoopInternals.length; i++) {
    if (canMount(ship, fuelScoopInternals[i], 'fs')) {
-      ship.use(fuelScoopInternals[i], ModuleUtils.findInternal('fs', fuelScoopInternals[i].maxClass, 'A'));
-      usedSlots.push(fuelScoopInternals[i]);
-      fuelScoopSlot = fuelScoopInternals[i];
-      break;
+      ship.use(fuelScoopInternals[i], ModuleUtils.findInternal('fs', fuelScoopInternals[i].maxClass, 'A'))
+      usedSlots.push(fuelScoopInternals[i])
+      fuelScoopSlot = fuelScoopInternals[i]
+      break
    }
  }

  // AFMUs - fill as they are 0-weight
-  const afmuOrder = [8, 7, 6, 5, 4, 3, 2, 1];
+  const afmuOrder = [8, 7, 6, 5, 4, 3, 2, 1]
  const afmuInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                       .filter(a => (!a.eligible) || a.eligible.pc)
-                                       .sort((a,b) => afmuOrder.indexOf(a.maxClass) - afmuOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.pc)
+    .sort((a, b) => afmuOrder.indexOf(a.maxClass) - afmuOrder.indexOf(b.maxClass))
  for (let i = 0; i < afmuInternals.length; i++) {
    if (canMount(ship, afmuInternals[i], 'am')) {
-      ship.use(afmuInternals[i], ModuleUtils.findInternal('am', afmuInternals[i].maxClass, 'A'));
-      usedSlots.push(afmuInternals[i]);
-      ship.setSlotEnabled(afmuInternals[i], false);   // Disable power for AFM Unit
+      ship.use(afmuInternals[i], ModuleUtils.findInternal('am', afmuInternals[i].maxClass, 'A'))
+      usedSlots.push(afmuInternals[i])
+      ship.setSlotEnabled(afmuInternals[i], false)   // Disable power for AFM Unit
    }
  }

  for (let s of ship.hardpoints) {
    if (s.maxClass == 0 && heatSinkCount) {       // Mount up to 2 heatsinks
-      ship.use(s, ModuleUtils.hardpoints('02'));
-      ship.setSlotEnabled(s, heatSinkCount == 2); // Only enable a single Heatsink
-      heatSinkCount--;
+      ship.use(s, ModuleUtils.hardpoints('02'))
+      ship.setSlotEnabled(s, heatSinkCount == 2) // Only enable a single Heatsink
+      heatSinkCount--
    } else {
-      ship.use(s, null);
+      ship.use(s, null)
    }
  }

  if (sgSlot && fuelScoopSlot) {
    // The SG and Fuel scoop to not need to be powered at the same time
    if (sgSlot.m.getPowerUsage() > fuelScoopSlot.m.getPowerUsage()) { // The Shield generator uses the most power
-      ship.setSlotEnabled(fuelScoopSlot, false);
+      ship.setSlotEnabled(fuelScoopSlot, false)
    } else {                                    // The Fuel scoop uses the most power
-      ship.setSlotEnabled(sgSlot, false);
+      ship.setSlotEnabled(sgSlot, false)
    }
  }

-  ship.useLightestStandard(standardOpts);
+  ship.useLightestStandard(standardOpts)
 }

 /**
@@ -199,187 +214,188 @@ export function explorer(ship, planetary) {
 * @param  {Ship} ship         Ship instance
 * @param  {Boolean} shielded  True if shield generator should be included
 */
-export function miner(ship, shielded) {
-  let standardOpts = { ppRating: 'A' },
-      miningLaserCount = 2,
-      usedSlots = [],
-      sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass);
+export function miner (ship, shielded) {
+  shielded = true
+  let standardOpts = {ppRating: 'A'},
+    miningLaserCount = 2,
+    usedSlots = [],
+    sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass)

  // Cargo hatch should be enabled
-  ship.setSlotEnabled(ship.cargoHatch, true);
+  ship.setSlotEnabled(ship.cargoHatch, true)

  // Largest possible refinery
-  const refineryOrder = [4, 5, 6, 7, 8, 3, 2, 1];
+  const refineryOrder = [4, 5, 6, 7, 8, 3, 2, 1]
  const refineryInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                         .filter(a => (!a.eligible) || a.eligible.rf)
-                                         .sort((a,b) => refineryOrder.indexOf(a.maxClass) - refineryOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.rf)
+    .sort((a, b) => refineryOrder.indexOf(a.maxClass) - refineryOrder.indexOf(b.maxClass))
  for (let i = 0; i < refineryInternals.length; i++) {
    if (canMount(ship, refineryInternals[i], 'rf')) {
-      ship.use(refineryInternals[i], ModuleUtils.findInternal('rf', Math.min(refineryInternals[i].maxClass, 4), 'A'));
-      usedSlots.push(refineryInternals[i]);
-      break;
+      ship.use(refineryInternals[i], ModuleUtils.findInternal('rf', Math.min(refineryInternals[i].maxClass, 4), 'A'))
+      usedSlots.push(refineryInternals[i])
+      break
    }
  }

  // Prospector limpet controller - 3A if possible
-  const prospectorOrder = [3, 4, 5, 6, 7, 8, 2, 1];
+  const prospectorOrder = [3, 4, 5, 6, 7, 8, 2, 1]
  const prospectorInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                           .filter(a => (!a.eligible) || a.eligible.pc)
-                                           .sort((a,b) => prospectorOrder.indexOf(a.maxClass) - prospectorOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.pc)
+    .sort((a, b) => prospectorOrder.indexOf(a.maxClass) - prospectorOrder.indexOf(b.maxClass))
  for (let i = 0; i < prospectorInternals.length; i++) {
    if (canMount(ship, prospectorInternals[i], 'pc')) {
      // Prospector only has odd classes
-      const prospectorClass = prospectorInternals[i].maxClass % 2 === 0 ? prospectorInternals[i].maxClass - 1 : prospectorInternals[i].maxClass;
-      ship.use(prospectorInternals[i], ModuleUtils.findInternal('pc', prospectorClass, 'A'));
-      usedSlots.push(prospectorInternals[i]);
-      break;
+      const prospectorClass = prospectorInternals[i].maxClass % 2 === 0 ? prospectorInternals[i].maxClass - 1 : prospectorInternals[i].maxClass
+      ship.use(prospectorInternals[i], ModuleUtils.findInternal('pc', prospectorClass, 'A'))
+      usedSlots.push(prospectorInternals[i])
+      break
    }
  }

  // Shield generator if required
  if (shielded) {
-    const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+    const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8]
    const shieldInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                         .filter(a => (!a.eligible) || a.eligible.sg)
-                                         .filter(a => a.maxClass >= sg.class)
-                                         .sort((a,b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass));
+      .filter(a => (!a.eligible) || a.eligible.sg)
+      .filter(a => a.maxClass >= sg.class)
+      .sort((a, b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass))
    for (let i = 0; i < shieldInternals.length; i++) {
      if (canMount(ship, shieldInternals[i], 'sg')) {
-        ship.use(shieldInternals[i], sg);
-        usedSlots.push(shieldInternals[i]);
-        break;
+        ship.use(shieldInternals[i], sg)
+        usedSlots.push(shieldInternals[i])
+        break
      }
    }
  }

  // Dual mining lasers of highest possible class; remove anything else
-  const miningLaserOrder = [2, 3, 4, 1, 0];
-  const miningLaserHardpoints = ship.hardpoints.concat().sort(function(a,b) {
-    return miningLaserOrder.indexOf(a.maxClass) - miningLaserOrder.indexOf(b.maxClass);
-  });
+  const miningLaserOrder = [2, 3, 4, 1, 0]
+  const miningLaserHardpoints = ship.hardpoints.concat().sort(function (a, b) {
+    return miningLaserOrder.indexOf(a.maxClass) - miningLaserOrder.indexOf(b.maxClass)
+  })
  for (let s of miningLaserHardpoints) {
    if (s.maxClass >= 1 && miningLaserCount) {
-      ship.use(s, ModuleUtils.hardpoints(s.maxClass >= 2 ? '2m' : '2l'));
-      miningLaserCount--;
+      ship.use(s, ModuleUtils.hardpoints(s.maxClass >= 2 ? '2m' : '2l'))
+      miningLaserCount--
    } else {
-      ship.use(s, null);
+      ship.use(s, null)
    }
  }

  // Number of collector limpets required to be active is a function of the size of the ship and the power of the lasers
  const miningLaserDps = ship.hardpoints.filter(h => h.m != null)
-                                        .reduce(function(a, b) {
-                                          return a + b.m.getDps();
-                                        }, 0);
+    .reduce(function (a, b) {
+      return a + b.m.getDps()
+    }, 0)
  // Find out how many internal slots we have, and their potential cargo size
  const potentialCargo = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                      .filter(a => (!a.eligible) || a.eligible.cr)
-                                      .map(b => Math.pow(2, b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.cr)
+    .map(b => Math.pow(2, b.maxClass))
  // One collector for each 1.25 DPS, multiply by 1.25 for medium ships and 1.5 for large ships as they have further to travel
  // 0 if we only have 1 cargo slot, otherwise minium of 1 and maximum of 6 (excluding size modifier)
-  const sizeModifier = ship.class == 2 ? 1.2 : ship.class == 3 ? 1.5 : 1;
-  let collectorLimpetsRequired = potentialCargo.length == 1 ? 0 : Math.ceil(sizeModifier * Math.min(6, Math.floor(miningLaserDps / 1.25)));
-  
+  const sizeModifier = ship.class == 2 ? 1.2 : ship.class == 3 ? 1.5 : 1
+  let collectorLimpetsRequired = potentialCargo.length == 1 ? 0 : Math.ceil(sizeModifier * Math.min(6, Math.floor(miningLaserDps / 1.25)))
+
  if (collectorLimpetsRequired > 0) {
-    const collectorOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+    const collectorOrder = [1, 2, 3, 4, 5, 6, 7, 8]
    const collectorInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                            .filter(a => (!a.eligible) || a.eligible.cc)
-                                            .sort((a,b) => collectorOrder.indexOf(a.maxClass) - collectorOrder.indexOf(b.maxClass));
+      .filter(a => (!a.eligible) || a.eligible.cc)
+      .sort((a, b) => collectorOrder.indexOf(a.maxClass) - collectorOrder.indexOf(b.maxClass))
    // Always keep at least 2 slots free for cargo racks (1 for shielded)
    for (let i = 0; i < collectorInternals.length - (shielded ? 1 : 2) && collectorLimpetsRequired > 0; i++) {
      if (canMount(ship, collectorInternals[i], 'cc')) {
        // Collector only has odd classes
-        const collectorClass = collectorInternals[i].maxClass % 2 === 0 ? collectorInternals[i].maxClass - 1 : collectorInternals[i].maxClass;
-        ship.use(collectorInternals[i], ModuleUtils.findInternal('cc', collectorClass, 'D'));
-        usedSlots.push(collectorInternals[i]);
-        collectorLimpetsRequired -= collectorInternals[i].m.maximum;
+        const collectorClass = collectorInternals[i].maxClass % 2 === 0 ? collectorInternals[i].maxClass - 1 : collectorInternals[i].maxClass
+        ship.use(collectorInternals[i], ModuleUtils.findInternal('cc', collectorClass, 'D'))
+        usedSlots.push(collectorInternals[i])
+        collectorLimpetsRequired -= collectorInternals[i].m.maximum
      }
    }
  }

  // Power distributor to power the mining lasers indefinitely
  const wepRateRequired = ship.hardpoints.filter(h => h.m != null)
-                                          .reduce(function(a, b) {
-                                            return a + b.m.getEps();
-                                          }, 0);
-  standardOpts.pd = ship.getAvailableModules().matchingPowerDist({ weprate: wepRateRequired }).id;
+    .reduce(function (a, b) {
+      return a + b.m.getEps()
+    }, 0)
+  standardOpts.pd = ship.getAvailableModules().matchingPowerDist({weprate: wepRateRequired}).id

  // Fill the empty internals with cargo racks
  for (let i = ship.internal.length; i--;) {
-    let slot = ship.internal[i];
+    let slot = ship.internal[i]
    if (usedSlots.indexOf(slot) == -1 && canMount(ship, slot, 'cr')) {
-      ship.use(slot, ModuleUtils.findInternal('cr', slot.maxClass, 'E'));
+      ship.use(slot, ModuleUtils.findInternal('cr', slot.maxClass, 'E'))
    }
  }

-  ship.useLightestStandard(standardOpts);
+  ship.useLightestStandard(standardOpts)
 }

 /**
 * Racer Role
 * @param  {Ship} ship         Ship instance
 */
-export function racer(ship) {
+export function racer (ship) {
  let standardOpts = {},
-      usedSlots = [],
-      sgSlot,
-      sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass);
+    usedSlots = [],
+    sgSlot,
+    sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass)

  // Cargo hatch can be disabled
-  ship.setSlotEnabled(ship.cargoHatch, false);
+  ship.setSlotEnabled(ship.cargoHatch, false)

  // Shield generator
-  const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+  const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8]
  const shieldInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                       .filter(a => (!a.eligible) || a.eligible.sg)
-                                       .filter(a => a.maxClass >= sg.class)
-                                       .sort((a,b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.sg)
+    .filter(a => a.maxClass >= sg.class)
+    .sort((a, b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass))
  for (let i = 0; i < shieldInternals.length; i++) {
    if (canMount(ship, shieldInternals[i], 'sg')) {
-      ship.use(shieldInternals[i], sg);
-      usedSlots.push(shieldInternals[i]);
-      sgSlot = shieldInternals[i];
-      break;
+      ship.use(shieldInternals[i], sg)
+      usedSlots.push(shieldInternals[i])
+      sgSlot = shieldInternals[i]
+      break
    }
  }

  // Empty the hardpoints
  for (let s of ship.hardpoints) {
-    ship.use(s, null);
+    ship.use(s, null)
  }

  // Empty the internals
  for (let i = ship.internal.length; i--;) {
-    let slot = ship.internal[i];
+    let slot = ship.internal[i]
    if (usedSlots.indexOf(slot) == -1) {
-      ship.use(slot, null);
+      ship.use(slot, null)
    }
  }

  // Best thrusters
  if (ship.standard[1].maxClass === 3) {
-    standardOpts.th = 'tz';
+    standardOpts.th = 'tz'
  } else if (ship.standard[1].maxClass === 2) {
-    standardOpts.th = 'u0';
+    standardOpts.th = 'u0'
  } else {
-    standardOpts.th = ship.standard[1].maxClass + 'A';
+    standardOpts.th = ship.standard[1].maxClass + 'A'
  }

  // Best power distributor for more boosting
-  standardOpts.pd = ship.standard[4].maxClass + 'A';
+  standardOpts.pd = ship.standard[4].maxClass + 'A'

  // Smallest possible FSD drive
-  standardOpts.fsd = '2D';
+  standardOpts.fsd = '2D'
  // Minimal fuel tank
-  standardOpts.ft = '1C';
+  standardOpts.ft = '1C'

  // Disable nearly everything
-  standardOpts.fsdDisabled = true;
-  standardOpts.sDisabled = true;
-  standardOpts.pdDisabled = true;
-  standardOpts.lsDisabled = true;
+  standardOpts.fsdDisabled = true
+  standardOpts.sDisabled = true
+  standardOpts.pdDisabled = true
+  standardOpts.lsDisabled = true

-  ship.useLightestStandard(standardOpts);
+  ship.useLightestStandard(standardOpts)

  // Apply engineering to each module
  // ship.standard[1].m.blueprint = getBlueprint('Engine_Dirty', ship.standard[0]);
--- a/src/app/utils/BlueprintFunctions.js
+++ b/src/app/utils/BlueprintFunctions.js
@@ -1,6 +1,67 @@
 import React from 'react';
 import { Modifications } from 'coriolis-data/dist';

+/**
+ * Generate a tooltip with details of a blueprint's specials
+ * @param   {Object}  translate   The translate object
+ * @param   {Object}  blueprint   The blueprint at the required grade
+ * @param   {string}  grp         The group of the module
+ * @param   {Object}  m           The module to compare with
+ * @param specialName
+ * @returns {Object}              The react components
+ */
+export function specialToolTip(translate, blueprint, grp, m, specialName) {
+  const effects = [];
+  if (!blueprint || !blueprint.features) {
+    return undefined;
+  }
+  if (m) {
+    // We also add in any benefits from specials that aren't covered above
+    if (m.blueprint) {
+        for (const feature in Modifications.modifierActions[specialName]) {
+          // if (!blueprint.features[feature] && !m.mods.feature) {
+            const featureDef = Modifications.modifications[feature];
+            if (featureDef && !featureDef.hidden) {
+              let symbol = '';
+              if (feature === 'jitter') {
+                symbol = '°';
+              } else if (featureDef.type === 'percentage') {
+                symbol = '%';
+              }
+              let current = m.getModValue(feature) - m.getModValue(feature, true);
+              if (featureDef.type === 'percentage') {
+                current = Math.round(current / 10) / 10;
+              } else if (featureDef.type === 'numeric') {
+                current /= 100;
+              }
+                const currentIsBeneficial = isValueBeneficial(feature, current);
+
+                effects.push(
+                  <tr key={feature + '_specialTT'}>
+                    <td style={{textAlign: 'left'}}>{translate(feature, grp)}</td>
+                    <td>&nbsp;</td>
+                    <td className={current === 0 ? '' : currentIsBeneficial ? 'secondary' : 'warning'}
+                        style={{textAlign: 'right'}}>{current}{symbol}</td>
+                    <td>&nbsp;</td>
+                  </tr>
+                );
+            }
+      }
+
+    }
+  }
+
+  return (
+    <div>
+      <table width='100%'>
+        <tbody>
+        {effects}
+        </tbody>
+      </table>
+    </div>
+  );
+}
+
 /**
 * Generate a tooltip with details of a blueprint's effects
 * @param   {Object}  translate   The translate object
@@ -12,6 +73,9 @@ import { Modifications } from 'coriolis-data/dist';
 */
 export function blueprintTooltip(translate, blueprint, engineers, grp, m) {
  const effects = [];
+  if (!blueprint || !blueprint.features) {
+    return undefined;
+  }
  for (const feature in blueprint.features) {
    const featureIsBeneficial = isBeneficial(feature, blueprint.features[feature]);
    const featureDef = Modifications.modifications[feature];
@@ -225,27 +289,13 @@ export function isValueBeneficial(feature, value) {
 */
 export function getBlueprint(name, module) {
  // Start with a copy of the blueprint
-  const blueprint = JSON.parse(JSON.stringify(Modifications.blueprints[name]));
+  const findMod = val => Object.keys(Modifications.blueprints).find(elem => elem.toString().toLowerCase().search(val.toString().toLowerCase().replace(/(OutfittingFieldType_|persecond)/igm, '')) >= 0)
+  const found = Modifications.blueprints[findMod(name)];
+  if (!found || !found.fdname) {
+    return {};
+  }
+  const blueprint = JSON.parse(JSON.stringify(found));
  if (module) {
-    if (module.grp === 'bh' || module.grp === 'hr' || module.grp === 'sg' || module.grp === 'psg' || module.grp === 'bsg') {
-      // Bulkheads, hull reinforcements and shield generators need to have their resistances altered by the base values
-      for (const grade in blueprint.grades) {
-        for (const feature in blueprint.grades[grade].features) {
-          if (feature === 'explres') {
-            blueprint.grades[grade].features[feature][0] *= (1 - module.explres);
-            blueprint.grades[grade].features[feature][1] *= (1 - module.explres);
-          }
-          if (feature === 'kinres') {
-            blueprint.grades[grade].features[feature][0] *= (1 - module.kinres);
-            blueprint.grades[grade].features[feature][1] *= (1 - module.kinres);
-          }
-          if (feature === 'thermres') {
-            blueprint.grades[grade].features[feature][0] *= (1 - module.thermres);
-            blueprint.grades[grade].features[feature][1] *= (1 - module.thermres);
-          }
-        }
-      }
-    }
    if (module.grp === 'sb') {
      // Shield boosters are treated internally as straight modifiers, so rather than (for example)
      // being a 4% boost they are a 104% multiplier.  We need to fix the values here so that they look
@@ -264,56 +314,31 @@ export function getBlueprint(name, module) {
 }

 /**
- * Provide 'worst' primary modifications
+ * Provide 'percent' primary modifications
 * @param {Object}      ship      The ship for which to perform the modifications
 * @param {Object}      m         The module for which to perform the modifications
+ * @param {Number} percent The percent to set values to of full.
 */
-export function setWorst(ship, m) {
-  ship.clearModifications(m);
-  const features = m.blueprint.grades[m.blueprint.grade].features;
-  for (const featureName in features) {
-    const value = features[featureName][0];
-    _setValue(ship, m, featureName, value);
-  }
-}
-
-/**
- * Provide 'best' primary modifications
- * @param {Object}      ship      The ship for which to perform the modifications
- * @param {Object}      m         The module for which to perform the modifications
- */
-export function setBest(ship, m) {
-  ship.clearModifications(m);
-  const features = m.blueprint.grades[m.blueprint.grade].features;
-  for (const featureName in features) {
-    const value = features[featureName][1];
-    _setValue(ship, m, featureName, value);
-  }
-}
-
-/**
- * Provide 'extreme' primary modifications
- * @param {Object}      ship      The ship for which to perform the modifications
- * @param {Object}      m         The module for which to perform the modifications
- */
-export function setExtreme(ship, m) {
+export function setPercent(ship, m, percent) {
  ship.clearModifications(m);
+  // Pick given value as multiplier
+  const mult = percent / 100;
  const features = m.blueprint.grades[m.blueprint.grade].features;
  for (const featureName in features) {
    let value;
    if (Modifications.modifications[featureName].higherbetter) {
      // Higher is better, but is this making it better or worse?
      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
-        value = features[featureName][0];
+        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
      } else {
-        value = features[featureName][1];
+        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
      }
    } else {
      // Higher is worse, but is this making it better or worse?
      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
-        value = features[featureName][1];
+        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
      } else {
-        value = features[featureName][0];
+        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
      }
    }

@@ -327,30 +352,8 @@ export function setExtreme(ship, m) {
 * @param {Object}      m         The module for which to perform the modifications
 */
 export function setRandom(ship, m) {
-  ship.clearModifications(m);
  // Pick a single value for our randomness
-  const mult = Math.random();
-  const features = m.blueprint.grades[m.blueprint.grade].features;
-  for (const featureName in features) {
-    let value;
-    if (Modifications.modifications[featureName].higherbetter) {
-      // Higher is better, but is this making it better or worse?
-      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
-        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
-      } else {
-        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
-      }
-    } else {
-      // Higher is worse, but is this making it better or worse?
-      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
-        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
-      } else {
-        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
-      }
-    }
-
-    _setValue(ship, m, featureName, value);
-  }
+  setPercent(ship, m, Math.random() * 100);
 }

 /**
@@ -369,3 +372,60 @@ function _setValue(ship, m, featureName, value) {
    ship.setModification(m, featureName, value);
  }
 }
+
+/**
+ * Provide 'percent' primary query
+ * @param {Object}      m         The module for which to perform the query
+ * @returns {Number} percent The percentage indicator of current applied values.
+ */
+export function getPercent(m) {
+  let result = null;
+  const features = m.blueprint.grades[m.blueprint.grade].features;
+  for (const featureName in features) {
+    
+	if (features[featureName][0] === features[featureName][1]) {
+		continue;
+	}
+	
+	let value = _getValue(m, featureName);
+	let mult;
+    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);
+      } else {
+		mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);        
+      }
+    } else {
+      // Higher is worse, but is this making it better or worse?
+      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
+		mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);
+      } else {
+		mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
+      }
+    }
+	
+	if (result && result != mult) {
+		return null;
+	} else if (result != mult) {
+		result = mult;
+	}
+  }
+  
+  return result;
+}
+
+/**
+ * Query a feature value
+ * @param {Object}      m             The module for which to perform the query
+ * @param {string}      featureName   The feature being queried
+ */
+function _getValue(m, featureName) {
+  if (Modifications.modifications[featureName].type == 'percentage') {
+    return m.getModValue(featureName, true) / 10000;
+  } else if (Modifications.modifications[featureName].type == 'numeric') {
+    return m.getModValue(featureName, true) / 100;
+  } else {
+    return m.getModValue(featureName, true);
+  }
+}
--- a/src/app/utils/CompanionApiUtils.js
+++ b/src/app/utils/CompanionApiUtils.js
@@ -43,7 +43,7 @@ const SHIP_FD_NAME_TO_CORIOLIS_NAME = {
 };

 // Mapping from hardpoint class to name in companion API
-const HARDPOINT_NUM_TO_CLASS = {
+export const HARDPOINT_NUM_TO_CLASS = {
  0: 'Tiny',
  1: 'Small',
  2: 'Medium',
@@ -106,7 +106,7 @@ function _moduleFromEdId(edId) {
 * @return {string} the Coriolis model of the ship
 */
 function _shipModelFromEDName(edName) {
-  return SHIP_FD_NAME_TO_CORIOLIS_NAME[edName];
+  return SHIP_FD_NAME_TO_CORIOLIS_NAME[Object.keys(SHIP_FD_NAME_TO_CORIOLIS_NAME).find(elem => elem.toLowerCase() === edName.toLowerCase())];
 }

 /**
@@ -115,7 +115,7 @@ function _shipModelFromEDName(edName) {
 * @return {string} the Coriolis model of the ship
 */
 export function shipModelFromJson(json) {
-  return _shipModelFromEDName(json.name);
+  return _shipModelFromEDName(json.name || json.Ship);
 }

 /**
@@ -145,18 +145,18 @@ export function shipFromJson(json) {
  }

  let rootModule;
-  
+
  // Add the bulkheads
  const armourJson = json.modules.Armour.module;
-  if (armourJson.name.endsWith('_Armour_Grade1')) {
+  if (armourJson.name.toLowerCase().endsWith('_armour_grade1')) {
    ship.useBulkhead(0, true);
-  } else if (armourJson.name.endsWith('_Armour_Grade2')) {
+  } else if (armourJson.name.toLowerCase().endsWith('_armour_grade2')) {
    ship.useBulkhead(1, true);
-  } else if (armourJson.name.endsWith('_Armour_Grade3')) {
+  } else if (armourJson.name.toLowerCase().endsWith('_armour_grade3')) {
    ship.useBulkhead(2, true);
-  } else if (armourJson.name.endsWith('_Armour_Mirrored')) {
+  } else if (armourJson.name.toLowerCase().endsWith('_armour_mirrored')) {
    ship.useBulkhead(3, true);
-  } else if (armourJson.name.endsWith('_Armour_Reactive')) {
+  } else if (armourJson.name.toLowerCase().endsWith('_armour_reactive')) {
    ship.useBulkhead(4, true);
  } else {
    throw 'Unknown bulkheads "' + armourJson.name + '"';
--- a/src/app/utils/JournalUtils.js
+++ b/src/app/utils/JournalUtils.js
@@ -0,0 +1,292 @@
+import Ship from '../shipyard/Ship'
+import { HARDPOINT_NUM_TO_CLASS, shipModelFromJson } from './CompanionApiUtils'
+import { Ships } from 'coriolis-data/dist'
+import Module from '../shipyard/Module'
+import { Modules } from 'coriolis-data/dist'
+import { Modifications } from 'coriolis-data/dist'
+import { getBlueprint } from './BlueprintFunctions'
+
+/**
+ * Obtain a module given its FD Name
+ * @param {string} fdname the FD Name of the module
+ * @return {Module} the module
+ */
+function _moduleFromFdName (fdname) {
+  if (!fdname) return null
+  fdname = fdname.toLowerCase()
+  // Check standard modules
+  for (const grp in Modules.standard) {
+    if (Modules.standard.hasOwnProperty(grp)) {
+      for (const i in Modules.standard[grp]) {
+        if (Modules.standard[grp][i].symbol && Modules.standard[grp][i].symbol.toLowerCase() === fdname) {
+          // Found it
+          return new Module({template: Modules.standard[grp][i]})
+        }
+      }
+    }
+  }
+
+  // Check hardpoint modules
+  for (const grp in Modules.hardpoints) {
+    if (Modules.hardpoints.hasOwnProperty(grp)) {
+      for (const i in Modules.hardpoints[grp]) {
+        if (Modules.hardpoints[grp][i].symbol && Modules.hardpoints[grp][i].symbol.toLowerCase() === fdname) {
+          // Found it
+          return new Module({template: Modules.hardpoints[grp][i]})
+        }
+      }
+    }
+  }
+
+  // Check internal modules
+  for (const grp in Modules.internal) {
+    if (Modules.internal.hasOwnProperty(grp)) {
+      for (const i in Modules.internal[grp]) {
+        if (Modules.internal[grp][i].symbol && Modules.internal[grp][i].symbol.toLowerCase() === fdname) {
+          // Found it
+          return new Module({template: Modules.internal[grp][i]})
+        }
+      }
+    }
+  }
+
+  // Not found
+  return null
+}
+
+/**
+ * Build a ship from the journal Loadout event JSON
+ * @param {object} json the Loadout event JSON
+ * @return {Ship} the built ship
+ */
+export function shipFromLoadoutJSON (json) {
+// Start off building a basic ship
+  const shipModel = shipModelFromJson(json)
+  if (!shipModel) {
+    throw 'No such ship found: "' + json.Ship + '"'
+  }
+  const shipTemplate = Ships[shipModel]
+
+  let ship = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots)
+  ship.buildWith(null)
+  // Initial Ship building, don't do engineering yet.
+  let opts = [];
+
+  for (const module of json.Modules) {
+    switch (module.Slot.toLowerCase()) {
+      // Cargo Hatch.
+      case 'cargohatch':
+        ship.cargoHatch.enabled = module.On
+        ship.cargoHatch.priority = module.Priority
+        break
+      // Add the bulkheads
+      case 'armour':
+        if (module.Item.toLowerCase().endsWith('_armour_grade1')) {
+          ship.useBulkhead(0, true)
+        } else if (module.Item.toLowerCase().endsWith('_armour_grade2')) {
+          ship.useBulkhead(1, true)
+        } else if (module.Item.toLowerCase().endsWith('_armour_grade3')) {
+          ship.useBulkhead(2, true)
+        } else if (module.Item.toLowerCase().endsWith('_armour_mirrored')) {
+          ship.useBulkhead(3, true)
+        } else if (module.Item.toLowerCase().endsWith('_armour_reactive')) {
+          ship.useBulkhead(4, true)
+        } else {
+          throw 'Unknown bulkheads "' + module.Item + '"'
+        }
+        ship.bulkheads.enabled = true
+        if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
+      case 'powerplant':
+        const powerplant = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[0], powerplant, true)
+        ship.standard[0].enabled = module.On
+        ship.standard[0].priority = module.Priority
+        if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
+      case 'mainengines':
+        const thrusters = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[1], thrusters, true)
+        ship.standard[1].enabled = module.On
+        ship.standard[1].priority = module.Priority
+        if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
+      case 'frameshiftdrive':
+        const frameshiftdrive = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[2], frameshiftdrive, true)
+        ship.standard[2].enabled = module.On
+        ship.standard[2].priority = module.Priority
+        if (module.Engineering)  _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
+      case 'lifesupport':
+        const lifesupport = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[3], lifesupport, true)
+        ship.standard[3].enabled = module.On === true
+        ship.standard[3].priority = module.Priority
+        if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
+      case 'powerdistributor':
+        const powerdistributor = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[4], powerdistributor, true)
+        ship.standard[4].enabled = module.On
+        ship.standard[4].priority = module.Priority
+        if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
+      case 'radar':
+        const sensors = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[5], sensors, true)
+        ship.standard[5].enabled = module.On
+        ship.standard[5].priority = module.Priority
+        if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
+      case 'fueltank':
+        const fueltank = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[6], fueltank, true)
+        ship.standard[6].enabled = true
+        ship.standard[6].priority = 0
+        break
+      default:
+    }
+    for (const module of json.Modules) {
+      if (module.Slot.toLowerCase().search(/hardpoint/) !== -1) {
+        // Add hardpoints
+        let hardpoint;
+        let hardpointClassNum = -1
+        let hardpointSlotNum = -1
+        let hardpointArrayNum = 0
+        for (let i in shipTemplate.slots.hardpoints) {
+          if (shipTemplate.slots.hardpoints[i] === hardpointClassNum) {
+            // Another slot of the same class
+            hardpointSlotNum++
+          } else {
+            // The first slot of a new class
+            hardpointClassNum = shipTemplate.slots.hardpoints[i]
+            hardpointSlotNum = 1
+          }
+
+          // Now that we know what we're looking for, find it
+          const hardpointName = HARDPOINT_NUM_TO_CLASS[hardpointClassNum] + 'Hardpoint' + hardpointSlotNum
+          const hardpointSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === hardpointName.toLowerCase())
+          if (!hardpointSlot) {
+            // This can happen with old imports that don't contain new hardpoints
+          } else if (!hardpointSlot) {
+            // No module
+          } else {
+            hardpoint = _moduleFromFdName(hardpointSlot.Item)
+            ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true)
+            ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On
+            ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority
+            opts.push({coriolisMod: hardpoint, json: hardpointSlot});
+          }
+          hardpointArrayNum++
+        }
+      }
+      if (module.Slot.toLowerCase().search(/slot\d/) !== -1) {
+        let internalSlotNum = 1
+        let militarySlotNum = 1
+        for (let i in shipTemplate.slots.internal) {
+          const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name = 'military' : false
+
+          // The internal slot might be a standard or a military slot.  Military slots have a different naming system
+          let internalSlot = null
+          if (isMilitary) {
+            const internalName = 'Military0' + militarySlotNum
+            internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase())
+            militarySlotNum++
+          } else {
+            // Slot numbers are not contiguous so handle skips.
+            while (internalSlot === null && internalSlotNum < 99) {
+              // Slot sizes have no relationship to the actual size, either, so check all possibilities
+              for (let slotsize = 0; slotsize < 9; slotsize++) {
+                const internalName = 'Slot' + (internalSlotNum <= 9 ? '0' : '') + internalSlotNum + '_Size' + slotsize
+                if (json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase())) {
+                  internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase());
+                  break
+                }
+              }
+              internalSlotNum++
+            }
+          }
+
+          if (!internalSlot) {
+            // This can happen with old imports that don't contain new slots
+          } else if (!internalSlot) {
+            // No module
+          } else {
+            const internalJson = internalSlot
+            const internal = _moduleFromFdName(internalJson.Item)
+            ship.use(ship.internal[i], internal, true)
+            ship.internal[i].enabled = internalJson.On === true
+            ship.internal[i].priority = internalJson.Priority
+            opts.push({coriolisMod: internal, json: internalSlot});
+          }
+        }
+      }
+    }
+  }
+
+  for (const i of opts) {
+    if (i.json.Engineering) _addModifications(i.coriolisMod, i.json.Engineering.Modifiers, i.json.Engineering.BlueprintName, i.json.Engineering.Level, i.json.Engineering.ExperimentalEffect)
+  }
+  // We don't have any information on it so guess it's priority 5 and disabled
+  if (!ship.cargoHatch) {
+    ship.cargoHatch.enabled = false
+    ship.cargoHatch.priority = 4
+  }
+  console.log(ship)
+
+  // Now update the ship's codes before returning it
+  return ship.updatePowerPrioritesString().updatePowerEnabledString().updateModificationsString()
+}
+
+/**
+ * Add the modifications for a module
+ * @param {Module} module the module
+ * @param {Object} modifiers the modifiers
+ * @param {Object} blueprint the blueprint of the modification
+ * @param {Object} grade the grade of the modification
+ * @param {Object} specialModifications special modification
+ */
+function _addModifications (module, modifiers, blueprint, grade, specialModifications) {
+  if (!modifiers) return
+  let special
+  if (specialModifications) {
+    special = Modifications.specials[specialModifications]
+  }
+  for (const i in modifiers) {
+    // Some special modifications
+    // Look up the modifiers to find what we need to do
+    const findMod = val => Object.keys(Modifications.modifierActions).find(elem => elem.toString().toLowerCase().search(val.toString().toLowerCase().replace(/(OutfittingFieldType_|persecond)/igm, '')) >= 0)
+    const modifierActions = Modifications.modifierActions[findMod(modifiers[i].Label)]
+    //TODO: Figure out how to scale this value.
+    if (!!modifiers[i].LessIsGood) {
+
+    }
+    let value = (modifiers[i].Value / modifiers[i].OriginalValue * 100 - 100)  * 100;
+    if (value === Infinity) {
+      value = modifiers[i].Value * 100;
+    }
+    if (modifiers[i].Label.search('Resistance') >= 0) {
+      value = (modifiers[i].Value * 100) - (modifiers[i].OriginalValue * 100)
+    }
+    // Carry out the required changes
+    for (const action in modifierActions) {
+      if (isNaN(modifierActions[action])) {
+        module.setModValue(action, modifierActions[action])
+      } else {
+        module.setModValue(action, value)
+      }
+    }
+  }
+
+  // Add the blueprint definition, grade and special
+  if (blueprint) {
+    module.blueprint = getBlueprint(blueprint, module)
+    if (grade) {
+      module.blueprint.grade = Number(grade)
+    }
+    if (special) {
+      module.blueprint.special = special
+    }
+  }
+}
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -55,10 +55,12 @@
    <!-- End Piwik Code -->

    <!-- Bugsnag -->
-    <script
-    src="//d2wy8f7a9ursnm.cloudfront.net/bugsnag-3.min.js"
-    data-apikey="2382691c622937f28f8fa82a1bfd797a"></script>
-
+    <script src="//d2wy8f7a9ursnm.cloudfront.net/v4/bugsnag.min.js"></script>
+    <script src="//d2wy8f7a9ursnm.cloudfront.net/bugsnag-plugins/v1/bugsnag-react.min.js"></script>
+    <script>
+      window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5', {appVersion: window.CORIOLIS_VERSION || undefined})
+      window.Bugsnag = window.bugsnagClient
+    </script>
  </head>
  <body style="background-color:#000;">
    <section id="coriolis"></section>
--- a/src/less/buttons.less
+++ b/src/less/buttons.less
@@ -31,6 +31,50 @@ button {
  }
 }

+.button-inline-menu {
+    white-space: nowrap;
+    line-height: 1.5em;
+    text-align: center;
+    margin: 0.5em 0;
+    padding-left: 5px;
+    border-top: 1px solid @primary-disabled;
+    border-bottom: 1px solid @primary-disabled;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    background: @primary-bg;
+
+   &.warning {
+      border-color: @warning-disabled;
+      color: @warning-disabled;
+      stroke: @warning-disabled;
+
+      .no-touch &:hover {
+        border-color: @warning;
+        color: @warning;
+        stroke: @warning;
+      }
+    }
+
+    &.disabled, &.disabled:hover {
+      cursor: not-allowed;
+      border-color: @disabled;
+      color: @disabled;
+      stroke: @disabled;
+    }
+
+    &.active {
+      border-color: @secondary;
+      color: @secondary;
+      stroke: @secondary;
+    }
+
+	&:hover {
+      border-color: @primary;
+      color: @primary;
+      stroke: @primary;
+    }
+  }
+
 .button-lbl {
  margin-left: 0.5em;

--- a/src/less/modal.less
+++ b/src/less/modal.less
@@ -54,6 +54,7 @@ textarea {
    width:100%;
    min-height: 10em;
    resize: vertical;
+    user-select: auto;
    margin:2em 0;
  }
 }
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -1,28 +1,30 @@
-var path = require('path');
-var exec = require('child_process').exec;
-var webpack = require('webpack');
-var pkgJson = require('./package');
-var HtmlWebpackPlugin = require("html-webpack-plugin");
-var ExtractTextPlugin = require("extract-text-webpack-plugin");
+const path = require('path')
+const exec = require('child_process').exec
+const webpack = require('webpack')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const WebpackNotifierPlugin = require('webpack-notifier')
+const pkgJson = require('./package')

 function CopyDirPlugin(source, destination) {
-  this.source = source;
-  this.destination = destination;
+  this.source = source
+  this.destination = destination
+}
+
+CopyDirPlugin.prototype.apply = function (compiler) {
+  compiler.plugin('done', () => {
+    console.log(compiler.outputPath, this.destination)
+    exec('cp -r ' + this.source + ' ' + path.join(compiler.outputPath, this.destination))
+  })
 }
-CopyDirPlugin.prototype.apply = function(compiler) {
-  compiler.plugin('done', function() {
-    console.log(compiler.outputPath, this.destination);
-    exec('cp -r ' + this.source + ' ' + path.join(compiler.outputPath, this.destination));
-  }.bind(this));
-};

 module.exports = {
-  devtool: 'eval',
+  devtool: 'source-map',
  devServer: {
-    headers: { "Access-Control-Allow-Origin": "*" }
+    headers: {'Access-Control-Allow-Origin': '*'}
  },
  entry: {
-    app: [ 'webpack-dev-server/client?http://0.0.0.0:3300', 'webpack/hot/only-dev-server', path.join(__dirname, "src/app/index.js") ],
+    app: ['webpack-dev-server/client?http://0.0.0.0:3300', 'webpack/hot/only-dev-server', path.join(__dirname, 'src/app/index.js')],
    lib: ['d3', 'react', 'react-dom', 'classnames', 'fbemitter', 'lz-string']
  },
  resolve: {
@@ -37,33 +39,34 @@ module.exports = {
  plugins: [
    new CopyDirPlugin(path.join(__dirname, 'src/.htaccess'), ''),
    new webpack.optimize.CommonsChunkPlugin({
-        name: 'lib',
-        filename: 'lib.js'
+      name: 'lib',
+      filename: 'lib.js'
    }),
    new HtmlWebpackPlugin({
-        inject: false,
-        template: path.join(__dirname, "src/index.ejs"),
-        version: pkgJson.version,
-        gapiKey: process.env.CORIOLIS_GAPI_KEY || '',
+      inject: false,
+      template: path.join(__dirname, 'src/index.ejs'),
+      version: pkgJson.version,
+      gapiKey: process.env.CORIOLIS_GAPI_KEY || ''
    }),
    new ExtractTextPlugin({
-        filename: 'app.css', 
-        disable: false,
-        allChunks: true
+      filename: 'app.css',
+      disable: false,
+      allChunks: true
    }),
+    new WebpackNotifierPlugin({alwaysNotify: true}),
    new webpack.HotModuleReplacementPlugin(),
    new webpack.NoEmitOnErrorsPlugin()
  ],
  module: {
    rules: [
-      { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader'}) },
-      { test: /\.less$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader'}) },
-      { test: /\.(js|jsx)$/, loaders: [ 'babel-loader' ], include: path.join(__dirname, 'src') },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream' },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader' },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml' }
+      {test: /\.css$/, loader: ExtractTextPlugin.extract({fallback: 'style-loader', use: 'css-loader'})},
+      {test: /\.less$/, loader: ExtractTextPlugin.extract({fallback: 'style-loader', use: 'css-loader!less-loader'})},
+      {test: /\.(js|jsx)$/, loaders: ['babel-loader'], include: path.join(__dirname, 'src')},
+      {test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
+      {test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
+      {test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'},
+      {test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'},
+      {test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml'}
    ]
  }
-};
+}
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -1,24 +1,27 @@
-var path = require('path');
-var exec = require('child_process').exec;
-var webpack = require('webpack');
-var pkgJson = require('./package');
-var HtmlWebpackPlugin = require("html-webpack-plugin");
-var ExtractTextPlugin = require("extract-text-webpack-plugin");
-var AppCachePlugin = require('appcache-webpack-plugin');
+const path = require('path')
+const exec = require('child_process').exec
+const webpack = require('webpack')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const AppCachePlugin = require('appcache-webpack-plugin')
+const {BugsnagSourceMapUploaderPlugin} = require('webpack-bugsnag-plugins')
+const pkgJson = require('./package')

-function CopyDirPlugin(source, destination) {
-    this.source = source;
-    this.destination = destination;
+function CopyDirPlugin (source, destination) {
+  this.source = source
+  this.destination = destination
+}
+
+CopyDirPlugin.prototype.apply = function (compiler) {
+  compiler.plugin('done', () => {
+    console.log(compiler.outputPath, this.destination)
+    exec('cp -r ' + this.source + ' ' + path.join(compiler.outputPath, this.destination))
+  })
 }
-CopyDirPlugin.prototype.apply = function(compiler) {
-    compiler.plugin('done', function() {
-      console.log(compiler.outputPath, this.destination);
-      exec('cp -r ' + this.source + ' ' + path.join(compiler.outputPath, this.destination));
-    }.bind(this));
-};

 module.exports = {
  cache: true,
+  devtool: 'source-map',
  entry: {
    app: ['babel-polyfill', path.resolve(__dirname, 'src/app/index')],
    lib: ['d3', 'react', 'react-dom', 'classnames', 'fbemitter', 'lz-string']
@@ -34,34 +37,39 @@ module.exports = {
  },
  plugins: [
    new webpack.optimize.UglifyJsPlugin({
-      'screw-ie8': true
+      'screw-ie8': true,
+      sourceMap: true
    }),
    //new webpack.optimize.CommonsChunkPlugin({
    //  name: 'lib',
    //  filename: 'lib.[chunkhash:6].js'
    //}),
    new HtmlWebpackPlugin({
-        inject: false,
-        appCache: 'coriolis.appcache',
-        minify: {
-          collapseBooleanAttributes: true,
-          collapseWhitespace: true,
-          removeAttributeQuotes: true,
-          removeComments: true,
-          removeEmptyAttributes: true,
-          removeRedundantAttributes: true,
-          removeScriptTypeAttributes: true,
-          removeStyleLinkTypeAttributes: true
-        },
-        template: path.join(__dirname, "src/index.ejs"),
-        uaTracking: process.env.CORIOLIS_UA_TRACKING || '',
-        gapiKey: process.env.CORIOLIS_GAPI_KEY || '',
-        version: pkgJson.version
+      inject: false,
+      appCache: 'coriolis.appcache',
+      minify: {
+        collapseBooleanAttributes: true,
+        collapseWhitespace: true,
+        removeAttributeQuotes: true,
+        removeComments: true,
+        removeEmptyAttributes: true,
+        removeRedundantAttributes: true,
+        removeScriptTypeAttributes: true,
+        removeStyleLinkTypeAttributes: true
+      },
+      template: path.join(__dirname, 'src/index.ejs'),
+      uaTracking: process.env.CORIOLIS_UA_TRACKING || '',
+      gapiKey: process.env.CORIOLIS_GAPI_KEY || '',
+      version: pkgJson.version
    }),
    new ExtractTextPlugin({
-        filename: '[contenthash:6].css',
-        disable: false,
-        allChunks: true
+      filename: '[contenthash:6].css',
+      disable: false,
+      allChunks: true
+    }),
+    new BugsnagSourceMapUploaderPlugin({
+      apiKey: 'ba9fae819372850fb660755341fa6ef5',
+      appVersion: pkgJson.version
    }),
    new CopyDirPlugin(path.join(__dirname, 'src/schemas'), 'schemas'),
    new CopyDirPlugin(path.join(__dirname, 'src/images/logo/*'), ''),
@@ -75,14 +83,14 @@ 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: /\.(js|jsx)$/, loader: 'babel-loader?cacheDirectory=true', include: path.join(__dirname, 'src') },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream' },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader' },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml' }
+      {test: /\.css$/, loader: ExtractTextPlugin.extract({fallback: 'style-loader', use: 'css-loader'})},
+      {test: /\.less$/, loader: ExtractTextPlugin.extract({fallback: 'style-loader', use: 'css-loader!less-loader'})},
+      {test: /\.(js|jsx)$/, loader: 'babel-loader?cacheDirectory=true', include: path.join(__dirname, 'src')},
+      {test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
+      {test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
+      {test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'},
+      {test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'},
+      {test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml'}
    ]
  }
-};
+}
Author	SHA1	Message	Date
willyb321	6922cfd047	2.9.11	2018-04-26 09:19:57 +10:00
willyb321	d93fc1d2d0	just update everything when applying a special	2018-04-26 09:06:18 +10:00
willyb321	48290b2e75	2.9.10	2018-04-25 20:00:36 +10:00
willyb321	b62abef618	2.9.9	2018-04-25 19:55:05 +10:00
willyb321	e0c0778d82	Lowercase in import	2018-04-25 18:45:24 +10:00
willyb321	b4a82ae7c2	fix crash with not having modifications key	2018-04-25 18:00:01 +10:00
willyb321	fc73102b30	Merge remote-tracking branch 'origin/develop' into develop	2018-04-25 15:07:23 +10:00
willyb321	b14e7473f3	add guardian powerplant, gauss cannon and also plasma charger	2018-04-25 15:07:13 +10:00
willyb321	f4cc9fc722	fix typo	2018-04-25 14:20:45 +10:00
William	8d19ef7783	Merge pull request #256 from ExitCode/develop Fixed bp preset highlight when specials alter on the same values	2018-04-24 14:49:39 +10:00
willyb321	32be186ec5	remove unused var	2018-04-23 18:15:44 +10:00
willyb321	abb0c7f90d	remove debug logs	2018-04-23 18:15:24 +10:00
willyb321	71ddbdfe75	add specials tooltip	2018-04-23 14:51:45 +10:00
ExitCode	38463ad9a6	Fixed bp preset highlight when specials alter on the same values	2018-04-23 01:16:13 +02:00
willyb321	70375f94c8	bump	2018-04-23 07:38:24 +10:00
William	2d4336116a	Merge pull request #254 from ExitCode/develop Value highlights for bp presets	2018-04-23 07:36:12 +10:00
willyb321	f52880765e	fix legacy mods showing up	2018-04-23 07:34:52 +10:00
ExitCode	dbfe68decb	Implemented active selected blueprint value highlight; updated look and feel	2018-04-22 05:36:19 +02:00
ExitCode	659f337de9	Added a spacer between the mod values	2018-04-22 05:34:25 +02:00
ExitCode	1d36d41da1	Tuned visibility of components in mod menu	2018-04-22 05:33:47 +02:00
ExitCode	0f90efaa54	Implemented a func to determine the current percentage level of a mod	2018-04-22 05:31:16 +02:00
willyb321	4442930a82	bump	2018-04-22 12:26:06 +10:00
William	912a775088	Merge pull request #253 from ExitCode/develop blue print workflow (easier editing of modules)	2018-04-22 12:08:01 +10:00
ExitCode	24a229d818	Implemented workflow on bp assignment; applied some styles	2018-04-22 03:43:57 +02:00
ExitCode	66afb61494	added new style for inline menu buttons	2018-04-22 03:41:21 +02:00
William	e7511cc05b	Merge pull request #252 from ExitCode/develop (optional) changed roll presets to 0-50-100	2018-04-22 09:09:37 +10:00
ExitCode	926f19a936	added default init 100% on bp selection as the new system makes it obvious to reach 100%	2018-04-22 00:59:44 +02:00
ExitCode	9e6f86b963	(optional) changed roll presets to 0-50-100	2018-04-22 00:28:04 +02:00
William	059de43a9a	Merge pull request #251 from ExitCode/develop reused random functionality as it worked better on percentage rolls between min max	2018-04-22 08:10:30 +10:00
ExitCode	e246b737b2	reused random functionality as it worked better on percentage rolls between min/max	2018-04-21 23:53:02 +02:00
willyb321	38842417b0	bump	2018-04-22 06:59:08 +10:00
willyb321	82d485a98e	fix preset rolls locked to low value	2018-04-22 06:49:43 +10:00
willyb321	fac71feea7	Lowercase armour check Fixes #231	2018-04-21 12:56:51 +10:00
willyb321	445c63878b	add guard for tooltips crashing the import	2018-04-21 11:39:02 +10:00
willyb321	7df5953824	bump	2018-04-21 11:05:19 +10:00
willyb321	e391b563fb	change preset rolls to 100%, 75%, 50% and random	2018-04-21 11:03:23 +10:00
willyb321	53f62f96d0	Merge branch 'master' into develop	2018-04-21 07:17:11 +10:00
willyb321	18745979a0	update about page	2018-04-20 19:20:47 +10:00
willyb321	c1966a38ff	Merge branch 'master' into develop	2018-04-20 12:49:10 +10:00
willyb321	d86973f3b1	specify appVersion for bugsnag	2018-04-20 12:48:46 +10:00
willyb321	56b8d19649	Merge branch 'release/2.9.4'	2018-04-19 07:17:21 +10:00
willyb321	7cb037e0bc	bump	2018-04-19 07:17:06 +10:00
willyb321	56e1b3f9e9	Revert "prep for guardian" This reverts commit `7e67bd80dd`.	2018-04-19 07:14:24 +10:00
willyb321	c792323a8a	misc bits	2018-04-19 07:14:13 +10:00
willyb321	4d2865de13	fix resistance blueprint values	2018-04-19 07:14:02 +10:00
willyb321	0d360bc367	bugsnag update	2018-04-19 07:13:20 +10:00
willyb321	91c9b46b91	clean up webpack configs	2018-04-19 06:44:02 +10:00
willyb321	7e67bd80dd	prep for guardian	2018-04-19 06:26:53 +10:00
willyb321	2f775ea09b	Merge branch 'release/2.9.3'	2018-04-18 18:04:42 +10:00
willyb321	0603c55089	bump	2018-04-18 18:04:28 +10:00
willyb321	41f25a44e9	Merge branch 'master' into develop	2018-04-18 10:33:17 +10:00
willyb321	35440b7273	allow specials in internal and standard slots	2018-04-18 10:33:11 +10:00
willyb321	7d68b91018	Merge branch 'release/2.9.2'	2018-04-17 17:33:45 +10:00
willyb321	deaa61b848	bump version	2018-04-17 17:32:56 +10:00
willyb321	2d00cbc41b	fix more values (hopefully done) also, Fixes #247 by changing passengers to pax	2018-04-17 17:31:11 +10:00
willyb321	57c1e83c67	apply new experimentals structure	2018-04-17 15:01:09 +10:00
William	b7079dbd4e	Merge pull request #246 from pnellesen/feature/bugfix_245 Fix for issue 245	2018-04-17 12:38:21 +10:00
willyb321	be642a5373	Merge branch 'master' into develop	2018-04-17 07:59:42 +10:00
willyb321	ffc691c1a2	Merge branch 'release/2.9.1'	2018-04-17 07:57:44 +10:00
willyb321	6122d99369	version bump	2018-04-17 07:57:13 +10:00
willyb321	b73a8bcdab	hopefully fix some values and crashes resistances are buggered on shields and armour by the looks of things	2018-04-17 07:55:17 +10:00
willyb321	dd624537b7	fix hardpoints / internals having the wrong mod applied	2018-04-17 07:50:57 +10:00
willyb321	50a67f73fd	get rid of some redundant code	2018-04-17 07:50:13 +10:00
willyb321	2262a980d4	Merge remote-tracking branch 'origin/develop' into develop	2018-04-17 07:46:35 +10:00
willyb321	84964ceb5f	add source maps to assist with debugging. also upload them to bugsnag	2018-04-17 07:46:26 +10:00
William Blythe	c4bdb7a66e	Merge remote-tracking branch 'origin/master' into develop	2018-04-16 13:11:44 +10:00
Pat	21309e129f	Fix for issue 245 - check that the passenger property is defined for a slot before calculating total passenger capacity	2018-04-14 08:50:48 -05:00
willyb321	928e02c718	Merge branch 'release/2.9.0'	2018-04-14 16:53:08 +10:00
willyb321	7f494dd200	bump	2018-04-14 16:52:05 +10:00
William	f38e743e59	Merge pull request #244 from EDCD/feature/beyond-coriolis Engineer mods.	2018-04-14 15:14:13 +10:00
Willyb321	58b55eb3da	Engineers. Are. Back. Probably.	2018-04-14 14:50:37 +10:00
willyb321	8375ad95b3	Merge branch 'master' into feature/beyond-coriolis	2018-04-14 10:16:20 +10:00
willyb321	506d027a2d	Merge branch 'develop'	2018-04-14 09:52:03 +10:00
willyb321	fbeb6237cf	fix webpack	2018-04-14 09:51:46 +10:00
willyb321	bd95e2c5a5	Merge branch 'master' into develop	2018-04-14 09:48:03 +10:00
willyb321	f3276e557a	Merge branch 'release/2.5.3'	2018-04-14 09:47:08 +10:00
willyb321	8b813e0e7f	bump	2018-04-14 09:46:41 +10:00
willyb321	d660d2959f	more roles fixing use a smaller shield, add boosters, d rate some internals	2018-04-14 09:44:29 +10:00
willyb321	014ebda7d2	start fixing suggested roles. Thanks to rinzler + others	2018-04-14 08:06:44 +10:00
William	607398d364	Merge pull request #241 from Blackth0rn/fix/#240_incorrect_passenger_counts Fix/#240 incorrect passenger counts	2018-04-13 16:20:52 +10:00
willyb321	97d141ce2b	update lockfile version	2018-04-13 16:17:59 +10:00
willyb321	9f492db9c6	source map	2018-04-13 16:16:42 +10:00
willyb321	6ed82b366c	update bugsnag	2018-04-13 16:16:01 +10:00
willyb321	a7ca037f48	loadout event prep	2018-04-13 14:38:22 +10:00
willyb321	6e21d0e74a	Work on engineering import	2018-04-13 13:39:33 +10:00
willyb321	e6c75bf2af	Merge branch 'develop' into feature/beyond-coriolis	2018-04-13 09:16:23 +10:00
willyb321	270c2f386e	Merge branch 'release/2.5.2'	2018-04-13 07:56:38 +10:00
willyb321	83f7880c58	bump version	2018-04-13 07:51:07 +10:00
William	51d29aee38	Merge pull request #235 from pnellesen/feature/fueltank_column Added fuel tank column to Core Module Classes on Shipyard	2018-04-13 07:38:07 +10:00
William	c7754c0365	Merge pull request #234 from joelgarboden/feature/remote_testing Disable 'localhost' host header requirement	2018-04-13 07:34:59 +10:00
Greg Matthews	94037cea38	Fix #240 : Added passenger count to individual ship page	2018-04-11 21:09:57 -07:00
Greg Matthews	5c1a9d9eea	Fix #240 : There is no size 7 passenger cabin so use the new findMaxInternal function to get the biggest one that fits in the slot	2018-04-11 21:07:00 -07:00
Greg Matthews	3835c73ffd	Add findMaxInternal function to find the biggest module of a given group, rating, slotsize	2018-04-11 21:06:07 -07:00
Pat	b8c1effecb	Update for issue #183 - use first letter of bulkhead instead of "Max Rating" value	2018-04-09 23:10:28 -05:00
Pat	dd07241dd9	Added fuel tank column to Core Module Classes on Shipyard	2018-04-07 18:57:54 -05:00
Joel Garboden	5ad828a613	Disable 'localhost' limit Disale host header so webpack allows more than localhost access	2018-04-07 22:34:50 +00:00
Unknown	9856df5527	Portiguese	2018-03-22 22:00:19 +00:00
Unknown	7b249900ec	Portuguese	2018-03-22 21:59:50 +00:00
Unknown	e3b9267c3f	Merge remote-tracking branch 'origin/feature/beyond-coriolis' into develop	2018-03-22 21:59:37 +00:00
willyb321	a996b8135a	inital engineerless import working	2018-03-23 08:51:48 +11:00
willyb321	5e1237390b	Initial work on 3.0 imports. Decided to split journal imports to a separate file.	2018-03-22 16:22:59 +11:00
Willyb321	83571b4bef	add .editorconfig Makes contributing and not messing up the codestyle easier	2018-03-22 12:07:19 +11:00
Willyb321	c2a0dad9a8	Export textarea select Fixes #146	2018-03-22 12:06:36 +11:00
Unknown	2e9e7c4fc6	Merge branch 'release/2.5.1'	2018-01-24 09:18:58 +00:00