Merge branch 'main' into CURA-10645_fix-hidden-tooltip

.github/workflows/macos.yml

@@ -143,6 +143,9 @@ jobs:
           p12-file-base64: ${{ secrets.MACOS_CERT_INSTALLER_P12 }}
           p12-password: ${{ secrets.MACOS_CERT_PASSPHRASE }}
 
+      - name: Remove private Artifactory
+        run: conan remote remove cura-conan-private || true
+
       - name: Get Conan configuration
         run: |
           conan config install https://github.com/Ultimaker/conan-config.git
@@ -155,7 +158,7 @@ jobs:
         run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING --json "cura_inst/conan_install_info.json"
 
       - name: Upload the Package(s)
-        if: always()
+        if: ${{ inputs.operating_system != 'self-hosted' }}
         run: |
           conan upload "*" -r cura --all -c
 

README.md

@@ -59,10 +59,10 @@
 [Contributors]: https://github.com/Ultimaker/Cura/graphs/contributors
 [PullRequests]: https://github.com/Ultimaker/Cura/pulls
 [Machines]: https://github.com/Ultimaker/Cura/wiki/Adding-new-machine-profiles-to-Cura
-[Building]: https://github.com/Ultimaker/Cura/wiki/Running-Cura-from-Source
+[Building]: https://github.com/Ultimaker/Cura/wiki/Getting-Started
 [Localize]: https://github.com/Ultimaker/Cura/wiki/Translating-Cura
-[Settings]: https://github.com/Ultimaker/Cura/wiki/Cura-Settings
-[Plugins]: https://github.com/Ultimaker/Cura/wiki/Plugin-Directory
+[Settings]: https://github.com/Ultimaker/Cura/wiki/Profiles-&-Settings
+[Plugins]: https://github.com/Ultimaker/Cura/wiki/Plugins-And-Packages
 [Closed]: https://github.com/Ultimaker/Cura/issues?q=is%3Aissue+is%3Aclosed
 [Issues]: https://github.com/Ultimaker/Cura/issues
 [Conan]: https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml
@@ -90,7 +90,7 @@
 <!---------------------------------[ Buttons ]--------------------------------->
 
 [Button Localize]: https://img.shields.io/badge/Help_Localize-e2467d?style=for-the-badge&logoColor=white&logo=GoogleTranslate
-[Button Machines]: https://img.shields.io/badge/Adding_Machines-yellow?style=for-the-badge&logoColor=white&logo=CloudFoundry
+[Button Machines]: https://img.shields.io/badge/Adding_Printers-yellow?style=for-the-badge&logoColor=white&logo=CloudFoundry
 [Button Settings]: https://img.shields.io/badge/Configuration-00979D?style=for-the-badge&logoColor=white&logo=CodeReview
 [Button Building]: https://img.shields.io/badge/Building_Cura-blue?style=for-the-badge&logoColor=white&logo=GitBook
 [Button Plugins]: https://img.shields.io/badge/Plugin_Usage-569A31?style=for-the-badge&logoColor=white&logo=ROS

conanfile.py

@@ -308,18 +308,18 @@ def requirements(self):
         self.requires("curaengine_grpc_definitions/latest@ultimaker/testing")
         self.requires("zlib/1.2.13")
         self.requires("pyarcus/5.3.0")
-        self.requires("curaengine/(latest)@ultimaker/stable")
+        self.requires("curaengine/(latest)@ultimaker/testing")
         self.requires("pysavitar/5.3.0")
         self.requires("pynest2d/5.3.0")
         self.requires("curaengine_plugin_gradual_flow/(latest)@ultimaker/testing")
-        self.requires("uranium/(latest)@ultimaker/stable")
-        self.requires("cura_binary_data/(latest)@ultimaker/stable")
+        self.requires("uranium/(latest)@ultimaker/testing")
+        self.requires("cura_binary_data/(latest)@ultimaker/testing")
         self.requires("cpython/3.10.4")
         if self.options.internal:
             self.requires("cura_private_data/(latest)@ultimaker/testing")
             self.requires("fdm_materials/(latest)@internal/testing")
         else:
-            self.requires("fdm_materials/(latest)@ultimaker/stable")
+            self.requires("fdm_materials/(latest)@ultimaker/testing")
 
     def build_requirements(self):
         if self.options.devtools: