Merge branch '5.10' into CURA-12386_G-Code-replacement-fails-with-single-line-code

conanfile.py

@@ -219,6 +219,9 @@ class CuraConan(ConanFile):
 
     @staticmethod
     def _get_license_from_repository(sources_url, version, license_file_name = None):
+        if sources_url.startswith("https://github.com/Ultimaker/") and "private" in sources_url:
+            return None
+
         git_url = sources_url
         if git_url.endswith('/'):
             git_url = git_url[:-1]

resources/definitions/fdmextruder.def.json

@@ -7,7 +7,7 @@
         "author": "Ultimaker",
         "manufacturer": "Unknown",
         "position": "0",
-        "setting_version": 24,
+        "setting_version": 25,
         "type": "extruder"
     },
     "settings":

resources/definitions/fdmprinter.def.json

@@ -6,7 +6,7 @@
         "type": "machine",
         "author": "Unknown",
         "manufacturer": "Unknown",
-        "setting_version": 24,
+        "setting_version": 25,
         "file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
         "visible": false,
         "has_materials": true,