From 42dafd7565f3cf7fb9a2ec5e9ec37f69eaf873fd Mon Sep 17 00:00:00 2001
From: Siim Raud <2ndalpha@gmail.com>
Date: Tue, 2 Feb 2016 00:35:52 +0200
Subject: [PATCH 1/3] Fixed parsing of "retraction_combing"

---
 src/octoprint/plugins/cura/profile.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/octoprint/plugins/cura/profile.py b/src/octoprint/plugins/cura/profile.py
index 59a0ee15..e5c19a54 100644
--- a/src/octoprint/plugins/cura/profile.py
+++ b/src/octoprint/plugins/cura/profile.py
@@ -31,6 +31,11 @@ class MachineShapeTypes(object):
 	SQUARE = "square"
 	CIRCULAR = "circular"
 
+class RetractionCombingTypes(object):
+    OFF = "off"
+    ALL = "all"
+    NO_SKIN = "no skin"
+
 class GcodeFlavors(object):
 	REPRAP = "reprap"
 	REPRAP_VOLUME = "reprap_volume"
@@ -390,7 +395,12 @@ class Profile(object):
 				"Both": SupportDualTypes.BOTH,
 				"First extruder": SupportDualTypes.FIRST,
 				"Second extruder": SupportDualTypes.SECOND
-			}
+			},
+            retraction_combing={
+                "Off": RetractionCombingTypes.OFF,
+                "All": RetractionCombingTypes.ALL,
+                "No Skin": RetractionCombingTypes.NO_SKIN
+            }
 		)
 
 		result = dict()
@@ -865,7 +875,7 @@ class Profile(object):
 			"retractionAmountExtruderSwitch": self.get_microns("retraction_dual_amount"),
 			"retractionZHop": self.get_microns("retraction_hop"),
 			"minimalExtrusionBeforeRetraction": self.get_microns("retraction_minimal_extrusion"),
-			"enableCombing": 1 if self.get_boolean("retraction_combing") else 0,
+            "enableCombing": 1 if self.get("retraction_combing") == RetractionCombingTypes.ALL else (2 if self.get("retraction_combing") == RetractionCombingTypes.NO_SKIN else 0),
 			"multiVolumeOverlap": self.get_microns("overlap_dual"),
 			"objectSink": max(0, self.get_microns("object_sink")),
 			"minimalLayerTime": self.get_int("cool_min_layer_time"),

From c4e2a8982fa8e7d4202ba038bde751aed5069314 Mon Sep 17 00:00:00 2001
From: Siim Raud <2ndalpha@gmail.com>
Date: Tue, 2 Feb 2016 00:40:52 +0200
Subject: [PATCH 2/3] Fixed formating

---
 src/octoprint/plugins/cura/profile.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/octoprint/plugins/cura/profile.py b/src/octoprint/plugins/cura/profile.py
index e5c19a54..1f223b39 100644
--- a/src/octoprint/plugins/cura/profile.py
+++ b/src/octoprint/plugins/cura/profile.py
@@ -32,9 +32,9 @@ class MachineShapeTypes(object):
 	CIRCULAR = "circular"
 
 class RetractionCombingTypes(object):
-    OFF = "off"
-    ALL = "all"
-    NO_SKIN = "no skin"
+	OFF = "off"
+	ALL = "all"
+	NO_SKIN = "no skin"
 
 class GcodeFlavors(object):
 	REPRAP = "reprap"
@@ -396,11 +396,11 @@ class Profile(object):
 				"First extruder": SupportDualTypes.FIRST,
 				"Second extruder": SupportDualTypes.SECOND
 			},
-            retraction_combing={
-                "Off": RetractionCombingTypes.OFF,
-                "All": RetractionCombingTypes.ALL,
-                "No Skin": RetractionCombingTypes.NO_SKIN
-            }
+			retraction_combing={
+				"Off": RetractionCombingTypes.OFF,
+				"All": RetractionCombingTypes.ALL,
+				"No Skin": RetractionCombingTypes.NO_SKIN
+			}
 		)
 
 		result = dict()
@@ -875,7 +875,7 @@ class Profile(object):
 			"retractionAmountExtruderSwitch": self.get_microns("retraction_dual_amount"),
 			"retractionZHop": self.get_microns("retraction_hop"),
 			"minimalExtrusionBeforeRetraction": self.get_microns("retraction_minimal_extrusion"),
-            "enableCombing": 1 if self.get("retraction_combing") == RetractionCombingTypes.ALL else (2 if self.get("retraction_combing") == RetractionCombingTypes.NO_SKIN else 0),
+			"enableCombing": 1 if self.get("retraction_combing") == RetractionCombingTypes.ALL else (2 if self.get("retraction_combing") == RetractionCombingTypes.NO_SKIN else 0),
 			"multiVolumeOverlap": self.get_microns("overlap_dual"),
 			"objectSink": max(0, self.get_microns("object_sink")),
 			"minimalLayerTime": self.get_int("cool_min_layer_time"),

From 73a587b3e434bed3af92a14668b2b638cec506f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 3 Feb 2016 09:04:27 +0100
Subject: [PATCH 3/3] Added missing entries to AUTHORS.md

---
 AUTHORS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index f49bfae9..132a1e63 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -56,6 +56,8 @@ date of first contribution):
   * [Mark Bastiaans](https://github.com/markbastiaans)
   * [Kevin Murphy](https://github.com/kevingelion)
   * [Richard Joyce](https://github.com/richjoyce)
+  * ["bwgan"](https://github.com/bwgan)
+  * [Siim Raud](https://github.com/2ndalpha)
 
 OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by
 [Daid Braam](https://github.com/daid). Parts of its communication layer and