From 3c5b108e4b6e1b654f2a634ac8add5adf256423d Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Sat, 26 Oct 2019 16:53:27 +0200
Subject: [PATCH 1/3] Disable uploading of mods to master by default

Set uploadModsToMaster to false in config.json.dist.  This feature is
not necessary as the integrated mod portal in Factorio provides a better
method to synchronize mods.
---
 CHANGELOG.md     | 8 ++++++++
 config.json.dist | 2 +-
 package.json     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a3faefe..2850b5d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+Version 1.2.3
+-------------
+
+- Disabled uploading mods to the master server by default as this is mostly
+  just a waste of bandwidth with the mod portal being integrated into the
+  game now.
+
+
 Version 1.2.2
 -------------
 
diff --git a/config.json.dist b/config.json.dist
index b3373b6e..f60012f0 100644
--- a/config.json.dist
+++ b/config.json.dist
@@ -50,7 +50,7 @@
 	"__comment6.5": "When the master is undersupplied, we have 3 different modes to 'fairly' distribute items. First to ask gets all, dole division using weird formula or experimental neural net tries to make stuff as fair as possible. Feel free to play around.",
 	"disableFairItemDistribution": false,
 	"useNeuralNetDoleDivider": true,
-	"uploadModsToMaster": true,
+	"uploadModsToMaster": false,
 	"msBetweenCommands": 10,
 	"allowRemoteCommandExecution": true,
 	"enableCrossServerShout": true,
diff --git a/package.json b/package.json
index 238fa283..d2bab08e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clusterio",
-  "version": "1.2.2",
+  "version": "1.2.3-alpha",
   "description": "Interserver communication for factorio",
   "repository": "https://github.com/Danielv123/factorioClusterio",
   "main": "master.js",

From 25eb5e5d766a731297ac22f385f426d707c41817 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Sat, 26 Oct 2019 17:37:24 +0200
Subject: [PATCH 2/3] Increase limit of Json payloads to master server

The default limit of 100kb to JSON payloads of bodyParser can be
exceeded when running modded games with researchSync.  Increase the
limit to 10mb as a bandaid to fix this issue.
---
 CHANGELOG.md | 2 ++
 master.js    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2850b5d3..3d43f1dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ Version 1.2.3
 - Disabled uploading mods to the master server by default as this is mostly
   just a waste of bandwidth with the mod portal being integrated into the
   game now.
+- Fixed researchSync breaking with heavily modded games due to the tech tree
+  exceeding the default 100kb limit on JSON payloads.
 
 
 Version 1.2.2
diff --git a/master.js b/master.js
index 568f2e66..2fb5aee8 100644
--- a/master.js
+++ b/master.js
@@ -83,7 +83,9 @@ const fileUpload = require('express-fileupload');
 var app = express();
 
 app.use(cookieParser());
-app.use(bodyParser.json());
+app.use(bodyParser.json({
+	limit: '10mb',
+}));
 app.use(bodyParser.urlencoded({
 	parameterLimit: 100000,
 	limit: '10mb',

From e75d9e967ea9955567a675bb1f7eb67f14164537 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Sun, 13 Oct 2019 16:00:22 +0200
Subject: [PATCH 3/3] Fix link in README.md

Fix the link to the master branch in README.md.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 05fea855..109b75f0 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Discord for development/support/play: https://discord.gg/5XuDkje
 ## Important notice
 
 This is the stable branch of the project.  The
-[master branch][http://github.com/clusterio/factorioClusterio/tree/master]
+[master branch](http://github.com/clusterio/factorioClusterio/tree/master)
 is undergoing significant changes that breaks compatibility to plugins and
 existing installations and is not recommended for use.