Merge branch '3.4'

CMakeLists.txt

@@ -19,7 +19,10 @@ endif()
 
 set(CURA_VERSION "master" CACHE STRING "Version name of Cura")
 set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'")
-set(CURA_PACKAGES_VERSION "" CACHE STRING "Packages version of Cura")
+set(CURA_SDK_VERSION "" CACHE STRING "SDK version of Cura")
+set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root")
+set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version")
+
 configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY)
 configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY)
 

cura/CuraVersion.py.in

@@ -4,4 +4,6 @@
 CuraVersion = "@CURA_VERSION@"
 CuraBuildType = "@CURA_BUILDTYPE@"
 CuraDebugMode = True if "@_cura_debugmode@" == "ON" else False
-CuraPackagesVersion = "@CURA_PACKAGES_VERSION@"
+CuraSDKVersion = "@CURA_SDK_VERSION@"
+CuraCloudAPIRoot = "@CURA_CLOUD_API_ROOT@"
+CuraCloudAPIVersion = "@CURA_CLOUD_API_VERSION@"

plugins/Toolbox/src/Toolbox.py

@@ -175,6 +175,8 @@ class Toolbox(QObject, Extension):
             return self.DEFAULT_CLOUD_API_ROOT
         if not hasattr(cura.CuraVersion, "CuraCloudAPIRoot"):
             return self.DEFAULT_CLOUD_API_ROOT
+        if not cura.CuraVersion.CuraCloudAPIRoot:
+            return self.DEFAULT_CLOUD_API_ROOT
         return cura.CuraVersion.CuraCloudAPIRoot
 
     # Get the cloud API version from CuraVersion
@@ -183,6 +185,8 @@ class Toolbox(QObject, Extension):
             return self.DEFAULT_CLOUD_API_VERSION
         if not hasattr(cura.CuraVersion, "CuraCloudAPIVersion"):
             return self.DEFAULT_CLOUD_API_VERSION
+        if not cura.CuraVersion.CuraCloudAPIVersion:
+            return self.DEFAULT_CLOUD_API_VERSION
         return cura.CuraVersion.CuraCloudAPIVersion
 
     # Get the packages version depending on Cura version settings.
@@ -191,6 +195,8 @@ class Toolbox(QObject, Extension):
             return self._plugin_registry.APIVersion
         if not hasattr(cura.CuraVersion, "CuraSDKVersion"):
             return self._plugin_registry.APIVersion
+        if not cura.CuraVersion.CuraSDKVersion:
+            return self._plugin_registry.APIVersion
         return cura.CuraVersion.CuraSDKVersion
 
     @pyqtSlot()

resources/definitions/fdmprinter.def.json

@@ -6678,14 +6678,6 @@
                     "type": "float",
                     "enabled": "bridge_settings_enabled and bridge_enable_more_layers",
                     "settable_per_mesh": true
-                },
-                "wall_try_line_thickness":
-                {
-                    "label": "Try Multiple Line Thicknesses",
-                    "description": "When creating inner walls, try various line thicknesses to fit the wall lines better in narrow spaces. This reduces or increases the inner wall line width by up to 0.01mm.",
-                    "default_value": false,
-                    "type": "bool",
-                    "settable_per_mesh": true
                 }
             }
         },