Merge branch '5.6'

Ultimaker · Nov 2, 2023 · 1292432 · 1292432
2 parents 3121766 + b0d4d4a
commit 1292432
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 39 deletions.
diff --git a/packaging/AppImage-builder/AppImageBuilder.yml.jinja b/packaging/AppImage-builder/AppImageBuilder.yml.jinja
@@ -14,38 +14,9 @@ AppDir:
     - amd64
     allow_unauthenticated: true
     sources:
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy main restricted
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy-updates main restricted
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy universe
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy-updates universe
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy multiverse
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy-updates multiverse
-    - sourceline: deb http://nl.archive.ubuntu.com/ubuntu/ jammy-backports main restricted
-        universe multiverse
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security main restricted
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security universe
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security multiverse
-    - sourceline: deb https://releases.jfrog.io/artifactory/jfrog-debs xenial contrib
-    - sourceline: deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main
-    - sourceline: deb https://ppa.launchpadcontent.net/ubuntu-toolchain-r/test/ubuntu/
-        jammy main
-    - sourceline: deb https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu/ jammy
-        main
-    - sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/ms-teams stable
-        main
-    - sourceline: deb https://ppa.launchpadcontent.net/ppa-verse/cling/ubuntu/ jammy
-        main
-    - sourceline: deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable
-        main
-    - sourceline: deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_14.x
-        jammy main
-    - sourceline: deb [arch=amd64 signed-by=/usr/share/keyrings/transip-stack.gpg]
-        https://mirror.transip.net/stack/software/deb/Ubuntu_22.04/ ./
-    - sourceline: deb http://repository.spotify.com stable non-free
-    - sourceline: deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code
-        stable main
-    - sourceline: deb https://packagecloud.io/slacktechnologies/slack/debian/ jessie
-        main
+      - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
+      - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
+      - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security main restricted universe multiverse
     include:
       - xdg-desktop-portal-kde
       - libgtk-3-0

diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py
@@ -113,16 +113,18 @@ def _createThumbnail(width: int, height: int) -> Optional[QBuffer]:
             return
         try:
             snapshot = Snapshot.isometricSnapshot(width, height)
-        except:
-            Logger.logException("w", "Failed to create snapshot image")
-            return
 
-        thumbnail_buffer = QBuffer()
-        thumbnail_buffer.open(QBuffer.OpenModeFlag.WriteOnly)
+            thumbnail_buffer = QBuffer()
+            thumbnail_buffer.open(QBuffer.OpenModeFlag.WriteOnly)
+
+            snapshot.save(thumbnail_buffer, "PNG")
 
-        snapshot.save(thumbnail_buffer, "PNG")
+            return thumbnail_buffer
+
+        except:
+            Logger.logException("w", "Failed to create snapshot image")
 
-        return thumbnail_buffer
+        return None
 
     def write(self, stream: BufferedIOBase, nodes: List[SceneNode], mode=MeshWriter.OutputMode.BinaryMode) -> bool:
         if mode != MeshWriter.OutputMode.BinaryMode:

diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json
@@ -355,6 +355,11 @@
         "prime_tower_line_width": { "value": 1 },
         "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" },
         "prime_tower_wipe_enabled": { "value": true },
+        "print_sequence":
+        {
+            "enabled": false,
+            "value": "all_at_once"
+        },
         "raft_base_line_spacing": { "value": "2*raft_base_line_width" },
         "raft_base_line_width": { "value": 1.4 },
         "raft_base_speed": { "value": 5 },