3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-03 15:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Jaime van Kessel 2019-05-09 15:05:18 +02:00
commit 8f8a982be7
10 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -732,6 +732,7 @@ class CuraEngineBackend(QObject, Backend):
"support_interface": message.time_support_interface,
"support": message.time_support,
"skirt": message.time_skirt,
"prime_tower": message.time_prime_tower,
"travel": message.time_travel,
"retract": message.time_retract,
"none": message.time_none

2
plugins/GCodeReader/FlavorParser.py
View file

@ -371,7 +371,7 @@ class FlavorParser:
elif type == "SUPPORT-INTERFACE":
self._layer_type = LayerPolygon.SupportInterfaceType
elif type == "PRIME-TOWER":
self._layer_type = LayerPolygon.SkirtType
self._layer_type = LayerPolygon.PrimeTowerType
else:
Logger.log("w", "Encountered a unknown type (%s) while parsing g-code.", type)

1
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -1179,6 +1179,7 @@ class XmlMaterialProfile(InstanceContainer):
"adhesion tendency": "material_adhesion_tendency",
"surface energy": "material_surface_energy",
"shrinkage percentage": "material_shrinkage_percentage",
"build volume temperature": "build_volume_temperature",
}
__unmapped_settings = [
"hardware compatible",