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

This commit is contained in:
Ghostkeeper 2017-12-01 15:00:25 +01:00
commit 378ad076b4
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A

View File

@ -283,6 +283,7 @@ Cura.MachineAction
Loader Loader
{ {
id: materialDiameterField id: materialDiameterField
visible: Cura.MachineManager.hasMaterials
sourceComponent: numericTextFieldWithUnit sourceComponent: numericTextFieldWithUnit
property string settingKey: "material_diameter" property string settingKey: "material_diameter"
property string unit: catalog.i18nc("@label", "mm") property string unit: catalog.i18nc("@label", "mm")