diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2019-12-23 18:26:25 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2019-12-23 18:26:25 +0300 |
| commit | 8a9b7912984a3d4a5fed23ae6caf3c62cde7c9f5 (patch) | |
| tree | ff4d870038f39aece3cd2dd97eb9b1e78a5b85ee /plugins/XmlMaterialProfile | |
| parent | ce5f7ce82189f49e72fabd8365cf219f97e1a07d (diff) | |
| parent | 8218d62e20f0843c252d510b0eb313c72e88268b (diff) | |
Merge branch '4.4'
Conflicts:
cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
Diffstat (limited to 'plugins/XmlMaterialProfile')
| -rw-r--r-- | plugins/XmlMaterialProfile/XmlMaterialProfile.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 52b204affc..bf1bf19e32 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -1106,6 +1106,12 @@ class XmlMaterialProfile(InstanceContainer): "break preparation speed": "material_break_preparation_speed", "break preparation temperature": "material_break_preparation_temperature", "break position": "material_break_retracted_position", + "flush purge speed": "material_flush_purge_speed", + "flush purge length": "material_flush_purge_length", + "end of filament purge speed": "material_end_of_filament_purge_speed", + "end of filament purge length": "material_end_of_filament_purge_length", + "maximum park duration": "material_maximum_park_duration", + "no load move factor": "material_no_load_move_factor", "break speed": "material_break_speed", "break temperature": "material_break_temperature" } # type: Dict[str, str] |