Merge pull request #393 from Hornwitser/abandon-1.2.x

Abandon 1.2.x

[skip ci]

.travis.yml

@@ -1,10 +0,0 @@
-language: node_js
-node_js:
-  - 10
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y curl git tar
-  - curl -o factorio.tar.gz -L https://www.factorio.com/get-download/latest/headless/linux64
-  - tar -xvf factorio.tar.gz
-script:
-  - npm run cover

README.md

@@ -8,12 +8,11 @@
 
 Discord for development/support/play: https://discord.gg/5XuDkje
 
-## Important notice
+# ABANDONED VERSION
 
-This is the stable branch of the project.  The
+**The 1.2.x version of Clusterio has been abandonded.
-[master branch](http://github.com/clusterio/factorioClusterio/tree/master)
+Please go to the [main branch of the project](https://github.com/clusterio/clusterio) and continue from there.
-is undergoing significant changes that breaks compatibility to plugins and
+The information below is out of date and kept for archival purposes only.**
-existing installations and is not recommended for use.
 
 ### Ways to support me/the project:
 

client.js

@@ -716,7 +716,7 @@ async function instanceManagement(instanceconfig) {
 							console.error(err);
 						} else if (response && response.body) {
 							// In the future we might be interested in whether or not we actually manage to send it, but honestly I don't care.
-							if(response.body !== "ok") {
+							if (typeof response.body !== "string" || response.body.toLowerCase() !== "ok") {
                                 console.log("Got no \"ok\" while registering our precense with master "+config.masterIP+" at " + payload.time);
                                 console.log(response.body);
                             }

master.js

@@ -329,6 +329,7 @@ app.post("/api/getID", authenticate.middleware, function(req,res) {
 		}
 		// console.log("Slave registered: " + slaves[req.body.unique].mac + " : " + slaves[req.body.unique].serverPort+" at " + slaves[req.body.unique].publicIP + " with name " + slaves[req.body.unique].instanceName);
 	}
+	res.sendStatus(200);
 });
 /**
 POST Allows you to add metadata related to slaves for other tools, like owner data, descriptions or statistics.