Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-09 06:43:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
William Blythe
2018-12-26 09:07:21 +11:00
parent 01e1609a9f 98782da200
commit 9ab35bbaf9
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/Coriolis.jsx
View File

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

2
src/app/components/AvailableModulesMenu.jsx
View File

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

1
src/app/i18n/en.json
View File

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

1
src/app/shipyard/Constants.js
View File

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