diff --git a/.github/ISSUE_TEMPLATE/SlicingCrash.yaml b/.github/ISSUE_TEMPLATE/SlicingCrash.yaml index 0d93977627..06025886a2 100644 --- a/.github/ISSUE_TEMPLATE/SlicingCrash.yaml +++ b/.github/ISSUE_TEMPLATE/SlicingCrash.yaml @@ -6,9 +6,9 @@ body: attributes: value: | ### ✨Try our improved Cura 5.7✨ - Before filling out the report below, we want you to try the latest Cura 5.7 Beta. + Before filling out the report below, we want you to try the latest Cura 5.7. This version of Cura has become significantly more reliable and has an updated slicing engine that will automatically send a report to the Cura Team for analysis. - #### [You can find the downloads here](https://github.com/Ultimaker/Cura/releases/tag/5.7.0-beta.1) #### + #### [You can find the downloads here](https://github.com/Ultimaker/Cura/releases/latest) #### If you still encounter a crash you are still welcome to report the issue so we can use your model as a test case, you can find instructions on how to do that below. ### Project File @@ -35,7 +35,7 @@ body: - type: markdown attributes: value: | - We work hard on improving our slicing crashes. Our most recent release is 5.6.0. + We work hard on improving our slicing crashes. Our most recent release is 5.7.1. If you are not on the latest version of Cura, [you can download it here](https://github.com/Ultimaker/Cura/releases/latest) - type: input attributes: diff --git a/conandata.yml b/conandata.yml index 2eb76d7468..0640813146 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,17 +1,17 @@ -version: "5.8.0-beta.1" +version: "5.9.0-alpha.0" requirements: - - "cura_resources/5.8.0-beta.1" - - "uranium/5.8.0-beta.1" - - "curaengine/5.8.0-beta.1" - - "cura_binary_data/5.8.0-beta.1" - - "fdm_materials/5.8.0-beta.1" + - "cura_resources/(latest)@ultimaker/testing" + - "uranium/(latest)@ultimaker/testing" + - "curaengine/(latest)@ultimaker/testing" + - "cura_binary_data/(latest)@ultimaker/testing" + - "fdm_materials/(latest)@ultimaker/testing" - "curaengine_plugin_gradual_flow/0.1.0-beta.4" - "dulcificum/0.2.1" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - "native_cad_plugin/2.0.0" requirements_internal: - - "fdm_materials/5.8.0-beta.1" + - "fdm_materials/(latest)@internal/testing" - "cura_private_data/(latest)@internal/testing" urls: default: diff --git a/cura/API/Interface/Settings.py b/cura/API/Interface/Settings.py index 706a6d8c74..084023b9bd 100644 --- a/cura/API/Interface/Settings.py +++ b/cura/API/Interface/Settings.py @@ -1,7 +1,13 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING +from dataclasses import asdict + +from typing import cast, Dict, TYPE_CHECKING + +from UM.Settings.InstanceContainer import InstanceContainer +from UM.Settings.SettingFunction import SettingFunction +from cura.Settings.GlobalStack import GlobalStack if TYPE_CHECKING: from cura.CuraApplication import CuraApplication @@ -47,3 +53,57 @@ class Settings: """ return self.application.getSidebarCustomMenuItems() + + def getSliceMetadata(self) -> Dict[str, Dict[str, Dict[str, str]]]: + """Get all changed settings and all settings. For each extruder and the global stack""" + print_information = self.application.getPrintInformation() + machine_manager = self.application.getMachineManager() + settings = { + "material": { + "length": print_information.materialLengths, + "weight": print_information.materialWeights, + "cost": print_information.materialCosts, + }, + "global": { + "changes": {}, + "all_settings": {}, + }, + "quality": asdict(machine_manager.activeQualityDisplayNameMap()), + } + + def _retrieveValue(container: InstanceContainer, setting_: str): + value_ = container.getProperty(setting_, "value") + for _ in range(0, 1024): # Prevent possibly endless loop by not using a limit. + if not isinstance(value_, SettingFunction): + return value_ # Success! + value_ = value_(container) + return 0 # Fallback value after breaking possibly endless loop. + + global_stack = cast(GlobalStack, self.application.getGlobalContainerStack()) + + # Add global user or quality changes + global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) + for setting in global_flattened_changes.getAllKeys(): + settings["global"]["changes"][setting] = _retrieveValue(global_flattened_changes, setting) + + # Get global all settings values without user or quality changes + for setting in global_stack.getAllKeys(): + settings["global"]["all_settings"][setting] = _retrieveValue(global_stack, setting) + + for i, extruder in enumerate(global_stack.extruderList): + # Add extruder fields to settings dictionary + settings[f"extruder_{i}"] = { + "changes": {}, + "all_settings": {}, + } + + # Add extruder user or quality changes + extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) + for setting in extruder_flattened_changes.getAllKeys(): + settings[f"extruder_{i}"]["changes"][setting] = _retrieveValue(extruder_flattened_changes, setting) + + # Get extruder all settings values without user or quality changes + for setting in extruder.getAllKeys(): + settings[f"extruder_{i}"]["all_settings"][setting] = _retrieveValue(extruder, setting) + + return settings diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py new file mode 100644 index 0000000000..b8ad4df2a2 --- /dev/null +++ b/cura/PrinterOutput/FormatMaps.py @@ -0,0 +1,106 @@ +# Copyright (c) 2024 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. + +from UM.Resources import Resources + +import json +from typing import Dict, List, Optional + +class FormatMaps: + + # A map from the printer-type in their native file-formats to the internal name we use. + PRINTER_TYPE_NAME = { + "fire_e": "ultimaker_method", + "lava_f": "ultimaker_methodx", + "magma_10": "ultimaker_methodxl", + "sketch": "ultimaker_sketch" + } + + # A map from the extruder-name in their native file-formats to the internal name we use. + EXTRUDER_NAME_MAP = { + "mk14_hot": "1XA", + "mk14_hot_s": "2XA", + "mk14_c": "1C", + "mk14": "1A", + "mk14_s": "2A", + "mk14_e": "LABS" + } + + # A map from the material-name in their native file-formats to some info, including the internal name we use. + MATERIAL_MAP = { + "abs": {"name": "ABS", "guid": "2780b345-577b-4a24-a2c5-12e6aad3e690"}, + "abs-cf10": {"name": "ABS-CF", "guid": "495a0ce5-9daf-4a16-b7b2-06856d82394d"}, + "abs-wss1": {"name": "ABS-R", "guid": "88c8919c-6a09-471a-b7b6-e801263d862d"}, + "asa": {"name": "ASA", "guid": "f79bc612-21eb-482e-ad6c-87d75bdde066"}, + "nylon12-cf": {"name": "Nylon 12 CF", "guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, + "nylon": {"name": "Nylon", "guid": "283d439a-3490-4481-920c-c51d8cdecf9c"}, + "pc": {"name": "PC", "guid": "62414577-94d1-490d-b1e4-7ef3ec40db02"}, + "petg": {"name": "PETG", "guid": "69386c85-5b6c-421a-bec5-aeb1fb33f060"}, + "pla": {"name": "PLA", "guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"}, + "pva": {"name": "PVA", "guid": "add51ef2-86eb-4c39-afd5-5586564f0715"}, + "wss1": {"name": "RapidRinse", "guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"}, + "sr30": {"name": "SR-30", "guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"}, + "bvoh": {"name": "BVOH", "guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"}, + "cpe": {"name": "CPE", "guid": "da1872c1-b991-4795-80ad-bdac0f131726"}, + "hips": {"name": "HIPS", "guid": "a468d86a-220c-47eb-99a5-bbb47e514eb0"}, + "tpu": {"name": "TPU 95A", "guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}, + "im-pla": {"name": "Tough", "guid": "de031137-a8ca-4a72-bd1b-17bb964033ad"} + } + + __inverse_printer_name: Optional[Dict[str, str]] = None + __inverse_extruder_type: Optional[Dict[str, str]] = None + __inverse_material_map: Optional[Dict[str, str]] = None + __product_to_id_map: Optional[Dict[str, List[str]]] = None + + @classmethod + def getInversePrinterNameMap(cls) -> Dict[str, str]: + """Returns the inverse of the printer name map, that is, from the internal name to the name used in output.""" + if cls.__inverse_printer_name is not None: + return cls.__inverse_printer_name + cls.__inverse_printer_name = {} + for key, value in cls.PRINTER_TYPE_NAME.items(): + cls.__inverse_printer_name[value] = key + return cls.__inverse_printer_name + + @classmethod + def getInverseExtruderTypeMap(cls) -> Dict[str, str]: + """Returns the inverse of the extruder type map, that is, from the internal name to the name used in output.""" + if cls.__inverse_extruder_type is not None: + return cls.__inverse_extruder_type + cls.__inverse_extruder_type = {} + for key, value in cls.EXTRUDER_NAME_MAP.items(): + cls.__inverse_extruder_type[value] = key + return cls.__inverse_extruder_type + + @classmethod + def getInverseMaterialMap(cls) -> Dict[str, str]: + """Returns the inverse of the material map, that is, from the internal name to the name used in output. + + Note that this drops the extra info saved in the non-inverse material map, use that if you need it. + """ + if cls.__inverse_material_map is not None: + return cls.__inverse_material_map + cls.__inverse_material_map = {} + for key, value in cls.MATERIAL_MAP.items(): + cls.__inverse_material_map[value["name"]] = key + return cls.__inverse_material_map + + @classmethod + def getProductIdMap(cls) -> Dict[str, List[str]]: + """Gets a mapping from product names (for example, in the XML files) to their definition IDs. + + This loads the mapping from a file. + """ + if cls.__product_to_id_map is not None: + return cls.__product_to_id_map + + product_to_id_file = Resources.getPath(Resources.Texts, "product_to_id.json") + with open(product_to_id_file, encoding = "utf-8") as f: + contents = "" + for line in f: + contents += line if "#" not in line else "".join([line.replace("#", str(n)) for n in range(1, 12)]) + cls.__product_to_id_map = json.loads(contents) + cls.__product_to_id_map = {key: [value] for key, value in cls.__product_to_id_map.items()} + #This also loads "Ultimaker S5" -> "ultimaker_s5" even though that is not strictly necessary with the default to change spaces into underscores. + #However it is not always loaded with that default; this mapping is also used in serialize() without that default. + return cls.__product_to_id_map diff --git a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py index ac924c684e..c5c480e224 100644 --- a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py +++ b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py @@ -1,9 +1,10 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2024 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional from PyQt6.QtCore import pyqtProperty, QObject, pyqtSignal +from cura.PrinterOutput.FormatMaps import FormatMaps from .MaterialOutputModel import MaterialOutputModel @@ -45,16 +46,8 @@ class ExtruderConfigurationModel(QObject): @staticmethod def applyNameMappingHotend(hotendId) -> str: - _EXTRUDER_NAME_MAP = { - "mk14_hot":"1XA", - "mk14_hot_s":"2XA", - "mk14_c":"1C", - "mk14":"1A", - "mk14_s":"2A", - "mk14_e": "LABS" - } - if hotendId in _EXTRUDER_NAME_MAP: - return _EXTRUDER_NAME_MAP[hotendId] + if hotendId in FormatMaps.EXTRUDER_NAME_MAP: + return FormatMaps.EXTRUDER_NAME_MAP[hotendId] return hotendId @pyqtProperty(str, fset = setHotendID, notify = extruderConfigurationChanged) diff --git a/cura/PrinterOutput/Models/MaterialOutputModel.py b/cura/PrinterOutput/Models/MaterialOutputModel.py index 854226c6d4..8790d1626e 100644 --- a/cura/PrinterOutput/Models/MaterialOutputModel.py +++ b/cura/PrinterOutput/Models/MaterialOutputModel.py @@ -1,9 +1,10 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2024 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional from PyQt6.QtCore import pyqtProperty, QObject +from cura.PrinterOutput.FormatMaps import FormatMaps class MaterialOutputModel(QObject): @@ -23,30 +24,9 @@ class MaterialOutputModel(QObject): @staticmethod def getMaterialFromDefinition(guid, type, brand, name): - - _MATERIAL_MAP = { "abs" :{"name" :"ABS" ,"guid": "2780b345-577b-4a24-a2c5-12e6aad3e690"}, - "abs-cf10" :{"name": "ABS-CF" ,"guid": "495a0ce5-9daf-4a16-b7b2-06856d82394d"}, - "abs-wss1" :{"name" :"ABS-R" ,"guid": "88c8919c-6a09-471a-b7b6-e801263d862d"}, - "asa" :{"name" :"ASA" ,"guid": "f79bc612-21eb-482e-ad6c-87d75bdde066"}, - "nylon12-cf":{"name": "Nylon 12 CF" ,"guid": "3c6f2877-71cc-4760-84e6-4b89ab243e3b"}, - "nylon" :{"name" :"Nylon" ,"guid": "283d439a-3490-4481-920c-c51d8cdecf9c"}, - "pc" :{"name" :"PC" ,"guid": "62414577-94d1-490d-b1e4-7ef3ec40db02"}, - "petg" :{"name" :"PETG" ,"guid": "69386c85-5b6c-421a-bec5-aeb1fb33f060"}, - "pla" :{"name" :"PLA" ,"guid": "abb9c58e-1f56-48d1-bd8f-055fde3a5b56"}, - "pva" :{"name" :"PVA" ,"guid": "add51ef2-86eb-4c39-afd5-5586564f0715"}, - "wss1" :{"name" :"RapidRinse" ,"guid": "a140ef8f-4f26-4e73-abe0-cfc29d6d1024"}, - "sr30" :{"name" :"SR-30" ,"guid": "77873465-83a9-4283-bc44-4e542b8eb3eb"}, - "bvoh" :{"name" :"BVOH" ,"guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"}, - "cpe" :{"name" :"CPE" ,"guid": "da1872c1-b991-4795-80ad-bdac0f131726"}, - "hips" :{"name" :"HIPS" ,"guid": "a468d86a-220c-47eb-99a5-bbb47e514eb0"}, - "tpu" :{"name" :"TPU 95A" ,"guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}, - "im-pla" :{"name": "Tough" ,"guid": "de031137-a8ca-4a72-bd1b-17bb964033ad"} - } - - - if guid is None and brand != "empty" and type in _MATERIAL_MAP: - name = _MATERIAL_MAP[type]["name"] - guid = _MATERIAL_MAP[type]["guid"] + if guid is None and brand != "empty" and type in FormatMaps.MATERIAL_MAP: + name = FormatMaps.MATERIAL_MAP[type]["name"] + guid = FormatMaps.MATERIAL_MAP[type]["guid"] return name, guid diff --git a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py index 2a683966db..3dc245d468 100644 --- a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py +++ b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Ultimaker B.V. +# Copyright (c) 2024 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. from UM.FileHandler.FileHandler import FileHandler #For typing. @@ -6,6 +6,7 @@ from UM.Logger import Logger from UM.Scene.SceneNode import SceneNode #For typing. from cura.API import Account from cura.CuraApplication import CuraApplication +from cura.PrinterOutput.FormatMaps import FormatMaps from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionState, ConnectionType @@ -419,14 +420,8 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice): @staticmethod def applyPrinterTypeMapping(printer_type): - _PRINTER_TYPE_NAME = { - "fire_e": "ultimaker_method", - "lava_f": "ultimaker_methodx", - "magma_10": "ultimaker_methodxl", - "sketch": "ultimaker_sketch" - } - if printer_type in _PRINTER_TYPE_NAME: - return _PRINTER_TYPE_NAME[printer_type] + if printer_type in FormatMaps.PRINTER_TYPE_NAME: + return FormatMaps.PRINTER_TYPE_NAME[printer_type] return printer_type @pyqtProperty(str, constant = True) diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index 25fc74b28f..1bef64f7aa 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -83,6 +83,15 @@ class GlobalStack(CuraContainerStack): """ return self.getMetaDataEntry("supports_material_export", False) + @pyqtProperty("QVariantList", constant = True) + def getOutputFileFormats(self) -> List[str]: + """ + Which output formats the printer supports. + :return: A list of strings with MIME-types. + """ + all_formats_str = self.getMetaDataEntry("file_formats", "") + return all_formats_str.split(";") + @classmethod def getLoadingPriority(cls) -> int: return 2 diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 5a9fa487fc..a3eb43ca32 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -114,22 +114,24 @@ class ThreeMFWriter(MeshWriter): mesh_data = um_node.getMeshData() + node_matrix = um_node.getLocalTransformation() + node_matrix.preMultiply(transformation) + if center_mesh: - node_matrix = Matrix() + center_matrix = Matrix() # compensate for original center position, if object(s) is/are not around its zero position if mesh_data is not None: extents = mesh_data.getExtents() if extents is not None: # We use a different coordinate space while writing, so flip Z and Y - center_vector = Vector(extents.center.x, extents.center.y, extents.center.z) - node_matrix.setByTranslation(center_vector) - node_matrix.multiply(um_node.getLocalTransformation()) - else: - node_matrix = um_node.getLocalTransformation() + center_vector = Vector(-extents.center.x, -extents.center.y, -extents.center.z) + center_matrix.setByTranslation(center_vector) + node_matrix.preMultiply(center_matrix) - matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix.preMultiply(transformation)) + matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix) savitar_node.setTransformation(matrix_string) + if mesh_data is not None: savitar_node.getMeshData().setVerticesFromBytes(mesh_data.getVerticesAsByteArray()) indices_array = mesh_data.getIndicesAsByteArray() diff --git a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml index 0b79b77a08..ee827a6d68 100644 --- a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml +++ b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml @@ -208,7 +208,7 @@ Item anchors.rightMargin: UM.Theme.getSize("thin_margin").height enabled: UM.Backend.state == UM.Backend.Done - currentIndex: UM.Backend.state == UM.Backend.Done ? dfFilenameTextfield.text.startsWith("MM")? 1 : 0 : 2 + currentIndex: UM.Backend.state == UM.Backend.Done ? (Cura.MachineManager.activeMachine.getOutputFileFormats.includes("application/x-makerbot") ? 1 : 0) : 2 textRole: "text" valueRole: "value" diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index 43595bbf24..34ef562fd3 100644 --- a/plugins/MakerbotWriter/MakerbotWriter.py +++ b/plugins/MakerbotWriter/MakerbotWriter.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 UltiMaker +# Copyright (c) 2024 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. from io import StringIO, BufferedIOBase import json @@ -18,6 +18,7 @@ from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.i18n import i18nCatalog from cura.CuraApplication import CuraApplication +from cura.PrinterOutput.FormatMaps import FormatMaps from cura.Snapshot import Snapshot from cura.Utils.Threading import call_on_qt_thread from cura.CuraVersion import ConanInstalls @@ -137,6 +138,30 @@ class MakerbotWriter(MeshWriter): for png_file in png_files: file, data = png_file["file"], png_file["data"] zip_stream.writestr(file, data) + api = CuraApplication.getInstance().getCuraAPI() + metadata_json = api.interface.settings.getSliceMetadata() + + # All the mapping stuff we have to do: + product_to_id_map = FormatMaps.getProductIdMap() + printer_name_map = FormatMaps.getInversePrinterNameMap() + extruder_type_map = FormatMaps.getInverseExtruderTypeMap() + material_map = FormatMaps.getInverseMaterialMap() + for key, value in metadata_json.items(): + if "all_settings" in value: + if "machine_name" in value["all_settings"]: + machine_name = value["all_settings"]["machine_name"] + if machine_name in product_to_id_map: + machine_name = product_to_id_map[machine_name][0] + value["all_settings"]["machine_name"] = printer_name_map.get(machine_name, machine_name) + if "machine_nozzle_id" in value["all_settings"]: + extruder_type = value["all_settings"]["machine_nozzle_id"] + value["all_settings"]["machine_nozzle_id"] = extruder_type_map.get(extruder_type, extruder_type) + if "material_type" in value["all_settings"]: + material_type = value["all_settings"]["material_type"] + value["all_settings"]["material_type"] = material_map.get(material_type, material_type) + + slice_metadata = json.dumps(metadata_json, separators=(", ", ": "), indent=4) + zip_stream.writestr("slicemetadata.json", slice_metadata) except (IOError, OSError, BadZipFile) as ex: Logger.log("e", f"Could not write to (.makerbot) file because: '{ex}'.") self.setInformation(catalog.i18nc("@error", "MakerbotWriter could not save to the designated path.")) diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 475e5fc01a..0cf756b6a4 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -24,6 +24,7 @@ from UM.Settings.InstanceContainer import InstanceContainer from cura.CuraApplication import CuraApplication from cura.Settings.GlobalStack import GlobalStack from cura.Utils.Threading import call_on_qt_thread +from cura.API import CuraAPI from UM.i18n import i18nCatalog @@ -85,7 +86,8 @@ class UFPWriter(MeshWriter): try: archive.addContentType(extension="json", mime_type="application/json") setting_textio = StringIO() - json.dump(self._getSliceMetadata(), setting_textio, separators=(", ", ": "), indent=4) + api = CuraApplication.getInstance().getCuraAPI() + json.dump(api.interface.settings.getSliceMetadata(), setting_textio, separators=(", ", ": "), indent=4) steam = archive.getStream(SLICE_METADATA_PATH) steam.write(setting_textio.getvalue().encode("UTF-8")) except EnvironmentError as e: @@ -210,57 +212,3 @@ class UFPWriter(MeshWriter): return [{"name": item.getName()} for item in DepthFirstIterator(node) if item.getMeshData() is not None and not item.callDecoration("isNonPrintingMesh")] - - def _getSliceMetadata(self) -> Dict[str, Dict[str, Dict[str, str]]]: - """Get all changed settings and all settings. For each extruder and the global stack""" - print_information = CuraApplication.getInstance().getPrintInformation() - machine_manager = CuraApplication.getInstance().getMachineManager() - settings = { - "material": { - "length": print_information.materialLengths, - "weight": print_information.materialWeights, - "cost": print_information.materialCosts, - }, - "global": { - "changes": {}, - "all_settings": {}, - }, - "quality": asdict(machine_manager.activeQualityDisplayNameMap()), - } - - def _retrieveValue(container: InstanceContainer, setting_: str): - value_ = container.getProperty(setting_, "value") - for _ in range(0, 1024): # Prevent possibly endless loop by not using a limit. - if not isinstance(value_, SettingFunction): - return value_ # Success! - value_ = value_(container) - return 0 # Fallback value after breaking possibly endless loop. - - global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack()) - - # Add global user or quality changes - global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) - for setting in global_flattened_changes.getAllKeys(): - settings["global"]["changes"][setting] = _retrieveValue(global_flattened_changes, setting) - - # Get global all settings values without user or quality changes - for setting in global_stack.getAllKeys(): - settings["global"]["all_settings"][setting] = _retrieveValue(global_stack, setting) - - for i, extruder in enumerate(global_stack.extruderList): - # Add extruder fields to settings dictionary - settings[f"extruder_{i}"] = { - "changes": {}, - "all_settings": {}, - } - - # Add extruder user or quality changes - extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) - for setting in extruder_flattened_changes.getAllKeys(): - settings[f"extruder_{i}"]["changes"][setting] = _retrieveValue(extruder_flattened_changes, setting) - - # Get extruder all settings values without user or quality changes - for setting in extruder.getAllKeys(): - settings[f"extruder_{i}"]["all_settings"][setting] = _retrieveValue(extruder, setting) - - return settings diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 98c0f95e10..49b5e7661d 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -17,6 +17,7 @@ from UM.Settings.ContainerRegistry import ContainerRegistry from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from cura.CuraApplication import CuraApplication +from cura.PrinterOutput.FormatMaps import FormatMaps from cura.Machines.VariantType import VariantType try: @@ -249,7 +250,7 @@ class XmlMaterialProfile(InstanceContainer): machine_variant_map[definition_id][variant_name] = variant_dict # Map machine human-readable names to IDs - product_id_map = self.getProductIdMap() + product_id_map = FormatMaps.getProductIdMap() for definition_id, container in machine_container_map.items(): definition_id = container.getMetaDataEntry("definition") @@ -647,7 +648,7 @@ class XmlMaterialProfile(InstanceContainer): self._dirty = False # Map machine human-readable names to IDs - product_id_map = self.getProductIdMap() + product_id_map = FormatMaps.getProductIdMap() machines = data.iterfind("./um:settings/um:machine", self.__namespaces) for machine in machines: @@ -923,7 +924,7 @@ class XmlMaterialProfile(InstanceContainer): result_metadata.append(base_metadata) # Map machine human-readable names to IDs - product_id_map = cls.getProductIdMap() + product_id_map = FormatMaps.getProductIdMap() for machine in data.iterfind("./um:settings/um:machine", cls.__namespaces): machine_compatibility = common_compatibility @@ -1083,10 +1084,9 @@ class XmlMaterialProfile(InstanceContainer): # Skip material properties (eg diameter) or metadata (eg GUID) return - if instance.value is True: - data = "yes" - elif instance.value is False: - data = "no" + truth_map = { True: "yes", False: "no" } + if tag_name != "cura:setting" and instance.value in truth_map: + data = truth_map[instance.value] else: data = str(instance.value) @@ -1129,29 +1129,6 @@ class XmlMaterialProfile(InstanceContainer): id_list = list(id_list) return id_list - __product_to_id_map: Optional[Dict[str, List[str]]] = None - - @classmethod - def getProductIdMap(cls) -> Dict[str, List[str]]: - """Gets a mapping from product names in the XML files to their definition IDs. - - This loads the mapping from a file. - """ - if cls.__product_to_id_map is not None: - return cls.__product_to_id_map - - plugin_path = cast(str, PluginRegistry.getInstance().getPluginPath("XmlMaterialProfile")) - product_to_id_file = os.path.join(plugin_path, "product_to_id.json") - with open(product_to_id_file, encoding = "utf-8") as f: - contents = "" - for line in f: - contents += line if "#" not in line else "".join([line.replace("#", str(n)) for n in range(1, 12)]) - cls.__product_to_id_map = json.loads(contents) - cls.__product_to_id_map = {key: [value] for key, value in cls.__product_to_id_map.items()} - #This also loads "Ultimaker S5" -> "ultimaker_s5" even though that is not strictly necessary with the default to change spaces into underscores. - #However it is not always loaded with that default; this mapping is also used in serialize() without that default. - return cls.__product_to_id_map - @staticmethod def _parseCompatibleValue(value: str): """Parse the value of the "material compatible" property.""" diff --git a/resources/conandata.yml b/resources/conandata.yml index 09d9e10d65..d43b7d4dd2 100644 --- a/resources/conandata.yml +++ b/resources/conandata.yml @@ -1 +1 @@ -version: "5.8.0-beta.1" +version: "5.8.0" diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 789d5d42ec..dab45dd80c 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -130,7 +130,6 @@ "machine_min_cool_heat_time_window": { "default_value": 15.0 }, "machine_name": { "default_value": "Mark2_for_Ultimaker2" }, "machine_nozzle_cool_down_speed": { "default_value": 1.5 }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_heat_up_speed": { "default_value": 3.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_show_variants": { "default_value": true }, diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json index c9b54d2f89..6fab25a96d 100644 --- a/resources/definitions/atom3.def.json +++ b/resources/definitions/atom3.def.json @@ -65,7 +65,6 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 340 }, "machine_name": { "default_value": "Atom 3" }, - "machine_nozzle_head_distance": { "default_value": 6 }, "machine_shape": { "default_value": "elliptic" }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE" }, diff --git a/resources/definitions/creality_crm4.def.json b/resources/definitions/creality_crm4.def.json new file mode 100644 index 0000000000..89ab3ed04c --- /dev/null +++ b/resources/definitions/creality_crm4.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Creality CR-M4", + "inherits": "creality_base", + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 450 }, + "machine_height": { "default_value": 470 }, + "machine_name": { "default_value": "Creality CR-M4" }, + "machine_width": { "default_value": 450 } + } +} \ No newline at end of file diff --git a/resources/definitions/diy220.def.json b/resources/definitions/diy220.def.json index f4c2e41364..ea3e89ab04 100644 --- a/resources/definitions/diy220.def.json +++ b/resources/definitions/diy220.def.json @@ -35,7 +35,6 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_name": { "default_value": "Diytech 220" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28\nG1 Z15 F200\nT0\nG92 E0\nG1 E16 F250\nG92 E0\n" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index c5eb9720f3..117edf43db 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -122,7 +122,6 @@ "machine_name": { "default_value": "dxu" }, "machine_nozzle_cool_down_speed": { "default_value": 1.5 }, "machine_nozzle_expansion_angle": { "default_value": 45 }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_heat_up_speed": { "default_value": 3.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_show_variants": { "default_value": true }, diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index 5baadf32e4..af5784e4e6 100644 --- a/resources/definitions/erzay3d.def.json +++ b/resources/definitions/erzay3d.def.json @@ -44,7 +44,6 @@ "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 10 }, "machine_name": { "default_value": "Erzay3D" }, - "machine_nozzle_head_distance": { "default_value": 2.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_shape": { "default_value": "elliptic" }, "machine_start_gcode": { "default_value": "G28\nG1 Z15.0 F6000\nG92 E0" }, diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index f60cf63360..101efee3b1 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -167,6 +167,17 @@ "type": "float", "unit": "mm" }, + "machine_nozzle_head_distance": + { + "default_value": 3, + "description": "The height difference between the tip of the nozzle and the lowest part of the print head.", + "label": "Nozzle Length", + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float", + "unit": "mm" + }, "machine_nozzle_id": { "default_value": "unknown", diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 65de59c27f..cf060daf49 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -28,6 +28,18 @@ "icon": "Printer", "children": { + "build_volume_fan_nr": + { + "label": "Build volume fan number", + "description": "The number of the fan that cools the build volume. If this is set to 0, it's means that there is no build volume fan", + "default_value": 0, + "minimum_value": "0", + "maximum_value": "999999", + "type": "int", + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, "machine_name": { "label": "Machine Type", @@ -289,17 +301,6 @@ "settable_per_meshgroup": false, "settable_globally": false }, - "machine_nozzle_head_distance": - { - "label": "Nozzle Length", - "description": "The height difference between the tip of the nozzle and the lowest part of the print head.", - "unit": "mm", - "default_value": 3, - "type": "float", - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false - }, "machine_nozzle_expansion_angle": { "label": "Nozzle Angle", @@ -4482,6 +4483,37 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "build_fan_full_at_height": + { + "label": "Build Fan Speed at Height", + "description": "The height at which the fans spin on regular fan speed. At the layers below the fan speed gradually increases from Initial Fan Speed to Regular Fan Speed.", + "unit": "mm", + "type": "float", + "default_value": 0, + "minimum_value": "0", + "enabled": "build_volume_fan_nr != 0", + "maximum_value_warning": "10.0", + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false, + "children": + { + "build_fan_full_layer": + { + "label": "Build Fan Speed at Layer", + "description": "The layer at which the build fans spin on full fan speed. This value is calculated and rounded to a whole number.", + "type": "int", + "default_value": 0, + "minimum_value": "0", + "enabled": "build_volume_fan_nr != 0", + "maximum_value_warning": "10 / resolveOrValue('layer_height')", + "value": "max(1, int(math.floor((build_fan_full_at_height - resolveOrValue('layer_height_0')) / resolveOrValue('layer_height')) + 2))", + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + } + } + }, "cool_fan_speed": { "label": "Fan Speed", diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index e654ee0915..5e5f9dcb5b 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -27,7 +27,6 @@ "machine_heated_bed": { "default_value": false }, "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "3DMaker Starter" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_width": { "default_value": 210 }, "raft_airgap": { "default_value": 0.2 }, diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index 57e1276e6a..d8619fe276 100644 --- a/resources/definitions/mendel90.def.json +++ b/resources/definitions/mendel90.def.json @@ -37,7 +37,6 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "Mendel90" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;absolute extrusion\nM107 ;start with the fan off\nG28 ;home\nG92 E0 ;zero the extruded length\nM140 S{material_bed_temperature_layer_0} ; set the bed temperature and continue on\nG1 X-50 Y98 F9000 ;go to the left of the top\nG1 Z0.05 ; close to the bed\nM104 S{material_print_temperature_layer_0}; pre-heat the extruder continue on\nM190 S{material_bed_temperature_layer_0} ;set the bed temp & wait\nM109 S{material_print_temperature_layer_0};set the extruder temp for layer 0 & wait\nG92 E0 ;zero the extruded length\nG1 X50 E10 F300 ; make a thick line to prime extruder\nG92 E0 ; reset extruder\nG1 E-4 F1800\nG1 Z0.3 ;lift Z\n" }, "machine_width": { "default_value": 200 }, diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index c013c49e05..722f4dade5 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -78,7 +78,6 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "default_value": "\n;Updated Firmware (.hex and Marlin .ino) for \n;Ultimaker 2+ with Discov3ry Extruder available at: \n;https://github.com/Structur3d/UM2.1Discov3ry-Firmware-beta \n;**Learn more at https://www.structur3d.io** \n \nM104 S{material_print_temperature} ;Start heating extruder \nM140 S{material_bed_temperature} ;Start heating bed \nG21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nM302 ;allow cold extrusion \nM92 E2589 ;set extruder EEPROM steps/mm for paste \nG28 Z0 ;move Z to bottom endstops \nG28 X0 Y0 ;move X/Y to endstops \nG1 X15 Y0 F4000 ;move X/Y to front of printer \nG1 Z15.0 F9000 ;move the platform to 15mm \nG92 E0 ;zero the extruded length \nG1 F200 E10 ;extrude 10 mm of feed stock \nG92 E0 ;zero the extruded length again \nG1 F9000 \n;Put printing message on LCD screen \nM117 Printing..." }, "machine_width": { "default_value": 205 }, diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 84bbc9c8fb..01437cebe7 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -44,7 +44,6 @@ "machine_max_acceleration_y": { "default_value": 6000 }, "machine_max_acceleration_z": { "default_value": 12000 }, "machine_name": { "default_value": "TypeAMachines" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": ";-- START GCODE --\n;Sliced for Type A Machines Series 1\n;Sliced at: {day} {date} {time}\n;Basic settings:\n;Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {fill_distance}\n;Print Speed: {print_speed}\n;Support: {support}\n;Retraction Speed: {retraction_speed}\n;Retraction Distance: {retraction_amount}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Settings based on: {material_profile}\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;move to endstops\nG29 ;allows for auto-levelling\nG1 Z15.0 F12000 ;move the platform down 15mm\nG1 X150 Y5 F9000 ;center\nM140 S{material_bed_temperature} ;Prep Heat Bed\nM109 S{default_material_print_temperature} ;Heat To temp\nM190 S{material_bed_temperature} ;Heat Bed to temp\nG1 X150 Y5 Z0.3 ;move the platform to purge extrusion\nG92 E0 ;zero the extruded length\nG1 F200 X250 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 X150 Y150 Z25 F12000 ;recenter and begin\nG1 F9000" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 0d0b162c01..21e905fdf8 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -128,7 +128,6 @@ "support_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" }, "support_tower_maximum_supported_diameter": { "value": "support_tower_diameter" }, "support_tower_roof_angle": { "value": "0 if support_interface_enable else 65" }, - "support_use_towers": { "value": false }, "support_wall_count": { "value": "1 if support_structure == 'tree' else 0" }, "support_xy_distance_overhang": { "value": "0.2" }, "support_z_distance": { "value": "0" }, @@ -138,7 +137,8 @@ "wall_x_material_flow_layer_0": { "value": "0.95 * material_flow_layer_0" }, "xy_offset": { "value": "-layer_height * 0.1" }, "xy_offset_layer_0": { "value": "-wall_line_width_0 / 5 + xy_offset" }, - "z_seam_corner": { "value": "'z_seam_corner_none'" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_relative": { "value": "True" }, "zig_zaggify_support": { "value": true } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 8c0e066cd1..d749c96a00 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -95,7 +95,6 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_name": { "default_value": "Ultimaker 2" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index b5ad30bb8d..c06d8b1e68 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -83,7 +83,6 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Ultimaker 2+" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "speed_infill": { "value": "speed_print" }, "speed_support": { "value": "speed_wall_0" }, diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 8aae2d4c19..6cdd3e9705 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -92,7 +92,6 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Ultimaker 2+ Connect" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "value": "''" }, "machine_width": { "default_value": 223 }, diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 93b19c3311..23e61410d9 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -191,6 +191,10 @@ "bridge_wall_material_flow": { "value": "material_flow" }, "bridge_wall_speed": { "value": "speed_wall" }, "brim_width": { "value": 5 }, + "cool_fan_enabled": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, "default_material_bed_temperature": { "resolve": "min(extruderValues('default_material_bed_temperature'))" }, "extruder_prime_pos_abs": { "default_value": true }, "gradual_support_infill_steps": { "value": 0 }, @@ -321,6 +325,10 @@ "material_bed_temperature": { "enabled": "machine_heated_bed" }, "material_flow": { "value": 100 }, "material_initial_print_temperature": { "value": "material_print_temperature-10" }, + "material_print_temperature": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, "material_shrinkage_percentage": { "enabled": true }, "min_bead_width": { "value": "0.75*line_width" }, "min_wall_line_width": { "value": 0.4 }, @@ -337,24 +345,88 @@ "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, "prime_tower_wipe_enabled": { "value": true }, "print_sequence": { "enabled": false }, + "raft_airgap": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, "raft_base_fan_speed": { "value": 0 }, - "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, - "raft_base_line_width": { "value": 1.4 }, + "raft_base_line_spacing": + { + "force_depends_on_settings": [ "raft_interface_extruder_nr" ], + "value": "2*raft_base_line_width" + }, + "raft_base_line_width": + { + "force_depends_on_settings": [ "raft_interface_extruder_nr" ], + "value": 1.4 + }, "raft_base_speed": { "value": 10 }, - "raft_base_thickness": { "value": 0.8 }, - "raft_base_wall_count": { "value": "raft_wall_count" }, + "raft_base_thickness": + { + "force_depends_on_settings": [ + "raft_interface_extruder_nr", + "support_extruder_nr" + ], + "value": 0.8 + }, + "raft_base_wall_count": + { + "force_depends_on_settings": [ "support_extruder_nr" ], + "value": "raft_wall_count" + }, "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, "raft_interface_fan_speed": { "value": 0 }, + "raft_interface_infill_overlap": + { + "force_depends_on_settings": [ "raft_interface_extruder_nr" ] + }, "raft_interface_layers": { "value": 2 }, - "raft_interface_line_width": { "value": 0.7 }, + "raft_interface_line_spacing": + { + "force_depends_on_settings": [ + "raft_base_thickness", + "raft_interface_extruder_nr" + ] + }, + "raft_interface_line_width": + { + "force_depends_on_settings": [ + "raft_base_thickness", + "raft_interface_extruder_nr" + ], + "value": 0.7 + }, "raft_interface_speed": { "value": 90 }, "raft_interface_thickness": { "value": 0.3 }, "raft_interface_wall_count": { "value": "raft_wall_count" }, + "raft_interface_z_offset": + { + "force_depends_on_settings": [ + "raft_base_thickness", + "raft_interface_extruder_nr" + ] + }, "raft_margin": { "value": 1.2 }, "raft_smoothing": { "value": 9.5 }, "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, "raft_surface_fan_speed": { "value": 0 }, + "raft_surface_flow": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, + "raft_surface_speed": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, + "raft_surface_thickness": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, "raft_surface_wall_count": { "value": "raft_wall_count" }, + "raft_surface_z_offset": + { + "force_depends_on_settings": [ "support_extruder_nr" ] + }, "raft_wall_count": { "value": 2 }, "retract_at_layer_change": { "value": true }, "retraction_amount": { "value": 0.75 }, @@ -405,6 +477,7 @@ "support_interface_enable": { "value": true }, "support_interface_height": { "value": "4*support_infill_sparse_thickness" }, "support_interface_material_flow": { "value": "material_flow" }, + "support_interface_offset": { "value": "1" }, "support_interface_pattern": { "value": "'lines'" }, "support_interface_wall_count": { "value": "1" }, "support_material_flow": { "value": "material_flow" }, @@ -413,6 +486,7 @@ "support_roof_height": { "value": "4*layer_height" }, "support_roof_material_flow": { "value": "material_flow" }, "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, + "support_use_towers": { "value": "False" }, "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" }, "support_xy_distance": { "value": 0.2 }, "support_xy_distance_overhang": { "value": "support_xy_distance" }, diff --git a/resources/extruders/Mark2_extruder1.def.json b/resources/extruders/Mark2_extruder1.def.json index 89992ad450..9617678f7e 100644 --- a/resources/extruders/Mark2_extruder1.def.json +++ b/resources/extruders/Mark2_extruder1.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 } } diff --git a/resources/extruders/Mark2_extruder2.def.json b/resources/extruders/Mark2_extruder2.def.json index 967e32d8b8..b0ea604fbb 100644 --- a/resources/extruders/Mark2_extruder2.def.json +++ b/resources/extruders/Mark2_extruder2.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 } } diff --git a/resources/extruders/atom3_extruder_0.def.json b/resources/extruders/atom3_extruder_0.def.json index ccc7a0bd6b..fc51a8cf03 100644 --- a/resources/extruders/atom3_extruder_0.def.json +++ b/resources/extruders/atom3_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 6 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/diy220_extruder_0.def.json b/resources/extruders/diy220_extruder_0.def.json index 4d802b4a8d..ab271d1006 100644 --- a/resources/extruders/diy220_extruder_0.def.json +++ b/resources/extruders/diy220_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/dxu_extruder1.def.json b/resources/extruders/dxu_extruder1.def.json index de974b8174..b44f79fdac 100644 --- a/resources/extruders/dxu_extruder1.def.json +++ b/resources/extruders/dxu_extruder1.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/extruders/dxu_extruder2.def.json b/resources/extruders/dxu_extruder2.def.json index b4de471289..358bc69dae 100644 --- a/resources/extruders/dxu_extruder2.def.json +++ b/resources/extruders/dxu_extruder2.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 19.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/extruders/erzay3d_extruder_0.def.json b/resources/extruders/erzay3d_extruder_0.def.json index a4082a6224..8ba6c573f3 100644 --- a/resources/extruders/erzay3d_extruder_0.def.json +++ b/resources/extruders/erzay3d_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 2.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/maker_starter_extruder_0.def.json b/resources/extruders/maker_starter_extruder_0.def.json index 1a8877f8ef..4154b00862 100644 --- a/resources/extruders/maker_starter_extruder_0.def.json +++ b/resources/extruders/maker_starter_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/mendel90_extruder_0.def.json b/resources/extruders/mendel90_extruder_0.def.json index 0701164a65..b04e2d2fe9 100644 --- a/resources/extruders/mendel90_extruder_0.def.json +++ b/resources/extruders/mendel90_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json index 0258f9da9c..ec25298a5c 100644 --- a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json +++ b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.84 }, "material_diameter": { "default_value": 3.175 } } diff --git a/resources/extruders/tam_extruder_0.def.json b/resources/extruders/tam_extruder_0.def.json index b606474ff0..4e5cbe4216 100644 --- a/resources/extruders/tam_extruder_0.def.json +++ b/resources/extruders/tam_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } diff --git a/resources/extruders/ultimaker2_extruder_0.def.json b/resources/extruders/ultimaker2_extruder_0.def.json index 17d0d425df..3432ace596 100644 --- a/resources/extruders/ultimaker2_extruder_0.def.json +++ b/resources/extruders/ultimaker2_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } diff --git a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json index 0b74aae019..9ad61af313 100644 --- a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json +++ b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } diff --git a/resources/extruders/ultimaker2_plus_extruder_0.def.json b/resources/extruders/ultimaker2_plus_extruder_0.def.json index 3fec85805e..ace4b5b813 100644 --- a/resources/extruders/ultimaker2_plus_extruder_0.def.json +++ b/resources/extruders/ultimaker2_plus_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 8bf8688e0e..24a5221f4f 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -215,14 +215,14 @@ msgstr "" msgctxt "@label crash message" msgid "" -"

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

