Add dwindle to progress bar options. Fixed indentation in fill.py

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py
index 28e79b7e1134b5d0e323394150032de275c82590..7353ad10b583feaf142f5d64b69583b3c72a6031 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py
@@ -1274,7 +1274,7 @@ class FillSkein:
                        elif firstWord == '(</extruderInitialization>)':
                                self.distanceFeedRate.addTagBracketedProcedure('fill')
                        self.distanceFeedRate.addLine(line)
- 
+
        def parseLine( self, lineIndex ):
                'Parse a gcode line and add it to the fill skein.'
                line = self.lines[lineIndex]
@@ -1314,7 +1314,7 @@ class FillSkein:
                self.gridInset = 1.2 * self.infillWidth
                self.gridRadius = self.infillWidth / self.infillSolidity
                self.gridXStepSize = 2.0 * self.gridRadius
-               self.offsetMultiplier = self.gridRadius
+               self.offsetMultiplier = self.gridRadius
                if self.repository.infillPatternGridHexagonal.value:
                        self.gridXStepSize = 4.0 / 3.0 * self.gridRadius
                        self.offsetMultiplier = 1.5 * self.gridXStepSize

diff --git a/Cura/util/sliceRun.py b/Cura/util/sliceRun.py
index 4bc302a04f443f9fd2f8686f76af50c59d38853d..7c2ca547c9d1e90df803eece9b95518eacc63a8e 100644 (file)
--- a/Cura/util/sliceRun.py
+++ b/Cura/util/sliceRun.py
@@ -18,6 +18,7 @@ sliceStepTimeFactor = {
        'skirt': 19.3436040878,
        'skin': 1.0,
        'joris': 1.0,
+       'dwindle': 1.0,
        'comb': 23.7805759907,
        'cool': 27.148763895,
        'dimension': 90.4914340973