Merge remote-tracking branch 'origin/master' into AO-build

Conflicts:
	Cura/gui/preferencesDialog.py
	Cura/util/profile.py

diff --git a/Cura/gui/aboutWindow.py b/Cura/gui/aboutWindow.py
index ccd105dfed0632391d9daa653418ed876840810d..72f76a21253f9ad94409459287918001a7c26236 100644 (file)
--- a/Cura/gui/aboutWindow.py
+++ b/Cura/gui/aboutWindow.py
@@ -21,7 +21,7 @@ class aboutWindow(wx.Frame):
                title.SetFont(wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD))
                s.Add(title, flag=wx.ALIGN_CENTRE|wx.EXPAND|wx.BOTTOM, border=5)
 
-               s.Add(wx.StaticText(p, -1, 'Version 14.09-1.15'))
+               s.Add(wx.StaticText(p, -1, 'Version 14.09-1.18'))
                s.Add(wx.StaticText(p, -1, 'End solution for Open Source Fused Filament Fabrication 3D printing.'), flag=wx.TOP, border=5)
                s.Add(wx.StaticText(p, -1, 'Cura is currently developed and maintained by David Braam and Ultimaker.'), flag=wx.TOP, border=5)
                s.Add(wx.StaticText(p, -1, 'Cura LulzBot Edition has been modified and maintained by Aleph Objects, Inc.'))

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 0c25bb00e7119d58359e311a7e9fb13f21161af9..d843c8da7b1cb9ee4f5e121f0df5902fe5d1f41f 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -510,6 +510,7 @@ setting('extruder_offset_y2', '0.0', float, 'machine', 'hidden').setLabel(_("Off
 setting('extruder_offset_x3', '0.0', float, 'machine', 'hidden').setLabel(_("Offset X"), _("The offset of your forth extruder compared to the primary."))
 setting('extruder_offset_y3', '0.0', float, 'machine', 'hidden').setLabel(_("Offset Y"), _("The offset of your forth extruder compared to the primary."))
 setting('extruder_z_offset', '0.0', float, 'machine', 'hidden').setLabel(_("Z-Offset (mm)"), _("This value will be added to the Z coordinate of every line in the output G-Code to compensate for a badly calibrate Z height endstop."))
+
 setting('steps_per_e', '0', float, 'machine', 'hidden').setLabel(_("E-Steps per 1mm filament"), _("Amount of steps per mm filament extrusion. If set to 0 then this value is ignored and the value in your firmware is used."))
 setting('serial_port', 'AUTO', str, 'machine', 'hidden').setLabel(_("Serial port"), _("Serial port to use for communication with the printer"))
 setting('serial_port_auto', '', str, 'machine', 'hidden')

diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index d01994aecb0f04254fb58243a0ed4ab5093af831..9759720c352a5cd6af990d21fd0c26772368af49 100644 (file)
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -492,7 +492,6 @@ class Engine(object):
                        'extruderOffset[2].Y': int(profile.getMachineSettingFloat('extruder_offset_y2') * 1000),
                        'extruderOffset[3].X': int(profile.getMachineSettingFloat('extruder_offset_x3') * 1000),
                        'extruderOffset[3].Y': int(profile.getMachineSettingFloat('extruder_offset_y3') * 1000),
-                       'zOffset': int(profile.getMachineSettingFloat('extruder_z_offset') * 1000),
                        'fixHorrible': 0,
                }
                fanFullHeight = int(profile.getProfileSettingFloat('fan_full_height') * 1000)

diff --git a/package.sh b/package.sh
index c57c8192a6fb4115f795b98a0d23f220f34fdea9..45b0a71311b867c95d5d0a4df8ae4f97edfbd8bf 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -22,7 +22,7 @@ export BUILD_NAME=14.09
 TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
 
 ##Revision
-export REVISION=1.15
+export REVISION=1.18
 
 ##Git commit
 GIT_HASH=$(git rev-parse --short=4 HEAD)
@@ -239,7 +239,7 @@ if [ "$BUILD_TARGET" = "debian_i386" ]; then
        sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R
        sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R
        cd scripts/linux
-       dpkg-deb --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura_${BUILD_NAME}-${REVISION}-${GIT_HASH}_i386.deb
+       dpkg-deb -Zgzip --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura_${BUILD_NAME}-${REVISION}-${GIT_HASH}_i386.deb
        sudo chown `id -un`:`id -gn` ${BUILD_TARGET} -R
        exit
 fi
@@ -275,7 +275,7 @@ if [ "$BUILD_TARGET" = "debian_amd64" ]; then
        sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R
        sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R
        cd scripts/linux
-       dpkg-deb --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura_${BUILD_NAME}-${REVISION}-${GIT_HASH}_amd64.deb
+       dpkg-deb -Zgzip --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura_${BUILD_NAME}-${REVISION}-${GIT_HASH}_amd64.deb
        sudo chown `id -un`:`id -gn` ${BUILD_TARGET} -R
        exit
 fi

diff --git a/scripts/linux/debian_amd64/DEBIAN/control b/scripts/linux/debian_amd64/DEBIAN/control
index 4516caf13335de5d69ed1551768414e866b4c782..004233b4d43b3d06236d5089207a8a662430d14a 100755 (executable)
--- a/scripts/linux/debian_amd64/DEBIAN/control
+++ b/scripts/linux/debian_amd64/DEBIAN/control
@@ -1,6 +1,6 @@
 Source: cura
 Package: cura
-Version: 14.09-1.15
+Version: 14.09-1.18
 Maintainer: Aleph Objects, Inc. <info@alephobjects.com>
 Section: misc
 Priority: optional

diff --git a/scripts/linux/debian_i386/DEBIAN/control b/scripts/linux/debian_i386/DEBIAN/control
index 9b249ace2408ac30de2e339f74c76dfa71bcd696..ea03e408e63dbf7f5e5f5c0e122755e227af24a4 100755 (executable)
--- a/scripts/linux/debian_i386/DEBIAN/control
+++ b/scripts/linux/debian_i386/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: cura
-Version: 14.01-1.15
+Version: 14.01-1.18
 Section: misc
 Priority: optional
 Architecture: i386