Merge branch '4.10'

cura/Backups/Backup.py

@@ -7,7 +7,7 @@ import re
 import shutil
 from copy import deepcopy
 from zipfile import ZipFile, ZIP_DEFLATED, BadZipfile
-from typing import Dict, Optional, TYPE_CHECKING
+from typing import Dict, Optional, TYPE_CHECKING, List
 
 from UM import i18nCatalog
 from UM.Logger import Logger
@@ -29,7 +29,7 @@ class Backup:
     IGNORED_FILES = [r"cura\.log", r"plugins\.json", r"cache", r"__pycache__", r"\.qmlc", r"\.pyc"]
     """These files should be ignored when making a backup."""
 
-    IGNORED_FOLDERS = [r"plugins"]
+    IGNORED_FOLDERS = []  # type: List[str]
 
     SECRETS_SETTINGS = ["general/ultimaker_auth_data"]
     """Secret preferences that need to obfuscated when making a backup of Cura"""

cura/Backups/BackupsManager.py

@@ -54,17 +54,6 @@ class BackupsManager:
         backup = Backup(self._application, zip_file = zip_file, meta_data = meta_data)
         restored = backup.restore()
 
-        package_manager = self._application.getPackageManager()
-
-        # If the backup was made with Cura 4.10 (or higher), we no longer store plugins.
-        # Since the restored backup doesn't have those plugins anymore, we should remove it from the list
-        # of installed plugins.
-        if Version(meta_data.get("cura_release")) >= Version("4.10.0"):
-            for package_id in package_manager.getAllInstalledPackageIDs():
-                package_data = package_manager.getInstalledPackageInfo(package_id)
-                if package_data.get("package_type") == "plugin" and not package_data.get("is_bundled"):
-                    package_manager.removePackage(package_id)
-
         if restored:
             # At this point, Cura will need to restart for the changes to take effect.
             # We don't want to store the data at this point as that would override the just-restored backup.

resources/qml/WelcomePages/WhatsNewContent.qml

@@ -135,7 +135,7 @@ Item
         anchors
         {
             bottom: whatsNewNextButton.top
-            bottomMargin: UM.Theme.getSize("narrow_margin").height
+            bottomMargin: UM.Theme.getSize("wide_margin").height
             horizontalCenter: parent.horizontalCenter
         }
 

resources/texts/change_log.txt

@@ -1,3 +1,56 @@
+[4.10.0]
+BETA
+
+*Native CAD import plugin
+Ultimaker Professional and Excellence subscribers can now directly import native CAD files into Ultimaker Cura.
+Enable this feature by downloading the Native CAD import plugin from the Ultimaker marketplace. 
+
+*Flow visualization
+In preview mode you can now visualize the flow. Contributed by khani3s.
+
+*Show loading plugins on startup
+When starting Cura you will now see which plugins Cura is loading.
+
+*Add Z position parameter to FilamentChange
+With the FilamentChange script you can now control all 3 coordinates. 
+
+*Allow FilamentChange script to use Marlin M600 configuration
+Contributed by Sekisback.
+
+*Double click on file in Digital Factory
+When double clicking on a file in the open project dialog in Digital Factory it will now open in Cura. 
+
+* Bug Fixes
+- Fixed temperature exceptions for UM2+C material profiles.
+- Fixed a bug where pause at height stops all extrusion if relative extrusion is used.
+- Fixed authentication issues when logging into UM account. Contributed by fieldOfView.
+- Fixed the pause-at-height retract with Repetier-flavour.
+- Fixed erasing z-coordinate in the move tool to the value of 0. 
+- Fixed the limit range of layer view to only visible structures. 
+- Fixed a bug where Cura crashes when scaling a model on Linux. 
+- Fixed path minimum limit. 
+- Fixed a bug when using right to left language numbers were overlaying on text in the print settings.
+- Fixed edge case with disabling bridging.
+- Fixed a bug where some names with Unicode characters crashes Cura when trying to authorize. 
+- Fixed renaming groups. Contributed by fieldOfView. 
+- Fixed a bug when the seam was not placed in sharpest corner.
+- Fixed the gantry height for S-line printers. 
+- Fixed a bug where a model is partially below build plate if center selected model is used.
+
+* Printer definitions, profiles and materials.
+- Add CC0.4 core and materials for S3 and S5.
+- Updated Axi machine start gcodes, contributed by Synsuiter.
+- Volumic 3D printer definitions, contributed by VOLUMIC.
+- Anycubic Mega X and Anycubic Mega S, contributed by NilsRo.
+- Updated Deltacomb printer profiles, contributed by kaleidoscopeit.
+- eMotionTech Strateo3D materials and profiles, contributed by ChronosTech.
+- Sovol SV03, contributed by balacij.
+- Two Trees Bluer, Bluer Plus, Sapphire Pro and Sapphire Plus, contributed by Lester3DGadgets.
+- Update Skriware 2, contributed by Lukkoz.
+- Longer LK1, LK1 Pro, LK1 Plus, LK4, LK4 Pro, LK5, LK5 Plus and Cube 2, contributed by lowkeyjoe. 
+- Mingda D3, D4 and Rock3, contributed by cataclism. 
+- JGAurora A6, contributed by CrissR.
+
 [4.9.1]
 * PETG Profile update.
 Ultimaker PETG profiles have been added. The Generic PETG profile for 2.85mm filaments has been updated as well.

