Merge branch 'release/2.3.2'

EDCD · Apr 14, 2017 · 077f432 · 077f432
2 parents c6a8e48 + e846b45
commit 077f432
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,12 @@
+#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
   * Update power distributor able-to-boost calculation to take fractional MJ values in to account

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis"

diff --git 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
@@ -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',