Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload

This commit is contained in:
Daniel Schiavini 2018-12-17 10:38:29 +01:00
commit 9086105204
54 changed files with 713 additions and 690 deletions

View file

@ -83,9 +83,7 @@ Item {
Column {
Repeater {
model: Cura.ExtrudersModel {
simpleNames: true;
}
model: CuraApplication.getExtrudersModel()
Label {
text: model.name;