resources/texts/whats_new/0.html

@@ -1,2 +1,3 @@
-<h4>Ultimaker PETG Profiles</h4>
+<h4>Open native CAD files for Ultimaker Professional and Excellence</h4>
-<p>Profiles for Ultimaker PETG are now included. Ultimaker PETG sets the standard for industrial applications and is suitable for a wide range of use cases thanks to its ease of use and versatility. <a href="https://ultimaker.com/materials"> Find out more</a></p>
+<p>Ultimaker Professional and Excellence subscribers can now directly import native CAD files into Ultimaker Cura. This provides users with an even more effective workflow by boosting productivity and increasing first-time right results.</br> 
+<a href="https://ultimaker.com/software/enterprise-software">Learn more</a> about our enterprise software or <a href="https://marketplace.ultimaker.com/app/cura/plugins">download the Native CAD import plugin</a>.</p>

resources/texts/whats_new/1.html

@@ -1,3 +1,2 @@
-<h4>Better visual representation</h4>
+<h4>Try Ultimaker 3D Printing Academy and level up your slicing skills</h4>
-<p>The Z-seam is now clearly indicated in Preview mode. This ensures that you will know whether the seam will be sufficiently hidden in the end product. <br>
+<p>Follow the <a href="https://academy.ultimaker.com/lms/index.php?r=course/deeplink&course_id=60&generated_by=13028&hash=36f400a16997152635224784d7370310b8331ee8">Expert Tips for Ultimaker Cura</a> course in the Ultimaker 3D Printing Academy and expand your knowledge. Get the most out of your slicing software by learning how to optimize prints and receive plugin recommendations from our team of 3D printing experts.</p>
-<i>Thanks to BasF0 for contributing to this feature.</i> </p>

resources/texts/whats_new/2.html

@@ -1,3 +1,2 @@
-<h4>Better visual representation</h4>
+<h4>Get more information!</h4>
-<p>The Z-seam is now clearly indicated in Preview mode. This ensures that you will know whether the seam will be sufficiently hidden in the end product. <br>
+<p>Want more information for Ultimaker Cura 4.10 beta and other exciting developments in the Ultimaker platform? Read the <a href="https://ultimaker.com/learn/ultimaker-software-news-roundup">blog post</a>, and don't forget to give us your <a href="https://github.com/Ultimaker/Cura/issues/new/choose">feedback</a>!</p>
-<i>Thanks to BasF0 for contributing to this feature.</i> </p>

resources/texts/whats_new/3.html

@@ -1,4 +0,0 @@
-<h4>“Line type” is now the default color scheme.</h4>
-<p>
-    This improves your user experience – as you will no longer have to manually switch to “line type” each time you enter Preview mode.
-</p>

resources/texts/whats_new/4.html

@@ -1,3 +0,0 @@
-<h4>Learn more</h4>
-<p>Want more information for Ultimaker Cura 4.9.1?</br>
-Read the <a href="https://ultimaker.com/learn/ultimaker-cura-4-9-seamless-and-efficient-with-digital-library-integration"> blog post</a> or watch the <a href="https://www.youtube.com/watch?app=desktop&v=q7IJ0I9Mi1I&feature=youtu.be"> video</a>. And don't forget to give us your <a href="https://github.com/Ultimaker/Cura/issues"> feedback</a>!</p>

resources/themes/cura-light/theme.json

@@ -581,7 +581,7 @@
 
         "monitor_preheat_temperature_control": [4.5, 2.0],
 
-        "welcome_wizard_window": [46, 45],
+        "welcome_wizard_window": [46, 50],
         "modal_window_minimum": [60.0, 45],
         "license_window_minimum": [45, 45],
         "wizard_progress": [10.0, 0.0],