Merge branch 'main' into CURA-9365_fix_building_cura_main

plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml

@@ -14,6 +14,9 @@ import DigitalFactory 1.0 as DF
 Item
 {
     id: base
+
+    property variant catalog: UM.I18nCatalog { name: "cura" }
+
     width: parent.width
     height: parent.height
 
@@ -190,53 +193,29 @@ Item
         text: "Save"
         enabled: (asProjectCheckbox.checked || asSlicedCheckbox.checked) && dfFilenameTextfield.text.length >= 1 && dfFilenameTextfield.state !== 'invalid'
 
-        onClicked:
+        onClicked: manager.saveFileToSelectedProject(dfFilenameTextfield.text, asProjectComboBox.currentValue)
-        {
-            let saveAsFormats = [];
-            if (asProjectCheckbox.checked)
-            {
-                saveAsFormats.push("3mf");
-            }
-            if (asSlicedCheckbox.checked)
-            {
-                saveAsFormats.push("ufp");
-            }
-            manager.saveFileToSelectedProject(dfFilenameTextfield.text, saveAsFormats);
-        }
         busy: false
     }
 
-    Row
+    Cura.ComboBox
     {
+        id: asProjectComboBox
 
-        id: saveAsFormatRow
+        width: UM.Theme.getSize("combobox_wide").width
+        height: saveButton.height
         anchors.verticalCenter: saveButton.verticalCenter
         anchors.right: saveButton.left
         anchors.rightMargin: UM.Theme.getSize("thin_margin").height
-        width: childrenRect.width
-        spacing: UM.Theme.getSize("default_margin").width
 
-        UM.CheckBox
+        enabled: UM.Backend.state == UM.Backend.Done
-        {
+        currentIndex: UM.Backend.state == UM.Backend.Done ? 0 : 1
-            id: asProjectCheckbox
+        textRole: "text"
-            height: UM.Theme.getSize("checkbox").height
+        valueRole: "value"
-            anchors.verticalCenter: parent.verticalCenter
-            checked: true
-            text: "Save Cura project"
-            font: UM.Theme.getFont("medium")
-        }
 
-        UM.CheckBox
+        model: [
-        {
+            { text: catalog.i18nc("@option", "Save Cura project and print file"), key: "3mf_ufp", value: ["3mf", "ufp"] },
-            id: asSlicedCheckbox
+            { text: catalog.i18nc("@option", "Save Cura project"), key: "3mf", value: ["3mf"] },
-            height: UM.Theme.getSize("checkbox").height
+        ]
-            anchors.verticalCenter: parent.verticalCenter
-
-            enabled: UM.Backend.state == UM.Backend.Done
-            checked: UM.Backend.state == UM.Backend.Done
-            text: "Save print file"
-            font: UM.Theme.getFont("medium")
-        }
     }
 
     Component.onCompleted:

plugins/DigitalLibrary/src/DFFileExportAndUploadManager.py

@@ -37,17 +37,18 @@ class DFFileExportAndUploadManager:
                  formats: List[str],
                  on_upload_error: Callable[[], Any],
                  on_upload_success: Callable[[], Any],
-                 on_upload_finished: Callable[[], Any] ,
+                 on_upload_finished: Callable[[], Any],
                  on_upload_progress: Callable[[int], Any]) -> None:
 
-        self._file_handlers = file_handlers  # type: Dict[str, FileHandler]
+        self._file_handlers: Dict[str, FileHandler] = file_handlers
-        self._nodes = nodes  # type: List[SceneNode]
+        self._nodes: List[SceneNode] = nodes
-        self._library_project_id = library_project_id  # type: str
+        self._library_project_id: str = library_project_id
-        self._library_project_name = library_project_name  # type: str
+        self._library_project_name: str = library_project_name
-        self._file_name = file_name  # type: str
+        self._file_name: str = file_name
-        self._upload_jobs = []  # type: List[ExportFileJob]
+        self._upload_jobs: List[ExportFileJob] = []
-        self._formats = formats  # type: List[str]
+        self._formats: List[str] = formats
         self._api = DigitalFactoryApiClient(application = CuraApplication.getInstance(), on_error = lambda error: Logger.log("e", str(error)))