\n" +"

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

\n" "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" " " msgstr "" msgctxt "@label crash message" msgid "" -"

Oops, UltiMaker Cura has encountered something that doesn't seem right.

\n" +"

Oops, UltiMaker Cura has encountered something that doesn't seem right.

\n" "

We encountered an unrecoverable error during start up. It was possibly caused by some incorrect configuration files. We suggest to backup and reset your configuration.

\n" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.06mm_visual.inst.cfg index d12071d3a5..834327a3e5 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.06mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.15mm_visual.inst.cfg index 8207705b54..cf2194fac1 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.15mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.1mm_visual.inst.cfg index 09e842f502..6f7e474d51 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_abs_0.1mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.06mm_visual.inst.cfg index 9304974dc9..baac9c79b2 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.06mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.15mm_visual.inst.cfg index 07bf6028e9..3219214dfc 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.15mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.1mm_visual.inst.cfg index ff6c3cc6b5..2cf936b59c 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_pla_0.1mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm_visual.inst.cfg index fb349859b0..7c30e50c27 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm_visual.inst.cfg index 4113a9fe8e..b6b0e3f0f0 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm_visual.inst.cfg index faa1084c27..b8c340f86a 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm_visual.inst.cfg index 8fa7230f62..b29c0a9521 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_visual.inst.cfg index c14e2d0c24..e3a7c7c27c 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_visual.inst.cfg index 7e4a2be518..ccc826e880 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_visual.inst.cfg index e6a3c4c30f..27c578bb70 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm_visual.inst.cfg index 392be6c548..cfe96cd0f0 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_visual.inst.cfg index f6cbbba69d..19208319d8 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_visual.inst.cfg index 6e60a687fa..a12c1ebfd3 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_visual.inst.cfg index a8ebd1b54c..9dafc8b132 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm_visual.inst.cfg index 7cf830c833..9e82f05e6c 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_visual.inst.cfg index 25c24997cd..64110998e3 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_visual.inst.cfg index 170dfd90ea..239f5815cc 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_visual.inst.cfg index 5d1ef78b71..2854968225 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg index ac5904d91f..f43a885619 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg index 2d6592179a..2ea031a390 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg index 2e254c0db0..eec67d4aa5 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg index 06957baa1f..686ee6ccb2 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_visual.inst.cfg index 6c58b08d10..1e824ed44c 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_visual.inst.cfg index 9253f808f9..40cbea238f 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_visual.inst.cfg index 7d18b5d3bf..51e407aa52 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg index a01998fc4d..701b852b80 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.06mm_visual.inst.cfg index 1088ed3384..cf0fd4fa07 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.06mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.15mm_visual.inst.cfg index 67d74786ea..f35180432f 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.15mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.1mm_visual.inst.cfg index 41062bcddf..91df4ccb07 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_abs_0.1mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.06mm_visual.inst.cfg index f0b2230088..bfd2ce1497 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.06mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.15mm_visual.inst.cfg index 50d90a00eb..93cced34ee 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.15mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.1mm_visual.inst.cfg index 23eb85c335..b72390abec 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_pla_0.1mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm_visual.inst.cfg index 18bdf42758..8d426384a9 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm_visual.inst.cfg index d4562bf3a2..bcf0a4fad4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm_visual.inst.cfg index 99ff066ecc..425e08958a 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm_visual.inst.cfg @@ -14,4 +14,5 @@ variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm_visual.inst.cfg index dc4a8e8734..4207e39a8c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_visual.inst.cfg index e20abaae69..74de88b39c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_visual.inst.cfg index 1738a2a7d4..7f14d6b9be 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_visual.inst.cfg index 75aab7d69f..ae48539ca6 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm_visual.inst.cfg index 6613e5fa4b..c18fad115e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_visual.inst.cfg index cbb246eda0..d49ea90995 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_visual.inst.cfg index 2bd5ad82d5..ce82524afc 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_visual.inst.cfg index a2f07990b8..dadd4384af 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm_visual.inst.cfg index 9764374cd2..367c5a8ab1 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_visual.inst.cfg index 4736d18dae..7a789b8668 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_visual.inst.cfg index 4eb56441b3..33d52d7ec7 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_visual.inst.cfg index bd2f1f1b9c..0aaf94199e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg index ef32bc56db..bbf46cce48 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg index 34b0afb5b1..44e1053064 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg index 70f539cfe8..bce5174047 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg index 9f4de00ec6..20ae02a33e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_visual.inst.cfg index 10e967fc41..458e5a301f 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_visual.inst.cfg index 01fa9a6e91..aa0e6b305f 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_visual.inst.cfg index 95716c5d9f..afc9e10f57 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg index ddb8021eba..94930d23a6 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50)) speed_wall_0 = =math.ceil(speed_wall*(20/50)) speed_wall_x = =math.ceil(speed_wall*(35/50)) top_bottom_thickness = =max(1.2 , layer_height * 6) +z_seam_type = back diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 1a4904d5fb..6037ef01b1 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -38,7 +38,6 @@ support_bottom_stair_step_height = 0 support_infill_rate = 12.0 support_line_width = =line_width * 0.75 support_roof_density = 85 -support_use_towers = True support_xy_distance = 0.3 support_z_distance = 0.25 diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index 88bfb0279a..99457a0867 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -56,14 +56,14 @@ support_conical_min_width = 20 support_fan_enable = False support_infill_density_multiplier_initial_layer = 2 support_infill_rate = 12 -support_interface_offset = 1 +support_interface_offset = 0 support_interface_wall_count = 2 support_offset = 1.8 support_pattern = grid support_roof_density = 95 support_roof_height = =layer_height*8 -support_roof_line_width = 0.25 -support_top_distance = 0.4 +support_roof_line_width = 0.4 +support_use_towers = True switch_extruder_extra_prime_amount = 1 switch_extruder_retraction_amount = 2.5 switch_extruder_retraction_speeds = 3 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg index 75c096fd74..26ad40893d 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -38,7 +38,6 @@ support_bottom_stair_step_height = 0 support_infill_rate = 12.0 support_line_width = =line_width * 0.75 support_roof_density = 85 -support_use_towers = True support_xy_distance = 0.3 support_z_distance = 0.25 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg index 9698b8c82e..f88e970e86 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-abscf-175_0.2mm.inst.cfg @@ -45,12 +45,10 @@ support_bottom_stair_step_height = 0 support_fan_enable = False support_infill_angles = [ 45,45,45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135,135,135] support_infill_rate = 15.0 -support_interface_offset = 1.2 support_line_width = 0.35 support_material_flow = 90 support_roof_density = 82 support_roof_line_width = 0.4 -support_use_towers = True support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 support_z_distance = 0.15 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg index 8f8daf3c22..9b3f5994a4 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm.inst.cfg @@ -55,7 +55,6 @@ support_roof_density = 85 support_roof_wall_count = 1 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg index f828dfcfb2..de573c160b 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg @@ -52,7 +52,6 @@ support_material_flow = =0.85*material_flow support_roof_density = 85 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 229b4ced76..038dee5842 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -38,7 +38,6 @@ support_bottom_stair_step_height = 0 support_infill_rate = 12.0 support_line_width = =line_width * 0.75 support_roof_density = 85 -support_use_towers = True support_xy_distance = 0.3 support_z_distance = 0.25 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg index f524e74483..bd0bc29c93 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm.inst.cfg @@ -55,7 +55,6 @@ support_roof_density = 85 support_roof_wall_count = 1 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg index 5ed60f58a8..426294338c 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg @@ -52,7 +52,6 @@ support_material_flow = =0.85*material_flow support_roof_density = 85 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 1f85251c1a..9c2e0c66ed 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -56,14 +56,14 @@ support_conical_min_width = 20 support_fan_enable = False support_infill_density_multiplier_initial_layer = 2 support_infill_rate = 12 -support_interface_offset = 1 +support_interface_offset = 0 support_interface_wall_count = 2 support_offset = 1.8 support_pattern = grid support_roof_density = 95 support_roof_height = =layer_height*8 -support_roof_line_width = 0.25 -support_top_distance = 0.4 +support_roof_line_width = 0.4 +support_use_towers = True switch_extruder_extra_prime_amount = 1 switch_extruder_retraction_amount = 2.5 switch_extruder_retraction_speeds = 3 diff --git a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg index 07d5cb2ca6..4185387c5a 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-rapidrinse-175_0.2mm.inst.cfg @@ -32,10 +32,11 @@ support_conical_angle = 20 support_conical_enabled = True support_conical_min_width = 20 support_fan_enable = False -support_interface_offset = 1 +support_interface_offset = 0 support_interface_wall_count = 2 support_offset = 1.8 support_roof_height = =5*layer_height support_roof_line_width = 0.25 +support_use_towers = True support_xy_distance_overhang = 0.15 diff --git a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg index 43c336e841..44f221726d 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg @@ -36,8 +36,9 @@ support_conical_angle = 20 support_conical_enabled = True support_conical_min_width = 20 support_fan_enable = False -support_interface_offset = 1 +support_interface_offset = 0 support_interface_wall_count = 2 support_offset = 0.8 support_roof_height = =5*layer_height +support_use_towers = True diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg index 95ab31907d..6e2b803865 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg @@ -45,12 +45,10 @@ support_bottom_stair_step_height = 0 support_fan_enable = False support_infill_angles = [ 45,45,45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135,135,135] support_infill_rate = 15.0 -support_interface_offset = 1.2 support_line_width = 0.35 support_material_flow = 90 support_roof_density = 82 support_roof_line_width = 0.4 -support_use_towers = True support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 support_z_distance = 0.15 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg index c85f3c38c3..af00dbfeb3 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg @@ -55,7 +55,6 @@ support_roof_density = 85 support_roof_wall_count = 1 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg index 16c9d10c6b..4db0b6b7ec 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg @@ -52,7 +52,6 @@ support_material_flow = =0.85*material_flow support_roof_density = 85 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg index af1498f39a..00b5775c9b 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -38,7 +38,6 @@ support_bottom_stair_step_height = 0 support_infill_rate = 12.0 support_line_width = =line_width * 0.75 support_roof_density = 85 -support_use_towers = True support_xy_distance = 0.3 support_z_distance = 0.25 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg index 9be523cfec..cafdccde66 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-abscf-175_0.2mm.inst.cfg @@ -47,12 +47,10 @@ support_bottom_stair_step_height = 0 support_fan_enable = False support_infill_angles = [ 45,45,45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135,135,135] support_infill_rate = 15.0 -support_interface_offset = 1.2 support_line_width = 0.35 support_material_flow = 90 support_roof_density = 82 support_roof_line_width = 0.4 -support_use_towers = True support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 support_z_distance = 0.15 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg index cf226b8a13..8917031687 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg @@ -54,7 +54,6 @@ support_roof_density = 85 support_roof_wall_count = 1 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg index d5291b5b14..9a1f0e2aa6 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg @@ -52,7 +52,6 @@ support_material_flow = =0.85*material_flow support_roof_density = 85 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 250a0d64db..e930693690 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -38,7 +38,6 @@ support_bottom_stair_step_height = 0 support_infill_rate = 12.0 support_line_width = =line_width * 0.75 support_roof_density = 85 -support_use_towers = True support_xy_distance = 0.3 support_z_distance = 0.25 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg index 0ddd9dc576..e002c7fa64 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg @@ -54,7 +54,6 @@ support_roof_density = 85 support_roof_wall_count = 1 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg index 1a79318ac2..bfb99a0484 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg @@ -52,7 +52,6 @@ support_material_flow = =0.85*material_flow support_roof_density = 85 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 6dfe921593..9534302ee2 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -56,14 +56,14 @@ support_conical_min_width = 20 support_fan_enable = False support_infill_density_multiplier_initial_layer = 2 support_infill_rate = 12 -support_interface_offset = 1 +support_interface_offset = 0 support_interface_wall_count = 2 support_offset = 1.8 support_pattern = grid support_roof_density = 95 support_roof_height = =layer_height*8 -support_roof_line_width = 0.25 -support_top_distance = 0.4 +support_roof_line_width = 0.4 +support_use_towers = True switch_extruder_extra_prime_amount = 1 switch_extruder_retraction_amount = 2.5 switch_extruder_retraction_speeds = 3 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg index cc07952868..50ba0208f7 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-rapidrinse-175_0.2mm.inst.cfg @@ -32,10 +32,11 @@ support_conical_angle = 20 support_conical_enabled = True support_conical_min_width = 20 support_fan_enable = False -support_interface_offset = 1 +support_interface_offset = 0 support_interface_wall_count = 2 support_offset = 1.8 support_roof_height = =5*layer_height support_roof_line_width = 0.25 +support_use_towers = True support_xy_distance_overhang = 0.15 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg index 9eae84bc75..d4e0c0dd1a 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg @@ -36,8 +36,9 @@ support_conical_angle = 20 support_conical_enabled = True support_conical_min_width = 20 support_fan_enable = False -support_interface_offset = 1 +support_interface_offset = 0 support_interface_wall_count = 2 support_offset = 0.8 support_roof_height = =5*layer_height +support_use_towers = True diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg index 4a22ed8097..139736f7a3 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg @@ -47,12 +47,10 @@ support_bottom_stair_step_height = 0 support_fan_enable = False support_infill_angles = [ 45,45,45,45,45,45,45,45,45,45,45,45,135,135,135,135,135,135,135,135,135,135,135,135] support_infill_rate = 15.0 -support_interface_offset = 1.2 support_line_width = 0.35 support_material_flow = 90 support_roof_density = 82 support_roof_line_width = 0.4 -support_use_towers = True support_xy_distance = 0.3 support_xy_distance_overhang = 0.25 support_z_distance = 0.15 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg index d35aa5dfc2..1d48bca467 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg @@ -54,7 +54,6 @@ support_roof_density = 85 support_roof_wall_count = 1 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg index 081edf2377..657f43af9c 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg @@ -52,7 +52,6 @@ support_material_flow = =0.85*material_flow support_roof_density = 85 support_supported_skin_fan_speed = 60.0 support_top_distance = =support_z_distance -support_use_towers = False support_xy_distance = 0.35 support_xy_distance_overhang = 0.25 support_xy_overrides_z = xy_overrides_z diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg index 77df45d601..d65d25f15e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -38,7 +38,6 @@ support_bottom_stair_step_height = 0 support_infill_rate = 12.0 support_line_width = =line_width * 0.75 support_roof_density = 85 -support_use_towers = True support_xy_distance = 0.3 support_z_distance = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg index eeb51a1428..fefbf8b615 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-petg_0.1mm.inst.cfg index fb5bcc256b..94de34ad72 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-petg_0.1mm.inst.cfg @@ -66,7 +66,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg index d7bd9816ed..4ed588e9e3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg @@ -66,7 +66,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-tough-pla_0.1mm.inst.cfg index 7d124c4578..7daf38b312 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-tough-pla_0.1mm.inst.cfg @@ -67,7 +67,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm.inst.cfg index e8cb2907b7..89614bec9c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg index a08e98868f..6716a2f504 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg @@ -69,7 +69,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm.inst.cfg index 54ca472acf..10f0c211cf 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg index 54acafc477..829dd29d22 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg @@ -74,7 +74,5 @@ top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_x_material_flow = =1.05 * wall_material_flow wall_x_material_flow_roofing = =wall_material_flow -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg index 78d2da225f..c42fbd390e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg @@ -71,7 +71,5 @@ support_z_distance = 0.4 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm.inst.cfg index 2ae056128c..2ab5c2fbfb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm.inst.cfg @@ -67,7 +67,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg index 7b57ca8f7a..e21e8ffdca 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm.inst.cfg index b19beadf42..629f53baf9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm.inst.cfg @@ -67,7 +67,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg index 77c839688b..c155871f26 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg @@ -73,7 +73,5 @@ top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_x_material_flow = =1.1 * wall_material_flow wall_x_material_flow_roofing = =wall_material_flow -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg index 647261b0c0..4c2671ff69 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg @@ -70,7 +70,5 @@ support_z_distance = 0.4 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg index 40b74593fa..163c3c400e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg @@ -67,7 +67,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg index a52bc4173d..be380e6b23 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg index 0fe2f9f4a1..e53e2b3dbd 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg @@ -67,7 +67,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg index c6206182fb..7b75e78fb5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg @@ -73,7 +73,5 @@ top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_x_material_flow = =1.1 * wall_material_flow wall_x_material_flow_roofing = =wall_material_flow -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg index 8044b7141f..0ea189daf8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg @@ -70,7 +70,5 @@ support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm.inst.cfg index e902727c41..87c575b978 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg index 15566dd63d..bcfad903cf 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg @@ -69,7 +69,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.35 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm.inst.cfg index c1f93a6ac6..244309d77e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg index fd0e3e5344..eb5bdba073 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg @@ -73,7 +73,5 @@ top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_x_material_flow = =1.1 * wall_material_flow wall_x_material_flow_roofing = =wall_material_flow -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg index 3f62d21120..efd4f4ecef 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg @@ -71,7 +71,5 @@ support_z_distance = 0.4 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg index 3bcab3006c..acddb2300a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg @@ -71,7 +71,5 @@ support_interface_enable = False support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg index d5f5439634..e7d9686a98 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg @@ -69,7 +69,5 @@ support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg index 58369c9252..5b1795f87e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg @@ -69,7 +69,5 @@ support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg index 5a804ae0e8..913f3f96cb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg @@ -70,7 +70,5 @@ support_interface_enable = False support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg index b66dba1dee..cab1ac9ae6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg @@ -70,7 +70,5 @@ support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg index 30d0e49ede..cf81658b7a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg @@ -70,7 +70,5 @@ support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg index 23ebb75153..d5469d6378 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg @@ -70,7 +70,5 @@ support_interface_enable = False support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg index ee0f35b386..c5bb22fb17 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg @@ -68,7 +68,5 @@ support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg index 6e481a3a94..260fb5ba10 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg @@ -68,7 +68,5 @@ support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg index b546398893..c0919d2192 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg @@ -71,7 +71,5 @@ support_interface_enable = False support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg index 403e44d04c..3d3f3b9eed 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg @@ -69,7 +69,5 @@ support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg index 867154ac70..d0aad55cf3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg @@ -69,7 +69,5 @@ support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg index a31045f9ed..d5486c1a55 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-petg_0.1mm.inst.cfg index b171fdef80..f2a9e39e7a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-petg_0.1mm.inst.cfg @@ -66,7 +66,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg index 5948b72f7d..3fff3081c9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg @@ -66,7 +66,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-tough-pla_0.1mm.inst.cfg index 74f71b970f..8168ef5278 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-tough-pla_0.1mm.inst.cfg @@ -67,7 +67,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm.inst.cfg index d0950efea0..4241f393e9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg index 74c3a78082..cf38fd6c7e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg @@ -69,7 +69,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm.inst.cfg index f71fe4a164..8d0b516c7e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg index b319290e66..7ddd9784c9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg @@ -74,7 +74,5 @@ top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_x_material_flow = =1.05 * wall_material_flow wall_x_material_flow_roofing = =wall_material_flow -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg index 8ff6abf061..1f13c14837 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg @@ -71,7 +71,5 @@ support_z_distance = 0.4 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm.inst.cfg index eb66565732..1ae9940414 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm.inst.cfg @@ -67,7 +67,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg index c40db10dd5..ff9b960365 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm.inst.cfg index db70a58d81..aad464cb8a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm.inst.cfg @@ -67,7 +67,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg index 53e9e671a1..2614301965 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg @@ -73,7 +73,5 @@ top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_x_material_flow = =1.1 * wall_material_flow wall_x_material_flow_roofing = =wall_material_flow -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg index 6b3a4ade86..731f07dd61 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg @@ -70,7 +70,5 @@ support_z_distance = 0.4 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg index 2ee13388b9..d1df42d929 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg @@ -67,7 +67,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg index faeca1fc2d..37c25af4f9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg index a5b4aa9aac..4669dcb57f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg @@ -67,7 +67,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg index b7f21f2449..7207ff17fa 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg @@ -73,7 +73,5 @@ top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_x_material_flow = =1.1 * wall_material_flow wall_x_material_flow_roofing = =wall_material_flow -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg index b4f500cd29..19b344a1b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg @@ -70,7 +70,5 @@ support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm.inst.cfg index 1c06b3206a..347a2f6898 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg index 1107e0ae89..6973077df4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg @@ -69,7 +69,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.35 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm.inst.cfg index f504aed78d..86ed61ff0c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm.inst.cfg @@ -68,7 +68,5 @@ support_top_distance = =support_z_distance support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg index 9453aa41cd..f0f022a0fa 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg @@ -73,7 +73,5 @@ top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_x_material_flow = =1.1 * wall_material_flow wall_x_material_flow_roofing = =wall_material_flow -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg index b4d3705503..82d20f7498 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg @@ -71,7 +71,5 @@ support_z_distance = 0.4 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg index a7d3b780e5..278ead1594 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg @@ -71,7 +71,5 @@ support_interface_enable = False support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg index 46c4e0e0e5..0d5d710e7b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg @@ -69,7 +69,5 @@ support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg index 81c80a3c87..8854b681d7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg @@ -69,7 +69,5 @@ support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg index a049c75173..dbff5632b7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg @@ -70,7 +70,5 @@ support_interface_enable = False support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg index 9efdfc7d57..c149805400 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg @@ -70,7 +70,5 @@ support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg index ffdb177247..785f23c008 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg @@ -70,7 +70,5 @@ support_structure = tree top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg index bbc57e29d9..9b3dbc2cf2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg @@ -70,7 +70,5 @@ support_interface_enable = False support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg index f3e8ca0332..ded73ff086 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg @@ -68,7 +68,5 @@ support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg index c5c7bc2732..9e435e175a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg @@ -68,7 +68,5 @@ support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg index 468ebdb9d6..757c7ce680 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg @@ -71,7 +71,5 @@ support_interface_enable = False support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg index 24221a0648..a701865092 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg @@ -69,7 +69,5 @@ support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg index 133469116d..e68093c7b2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg @@ -69,7 +69,5 @@ support_structure = tree top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) -z_seam_relative = True -z_seam_type = back zig_zaggify_infill = True diff --git a/plugins/XmlMaterialProfile/product_to_id.json b/resources/texts/product_to_id.json similarity index 100% rename from plugins/XmlMaterialProfile/product_to_id.json rename to resources/texts/product_to_id.json