diff options
| author | Remco Burema <r.burema@ultimaker.com> | 2020-10-20 13:36:41 +0300 |
|---|---|---|
| committer | Remco Burema <r.burema@ultimaker.com> | 2020-10-20 13:36:41 +0300 |
| commit | a8acdd01e4e0b3f07522852364def9a6f75b00e6 (patch) | |
| tree | efd6218f65baad9359a4bd5af53c9cecef497ab5 /plugins/UM3NetworkPrinting | |
| parent | eb9912b924613484ca55de0dc3dfc99508af2d64 (diff) | |
| parent | 25612d41847f3b7f992ee557c736d514adc16038 (diff) | |
Merge branch 'master' of https://github.com/Ultimaker/Cura
Diffstat (limited to 'plugins/UM3NetworkPrinting')
| -rw-r--r-- | plugins/UM3NetworkPrinting/resources/png/Ultimaker 3 Extended.png | bin | 1038742 -> 920730 bytes | |||
| -rw-r--r-- | plugins/UM3NetworkPrinting/resources/png/Ultimaker 3.png | bin | 792765 -> 698757 bytes | |||
| -rw-r--r-- | plugins/UM3NetworkPrinting/resources/png/Ultimaker S3.png | bin | 484401 -> 440557 bytes | |||
| -rw-r--r-- | plugins/UM3NetworkPrinting/resources/png/Ultimaker S5.png | bin | 1476464 -> 1298912 bytes | |||
| -rw-r--r-- | plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py | 2 |
5 files changed, 2 insertions, 0 deletions
diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3 Extended.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3 Extended.png Binary files differindex 1ce19c2933..c4beb8d709 100644 --- a/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3 Extended.png +++ b/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3 Extended.png diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3.png Binary files differindex 4639cb3fde..e499d767c1 100644 --- a/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3.png +++ b/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3.png diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S3.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S3.png Binary files differindex b6ce6e1273..d92e454d23 100644 --- a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S3.png +++ b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S3.png diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S5.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S5.png Binary files differindex 29ba428e38..56400f7027 100644 --- a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S5.png +++ b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S5.png diff --git a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py index 2740f86605..28f6b29dd9 100644 --- a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py +++ b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py @@ -81,6 +81,8 @@ class SendMaterialJob(Job): container_registry = CuraApplication.getInstance().getContainerRegistry() all_materials = container_registry.findInstanceContainersMetadata(type = "material") all_base_files = {material["base_file"] for material in all_materials if "base_file" in material} # Filters out uniques by making it a set. Don't include files without base file (i.e. empty material). + if "empty_material" in all_base_files: + all_base_files.remove("empty_material") # Don't send the empty material. for root_material_id in all_base_files: if root_material_id not in materials_to_send: |
