GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 23:34:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View File

@ -1196,11 +1196,11 @@ class XmlMaterialProfile(InstanceContainer):
"surface energy": "material_surface_energy", "surface energy": "material_surface_energy",
"shrinkage percentage": "material_shrinkage_percentage", "shrinkage percentage": "material_shrinkage_percentage",
"build volume temperature": "build_volume_temperature", "build volume temperature": "build_volume_temperature",
"anti ooze retracted position": "material_anti_ooze_retracted_position", "anti ooze retract position": "material_anti_ooze_retracted_position",
"anti ooze retract speed": "material_anti_ooze_retraction_speed", "anti ooze retract speed": "material_anti_ooze_retraction_speed",
"break preparation retracted position": "material_break_preparation_retracted_position", "break preparation position": "material_break_preparation_retracted_position",
"break preparation speed": "material_break_preparation_speed", "break preparation speed": "material_break_preparation_speed",
"break retracted position": "material_break_retracted_position", "break position": "material_break_retracted_position",
"break speed": "material_break_speed", "break speed": "material_break_speed",
"break temperature": "material_break_temperature" "break temperature": "material_break_temperature"
} }

12
resources/definitions/fdmprinter.def.json
View File

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