Merge pull request #116 from donovan6000/devel

Version 0.30 release
donovan6000 · Mar 16, 2016 · fc473ef · fc473ef
2 parents 049afdf + 4880f0c
commit fc473ef
Show file tree

Hide file tree

Showing 20 changed files with 1,632 additions and 1,647 deletions.
diff --git a/Changelog b/Changelog
@@ -1,5 +1,13 @@
 Changelog:
 
+V0.30 March 16, 2016
+
+	* Fixed compatibility with OctoPrint V1.2.10
+	* Fixes issue with dialog system
+	* Made pausing/resuming/canceling a print more reliable when line numbers above 65535 are being sent
+	* Prevents unhandled firmware and communication errors from being displayed
+	* Fixed issue where printer would hang when a command with a line number greater than 65535 isn't sucessfully sent to the printer
+
 V0.29 March 11, 2016
 
 	* Added raft/brim to model editor

diff --git a/installers/Linux/install.zip b/installers/Linux/install.zip
diff --git a/installers/OS X/install.sh b/installers/OS X/install.sh
@@ -116,7 +116,7 @@ else
 
 		# Get OctoPrint parameter
 		octoPrintVersion="$(/Users/$SUDO_USER/Library/Python/2.7/bin/octoprint --version | cut -d' ' -f3)"
-		if [ $octoPrintVersion = "1.2.8" ] || [ $octoPrintVersion = "1.2.9" ]; then
+		if [ $octoPrintVersion = "1.2.8" ] || [ $octoPrintVersion = "1.2.9" ] || [ $octoPrintVersion = "1.2.10" ] || [ $octoPrintVersion = "1.2.11" ]; then
 			octoPrintParameter=""
 		else
 			octoPrintParameter="<string>serve<\/string>"

diff --git a/installers/Windows/install.zip b/installers/Windows/install.zip