+        self._source_file_id: Optional[str] = None
 
         # Functions of the parent class that should be called based on the upload process output
         self._on_upload_error = on_upload_error
@@ -59,7 +60,7 @@ class DFFileExportAndUploadManager:
         # show the success message (once both upload jobs are done)
         self._message_lock = threading.Lock()
 
-        self._file_upload_job_metadata = self.initializeFileUploadJobMetadata()  # type: Dict[str, Dict[str, Any]]
+        self._file_upload_job_metadata: Dict[str, Dict[str, Any]] = self.initializeFileUploadJobMetadata()
 
         self.progress_message = Message(
                 title = "Uploading...",
@@ -113,7 +114,8 @@ class DFFileExportAndUploadManager:
                 content_type = job.getMimeType(),
                 job_name = job.getFileName(),
                 file_size = len(job.getOutput()),
-                library_project_id = self._library_project_id
+                library_project_id = self._library_project_id,
+                source_file_id = self._source_file_id
         )
         self._api.requestUploadUFP(request, on_finished = self._uploadFileData, on_error = self._onRequestUploadPrintFileFailed)
 
@@ -125,6 +127,9 @@ class DFFileExportAndUploadManager:
         """
         if isinstance(file_upload_response, DFLibraryFileUploadResponse):
             file_name = file_upload_response.file_name
+
+            # store the `file_id` so it can be as `source_file_id` when uploading the print file
+            self._source_file_id = file_upload_response.file_id
         elif isinstance(file_upload_response, DFPrintJobUploadResponse):
             file_name = file_upload_response.job_name if file_upload_response.job_name is not None else ""
         else:
@@ -145,6 +150,8 @@ class DFFileExportAndUploadManager:
                                          on_progress = self._onUploadProgress,
                                          on_error = self._onUploadError)
 
+        self._handleNextUploadJob()
+
     def _onUploadProgress(self, filename: str, progress: int) -> None:
         """
         Updates the progress message according to the total progress of the two files and displays it to the user. It is
@@ -325,8 +332,13 @@ class DFFileExportAndUploadManager:
             message.hide()
 
     def start(self) -> None:
-        for job in self._upload_jobs:
+        self._handleNextUploadJob()
-            job.start()
+
+    def _handleNextUploadJob(self):
+        match self._upload_jobs:
+            case [job, *jobs]:
+                job.start()
+                self._upload_jobs = jobs
 
     def initializeFileUploadJobMetadata(self) -> Dict[str, Any]:
         metadata = {}

plugins/DigitalLibrary/src/DFFileUploader.py

@@ -39,8 +39,8 @@ class DFFileUploader:
         :param on_error: The method to be called when an error occurs.
         """
 
-        self._http = http  # type: HttpRequestManager
+        self._http: HttpRequestManager = http
-        self._df_file = df_file  # type: Union[DFLibraryFileUploadResponse, DFPrintJobUploadResponse]
+        self._df_file: Union[DFLibraryFileUploadResponse, DFPrintJobUploadResponse] = df_file
         self._file_name = ""
         if isinstance(self._df_file, DFLibraryFileUploadResponse):
             self._file_name = self._df_file.file_name
@@ -51,7 +51,7 @@ class DFFileUploader:
                 self._file_name = ""
         else:
             raise TypeError("Incorrect input type")
-        self._data = data  # type: bytes
+        self._data: bytes = data
 
         self._on_finished = on_finished
         self._on_success = on_success

plugins/DigitalLibrary/src/DFPrintJobUploadRequest.py

@@ -1,12 +1,14 @@
 # Copyright (c) 2021 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
+from typing import Optional
+
 from .BaseModel import BaseModel
 
 
 # Model that represents the request to upload a print job to the cloud
 class DFPrintJobUploadRequest(BaseModel):
 
-    def __init__(self, job_name: str, file_size: int, content_type: str, library_project_id: str, **kwargs) -> None:
+    def __init__(self, job_name: str, file_size: int, content_type: str, library_project_id: str, source_file_id: str, **kwargs) -> None:
         """Creates a new print job upload request.
 
         :param job_name: The name of the print job.
