From e29a4b263ddad11f877c3dbf943dd81adc220d8b Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 13 Apr 2017 23:19:27 +0100 Subject: [PATCH 1/3] Fix scan time/scan rate confusion --- ChangeLog.md | 4 ++++ src/app/i18n/en.js | 1 + src/app/utils/CompanionApiUtils.js | 1 + 3 files changed, 6 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index f357241d..8b416cce 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,7 @@ +#2.3.1 + * Use scan range for DSS rather than scan time + * Fix companion API import of Dolphin + #2.3.0 * Make scan time visible on scanners where available * Update power distributor able-to-boost calculation to take fractional MJ values in to account diff --git a/src/app/i18n/en.js b/src/app/i18n/en.js index 974d6be6..b154cae4 100644 --- a/src/app/i18n/en.js +++ b/src/app/i18n/en.js @@ -234,6 +234,7 @@ export const terms = { reload: 'Reload', rof: 'Rate of fire', angle: 'Scan angle', + scanrate: 'Scan rate', scantime: 'Scan time', shield: 'Shield', shieldboost: 'Shield boost', diff --git a/src/app/utils/CompanionApiUtils.js b/src/app/utils/CompanionApiUtils.js index 25124864..036cfd36 100644 --- a/src/app/utils/CompanionApiUtils.js +++ b/src/app/utils/CompanionApiUtils.js @@ -17,6 +17,7 @@ const SHIP_FD_NAME_TO_CORIOLIS_NAME = { 'Cutter': 'imperial_cutter', 'DiamondBackXL': 'diamondback_explorer', 'DiamondBack': 'diamondback', + 'Dolphin': 'dolphin', 'Eagle': 'eagle', 'Empire_Courier': 'imperial_courier', 'Empire_Eagle': 'imperial_eagle', From 3be78885b8e562411832b0652a00142e66e392ee Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Fri, 14 Apr 2017 10:58:15 +0100 Subject: [PATCH 2/3] Bump --- ChangeLog.md | 7 ++++++- package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 8b416cce..0f7dda9b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,11 @@ -#2.3.1 +#2.3.2 * Use scan range for DSS rather than scan time * Fix companion API import of Dolphin + * Use coriolis-data 2.3.2: + * Separate scan time and scan range + * Add Frontier IDs for new items in 2.3 + * Update ownership of module blueprints for sensors and scanners + * Update railgun penetration #2.3.0 * Make scan time visible on scanners where available diff --git a/package.json b/package.json index c74d4062..a467d76e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis_shipyard", - "version": "2.3.0", + "version": "2.3.1", "repository": { "type": "git", "url": "https://github.com/EDCD/coriolis" From e846b4508bb8ea486d450d10f571c78299f20cc5 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Fri, 14 Apr 2017 11:06:09 +0100 Subject: [PATCH 3/3] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a467d76e..f9851ca5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis_shipyard", - "version": "2.3.1", + "version": "2.3.2", "repository": { "type": "git", "url": "https://github.com/EDCD/coriolis"