Merge branch 'develop'

src/app/Coriolis.jsx

@@ -16,6 +16,7 @@ import ModalPermalink from './components/ModalPermalink';
 import * as CompanionApiUtils from './utils/CompanionApiUtils';
 import * as JournalUtils from './utils/JournalUtils';
 import NotFoundPage from './pages/NotFoundPage';
+import ShipyardPage from './pages/ShipyardPage';
 import ErrorDetails from './pages/ErrorDetails';
 
 const zlib = require('pako');
@@ -69,12 +70,7 @@ export default class Coriolis extends React.Component {
       sizeRatio: Persist.getSizeRatio()
     };
     this._getAnnouncements();
-    Router('', (r) => {
-      return import(/* webpackChunkName: "shipyard" */ './pages/ShipyardPage')
-        .then(ShipyardPage => {
-          return this._setPage(ShipyardPage.default, r);
-        })
-    });
+    Router('', (r) => this._setPage(ShipyardPage, r));
     Router('/import?', (r) => this._importBuild(r));
     Router('/import/:data', (r) => this._importBuild(r));
     Router('/outfit/?', (r) => {

src/app/components/AvailableModulesMenu.jsx

@@ -109,7 +109,7 @@ const CATEGORIES = {
   // Guardian
   'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc'],
 
-  'mining': ['ml', 'scl', 'pwa', 'sdm'],
+  'mining': ['ml', 'scl', 'pwa', 'sdm', 'abl'],
 };
 
 /**

src/app/i18n/en.json

@@ -133,6 +133,7 @@
     "ghrp": "Guardian Hull Reinforcement Package",
     "gmrp": "Guardian Module Reinforcement Package",
     "pwa": "Pulse Wave Analyser",
+    "abl": "Abrasion Blaster",
     "scl": "Seismic Charge Launcher",
     "sdm": "Sub-Surface Displacement Missile",
     "tbsc": "Shock Cannon",

src/app/shipyard/Constants.js

@@ -95,6 +95,7 @@ export const ModuleGroupToName = {
   tbem: 'Enzyme Missile Rack',
   tbrfl: 'Remote Release Flechette Launcher',
   pwa: 'Pulse Wave Analyser',
+  abl: 'Abrasion Blaster',
   scl: 'Seismic Charge Launcher',
   sdm: 'Sub-Surface Displacement Missile',
 };