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

Merge branch 'master' into feature_xmlmaterials_cura_settings

Browse source
This commit is contained in:
fieldOfView 2018-03-23 14:57:31 +01:00
commit 251e24fedc
23 changed files with 382 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -1032,7 +1032,8 @@ class XmlMaterialProfile(InstanceContainer):
"retraction amount": "retraction_amount",
"retraction speed": "retraction_speed",
"adhesion tendency": "material_adhesion_tendency",
"surface energy": "material_surface_energy"
"surface energy": "material_surface_energy",
"shrinkage percentage": "material_shrinkage_percentage",
}
__unmapped_settings = [
"hardware compatible",