diff options
| author | Jack Ha <jackha@gmail.com> | 2017-12-21 12:52:51 +0300 |
|---|---|---|
| committer | Jack Ha <jackha@gmail.com> | 2017-12-21 12:52:51 +0300 |
| commit | 5152b2ae6571a09eb5d2624db1b394b19bd8b119 (patch) | |
| tree | b8f81301e84971a8ceb49f03851b187242058461 /plugins/3MFWriter | |
| parent | 579f2b5ec6b6e57766bd6a5a3c083045601d421d (diff) | |
| parent | 0a0db39f0288afe188cfc66e43a0484bb5b057f7 (diff) | |
Solved merge conflicts. CURA-4525
Diffstat (limited to 'plugins/3MFWriter')
| -rw-r--r-- | plugins/3MFWriter/ThreeMFWorkspaceWriter.py | 6 | ||||
| -rw-r--r-- | plugins/3MFWriter/ThreeMFWriter.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/plugins/3MFWriter/ThreeMFWorkspaceWriter.py b/plugins/3MFWriter/ThreeMFWorkspaceWriter.py index 9c143f0057..f07a37a25f 100644 --- a/plugins/3MFWriter/ThreeMFWorkspaceWriter.py +++ b/plugins/3MFWriter/ThreeMFWorkspaceWriter.py @@ -59,7 +59,9 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter): version_file = zipfile.ZipInfo("Cura/version.ini") version_config_parser = configparser.ConfigParser() version_config_parser.add_section("versions") - version_config_parser.set("versions", "cura_version", Application.getStaticVersion()) + version_config_parser.set("versions", "cura_version", Application.getInstance().getVersion()) + version_config_parser.set("versions", "build_type", Application.getInstance().getBuildType()) + version_config_parser.set("versions", "is_debug_mode", str(Application.getInstance().getIsDebugMode())) version_file_string = StringIO() version_config_parser.write(version_file_string) @@ -95,7 +97,7 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter): file_in_archive.compress_type = zipfile.ZIP_DEFLATED # Do not include the network authentication keys - ignore_keys = ["network_authentication_id", "network_authentication_key"] + ignore_keys = {"network_authentication_id", "network_authentication_key"} serialized_data = container.serialize(ignored_metadata_keys = ignore_keys) archive.writestr(file_in_archive, serialized_data) diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 8e005c47b1..79b821fe31 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -88,7 +88,7 @@ class ThreeMFWriter(MeshWriter): if stack is not None: changed_setting_keys = set(stack.getTop().getAllKeys()) - # Ensure that we save the extruder used for this object. + # Ensure that we save the extruder used for this object in a multi-extrusion setup if stack.getProperty("machine_extruder_count", "value") > 1: changed_setting_keys.add("extruder_nr") |