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 'release/2.4.1'

Browse Source
This commit is contained in:
Unknown
2017-10-31 16:52:34 +00:00
parent bcebb26d4a cc2e56dc8a
commit b90ab6fe48
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.md
View File

@@ -1,3 +1,6 @@
#2.4.1
* Small patches and changes
#2.4.0 #2.4.0
* Changed compression library to Pako * Changed compression library to Pako
* Use coriolis-data 2.4.0 * Use coriolis-data 2.4.0

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "coriolis_shipyard", "name": "coriolis_shipyard",
"version": "2.4.0", "version": "2.4.1",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/EDCD/coriolis" "url": "https://github.com/EDCD/coriolis"

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

@@ -20,6 +20,7 @@ const GRPCAT = {
'fx': 'limpet controllers', 'fx': 'limpet controllers',
'hb': 'limpet controllers', 'hb': 'limpet controllers',
'pc': 'limpet controllers', 'pc': 'limpet controllers',
'rpl': 'limpet controllers',
'pce': 'passenger cabins', 'pce': 'passenger cabins',
'pci': 'passenger cabins', 'pci': 'passenger cabins',
'pcm': 'passenger cabins', 'pcm': 'passenger cabins',
@@ -60,7 +61,7 @@ const CATEGORIES = {
'fi': ['fi'], 'fi': ['fi'],
'fuel': ['ft', 'fs'], 'fuel': ['ft', 'fs'],
'hangars': ['fh', 'pv'], 'hangars': ['fh', 'pv'],
'limpet controllers': ['cc', 'fx', 'hb', 'pc'], 'limpet controllers': ['cc', 'fx', 'hb', 'pc', 'rpl'],
'passenger cabins': ['pce', 'pci', 'pcm', 'pcq'], 'passenger cabins': ['pce', 'pci', 'pcm', 'pcq'],
'rf': ['rf'], 'rf': ['rf'],
'shields': ['sg', 'bsg', 'psg', 'scb'], 'shields': ['sg', 'bsg', 'psg', 'scb'],
@@ -148,7 +149,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
const existing = catmodules[moduleCategory] || []; const existing = catmodules[moduleCategory] || [];
catmodules[moduleCategory] = existing.concat(modules[g]); catmodules[moduleCategory] = existing.concat(modules[g]);
} }
for (let category in catmodules) { for (let category in catmodules) {
let categoryHeader = false; let categoryHeader = false;
// Order through CATEGORIES if present // Order through CATEGORIES if present

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

@@ -26,7 +26,7 @@ export default class InternalSlot extends Slot {
let classRating = m.class + m.rating; let classRating = m.class + m.rating;
let { drag, drop, ship } = this.props; let { drag, drop, ship } = this.props;
let { termtip, tooltip } = this.context; let { termtip, tooltip } = this.context;
let validMods = Modifications.modules[m.grp].modifications || []; let validMods = (Modifications.modules[m.grp] ? Modifications.modules[m.grp].modifications : []);
let showModuleResistances = Persist.showModuleResistances(); let showModuleResistances = Persist.showModuleResistances();
// Modifications tooltip shows blueprint and grade, if available // Modifications tooltip shows blueprint and grade, if available