Merge pull request #412 from suresttexas00/development

Attempt fix of #316
benbaptist · Jan 21, 2017 · 34890c3 · 34890c3
2 parents 486b5cf + 77566fd
commit 34890c3
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/Wrapper.py b/Wrapper.py
diff --git a/build/Wrapper.py.md5 b/build/Wrapper.py.md5
@@ -1 +1 @@
-9ade8a8e003374d8d2114b7aae3745c1
+8c5aaa8ab47259ffdc9eb9fd83a36a3c
diff --git a/build/buildinfo.py b/build/buildinfo.py
@@ -2,5 +2,5 @@
 # Do not edit this file to bump versions; it is built automatically
 
 __version__ = [0, 11, 0]
-__build__ = 184
+__build__ = 185
 __branch__ = 'dev'
diff --git a/build/version.json b/build/version.json
@@ -1 +1 @@
-{"__build__": 184, "__branch__": "dev", "repotype": "dev", "build": 112, "release_time": 1485029464.069117, "__version__": [0, 11, 0]}
+{"__build__": 185, "__branch__": "dev", "repotype": "dev", "build": 112, "release_time": 1485030637.729866, "__version__": [0, 11, 0]}
diff --git a/wrapper/core/buildinfo.py b/wrapper/core/buildinfo.py
@@ -2,5 +2,5 @@
 # Do not edit this file to bump versions; it is built automatically
 
 __version__ = [0, 11, 0]
-__build__ = 184
+__build__ = 185
 __branch__ = 'dev'
diff --git a/wrapper/core/mcserver.py b/wrapper/core/mcserver.py
@@ -168,7 +168,7 @@ def handle_server(self):
             self.changestate(STARTING)
             self.log.info("Starting server...")
             self.reloadproperties()
-            command = '2>&1'
+            command = '-fdiagnostics-color=always'
             self.args.append(command)
             command2 = self.args
             # print("args:\n%s\n" % command2)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		9ade8a8e003374d8d2114b7aae3745c1
		8c5aaa8ab47259ffdc9eb9fd83a36a3c
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"__build__": 184, "__branch__": "dev", "repotype": "dev", "build": 112, "release_time": 1485029464.069117, "__version__": [0, 11, 0]}
		{"__build__": 185, "__branch__": "dev", "repotype": "dev", "build": 112, "release_time": 1485030637.729866, "__version__": [0, 11, 0]}