Merge branch 'master' into feature-backup-manager

cura/CuraPackageManager.py

@@ -338,13 +338,7 @@ class CuraPackageManager(QObject):
         with zipfile.ZipFile(filename) as archive:
             # Go through all the files and use the first successful read as the result
             for file_info in archive.infolist():
-                is_dir = lambda file_info: file_info.filename.endswith('/')
+                if file_info.filename.endswith("LICENSE"):
-                if is_dir or not file_info.filename.startswith("files/"):
-                    continue
-
-                filename_parts = os.path.basename(file_info.filename.lower()).split(".")
-                stripped_filename = filename_parts[0]
-                if stripped_filename in ("license", "licence"):
                     Logger.log("d", "Found potential license file '%s'", file_info.filename)
                     try:
                         with archive.open(file_info.filename, "r") as f:

resources/definitions/fdmprinter.def.json

@@ -5772,6 +5772,27 @@
                     "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
+                "cross_infill_density_image":
+                {
+                    "label": "Cross Infill Density Image",
+                    "description": "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the infill of the print.",
+                    "type": "str",
+                    "default_value": "",
+                    "enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'",
+                    "limit_to_extruder": "infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
+                "cross_support_density_image":
+                {
+                    "label": "Cross Fill Density Image for Support",
+                    "description": "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support.",
+                    "type": "str",
+                    "default_value": "",
+                    "enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'",
+                    "limit_to_extruder": "support_infill_extruder_nr",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
                 "spaghetti_infill_enabled":
                 {
                     "label": "Spaghetti Infill",