Merge pull request #32 from Ultimaker/5.4

5.4

.github/workflows/conan-package.yml

@@ -13,6 +13,7 @@ on:
             - 'uranium/**'
             - 'windows'
             - '.github/workflows/conan-package.yml'
+            - 'conanfile.py'
         branches:
             - main
             - 'CURA-*'
@@ -26,18 +27,6 @@ jobs:
         with:
             project_name: cura_binary_data
 
-    conan-package-export-macos:
-        needs: [ conan-recipe-version ]
-        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main
-        with:
-            recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-            recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
-            runs_on: 'macos-10.15'
-            python_version: '3.10.x'
-            conan_logging_level: 'info'
-            conan_export_binaries: true
-        secrets: inherit
-
     conan-package-export-linux:
         needs: [ conan-recipe-version ]
         uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main
@@ -64,7 +53,7 @@ jobs:
 
     notify-export:
         if: ${{ always() }}
-        needs: [ conan-recipe-version, conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ]
+        needs: [ conan-recipe-version, conan-package-export-linux, conan-package-export-windows ]
 
         uses: ultimaker/cura/.github/workflows/notify.yml@main
         with:

conanfile.py

@@ -24,6 +24,10 @@ class CuraBinaryDataConan(ConanFile):
         "url": "auto",
         "revision": "auto"
     }
+
+    def set_version(self):
+        if not self.version:
+            self.version = "5.4.0-beta.1"
 
     def validate(self):
         if (self.version != None) and (tools.Version(self.version) <= tools.Version("4")):
@@ -48,3 +52,7 @@ def package_info(self):
     def package_id(self):
         del self.info.settings.compiler
         del self.info.settings.build_type
+        if self.settings.os != "Windows":
+            compatible_pkg = self.info.clone()
+            compatible_pkg.settings.os = "Linux"
+            self.compatible_packages.append(compatible_pkg)

cura/resources/texts/whats_new/0.html

@@ -1,2 +1,2 @@
-<h4>Combine previously incompatible materials with an interlocking structure</h4>
-<p>Interlocking structures now enable you to print multiple materials together, even if those materials are not compatible with each other. When activating this new setting, an interlocking pattern is generated at the interface layer between materials which physically ‘locks’ the materials together. <a href="https://www.thingiverse.com/thing:5842529?utm_source=whatsnew&utm_medium=cura&utm_campaign=53_beta">See for yourself with this test model which you can download from Thingiverse</a>.</p> 
+<h4>Updated tree supports use less material and print faster</h4>
+<p>Improved tree supports now use less material and print faster, making them easier to remove and resulting in a cleaner final print. If you downloaded our previous Xmas tree support alpha, then Xmas has come again thanks to you and everyone else who helped us test and refine these supports. Also a big shout out to community member Thomas Rahm who originally proposed and created these new improvements.<a href="https://www.thingiverse.com/thing:6069926?utm_source=whatsnew&utm_medium=cura&utm_campaign=54_beta"> Visit our Thingiverse page to download this amazing dragon pencil holder to try the supports for yourself</a>.</p> 

cura/resources/texts/whats_new/1.html

@@ -1,2 +1,2 @@
-<h4>Improved print quality and better brims</h4>
-<p>A number of settings have been tuned to provide better print quality. Z seams should now be aligned more evenly when printing using the ‘Sharpest Corner’ setting and selecting  ‘None’ as the Seam Corner Preference. Supports will also now generate more reliably and with fewer unneeded support structures. Brims will print faster and should be easier to remove, and concentric top and bottom lines are now printed in the correct order.</p>
+<h4>New brims are easier to remove</h4>
+<p>The order that brims are printed in has been tweaked so that they are now easier to remove. If you have been avoiding using brims in the past because of how hard they are to remove, make sure to enable the Smart Brim setting and give them another go. You can now look forward to easier brim removal and less (or no) brim material left behind on your final part. <a href="https://www.thingiverse.com/thing:6080908?utm_source=whatsnew&utm_medium=cura&utm_campaign=54_beta"> Visit our Thingiverse page to download this cookie cutter to try the smart brim for yourself</a>.</p>

cura/resources/texts/whats_new/2.html

@@ -1,2 +1,2 @@
-<h4>Updated recommended print settings menu</h4>
-<p>The recommended print settings menu has been updated to include many of the most commonly changed settings such as the option to choose an infill pattern, support placement, and more. It is also now possible to save changes to the recommended settings for future prints. We also improve our intent profiles with every release, feel free to select one the next time you need a fast or accurate print.</p>
+<h4>Give us feedback on GitHub</h4>
+<p>Please head on over to <a href="https://github.com/Ultimaker/Cura/discussions"> our UltiMaker Cura GitHub Discussion page</a> to share your feedback about this Beta. Cura is open source and many of the improvements and new features we add with every release come from –or are suggested by– our users. Including the new tree supports in this release which exist thanks to Cura community member Thomas Rahm!</p>