From 7e2ca58a59a4ee74279245bab3a101d4cd786f9a Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Wed, 11 Sep 2019 17:09:43 +0200
Subject: [PATCH 1/2] Fix license in package.json

Correct license entry being ISC instead of MIT in package.json.
---
 CHANGELOG.md | 1 +
 package.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ae53428..63f1da2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Version 1.2.1
   ([#229][#229].)
 - Fixed SIGINT being sent twice to Factorio server when interrupted by CTRL+C
   on Linux ([#217][#217].)
+- Fixed package.json incorrectly reporting the license as ISC.
 
 [#217]: https://github.com/clusterio/factorioClusterio/issues/217
 [#229]: https://github.com/clusterio/factorioClusterio/issues/229
diff --git a/package.json b/package.json
index 570040fb..c3295f02 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "factorio"
   ],
   "author": "Danielv123",
-  "license": "ISC",
+  "license": "MIT",
   "dependencies": {
     "as-table": "^1.0.31",
     "averaged-timeseries": "^1.4.0",

From 2a7758f60d2493758fa039405a0674e926d0f6a9 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Wed, 18 Sep 2019 18:20:00 +0200
Subject: [PATCH 2/2] Release version 1.2.1

This release incorporates some minor bugfixes and a security fix for
an unauthenticated api in the master server.  See CHANGELOG.md for
details.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c3295f02..bd47e6a5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clusterio",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Interserver communication for factorio",
   "repository": "https://github.com/Danielv123/factorioClusterio",
   "main": "master.js",