3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4.4'

Browse source 
Conflicts:
	cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
This commit is contained in:
Ghostkeeper 2019-12-23 16:26:25 +01:00
commit 8a9b791298
No known key found for this signature in database
GPG key ID: 37E2020986774393
5 changed files with 78 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -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]