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

CURA-5045 solve merge conflicts

Browse source
This commit is contained in:
Jack Ha 2018-03-29 09:22:19 +02:00
commit c9dc429b2b
66 changed files with 31591 additions and 17842 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -385,7 +385,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
parser = ConfigParser(interpolation = None)
parser.read_string(serialized)
quality_container_id = parser["containers"][str(_ContainerIndexes.Quality)]
quality_type = instance_container_info_dict[quality_container_id].parser["metadata"]["quality_type"]
quality_type = "empty_quality"
if quality_container_id not in ("empty", "empty_quality"):
quality_type = instance_container_info_dict[quality_container_id].parser["metadata"]["quality_type"]
# Get machine info
serialized = archive.open(global_stack_file).read().decode("utf-8")