Merge branch 'master' into fix_simple_mode_disabled_features

# Conflicts:
#	resources/qml/SidebarSimple.qml
This commit is contained in:
fieldOfView 2017-09-04 16:44:59 +02:00
commit 46b333bfc9
5 changed files with 33 additions and 5 deletions

View file

@ -425,7 +425,7 @@ Item
property alias _hovered: adhesionMouseArea.containsMouse
anchors.top: enableSupportCheckBox.visible ? supportExtruderCombobox.bottom : infillCellRight.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.left: infillCellRight.left
//: Setting enable printing build-plate adhesion helper checkbox