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

This commit is contained in:
Jaime van Kessel 2019-09-11 16:10:12 +02:00
commit 5e4f673ec2
No known key found for this signature in database
GPG key ID: 3710727397403C91
3 changed files with 12 additions and 10 deletions

View file

@ -2699,7 +2699,7 @@
"minimum_value": "0",
"minimum_value_warning": "line_width * 1.5",
"maximum_value_warning": "10",
"enabled": "retraction_enable",
"enabled": false,
"settable_per_mesh": false,
"settable_per_extruder": true
},

View file

@ -619,6 +619,8 @@
"monitor_empty_state_offset": [5.6, 5.6],
"monitor_empty_state_size": [35.0, 25.0],
"monitor_external_link_icon": [1.16, 1.16],
"monitor_column": [18.0, 1.0]
"monitor_column": [18.0, 1.0],
"monitor_progress_bar": [16.5, 1.0],
"monitor_margin": [1.5, 1.5]
}
}