{classRating} {translate(m.name || m.grp)}{m.mods && Object.keys(m.mods).length > 0 ? : ''}
From d9a92e7a78989e8d01bc8b69994ae6c4f0c402ed Mon Sep 17 00:00:00 2001
From: strideynet
Date: Thu, 17 Aug 2017 13:59:23 +0100
Subject: [PATCH 08/18] Remove redundant LoC
---
src/app/components/InternalSlotSection.jsx | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/app/components/InternalSlotSection.jsx b/src/app/components/InternalSlotSection.jsx
index a41dced6..dd4b00b5 100644
--- a/src/app/components/InternalSlotSection.jsx
+++ b/src/app/components/InternalSlotSection.jsx
@@ -216,7 +216,6 @@ export default class InternalSlotSection extends SlotSection {
onChange={this.props.onChange}
onSelect={this._selectModule.bind(this, s)}
selected={currentMenu == s}
- enabled={s.enabled}
eligible={s.eligible}
m={s.m}
drag={this._drag.bind(this, s)}
From 9c82c7caed8418c0a2542cd64e1efd015725b2dd Mon Sep 17 00:00:00 2001
From: strideynet
Date: Thu, 17 Aug 2017 14:01:12 +0100
Subject: [PATCH 09/18] remove redundant LoC
---
src/app/components/UtilitySlotSection.jsx | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/app/components/UtilitySlotSection.jsx b/src/app/components/UtilitySlotSection.jsx
index cdfe3755..594e75d7 100644
--- a/src/app/components/UtilitySlotSection.jsx
+++ b/src/app/components/UtilitySlotSection.jsx
@@ -74,7 +74,6 @@ export default class UtilitySlotSection extends SlotSection {
dragOver={this._dragOverSlot.bind(this, h)}
drop={this._drop}
dropClass={this._dropClass(h, originSlot, targetSlot)}
- enabled={h.enabled}
ship={ship}
m={h.m}
enabled={h.enabled ? true : false}
From 77ae126a5140d6f5dd522987e22db6cd3b7a37bc Mon Sep 17 00:00:00 2001
From: strideynet
Date: Thu, 17 Aug 2017 14:05:22 +0100
Subject: [PATCH 10/18] Compliance
As per #132
---
src/app/i18n/ru.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/i18n/ru.js b/src/app/i18n/ru.js
index 5607e0e7..362a907c 100644
--- a/src/app/i18n/ru.js
+++ b/src/app/i18n/ru.js
@@ -93,7 +93,7 @@ export const terms = {
TT_SUMMARY_UNLADEN_TOTAL_JUMP: 'Самая дальняя общая дистанция без груза, с полным топливным баком и при прыжках на максимальное расстояние',
TT_SUMMARY_LADEN_TOTAL_JUMP: 'Самая дальняя общая дистанция с полным грузовым отсеком, с полным топливным баком и при прыжках на максимальное расстояние',
-HELP_MODIFICATIONS_MENU: 'Ткните на номер чтобы ввести новое значение, или потяните вдоль полосы для малых изменений',
+ HELP_MODIFICATIONS_MENU: 'Ткните на номер чтобы ввести новое значение, или потяните вдоль полосы для малых изменений',
// Other languages fallback to these values
// Only Translate to other languages if the name is different in-game
From 00afd1cd6ade8ba96f5071168621ff0c96691d96 Mon Sep 17 00:00:00 2001
From: strideynet
Date: Thu, 17 Aug 2017 14:12:25 +0100
Subject: [PATCH 11/18] Attempt to fix JSDoc
---
src/app/components/ShipPicker.jsx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/components/ShipPicker.jsx b/src/app/components/ShipPicker.jsx
index 7d63dc39..34d21fb1 100644
--- a/src/app/components/ShipPicker.jsx
+++ b/src/app/components/ShipPicker.jsx
@@ -24,8 +24,8 @@ export default class ShipPicker extends TranslatedComponent {
/**
* Constructor
- * @param {Object} props React Component properties
- * @param {Object} context React Component context
+ * @param {Object} props React Component properties
+ * @param {Object} context React Component context
*/
constructor(props, context) {
super(props);
@@ -39,8 +39,8 @@ export default class ShipPicker extends TranslatedComponent {
/**
* Update ship
- * @param {object} ship the ship
- * @param {string} build the build, if present
+ * @param {object} ship the ship
+ * @param {string} build the build, if present
*/
_shipChange(ship, build) {
this._closeMenu();
From 645e86714e73a35a7d1e1cbaf178b69022c8ee7e Mon Sep 17 00:00:00 2001
From: strideynet
Date: Thu, 17 Aug 2017 14:31:00 +0100
Subject: [PATCH 12/18] attempted fix for jsdoc detection
---
src/app/components/ShipPicker.jsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/components/ShipPicker.jsx b/src/app/components/ShipPicker.jsx
index 34d21fb1..00e776aa 100644
--- a/src/app/components/ShipPicker.jsx
+++ b/src/app/components/ShipPicker.jsx
@@ -23,9 +23,9 @@ export default class ShipPicker extends TranslatedComponent {
}
/**
- * Constructor
- * @param {Object} props React Component properties
- * @param {Object} context React Component context
+ * constructor
+ * @param {object} props Properties react
+ * @param {object} context react context
*/
constructor(props, context) {
super(props);
From 6e0d45f4193b417469e98214d4be4ddf0f84488e Mon Sep 17 00:00:00 2001
From: strideynet
Date: Thu, 17 Aug 2017 14:42:44 +0100
Subject: [PATCH 13/18] ESLint issue
ESLint is picking a fault with the JSDoc despite it being correct. Will investigate further but for now this resolves the issue.
---
src/app/components/ShipPicker.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/components/ShipPicker.jsx b/src/app/components/ShipPicker.jsx
index 00e776aa..f1494f3c 100644
--- a/src/app/components/ShipPicker.jsx
+++ b/src/app/components/ShipPicker.jsx
@@ -27,7 +27,7 @@ export default class ShipPicker extends TranslatedComponent {
* @param {object} props Properties react
* @param {object} context react context
*/
- constructor(props, context) {
+ constructor(props, context) { // eslint-disable-line
super(props);
this.shipOrder = Object.keys(Ships).sort();
From 9e57eb4262ddbcab48500409e0c32a87dc847051 Mon Sep 17 00:00:00 2001
From: strideynet
Date: Thu, 17 Aug 2017 15:00:13 +0100
Subject: [PATCH 14/18] Remove unwanted console.log and spacing fix
---
src/app/shipyard/ShipRoles.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/app/shipyard/ShipRoles.js b/src/app/shipyard/ShipRoles.js
index 73fb132f..bb2f0a38 100644
--- a/src/app/shipyard/ShipRoles.js
+++ b/src/app/shipyard/ShipRoles.js
@@ -279,8 +279,7 @@ export function miner(ship, shielded) {
// 0 if we only have 1 cargo slot, otherwise minium of 1 and maximum of 6 (excluding size modifier)
const sizeModifier = ship.class == 2 ? 1.2 : ship.class == 3 ? 1.5 : 1;
let collectorLimpetsRequired = potentialCargo.length == 1 ? 0 : Math.ceil(sizeModifier * Math.min(6, Math.floor(miningLaserDps / 1.25)));
- console.log(`${collectorLimpetsRequired}`);
-
+
if (collectorLimpetsRequired > 0) {
const collectorOrder = [1, 2, 3, 4, 5, 6, 7, 8];
const collectorInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
@@ -303,7 +302,7 @@ export function miner(ship, shielded) {
.reduce(function(a, b) {
return a + b.m.getEps();
}, 0);
- standardOpts.pd = ship.getAvailableModules().matchingPowerDist({weprate: wepRateRequired}).id;
+ standardOpts.pd = ship.getAvailableModules().matchingPowerDist({ weprate: wepRateRequired }).id;
// Fill the empty internals with cargo racks
for (let i = ship.internal.length; i--;) {
From d82128690b1ae871b0f654b145177688e2e9c36c Mon Sep 17 00:00:00 2001
From: strideynet
Date: Thu, 17 Aug 2017 19:47:13 +0100
Subject: [PATCH 15/18] Outdated URLs in tests don't match actual URLs
---
__tests__/test-import.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/__tests__/test-import.js b/__tests__/test-import.js
index 60e48797..2bcd2c22 100644
--- a/__tests__/test-import.js
+++ b/__tests__/test-import.js
@@ -169,7 +169,7 @@ describe('Import Modal', function() {
expect(modal.state.singleBuild).toBe(true);
clickProceed();
expect(MockRouter.go.mock.calls.length).toBe(1);
- expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/anaconda?code=A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b.AwRj4zNLaA%3D%3D.CwBhCYzBGW9qCTSqq5xA.H4sIAAAAAAAAA2MUe8HMwPD%2FPwMcAABTINwTEgAAAA%3D%3D&bn=Test%20My%20Ship');
+ expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/anaconda?code=A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b.AwRj4zNLaA%3D%3D.CwBhCYzBGW9qCTSqq5xA.H4sIAAAAAAAAA2MUe8HMwPD%2FPwMAAGvB0AkAAAA%3D&bn=Test%20My%20Ship');
});
});
@@ -186,7 +186,7 @@ describe('Import Modal', function() {
expect(modal.state.singleBuild).toBe(true);
clickProceed();
expect(MockRouter.go.mock.calls.length).toBe(1);
- expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/asp?code=A0pftiFflfddsnf5------020202033c044002v62f2i.AwRj4yvI.CwRgDBldHnJA.H4sIAAAAAAAAA2P858DAwPCXEUhwHPvx%2F78YG5AltB7I%2F8%2F0TwImJboDSPJ%2F%2B%2Ff%2Fv%2FKlX%2F%2F%2Fi3AwMTBIfARK%2FGf%2BJwVSxArStVAYqOjvz%2F%2F%2FJVo5GRhE2IBc4SKQSSz%2FDGEmCa398P8%2F%2F2%2BgTf%2F%2FAwDFxwtofAAAAA%3D%3D&bn=Multi-purpose%20Asp%20Explorer');
+ expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/asp?code=A0pftiFflfddsnf5------020202033c044002v62f2i.AwRj4yvI.CwRgDBldHnJA.H4sIAAAAAAAAA2P858DAwPCXEUhwHPvx%2F78YG5AltB7I%2F8%2F0TwImJboDSPJ%2F%2B%2Ff%2Fv%2FKlX%2F%2F%2Fi3AwMTBIfARK%2FGf%2BJwVSxArStVAYqOjvz%2F%2F%2FJVo5GRhE2IBc4SKQSSz%2FDGEmCa398P8%2F%2F2%2BgTf%2F%2FA7kMAExxqlSAAAAA&bn=Multi-purpose%20Asp%20Explorer');
});
it('imports a valid v4 build with modifications', function() {
@@ -198,7 +198,7 @@ describe('Import Modal', function() {
expect(modal.state.singleBuild).toBe(true);
clickProceed();
expect(MockRouter.go.mock.calls.length).toBe(1);
- expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/imperial_courier?code=A0patzF5l0das8f31a1a270202000e402t0101-2f.AwRj4zKA.CwRgDBldLiQ%3D.H4sIAAAAAAAAA12OP0tCYRjFj9fuVbvF1du9ekkT8s%2FkIg4NElyIBBd321yaGvwUQTS3N7UFfYygIT9EoyQUJA36ns47XJCWA%2B%2Fz%2Bz3Pe3ImBbDNKaqNPSBoGrL4ngfomKpFGiJ%2BLgHteR1IPjxJT5pF11uSeXNsJVcRfgdC92syWUuK0iMdKZqrjJ%2F0aoA71lJ5oKf38knWcCiptCPdhJIerdS00vlK0qktlqoj983UmqqHjQ33VsW8eazFmaTyULP2hQ4lX8LBme6g%2F6v0TTdbxJ2KhdEIaCw15MF%2FNB0L%2BS2hwEwyFM8KgP%2BqEpWWA3Qu9Z3z9kPWHzakt7Dt%2BAeD7ghSTgEAAA%3D%3D&bn=Multi-purpose%20Imperial%20Courier');
+ expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/imperial_courier?code=A0patzF5l0das8f31a1a270202000e402t0101-2f.AwRj4zKA.CwRgDBldLiQ%3D.H4sIAAAAAAAAA12OPUvDYBSFT1OTfkRJjUkbbC3Yj8mlODgUISAtdOlety5ODv0Vgji7O7kJ%2FgzBQX%2BEY7Gg0NKhfY%2FnHQLFDBdynufe9%2BRMCmCb06g29oCgacjiRx6gY6oWKUT8UgLaszqQfHmSnpVFN1uSeXNsJVcj%2FA2EHlZkspIUpUc6UjTXGT85qwHuSEuVc%2F16r99kDQeSSjvSbSjpyUpNK10uJJ3aYqk6smwm1lQ9bOxw71TMm8VanEqq9JW1r3Qo%2BREOLnQHvbWmb7rZIu5VLIyGQGOukPv%2F0WQk5LeEAjPOUDwtAP6bShy2HKAz0HPO%2B5KsP25I79O2I7LvD%2Bz4Il1XAQAA&bn=Multi-purpose%20Imperial%20Courier');
});
});
@@ -240,7 +240,7 @@ describe('Import Modal', function() {
expect(modal.state.singleBuild).toBe(true);
clickProceed();
expect(MockRouter.go.mock.calls.length).toBe(1);
- expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr--v66g2f.AwRj4zNaqA%3D%3D.CwRgDBldUExuBiIlUA%3D%3D.H4sIAAAAAAAAA02SPy9DURjG3%2F65vW1v47TXVbeqqF7EQtIIBomRJswsYmISH8BgkFhqFZ9AwlALMYitkXQyEF2k4SMYJNK0dV7PK7nc5ck55%2Fm9z%2FnznpBeJqLvECQbM4hUjZnjO5hyWGfFikAGGjGiku0QuddhQCNdZmdWM9snsDmih4REOdlnNvz9DrPrJIicPdSwoZf8pAnTIpq8x7DYADS%2Bi5DERY85%2BYqpmkc6x%2FWGf6beKCR3YBIZFZCxCgrtczjuOmo4qTf94F4KYuxhz5jjEhXmUJNexFrpIUo02ALN1j9u1JMgD%2FMga1GfbMNRd9iHUwGy%2BpspZF3IBSGvMFJluS%2FuR24FJ2KlV%2Fxju6sQq4lhRsQTUVUJTgegLtS6EUjEE1HPAmUC0KdAjwKJeCKqD8zoURx72gHyDW9nvQhJGHkyUscS1x%2BAZnAlqwU%2FI%2BKJKEvextXrf93eQrR1KUlS5HWwGC61mfOn0oN3IM4OHoBzuuIHj33hS5jT8KeamIYa0sjhgH%2BLfplP4kcwD5Xl3xR1wfeHtqWzBHHX8I9SH9Je%2FgGvXxeungIAAA%3D%3D&bn=Imported%20Federal%20Corvette');
+ expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr--v66g2f.AwRj4zNaqA%3D%3D.CwRgDBldUExuBiIlUA%3D%3D.H4sIAAAAAAAAA12STy8DURTFb1szU53Ga8dg2qqqDmJDIoKFxJImumYjVrVqfAALC4lNbcUnkLCoDbEQu0bSlQVhI8JHsJBIQ73rXMkwMYuT9%2Bb87nl%2F7ovoRSL6ikD6TYNINZg5XsWUo7pfrBikr2USlRyXyDuLAhr6ZHanNLOzD5tjOiskysk5dOBvfTB7bjeRW0MNG3ohSBq1bKKxKwyLLUAjmwjpPu4wJx4xVbNI57heDfbUKUAy2xaRUQZpllHoHMHxKqjhhF4LgjtJiFHDmqbrEeVnUJOax7%2FSdRfRwBNotv9wo5kAuZMD2egKyDYcdYl1OBki6z%2BZQjaFnBPyFCM1LefF%2BcgrY0es9FKwbW8ZYj9gmBbxRVRdglMh6BNqnwsk4ouoO4HSIehNoBuBRHwR1QOmsBvHmk6IfMbd2fdCEka%2BjNSexPWGoEkcyX6CnxbxRZQtd%2BPpym%2B31xFtn0iSFPkf%2BBkttZlzB9KDFyBuFRfAGV0Ogoff8SSsCfjjD5hGWtLIwZB%2FgX5Zt%2BLHMI9My7sp6nzgZzekswTxVvCOkq%2FSXqb%2F3zfLxh6HrwIAAA%3D%3D&bn=Imported%20Federal%20Corvette');
});
it('imports a valid companion API build', function() {
@@ -252,7 +252,7 @@ describe('Import Modal', function() {
expect(modal.state.singleBuild).toBe(true);
clickProceed();
expect(MockRouter.go.mock.calls.length).toBe(1);
- expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/beluga?code=A0pktsFplCdpsnf70t0t2727270004040404043c4fmimlmm04mc0iv62i2f.AwRj4yukg%3D%3D%3D.CwRgDBldHi8IUA%3D%3D.H4sIAAAAAAAAA2P8Z8%2FAwPCXEUiIKTMxMPCv%2F%2Ff%2FP8cFIPGf6Z8YTEr0GjMDg%2FJWICERBOTzn%2Fn7%2F7%2FIO5Ai5n9SIEWsQEIoSxAolfbt%2F3%2BJPk4GBhE7YQYGYVmgcuVnf4Aq%2FwMAIrEcGGsAAAA%3D&bn=Imported%20Beluga%20Liner');
+ expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/beluga?code=A0pktsFplCdpsnf70t0t2727270004040404043c4fmimlmm04mc0iv62i2f.AwRj4yukg%3D%3D%3D.CwRgDBldHi8IUA%3D%3D.H4sIAAAAAAAAA2P8Z8%2FAwPCXEUiIKTMxMPCv%2F%2Ff%2FP8cFIPGf6Z8YTEr0GjMDg%2FJWICERBOTzn%2Fn7%2F7%2FIO5Ai5n9SIEWsQEIoSxAolfbt%2F3%2BJPk4GBhE7YQYGYVmgcuVnf4Aq%2FwOVAAAyiFctbgAAAA%3D%3D&bn=Imported%20Beluga%20Liner');
});
it('imports a valid companion API build', function() {
@@ -276,7 +276,7 @@ describe('Import Modal', function() {
expect(modal.state.singleBuild).toBe(true);
clickProceed();
expect(MockRouter.go.mock.calls.length).toBe(1);
- expect(MockRouter.go.mock.calls[0][0]).toBe('outfit/cobra_mk_iii?code=A0p0tdFaldd3sdf4------34---2f2i.AwRj4yKA.CwRgDMYExre1Rcg%3D..EweloBhBGA2EoFMCGBzANokMK6A%3D');
+ expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/cobra_mk_iii?code=A0p0tdFaldd3sdf4------34---2f2i.AwRj4yKA.CwRgDMYExrezBUg%3D.&bn=Imported%20Cobra%20Mk%20III');
});
});
From 7ac16d6d2235a6c3a0f4c5fb21dddf3d4ce10529 Mon Sep 17 00:00:00 2001
From: strideynet
Date: Tue, 22 Aug 2017 20:59:39 +0100
Subject: [PATCH 16/18] Update Tracking
---
src/index.ejs | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/src/index.ejs b/src/index.ejs
index 27897d2a..8d2a385d 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -36,6 +36,23 @@
<% } %>
+
+
+
+
From fc012fe68a8686d0de762cb440060c2960f844e3 Mon Sep 17 00:00:00 2001
From: Kamen Litchev
Date: Tue, 29 Aug 2017 15:29:47 +0300
Subject: [PATCH 17/18] Fix stroke-width handling bug in Safari 11 (#138)
* Fix stroke-width handling bug in Safari 11
* Further fix Safari 11 SVG stroke-width issues
---
src/less/icons.less | 5 ++++-
src/less/select.less | 5 ++++-
src/less/slot.less | 21 ++++++++++++++++-----
3 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/less/icons.less b/src/less/icons.less
index 17798985..0d3cfcd3 100755
--- a/src/less/icons.less
+++ b/src/less/icons.less
@@ -60,6 +60,9 @@
.summary {
stroke: @fg;
- stroke-width: 10;
fill: @fg;
+
+ svg {
+ stroke-width: 10;
+ }
}
diff --git a/src/less/select.less b/src/less/select.less
index 96f27a55..81b80a1a 100755
--- a/src/less/select.less
+++ b/src/less/select.less
@@ -88,7 +88,6 @@ select {
cursor: pointer;
line-height:@optionSpacing;
color: @primary-disabled;
- stroke-width: 0.5em;
stroke: @primary-disabled;
.no-touch &:hover {
@@ -96,6 +95,10 @@ select {
color: @primary;
stroke: @primary;
}
+
+ svg {
+ stroke-width: 0.5em;
+ }
}
.lc, .c {
diff --git a/src/less/slot.less b/src/less/slot.less
index 11d17d30..3749bd06 100755
--- a/src/less/slot.less
+++ b/src/less/slot.less
@@ -13,7 +13,6 @@
border: 1px solid @primary-disabled;
color: @fg;
stroke: @fg;
- stroke-width: 20;
fill: @fg;
.details-container {
@@ -57,11 +56,13 @@
width: 1.2em;
color: @primary-disabled;
stroke: @primary-disabled;
- stroke-width: 20;
border-right: 1px solid @primary-disabled;
box-sizing: border-box;
padding-top: 0.2em;
padding-left: 0.05em;
+ svg {
+ stroke-width: 20;
+ }
}
.empty {
@@ -69,16 +70,17 @@
font-size: 1.3em;
color: lighten(@primary-bg, 12%);
stroke: lighten(@primary-bg, 12%);
- stroke-width: 20;
text-align: center;
letter-spacing: 0.1em;
line-height: 1.7em;
+ svg {
+ stroke-width: 20;
+ }
}
&.selected {
color: @primary-bg;
stroke: @primary-bg;
- stroke-width: 20;
fill: @primary-bg;
background-color: @primary;
border: 1px solid @primary;
@@ -86,13 +88,18 @@
.sz {
color: @primary;
stroke: @primary;
- stroke-width: 20;
background-color: @primary-bg;
border-right: 1px solid @primary;
+ svg {
+ stroke-width: 20;
+ }
}
.details {
background-color: transparent;
}
+ svg {
+ stroke-width: 20;
+ }
}
&.eligible {
@@ -144,4 +151,8 @@
background-color: transparent;
}
}
+
+ svg {
+ stroke-width: 20;
+ }
}
From be02444487dde932abe6f279533adbf5e2a9a925 Mon Sep 17 00:00:00 2001
From: Unknown
Date: Tue, 29 Aug 2017 20:04:41 +0100
Subject: [PATCH 18/18] Changelog
Bump Version
---
ChangeLog.md | 8 ++++++++
package.json | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 96f7cacd..fcddebbd 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,11 @@
+#2.3.7
+ * Fixed Travis test issues
+ * Bumped NodeJS version to provide better compatability and support
+ * Added updated German Translation
+ * Fixed issues with Safari
+ * Use coriolis-data 2.3.7
+ * Fixed Orca mass-lock
+
#2.3.6
* Update miner role to provide better defaults
* Fix issue where torpedo special effects were not showing
diff --git a/package.json b/package.json
index fc9d7b0a..53f3c0e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "coriolis_shipyard",
- "version": "2.3.6",
+ "version": "2.3.7",
"repository": {
"type": "git",
"url": "https://github.com/EDCD/coriolis"