Merge remote-tracking branch 'origin/master' into feature_intent

This commit is contained in:
Lipu Fei 2019-09-25 08:03:37 +02:00
commit 07269e4988
26 changed files with 922 additions and 764 deletions

View file

@ -761,6 +761,7 @@ UM.PreferencesPage
}
}
/* Multi-buildplate functionality is disabled because it's broken. See CURA-4975 for the ticket to remove it.
Item
{
//: Spacer
@ -787,7 +788,7 @@ UM.PreferencesPage
checked: boolCheck(UM.Preferences.getValue("cura/use_multi_build_plate"))
onCheckedChanged: UM.Preferences.setValue("cura/use_multi_build_plate", checked)
}
}
}*/
Connections
{