Merge branch 'master' of github.com:Ultimaker/Cura into feature_top_navigation_bar

This commit is contained in:
Jaime van Kessel 2017-07-03 16:40:47 +02:00
commit edeb2fa787
2 changed files with 2 additions and 5 deletions

View File

@ -33,7 +33,6 @@ UM.Dialog
text: catalog.i18nc("@action:button", "Refresh")
onClicked: manager.requestPluginList()
anchors.right: parent.right
anchors.rightMargin: -3
}
}
ScrollView
@ -69,8 +68,7 @@ UM.Dialog
anchors.left:parent.left
anchors.right: closeButton.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.bottomMargin: 4
height: UM.Theme.getSize("default_margin").height
height: 10
value: manager.downloadProgress
}
@ -82,7 +80,6 @@ UM.Dialog
onClicked: base.close()
anchors.bottom: parent.bottom
anchors.right: parent.right
anchors.rightMargin: -3
}
}

View File

@ -677,7 +677,7 @@
"minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if outer_inset_first else 0.1 * machine_nozzle_size",
"maximum_value_warning": "2 * machine_nozzle_size",
"default_value": 0.4,
"value": "wall_line_width",
"value": "extruderValue(wall_0_extruder_nr, 'wall_line_width')",
"type": "float",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true