@@ -18,4 +20,5 @@ class DFPrintJobUploadRequest(BaseModel):
         self.file_size = file_size
         self.content_type = content_type
         self.library_project_id = library_project_id
+        self.source_file_id = source_file_id
         super().__init__(**kwargs)

plugins/DigitalLibrary/src/DigitalFactoryApiClient.py

@@ -40,7 +40,7 @@ class DigitalFactoryApiClient:
     DEFAULT_REQUEST_TIMEOUT = 10  # seconds
 
     # In order to avoid garbage collection we keep the callbacks in this list.
-    _anti_gc_callbacks = []  # type: List[Callable[[Any], None]]
+    _anti_gc_callbacks: List[Callable[[Any], None]] = []
 
     def __init__(self, application: CuraApplication, on_error: Callable[[List[CloudError]], None], projects_limit_per_page: Optional[int] = None) -> None:
         """Initializes a new digital factory API client.
@@ -54,7 +54,7 @@ class DigitalFactoryApiClient:
         self._scope = JsonDecoratorScope(UltimakerCloudScope(application))
         self._http = HttpRequestManager.getInstance()
         self._on_error = on_error
-        self._file_uploader = None  # type: Optional[DFFileUploader]
+        self._file_uploader: Optional[DFFileUploader] = None
         self._library_max_private_projects: Optional[int] = None
 
         self._projects_pagination_mgr = PaginationManager(limit = projects_limit_per_page) if projects_limit_per_page else None  # type: Optional[PaginationManager]

plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py

@@ -80,6 +80,18 @@ class RemovableDriveOutputDevice(OutputDevice):
         if extension:  # Not empty string.
             extension = "." + extension
         file_name = os.path.join(self.getId(), file_name + extension)
+        self._performWrite(file_name, preferred_format, writer, nodes)
+
+    def _performWrite(self, file_name, preferred_format, writer, nodes):
+        """Writes the specified nodes to the removable drive. This is split from
+        requestWrite to allow interception in other plugins. See Ultimaker/Cura#10917.
+
+        :param file_name: File path to write to.
+        :param preferred_format: Preferred file format to write to.
+        :param writer: Writer for writing to the file.
+        :param nodes: A collection of scene nodes that should be written to the
+        file.
+        """
 
         try:
             Logger.log("d", "Writing to %s", file_name)

resources/definitions/ultimaker.def.json

@@ -213,6 +213,51 @@
         },
         "jerk_skirt_brim": {
             "minimum_value_warning": 20
+        },
+        "support_wall_count": {
+            "value": "1 if support_structure == 'tree' else 0"
+        },
+        "zig_zaggify_support": {
+            "value": true
+        },
+        "support_infill_rate": {
+            "value": "80 if gradual_support_infill_steps != 0 else 15"
+        },
+        "gradual_support_infill_steps": {
+            "value": "2 if support_interface_enable else 0"
+        },
+        "gradual_support_infill_step_height": {
+            "value": "4*layer_height"
+        },
+        "support_interface_height": {
+            "value": "2*layer_height"
+        },
+        "support_offset": {
+            "value": "2*line_width if support_interface_enable else 0"
+        },
+        "support_xy_distance": {
+            "value": "1"
+        },
+        "support_xy_distance_overhang": {
+            "value": "wall_line_width_0"
+        },
+        "minimum_support_area": {
+            "value": "(2 + support_offset)**2"
+        },
+        "support_interface_skip_height": {
+            "value": "layer_height"
+        },
+        "support_interface_pattern": {
+            "value": "'concentric'"
+        },
+        "support_interface_offset": {
+            "value": "support_offset"
+        },
+        "support_use_towers": {
+            "value": false
+        },
+        "support_z_distance": {
+            "value": "0"
         }
     }
 }

resources/definitions/ultimaker2.def.json

@@ -86,6 +86,9 @@
         },
         "machine_acceleration": {
             "default_value": 3000
+        },
+        "support_z_distance": {
+            "value": "0.1"
         }
     }
 }

resources/definitions/ultimaker3.def.json

@@ -139,11 +139,6 @@
         "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": "45" },
-        "support_pattern": { "value": "'triangles'" },
-        "support_use_towers": { "value": "False" },
-        "support_xy_distance": { "value": "wall_line_width_0 * 2.5" },
-        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
-        "support_z_distance": { "value": "0" },
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "top_bottom_thickness": { "value": "1" },

resources/definitions/ultimaker_s3.def.json

@@ -131,14 +131,10 @@
         "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": "45" },
-        "support_pattern": { "value": "'triangles'" },
-        "support_use_towers": { "value": "False" },
-        "support_xy_distance": { "value": "wall_line_width_0 * 2.5" },
-        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
-        "support_z_distance": { "value": "0" },
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "top_bottom_thickness": { "value": "1" },
+        "travel_avoid_supports": { "value": "True" },
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
         "initial_layer_line_width_factor": { "value": "120" },

resources/definitions/ultimaker_s5.def.json

@@ -133,14 +133,10 @@
         "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": "45" },
-        "support_pattern": { "value": "'triangles'" },
-        "support_use_towers": { "value": "False" },
-        "support_xy_distance": { "value": "wall_line_width_0 * 2.5" },
-        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
-        "support_z_distance": { "value": "0" },
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "top_bottom_thickness": { "value": "1" },
+        "travel_avoid_supports": { "value": "True" },
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
         "optimize_wall_printing_order": { "value": "True" },

resources/definitions/voron2_base.def.json

@@ -108,7 +108,7 @@
         "retraction_combing":                           { "value": "'noskin'" },
         "retraction_combing_max_distance":              { "default_value": 10 },
         "travel_avoid_other_parts":                     { "default_value": false },
-        "speed_travel":                                 { "maximum_value": 300, "value": 300, "maximum_value_warning": 501 },
+        "speed_travel":                                 { "value": 300, "maximum_value_warning": 501 },
         "speed_travel_layer_0":                         { "value": "math.ceil(speed_travel * 0.4)" },
         "speed_layer_0":                                { "value": "math.ceil(speed_print * 0.25)" },
         "speed_wall":                                   { "value": "math.ceil(speed_print * 0.33)" },
@@ -152,4 +152,4 @@
         "jerk_wall_0":                                  { "value": 10 },
         "jerk_roofing":                                 { "value": 10 }
     }
-}
+}

resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg

@@ -34,7 +34,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.5

resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg

@@ -34,7 +34,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 35)
 speed_wall_x = =math.ceil(speed_print * 30 / 35)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.5

resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg

@@ -37,9 +37,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_line_distance = 2.85
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = 0.22
 top_bottom_thickness = 0.75

resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg

@@ -37,9 +37,5 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 35)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_line_distance = 2.85
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = 0.22
 top_bottom_thickness = 0.75

resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg

@@ -34,7 +34,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg

@@ -34,7 +34,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg

@@ -35,9 +35,6 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =speed_print
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
 speed_infill = =math.ceil(speed_print * 40 / 40)

resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg

@@ -35,8 +35,5 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =speed_print
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg

@@ -34,9 +34,6 @@ speed_travel = 150
 speed_wall = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 0.75
 speed_wall_0 = =math.ceil(speed_print * 30 / 45)

resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg

@@ -33,8 +33,5 @@ speed_travel = 150
 speed_wall = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 0.75

resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg

@@ -36,12 +36,7 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 15 / 55)
 speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
-support_bottom_distance = 0.55
 support_enable = True
-support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
+support_z_distance = 0.55
-support_pattern = lines
-support_top_distance = 0.55
-support_xy_distance = 0.7
-support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
 speed_infill = =math.ceil(speed_print * 55 / 55)

resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg

@@ -37,8 +37,5 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 55)
 speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
-support_pattern = lines
-support_xy_distance = 0.7
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg

@@ -35,11 +35,7 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 15 / 55)
 speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
-support_bottom_distance = 0.65
 support_enable = True
-support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
+support_z_distance = 0.5
-support_pattern = lines
+support_bottom_distance = 0.65
-support_top_distance = 0.5
-support_xy_distance = 0.75
-support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg

@@ -37,9 +37,6 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_bottom_distance = 0.65
 support_enable = True
-support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
-support_pattern = lines
 support_top_distance = 0.5
-support_xy_distance = 0.75
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg

@@ -31,8 +31,6 @@ raft_surface_line_width = 0.2
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.19
 speed_topbottom = =math.ceil(speed_print * 15 / 30)
 speed_infill = =math.ceil(speed_print * 80 / 30)

resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg

@@ -31,6 +31,4 @@ raft_surface_line_width = 0.2
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.19

resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg

@@ -32,8 +32,6 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45)
 speed_wall_x = =math.ceil(speed_print * 30 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.19
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
 speed_infill = =math.ceil(speed_print * 45 / 45)

resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg

@@ -32,6 +32,4 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45)
 speed_wall_x = =math.ceil(speed_print * 30 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.19

resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg

@@ -36,9 +36,6 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_line_distance = 3.5333
-support_pattern = lines
 support_z_distance = 0.21
 top_bottom_thickness = 0.75
 speed_infill = =math.ceil(speed_print * 45 / 45)

resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg

@@ -36,8 +36,5 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_line_distance = 3.5333
-support_pattern = lines
 support_z_distance = 0.21
 top_bottom_thickness = 0.75

resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg

@@ -31,7 +31,5 @@ speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 2.0

resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg

@@ -31,7 +31,5 @@ speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg

@@ -56,11 +56,8 @@ speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
+support_bottom_distance = =support_z_distance / 2
 travel_avoid_distance = 3
 wall_0_inset = 0
 speed_wall_x = =math.ceil(speed_print * 25 / 25)

resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg

@@ -47,10 +47,7 @@ speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
+support_bottom_distance = =support_z_distance / 2
 travel_avoid_distance = 3
 wall_0_inset = 0

resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg

@@ -46,11 +46,8 @@ speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
+support_bottom_distance = =support_z_distance / 2
 top_bottom_thickness = 1.1
 travel_avoid_distance = 3
 wall_0_inset = 0

resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg

@@ -55,11 +55,8 @@ speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
+support_bottom_distance = =support_z_distance / 2
 top_bottom_thickness = 1.1
 travel_avoid_distance = 3
 wall_0_inset = 0

resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg

@@ -46,11 +46,8 @@ speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
+support_bottom_distance = =support_z_distance / 2
 top_bottom_thickness = 1.5
 travel_avoid_distance = 3
 wall_0_inset = 0

resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg

@@ -55,11 +55,8 @@ speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
+support_bottom_distance = =support_z_distance / 2
 top_bottom_thickness = 1.5
 travel_avoid_distance = 3
 wall_0_inset = 0

resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg

@@ -36,8 +36,6 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 40)
 speed_wall_x = =math.ceil(speed_print * 38 / 40)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
-support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
 speed_infill = =math.ceil(speed_print * 40 / 40)

resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg

@@ -34,7 +34,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =math.ceil(speed_print * 35 / 40)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
-support_xy_distance = 0.65
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg

@@ -37,8 +37,6 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
-support_xy_distance = 0.7
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
 speed_infill = =math.ceil(speed_print * 45 / 45)

resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg

@@ -35,7 +35,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.5

resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg

@@ -35,7 +35,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 35)
 speed_wall_x = =math.ceil(speed_print * 30 / 35)
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.5

resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg

@@ -37,9 +37,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_line_distance = 2.85
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = 0.22
 top_bottom_thickness = 0.75

resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg

@@ -37,9 +37,5 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 35)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_line_distance = 2.85
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = 0.22
 top_bottom_thickness = 0.75

resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg

@@ -33,8 +33,6 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2
 retraction_combing_max_distance = 50

resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg

@@ -33,8 +33,6 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2
 retraction_combing_max_distance = 50

resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg

@@ -34,9 +34,6 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =speed_print
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
 speed_infill = =math.ceil(speed_print * 40 / 40)

resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg

@@ -34,8 +34,5 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =speed_print
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg

@@ -34,9 +34,6 @@ speed_travel = 150
 speed_wall = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 0.75
 speed_wall_0 = =math.ceil(speed_print * 30 / 45)

resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg

@@ -33,8 +33,5 @@ speed_travel = 150
 speed_wall = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
-support_pattern = lines
-support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 0.75

resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg

@@ -36,12 +36,7 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 15 / 55)
 speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
-support_bottom_distance = 0.55
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
+support_z_distance = 0.55
-support_pattern = lines
-support_top_distance = 0.55
-support_xy_distance = 0.7
-support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
 speed_infill = =math.ceil(speed_print * 55 / 55)

resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg

@@ -37,8 +37,5 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 55)
 speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
-support_pattern = lines
-support_xy_distance = 0.7
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg

@@ -34,11 +34,7 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 15 / 55)
 speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
-support_bottom_distance = 0.65
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
+support_z_distance = 0.5
-support_pattern = lines
+support_bottom_distance = 0.65
-support_top_distance = 0.5
-support_xy_distance = 0.75
-support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg

@@ -36,9 +36,6 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_bottom_distance = 0.65
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
-support_pattern = lines
 support_top_distance = 0.5
-support_xy_distance = 0.75
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg

@@ -30,7 +30,5 @@ raft_surface_line_width = 0.2
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.19
 speed_topbottom = =math.ceil(speed_print * 15 / 30)

resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg

@@ -30,6 +30,4 @@ raft_surface_line_width = 0.2
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.19

resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg

@@ -31,8 +31,6 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45)
 speed_wall_x = =math.ceil(speed_print * 30 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.19
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
 speed_infill = =math.ceil(speed_print * 45 / 45)

resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg

@@ -31,6 +31,4 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45)
 speed_wall_x = =math.ceil(speed_print * 30 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.19

resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg

@@ -35,9 +35,6 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_line_distance = 3.5333
-support_pattern = lines
 support_z_distance = 0.21
 top_bottom_thickness = 0.75
 speed_infill = =math.ceil(speed_print * 45 / 45)

resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg

@@ -35,8 +35,5 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
-support_line_distance = 3.5333
-support_pattern = lines
 support_z_distance = 0.21
 top_bottom_thickness = 0.75

resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg

@@ -30,7 +30,5 @@ speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_structure == 'tree' else 20
-support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg

@@ -46,11 +46,8 @@ speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
+support_bottom_distance = =support_z_distance / 2
 travel_avoid_distance = 3
 wall_0_inset = 0
 speed_wall_x = =math.ceil(speed_print * 25 / 25)

resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg

@@ -46,10 +46,7 @@ speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
+support_bottom_distance = =support_z_distance / 2
 travel_avoid_distance = 3
 wall_0_inset = 0

resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg

@@ -45,11 +45,8 @@ speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
+support_bottom_distance = =support_z_distance / 2
 top_bottom_thickness = 1.1
 travel_avoid_distance = 3
 wall_0_inset = 0

resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg

@@ -45,11 +45,8 @@ speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
+support_bottom_distance = =support_z_distance / 2
 top_bottom_thickness = 1.1
 travel_avoid_distance = 3
 wall_0_inset = 0

resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg

@@ -57,8 +57,6 @@ speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.5
 travel_avoid_distance = 3

resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg

@@ -48,8 +48,6 @@ speed_wall_0 = =math.ceil(speed_wall * 20 / 25)
 support_angle = 60
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.5
 travel_avoid_distance = 3

resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg

@@ -36,8 +36,6 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 40)
 speed_wall_x = =math.ceil(speed_print * 38 / 40)
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
-support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
 speed_infill = =math.ceil(speed_print * 40 / 40)

resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg

@@ -34,7 +34,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =math.ceil(speed_print * 35 / 40)
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
-support_xy_distance = 0.65
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2

resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg

@@ -37,8 +37,6 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =0 if support_structure == 'tree' else 25
-support_xy_distance = 0.7
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
 speed_infill = =math.ceil(speed_print * 45 / 45)

resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg

@@ -40,9 +40,7 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
-support_bottom_distance = =support_z_distance
 support_interface_density = 87.5
-support_interface_pattern = lines
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35

resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg

@@ -29,11 +29,6 @@ top_bottom_thickness = 1
 support_brim_enable = True
 support_interface_enable = True
 support_interface_density = =min(extruderValues('material_surface_energy'))
-support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric'
 support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
 support_angle = 45
-support_join_distance = 5
-support_offset = 2
-support_pattern = triangles
-support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10

resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg

@@ -28,11 +28,6 @@ top_bottom_thickness = 1
 support_brim_enable = True
 support_interface_enable = True
 support_interface_density = =min(extruderValues('material_surface_energy'))
-support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric'
 support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
 support_angle = 45
-support_join_distance = 5
-support_offset = 2
-support_pattern = triangles
-support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10

resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg

@@ -25,12 +25,7 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70)
 support_brim_enable = True
 support_interface_enable = True
 support_interface_density = =min(extruderValues('material_surface_energy'))
-support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric'
 support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
 support_angle = 45
-support_join_distance = 5
-support_offset = 2
-support_pattern = triangles
-support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
 top_bottom_thickness = 1

resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg

@@ -38,6 +38,5 @@ speed_topbottom = =math.ceil(speed_print * 40 / 50)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 50 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
-support_bottom_distance = =support_z_distance
 support_z_distance = =layer_height
 wall_0_inset = 0

resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg

@@ -38,6 +38,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 45 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
-support_bottom_distance = =support_z_distance
 support_z_distance = =layer_height
 wall_0_inset = 0

resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg

@@ -40,6 +40,5 @@ speed_topbottom = =math.ceil(speed_print * 30 / 35)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 35 / 40)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 35)
-support_bottom_distance = =support_z_distance
 support_z_distance = =layer_height
 wall_0_inset = 0

resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg

@@ -39,6 +39,5 @@ speed_topbottom = =math.ceil(speed_print * 30 / 35)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 35 / 40)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 35)
-support_bottom_distance = =support_z_distance
 support_z_distance = =layer_height
 wall_0_inset = 0

resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg

@@ -49,9 +49,7 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
-support_bottom_distance = =support_z_distance
 support_interface_density = 87.5
-support_interface_pattern = lines
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35

resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg

@@ -47,9 +47,7 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
-support_bottom_distance = =support_z_distance
 support_interface_density = 87.5
-support_interface_pattern = lines
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35

resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg

@@ -49,9 +49,7 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
-support_bottom_distance = =support_z_distance
 support_interface_density = 87.5
-support_interface_pattern = lines
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35

resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg

@@ -46,9 +46,7 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_travel = 250
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
-support_bottom_distance = =support_z_distance
 support_interface_density = 87.5
-support_interface_pattern = lines
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35

resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg

@@ -30,6 +30,5 @@ speed_slowdown_layers = 15
 speed_topbottom = =math.ceil(speed_print * 35 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
-support_bottom_distance = =support_z_distance
 support_z_distance = =layer_height
 top_bottom_thickness = 1.2

resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg

@@ -32,6 +32,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 speed_infill = =math.ceil(speed_print * 40 / 50)
-support_bottom_distance = =support_z_distance
 support_z_distance = =layer_height
 top_bottom_thickness = 1.2

resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg

@@ -32,6 +32,5 @@ speed_slowdown_layers = 10
 speed_topbottom = =math.ceil(speed_print * 35 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
-support_bottom_distance = =support_z_distance
 support_z_distance = =layer_height
 top_bottom_thickness = 1.2

resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg

@@ -26,7 +26,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
 raft_margin = 10
 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
 support_angle = 70
-support_xy_distance = =wall_line_width_0 * 1.5
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40

resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg

@@ -27,7 +27,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
 raft_margin = 10
 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
 support_angle = 70
-support_xy_distance = =wall_line_width_0 * 1.5
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40

resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg

@@ -31,6 +31,4 @@ speed_wall = =math.ceil(speed_print * 40 / 45)
 speed_wall_x = =speed_wall
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 support_angle = 70
-support_pattern = ='triangles'
-support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 4

resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg

@@ -34,6 +34,4 @@ speed_wall_x = =speed_wall
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 speed_infill = =math.ceil(speed_print * 35 / 45)
 support_angle = 70
-support_pattern = ='triangles'
-support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 4

resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg

@@ -32,6 +32,4 @@ speed_wall = =math.ceil(speed_print * 40 / 45)
 speed_wall_x = =speed_wall
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 support_angle = 70
-support_pattern = ='triangles'
-support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 4

resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg

@@ -33,8 +33,6 @@ retraction_min_travel = 1.5
 retraction_prime_speed = 15
 speed_travel = 300
 speed_wall_x = =math.ceil(speed_wall * 30 / 30)
-support_bottom_distance = =support_z_distance
-support_offset = =line_width
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45

resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg

@@ -34,8 +34,6 @@ retraction_prime_speed = 15
 speed_travel = 300
 speed_wall_x = =math.ceil(speed_wall * 30 / 30)
 speed_infill = =math.ceil(speed_wall * 30 / 30)
-support_bottom_distance = =support_z_distance
-support_offset = =line_width
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45

resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg

@@ -33,8 +33,6 @@ retraction_min_travel = 1.5
 retraction_prime_speed = 15
 speed_travel = 300
 speed_wall_x = =math.ceil(speed_wall * 30 / 30)
-support_bottom_distance = =support_z_distance
-support_offset = =line_width
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45

resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg

@@ -27,5 +27,4 @@ prime_tower_enable = False
 retract_at_layer_change = False
 speed_print = 45
 support_angle = 70
-support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 6

resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg

@@ -32,5 +32,4 @@ speed_topbottom = =math.ceil(speed_print * 20 / 30)
 speed_wall = =math.ceil(speed_print * 25/ 30)
 speed_wall_0 = =math.ceil(speed_print * 20 / 30)
 support_angle = 70
-support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 4

resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg

@@ -32,6 +32,4 @@ speed_topbottom = =math.ceil(speed_print * 20 / 35)
 speed_wall = =math.ceil(speed_print * 25/ 35)
 speed_wall_0 = =math.ceil(speed_print * 20 / 35)
 support_angle = 70
-support_pattern = ='triangles'
-support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 4

resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg

@@ -42,8 +42,6 @@ speed_travel = 300
 speed_wall = =math.ceil(speed_print * 30 / 30)
 speed_wall_x = =math.ceil(speed_wall * 30 / 30)
 support_angle = 50
-support_bottom_distance = =support_z_distance
-support_offset = =line_width
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45