Merge branch 'revert_correct_depriming_settings' of github.com:Ultimaker/Cura into 4.2

This commit is contained in:
Jaime van Kessel 2019-07-17 12:51:56 +02:00
commit ea5c34868e
2 changed files with 9 additions and 9 deletions

View file

@ -2252,8 +2252,8 @@
"unit": "mm",
"default_value": 4,
"enabled": false,
"minimum_value_warning": "0",
"maximum_value_warning": "retraction_amount",
"minimum_value_warning": "-retraction_amount",
"maximum_value_warning": "0",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -2278,8 +2278,8 @@
"unit": "mm",
"default_value": 16,
"enabled": false,
"minimum_value_warning": "0",
"maximum_value_warning": "retraction_amount * 4",
"minimum_value_warning": "-retraction_amount * 4",
"maximum_value_warning": "0",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -2304,8 +2304,8 @@
"unit": "mm",
"default_value": 50,
"enabled": false,
"minimum_value_warning": "0",
"maximum_value_warning": "100",
"minimum_value_warning": "-100",
"maximum_value_warning": "0",
"settable_per_mesh": false,
"settable_per_extruder": true
},