diff --git a/.github/ISSUE_TEMPLATE/SlicingCrash.yaml b/.github/ISSUE_TEMPLATE/SlicingCrash.yaml index 37a70354c6..f4e082e00a 100644 --- a/.github/ISSUE_TEMPLATE/SlicingCrash.yaml +++ b/.github/ISSUE_TEMPLATE/SlicingCrash.yaml @@ -4,7 +4,7 @@ labels: ["Type: Bug", "Status: Triage", "Slicing Error :collision:"] body: - type: markdown attributes: - value: | + value: | ### 💥 Slicing Crash Analysis Tool 💥 We are taking steps to analyze an increase in reported crashes more systematically. We'll need some help with that. 😇 Before filling out the report below, we want you to try a special Cura 5.7 Alpha. diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 9a42f4f85d..2165540889 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -55,7 +55,7 @@ jobs: needs: [ conan-recipe-version ] with: recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - conan_extra_args: '-g VirtualPythonEnv -o cura:devtools=True -c tools.build:skip_test=False' + conan_extra_args: '-g VirtualPythonEnv -o cura:devtools=True -c tools.build:skip_test=False --options "*:enable_sentry=False"' unit_test_cmd: 'pytest --junitxml=junit_cura.xml' unit_test_dir: 'tests' conan_generator_dir: './venv/bin' diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja index 99bfa80078..2dce96282e 100644 --- a/UltiMaker-Cura.spec.jinja +++ b/UltiMaker-Cura.spec.jinja @@ -92,7 +92,7 @@ app = BUNDLE( }], 'CFBundleDocumentTypes': [{ 'CFBundleTypeRole': 'Viewer', - 'CFBundleTypeExtensions': ['*'], + 'CFBundleTypeExtensions': ['stl', 'obj', '3mf', 'gcode', 'ufp'], 'CFBundleTypeName': 'Model Files', }] }, diff --git a/conandata.yml b/conandata.yml index 2485dd8bd0..51a44c152d 100644 --- a/conandata.yml +++ b/conandata.yml @@ -159,6 +159,10 @@ pycharm_targets: module_name: Cura name: pytest in TestGCodeListDecorator.py script_name: tests/TestGCodeListDecorator.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestHitChecker.py + script_name: tests/TestHitChecker.py - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja module_name: Cura name: pytest in TestIntentManager.py @@ -187,6 +191,10 @@ pycharm_targets: module_name: Cura name: pytest in TestPrintInformation.py script_name: tests/TestPrintInformation.py + - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja + module_name: Cura + name: pytest in TestPrintOrderManager.py + script_name: tests/TestPrintOrderManager.py - jinja_path: .run_templates/pycharm_cura_test.run.xml.jinja module_name: Cura name: pytest in TestProfileRequirements.py diff --git a/conanfile.py b/conanfile.py index 3b48442fa0..ca6b4eabd0 100644 --- a/conanfile.py +++ b/conanfile.py @@ -350,6 +350,7 @@ class CuraConan(ConanFile): self.requires("cpython/3.10.4@ultimaker/stable") self.requires("clipper/6.4.2@ultimaker/stable") self.requires("openssl/3.2.0") + self.requires("protobuf/3.21.12") self.requires("boost/1.82.0") self.requires("spdlog/1.12.0") self.requires("fmt/10.1.1") diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 742d1872cb..56abfc0fa1 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -880,7 +880,7 @@ class BuildVolume(SceneNode): result[extruder.getId()] = [] # Currently, the only normally printed object is the prime tower. - if self._global_container_stack.getProperty("prime_tower_enable", "value"): + if self._global_container_stack.getProperty("prime_tower_mode", "value") != 'none': prime_tower_size = self._global_container_stack.getProperty("prime_tower_size", "value") machine_width = self._global_container_stack.getProperty("machine_width", "value") machine_depth = self._global_container_stack.getProperty("machine_depth", "value") @@ -1208,7 +1208,7 @@ class BuildVolume(SceneNode): _raft_settings = ["adhesion_type", "raft_base_thickness", "raft_interface_layers", "raft_interface_thickness", "raft_surface_layers", "raft_surface_thickness", "raft_airgap", "layer_0_z_overlap"] _extra_z_settings = ["retraction_hop_enabled", "retraction_hop"] _prime_settings = ["extruder_prime_pos_x", "extruder_prime_pos_y", "prime_blob_enable"] - _tower_settings = ["prime_tower_enable", "prime_tower_size", "prime_tower_position_x", "prime_tower_position_y", "prime_tower_brim_enable", "prime_tower_base_size", "prime_tower_base_height"] + _tower_settings = ["prime_tower_mode", "prime_tower_size", "prime_tower_position_x", "prime_tower_position_y", "prime_tower_brim_enable", "prime_tower_base_size", "prime_tower_base_height"] _ooze_shield_settings = ["ooze_shield_enabled", "ooze_shield_dist"] _distance_settings = ["infill_wipe_dist", "travel_avoid_distance", "support_offset", "support_enable", "travel_avoid_other_parts", "travel_avoid_supports", "wall_line_count", "wall_line_width_0", "wall_line_width_x"] _extruder_settings = ["support_enable", "support_bottom_enable", "support_roof_enable", "support_infill_extruder_nr", "support_extruder_nr_layer_0", "support_bottom_extruder_nr", "support_roof_extruder_nr", "brim_line_count", "skirt_brim_extruder_nr", "raft_base_extruder_nr", "raft_interface_extruder_nr", "raft_surface_extruder_nr", "adhesion_type"] #Settings that can affect which extruders are used. diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index edf4353ae8..6132d8ab36 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -126,6 +126,7 @@ from .Machines.Models.CompatibleMachineModel import CompatibleMachineModel from .Machines.Models.MachineListModel import MachineListModel from .Machines.Models.ActiveIntentQualitiesModel import ActiveIntentQualitiesModel from .Machines.Models.IntentSelectionModel import IntentSelectionModel +from .PrintOrderManager import PrintOrderManager from .SingleInstance import SingleInstance if TYPE_CHECKING: @@ -180,6 +181,7 @@ class CuraApplication(QtApplication): # Variables set from CLI self._files_to_open = [] + self._urls_to_open = [] self._use_single_instance = False self._single_instance = None @@ -203,6 +205,7 @@ class CuraApplication(QtApplication): self._container_manager = None self._object_manager = None + self._print_order_manager = None self._extruders_model = None self._extruders_model_with_optional = None self._build_plate_model = None @@ -334,7 +337,7 @@ class CuraApplication(QtApplication): for filename in self._cli_args.file: url = QUrl(filename) if url.scheme() in self._supported_url_schemes: - self._open_url_queue.append(url) + self._urls_to_open.append(url) else: self._files_to_open.append(os.path.abspath(filename)) @@ -357,7 +360,7 @@ class CuraApplication(QtApplication): self._machine_action_manager.initialize() def __sendCommandToSingleInstance(self): - self._single_instance = SingleInstance(self, self._files_to_open) + self._single_instance = SingleInstance(self, self._files_to_open, self._urls_to_open) # If we use single instance, try to connect to the single instance server, send commands, and then exit. # If we cannot find an existing single instance server, this is the only instance, so just keep going. @@ -598,7 +601,9 @@ class CuraApplication(QtApplication): preferences.addPreference("mesh/scale_to_fit", False) preferences.addPreference("mesh/scale_tiny_meshes", True) preferences.addPreference("cura/dialog_on_project_save", True) + preferences.addPreference("cura/dialog_on_ucp_project_save", True) preferences.addPreference("cura/asked_dialog_on_project_save", False) + preferences.addPreference("cura/asked_dialog_on_ucp_project_save", False) preferences.addPreference("cura/choice_on_profile_override", "always_ask") preferences.addPreference("cura/choice_on_open_project", "always_ask") preferences.addPreference("cura/use_multi_build_plate", False) @@ -614,6 +619,7 @@ class CuraApplication(QtApplication): preferences.addPreference("view/invert_zoom", False) preferences.addPreference("view/filter_current_build_plate", False) + preferences.addPreference("view/navigation_style", "cura") preferences.addPreference("cura/sidebar_collapsed", False) preferences.addPreference("cura/favorite_materials", "") @@ -906,6 +912,7 @@ class CuraApplication(QtApplication): # initialize info objects self._print_information = PrintInformation.PrintInformation(self) self._cura_actions = CuraActions.CuraActions(self) + self._print_order_manager = PrintOrderManager(self.getObjectsModel().getNodes) self.processEvents() # Initialize setting visibility presets model. self._setting_visibility_presets_model = SettingVisibilityPresetsModel(self.getPreferences(), parent = self) @@ -963,6 +970,8 @@ class CuraApplication(QtApplication): self.callLater(self._openFile, file_name) for file_name in self._open_file_queue: # Open all the files that were queued up while plug-ins were loading. self.callLater(self._openFile, file_name) + for url in self._urls_to_open: + self.callLater(self._openUrl, url) for url in self._open_url_queue: self.callLater(self._openUrl, url) @@ -986,6 +995,7 @@ class CuraApplication(QtApplication): t.setEnabledAxis([ToolHandle.XAxis, ToolHandle.YAxis, ToolHandle.ZAxis]) Selection.selectionChanged.connect(self.onSelectionChanged) + self._print_order_manager.printOrderChanged.connect(self._onPrintOrderChanged) # Set default background color for scene self.getRenderer().setBackgroundColor(QColor(245, 245, 245)) @@ -1075,6 +1085,10 @@ class CuraApplication(QtApplication): def getTextManager(self, *args) -> "TextManager": return self._text_manager + @pyqtSlot(bool) + def getWorkplaceDropToBuildplate(self, drop_to_build_plate: bool) ->None: + return self._physics.setAppPerModelDropDown(drop_to_build_plate) + def getCuraFormulaFunctions(self, *args) -> "CuraFormulaFunctions": if self._cura_formula_functions is None: self._cura_formula_functions = CuraFormulaFunctions(self) @@ -1101,6 +1115,10 @@ class CuraApplication(QtApplication): self._object_manager = ObjectsModel(self) return self._object_manager + @pyqtSlot(str, result = "QVariantList") + def getSupportedActionMachineList(self, definition_id: str) -> List["MachineAction"]: + return self._machine_action_manager.getSupportedActions(self._machine_manager.getDefinitionByMachineId(definition_id)) + @pyqtSlot(result = QObject) def getExtrudersModel(self, *args) -> "ExtrudersModel": if self._extruders_model is None: @@ -1126,6 +1144,16 @@ class CuraApplication(QtApplication): self._build_plate_model = BuildPlateModel(self) return self._build_plate_model + @pyqtSlot() + def exportUcp(self): + writer = self.getMeshFileHandler().getWriter("3MFWriter") + + if writer is None: + Logger.warning("3mf writer is not enabled") + return + + writer.exportUcp() + def getCuraSceneController(self, *args) -> CuraSceneController: if self._cura_scene_controller is None: self._cura_scene_controller = CuraSceneController.createCuraSceneController() @@ -1255,6 +1283,7 @@ class CuraApplication(QtApplication): self.processEvents() engine.rootContext().setContextProperty("Printer", self) engine.rootContext().setContextProperty("CuraApplication", self) + engine.rootContext().setContextProperty("PrintOrderManager", self._print_order_manager) engine.rootContext().setContextProperty("PrintInformation", self._print_information) engine.rootContext().setContextProperty("CuraActions", self._cura_actions) engine.rootContext().setContextProperty("CuraSDKVersion", ApplicationMetadata.CuraSDKVersion) @@ -1750,8 +1779,12 @@ class CuraApplication(QtApplication): Selection.remove(node) Selection.add(group_node) + all_nodes = self.getObjectsModel().getNodes() + PrintOrderManager.updatePrintOrdersAfterGroupOperation(all_nodes, group_node, selected_nodes) + @pyqtSlot() def ungroupSelected(self) -> None: + all_nodes = self.getObjectsModel().getNodes() selected_objects = Selection.getAllSelectedObjects().copy() for node in selected_objects: if node.callDecoration("isGroup"): @@ -1759,21 +1792,30 @@ class CuraApplication(QtApplication): group_parent = node.getParent() children = node.getChildren().copy() - for child in children: - # Ungroup only 1 level deep - if child.getParent() != node: - continue + # Ungroup only 1 level deep + children_to_ungroup = list(filter(lambda child: child.getParent() == node, children)) + for child in children_to_ungroup: # Set the parent of the children to the parent of the group-node op.addOperation(SetParentOperation(child, group_parent)) # Add all individual nodes to the selection Selection.add(child) + PrintOrderManager.updatePrintOrdersAfterUngroupOperation(all_nodes, node, children_to_ungroup) op.push() # Note: The group removes itself from the scene once all its children have left it, # see GroupDecorator._onChildrenChanged + def _onPrintOrderChanged(self) -> None: + # update object list + scene = self.getController().getScene() + scene.sceneChanged.emit(scene.getRoot()) + + # reset if already was sliced + Application.getInstance().getBackend().needsSlicing() + Application.getInstance().getBackend().tickle() + def _createSplashScreen(self) -> Optional[CuraSplashScreen.CuraSplashScreen]: if self._is_headless: return None diff --git a/cura/HitChecker.py b/cura/HitChecker.py new file mode 100644 index 0000000000..4b229e6b9b --- /dev/null +++ b/cura/HitChecker.py @@ -0,0 +1,88 @@ +from typing import List, Dict +from cura.Scene.CuraSceneNode import CuraSceneNode + + +class HitChecker: + """Checks if nodes can be printed without causing any collisions and interference""" + + def __init__(self, nodes: List[CuraSceneNode]) -> None: + self._hit_map = self._buildHitMap(nodes) + + def anyTwoNodesBlockEachOther(self, nodes: List[CuraSceneNode]) -> bool: + """Returns True if any 2 nodes block each other""" + for a in nodes: + for b in nodes: + if self._hit_map[a][b] and self._hit_map[b][a]: + return True + return False + + def canPrintBefore(self, node: CuraSceneNode, other_nodes: List[CuraSceneNode]) -> bool: + """Returns True if node doesn't block other_nodes and can be printed before them""" + no_hits = all(not self._hit_map[node][other_node] for other_node in other_nodes) + return no_hits + + def canPrintAfter(self, node: CuraSceneNode, other_nodes: List[CuraSceneNode]) -> bool: + """Returns True if node doesn't hit other nodes and can be printed after them""" + no_hits = all(not self._hit_map[other_node][node] for other_node in other_nodes) + return no_hits + + def calculateScore(self, a: CuraSceneNode, b: CuraSceneNode) -> int: + """Calculate score simply sums the number of other objects it 'blocks' + + :param a: node + :param b: node + :return: sum of the number of other objects + """ + + score_a = sum(self._hit_map[a].values()) + score_b = sum(self._hit_map[b].values()) + return score_a - score_b + + def canPrintNodesInProvidedOrder(self, ordered_nodes: List[CuraSceneNode]) -> bool: + """Returns True If nodes don't have any hits in provided order""" + for node_index, node in enumerate(ordered_nodes): + nodes_before = ordered_nodes[:node_index - 1] if node_index - 1 >= 0 else [] + nodes_after = ordered_nodes[node_index + 1:] if node_index + 1 < len(ordered_nodes) else [] + if not self.canPrintBefore(node, nodes_after) or not self.canPrintAfter(node, nodes_before): + return False + return True + + @staticmethod + def _buildHitMap(nodes: List[CuraSceneNode]) -> Dict[CuraSceneNode, CuraSceneNode]: + """Pre-computes all hits between all objects + + :nodes: nodes that need to be checked for collisions + :return: dictionary where hit_map[node1][node2] is False if there node1 can be printed before node2 + """ + hit_map = {j: {i: HitChecker._checkHit(j, i) for i in nodes} for j in nodes} + return hit_map + + @staticmethod + def _checkHit(a: CuraSceneNode, b: CuraSceneNode) -> bool: + """Checks if a can be printed before b + + :param a: node + :param b: node + :return: False if a can be printed before b + """ + + if a == b: + return False + + a_hit_hull = a.callDecoration("getConvexHullBoundary") + b_hit_hull = b.callDecoration("getConvexHullHeadFull") + overlap = a_hit_hull.intersectsPolygon(b_hit_hull) + + if overlap: + return True + + # Adhesion areas must never overlap, regardless of printing order + # This would cause over-extrusion + a_hit_hull = a.callDecoration("getAdhesionArea") + b_hit_hull = b.callDecoration("getAdhesionArea") + overlap = a_hit_hull.intersectsPolygon(b_hit_hull) + + if overlap: + return True + else: + return False diff --git a/cura/OAuth2/AuthorizationHelpers.py b/cura/OAuth2/AuthorizationHelpers.py index 569ba80659..3e7dabaf08 100644 --- a/cura/OAuth2/AuthorizationHelpers.py +++ b/cura/OAuth2/AuthorizationHelpers.py @@ -16,6 +16,7 @@ from UM.TaskManagement.HttpRequestManager import HttpRequestManager # To downlo catalog = i18nCatalog("cura") TOKEN_TIMESTAMP_FORMAT = "%Y-%m-%d %H:%M:%S" +REQUEST_TIMEOUT = 5 # Seconds class AuthorizationHelpers: @@ -53,7 +54,8 @@ class AuthorizationHelpers: data = urllib.parse.urlencode(data).encode("UTF-8"), headers_dict = headers, callback = lambda response: self.parseTokenResponse(response, callback), - error_callback = lambda response, _: self.parseTokenResponse(response, callback) + error_callback = lambda response, _: self.parseTokenResponse(response, callback), + timeout = REQUEST_TIMEOUT ) def getAccessTokenUsingRefreshToken(self, refresh_token: str, callback: Callable[[AuthenticationResponse], None]) -> None: @@ -77,7 +79,9 @@ class AuthorizationHelpers: data = urllib.parse.urlencode(data).encode("UTF-8"), headers_dict = headers, callback = lambda response: self.parseTokenResponse(response, callback), - error_callback = lambda response, _: self.parseTokenResponse(response, callback) + error_callback = lambda response, _: self.parseTokenResponse(response, callback), + urgent = True, + timeout = REQUEST_TIMEOUT ) def parseTokenResponse(self, token_response: QNetworkReply, callback: Callable[[AuthenticationResponse], None]) -> None: @@ -122,7 +126,8 @@ class AuthorizationHelpers: check_token_url, headers_dict = headers, callback = lambda reply: self._parseUserProfile(reply, success_callback, failed_callback), - error_callback = lambda _, _2: failed_callback() if failed_callback is not None else None + error_callback = lambda _, _2: failed_callback() if failed_callback is not None else None, + timeout = REQUEST_TIMEOUT ) def _parseUserProfile(self, reply: QNetworkReply, success_callback: Optional[Callable[[UserProfile], None]], failed_callback: Optional[Callable[[], None]] = None) -> None: diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py index 06478e911b..4e8d28173a 100644 --- a/cura/OAuth2/AuthorizationService.py +++ b/cura/OAuth2/AuthorizationService.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. import json @@ -6,13 +6,14 @@ from datetime import datetime, timedelta from typing import Callable, Dict, Optional, TYPE_CHECKING, Union from urllib.parse import urlencode, quote_plus -from PyQt6.QtCore import QUrl +from PyQt6.QtCore import QUrl, QTimer from PyQt6.QtGui import QDesktopServices from UM.Logger import Logger from UM.Message import Message from UM.Signal import Signal from UM.i18n import i18nCatalog +from UM.TaskManagement.HttpRequestManager import HttpRequestManager # To download log-in tokens. from cura.OAuth2.AuthorizationHelpers import AuthorizationHelpers, TOKEN_TIMESTAMP_FORMAT from cura.OAuth2.LocalAuthorizationServer import LocalAuthorizationServer from cura.OAuth2.Models import AuthenticationResponse, BaseModel @@ -25,6 +26,8 @@ if TYPE_CHECKING: MYCLOUD_LOGOFF_URL = "https://account.ultimaker.com/logoff?utm_source=cura&utm_medium=software&utm_campaign=change-account-before-adding-printers" +REFRESH_TOKEN_MAX_RETRIES = 15 +REFRESH_TOKEN_RETRY_INTERVAL = 1000 class AuthorizationService: """The authorization service is responsible for handling the login flow, storing user credentials and providing @@ -57,6 +60,12 @@ class AuthorizationService: self.onAuthStateChanged.connect(self._authChanged) + self._refresh_token_retries = 0 + self._refresh_token_retry_timer = QTimer() + self._refresh_token_retry_timer.setInterval(REFRESH_TOKEN_RETRY_INTERVAL) + self._refresh_token_retry_timer.setSingleShot(True) + self._refresh_token_retry_timer.timeout.connect(self.refreshAccessToken) + def _authChanged(self, logged_in): if logged_in and self._unable_to_get_data_message is not None: self._unable_to_get_data_message.hide() @@ -167,16 +176,29 @@ class AuthorizationService: return def process_auth_data(response: AuthenticationResponse) -> None: + self._currently_refreshing_token = False + if response.success: + self._refresh_token_retries = 0 self._storeAuthData(response) + HttpRequestManager.getInstance().setDelayRequests(False) self.onAuthStateChanged.emit(logged_in = True) else: - Logger.warning("Failed to get a new access token from the server.") - self.onAuthStateChanged.emit(logged_in = False) + if self._refresh_token_retries >= REFRESH_TOKEN_MAX_RETRIES: + self._refresh_token_retries = 0 + Logger.warning("Failed to get a new access token from the server, giving up.") + HttpRequestManager.getInstance().setDelayRequests(False) + self.onAuthStateChanged.emit(logged_in = False) + else: + # Retry a bit later, network may be offline right now and will hopefully be back soon + Logger.warning("Failed to get a new access token from the server, retrying later.") + self._refresh_token_retries += 1 + self._refresh_token_retry_timer.start() if self._currently_refreshing_token: Logger.debug("Was already busy refreshing token. Do not start a new request.") return + HttpRequestManager.getInstance().setDelayRequests(True) self._currently_refreshing_token = True self._auth_helpers.getAccessTokenUsingRefreshToken(self._auth_data.refresh_token, process_auth_data) diff --git a/cura/OneAtATimeIterator.py b/cura/OneAtATimeIterator.py index 8bdddba554..1017cfc79e 100644 --- a/cura/OneAtATimeIterator.py +++ b/cura/OneAtATimeIterator.py @@ -7,6 +7,11 @@ from UM.Scene.Iterator import Iterator from UM.Scene.SceneNode import SceneNode from functools import cmp_to_key +from cura.HitChecker import HitChecker +from cura.PrintOrderManager import PrintOrderManager +from cura.Scene.CuraSceneNode import CuraSceneNode + + class OneAtATimeIterator(Iterator.Iterator): """Iterator that returns a list of nodes in the order that they need to be printed @@ -16,8 +21,6 @@ class OneAtATimeIterator(Iterator.Iterator): def __init__(self, scene_node) -> None: super().__init__(scene_node) # Call super to make multiple inheritance work. - self._hit_map = [[]] # type: List[List[bool]] # For each node, which other nodes this hits. A grid of booleans on which nodes hit which. - self._original_node_list = [] # type: List[SceneNode] # The nodes that need to be checked for collisions. def _fillStack(self) -> None: """Fills the ``_node_stack`` with a list of scene nodes that need to be printed in order. """ @@ -38,104 +41,50 @@ class OneAtATimeIterator(Iterator.Iterator): self._node_stack = node_list[:] return - # Copy the list - self._original_node_list = node_list[:] + hit_checker = HitChecker(node_list) - # Initialise the hit map (pre-compute all hits between all objects) - self._hit_map = [[self._checkHit(i, j) for i in node_list] for j in node_list] + if PrintOrderManager.isUserDefinedPrintOrderEnabled(): + self._node_stack = self._getNodesOrderedByUser(hit_checker, node_list) + else: + self._node_stack = self._getNodesOrderedAutomatically(hit_checker, node_list) - # Check if we have to files that block each other. If this is the case, there is no solution! - for a in range(0, len(node_list)): - for b in range(0, len(node_list)): - if a != b and self._hit_map[a][b] and self._hit_map[b][a]: - return + # update print orders so that user can try to arrange the nodes automatically first + # and if result is not satisfactory he/she can switch to manual mode and change it + for index, node in enumerate(self._node_stack): + node.printOrder = index + 1 + + @staticmethod + def _getNodesOrderedByUser(hit_checker: HitChecker, node_list: List[CuraSceneNode]) -> List[CuraSceneNode]: + nodes_ordered_by_user = sorted(node_list, key=lambda n: n.printOrder) + if hit_checker.canPrintNodesInProvidedOrder(nodes_ordered_by_user): + return nodes_ordered_by_user + return [] # No solution + + @staticmethod + def _getNodesOrderedAutomatically(hit_checker: HitChecker, node_list: List[CuraSceneNode]) -> List[CuraSceneNode]: + # Check if we have two files that block each other. If this is the case, there is no solution! + if hit_checker.anyTwoNodesBlockEachOther(node_list): + return [] # No solution # Sort the original list so that items that block the most other objects are at the beginning. # This does not decrease the worst case running time, but should improve it in most cases. - sorted(node_list, key = cmp_to_key(self._calculateScore)) + node_list = sorted(node_list, key = cmp_to_key(hit_checker.calculateScore)) todo_node_list = [_ObjectOrder([], node_list)] while len(todo_node_list) > 0: current = todo_node_list.pop() for node in current.todo: # Check if the object can be placed with what we have and still allows for a solution in the future - if not self._checkHitMultiple(node, current.order) and not self._checkBlockMultiple(node, current.todo): + if hit_checker.canPrintAfter(node, current.order) and hit_checker.canPrintBefore(node, current.todo): # We found a possible result. Create new todo & order list. new_todo_list = current.todo[:] new_todo_list.remove(node) new_order = current.order[:] + [node] if len(new_todo_list) == 0: # We have no more nodes to check, so quit looking. - self._node_stack = new_order - return + return new_order # Solution found! todo_node_list.append(_ObjectOrder(new_order, new_todo_list)) - self._node_stack = [] #No result found! - - - # Check if first object can be printed before the provided list (using the hit map) - def _checkHitMultiple(self, node: SceneNode, other_nodes: List[SceneNode]) -> bool: - node_index = self._original_node_list.index(node) - for other_node in other_nodes: - other_node_index = self._original_node_list.index(other_node) - if self._hit_map[node_index][other_node_index]: - return True - return False - - def _checkBlockMultiple(self, node: SceneNode, other_nodes: List[SceneNode]) -> bool: - """Check for a node whether it hits any of the other nodes. - - :param node: The node to check whether it collides with the other nodes. - :param other_nodes: The nodes to check for collisions. - :return: returns collision between nodes - """ - - node_index = self._original_node_list.index(node) - for other_node in other_nodes: - other_node_index = self._original_node_list.index(other_node) - if self._hit_map[other_node_index][node_index] and node_index != other_node_index: - return True - return False - - def _calculateScore(self, a: SceneNode, b: SceneNode) -> int: - """Calculate score simply sums the number of other objects it 'blocks' - - :param a: node - :param b: node - :return: sum of the number of other objects - """ - - score_a = sum(self._hit_map[self._original_node_list.index(a)]) - score_b = sum(self._hit_map[self._original_node_list.index(b)]) - return score_a - score_b - - def _checkHit(self, a: SceneNode, b: SceneNode) -> bool: - """Checks if a can be printed before b - - :param a: node - :param b: node - :return: true if a can be printed before b - """ - - if a == b: - return False - - a_hit_hull = a.callDecoration("getConvexHullBoundary") - b_hit_hull = b.callDecoration("getConvexHullHeadFull") - overlap = a_hit_hull.intersectsPolygon(b_hit_hull) - - if overlap: - return True - - # Adhesion areas must never overlap, regardless of printing order - # This would cause over-extrusion - a_hit_hull = a.callDecoration("getAdhesionArea") - b_hit_hull = b.callDecoration("getAdhesionArea") - overlap = a_hit_hull.intersectsPolygon(b_hit_hull) - - if overlap: - return True - else: - return False + return [] # No result found! class _ObjectOrder: diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index 1ef39de80d..6a26190a56 100755 --- a/cura/PlatformPhysics.py +++ b/cura/PlatformPhysics.py @@ -38,7 +38,14 @@ class PlatformPhysics: self._minimum_gap = 2 # It is a minimum distance (in mm) between two models, applicable for small models Application.getInstance().getPreferences().addPreference("physics/automatic_push_free", False) - Application.getInstance().getPreferences().addPreference("physics/automatic_drop_down", True) + Application.getInstance().getPreferences().addPreference("physics/automatic_drop_down", False) + self._app_per_model_drop = Application.getInstance().getPreferences().getValue("physics/automatic_drop_down") + + def getAppPerModelDropDown(self): + return self._app_per_model_drop + + def setAppPerModelDropDown(self, drop_to_buildplate): + self._app_per_model_drop = drop_to_buildplate def _onSceneChanged(self, source): if not source.callDecoration("isSliceable"): @@ -71,6 +78,7 @@ class PlatformPhysics: # We try to shuffle all the nodes to prevent "locked" situations, where iteration B inverts iteration A. # By shuffling the order of the nodes, this might happen a few times, but at some point it will resolve. random.shuffle(nodes) + for node in nodes: if node is root or not isinstance(node, SceneNode) or node.getBoundingBox() is None: continue @@ -80,7 +88,10 @@ class PlatformPhysics: # Move it downwards if bottom is above platform move_vector = Vector() - if node.getSetting(SceneNodeSettings.AutoDropDown, app_automatic_drop_down) and not (node.getParent() and node.getParent().callDecoration("isGroup") or node.getParent() != root) and node.isEnabled(): #If an object is grouped, don't move it down + # if per model drop is different then app_automatic_drop, in case of 3mf loading when user changes this setting for that model + if (self._app_per_model_drop != app_automatic_drop_down): + node.setSetting(SceneNodeSettings.AutoDropDown, self._app_per_model_drop) + if node.getSetting(SceneNodeSettings.AutoDropDown, self._app_per_model_drop) and not (node.getParent() and node.getParent().callDecoration("isGroup") or node.getParent() != root) and node.isEnabled(): #If an object is grouped, don't move it down z_offset = node.callDecoration("getZOffset") if node.getDecorator(ZOffsetDecorator.ZOffsetDecorator) else 0 move_vector = move_vector.set(y = -bbox.bottom + z_offset) @@ -168,6 +179,8 @@ class PlatformPhysics: op = PlatformPhysicsOperation.PlatformPhysicsOperation(node, move_vector) op.push() + # setting this drop to model same as app_automatic_drop_down + self._app_per_model_drop = app_automatic_drop_down # After moving, we have to evaluate the boundary checks for nodes build_volume.updateNodeBoundaryCheck() diff --git a/cura/PrintOrderManager.py b/cura/PrintOrderManager.py new file mode 100644 index 0000000000..80fc1e99dc --- /dev/null +++ b/cura/PrintOrderManager.py @@ -0,0 +1,171 @@ +from typing import List, Callable, Optional, Any + +from PyQt6.QtCore import pyqtProperty, pyqtSignal, QObject, pyqtSlot +from UM.Application import Application +from UM.Scene.Selection import Selection + +from cura.Scene.CuraSceneNode import CuraSceneNode + + +class PrintOrderManager(QObject): + """Allows to order the object list to set the print sequence manually""" + + def __init__(self, get_nodes: Callable[[], List[CuraSceneNode]]) -> None: + super().__init__() + self._get_nodes = get_nodes + self._configureEvents() + + _settingsChanged = pyqtSignal() + _uiActionsOutdated = pyqtSignal() + printOrderChanged = pyqtSignal() + + @pyqtSlot() + def swapSelectedAndPreviousNodes(self) -> None: + selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes() + self._swapPrintOrders(selected_node, previous_node) + + @pyqtSlot() + def swapSelectedAndNextNodes(self) -> None: + selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes() + self._swapPrintOrders(selected_node, next_node) + + @pyqtProperty(str, notify=_uiActionsOutdated) + def previousNodeName(self) -> str: + selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes() + return self._getNodeName(previous_node) + + @pyqtProperty(str, notify=_uiActionsOutdated) + def nextNodeName(self) -> str: + selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes() + return self._getNodeName(next_node) + + @pyqtProperty(bool, notify=_uiActionsOutdated) + def shouldEnablePrintBeforeAction(self) -> bool: + selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes() + can_swap_with_previous_node = selected_node is not None and previous_node is not None + return can_swap_with_previous_node + + @pyqtProperty(bool, notify=_uiActionsOutdated) + def shouldEnablePrintAfterAction(self) -> bool: + selected_node, previous_node, next_node = self._getSelectedAndNeighborNodes() + can_swap_with_next_node = selected_node is not None and next_node is not None + return can_swap_with_next_node + + @pyqtProperty(bool, notify=_settingsChanged) + def shouldShowEditPrintOrderActions(self) -> bool: + return PrintOrderManager.isUserDefinedPrintOrderEnabled() + + @staticmethod + def isUserDefinedPrintOrderEnabled() -> bool: + stack = Application.getInstance().getGlobalContainerStack() + is_enabled = stack and \ + stack.getProperty("print_sequence", "value") == "one_at_a_time" and \ + stack.getProperty("user_defined_print_order_enabled", "value") + return bool(is_enabled) + + @staticmethod + def initializePrintOrders(nodes: List[CuraSceneNode]) -> None: + """Just created (loaded from file) nodes have print order 0. + + This method initializes print orders with max value to put nodes at the end of object list""" + max_print_order = max(map(lambda n: n.printOrder, nodes), default=0) + for node in nodes: + if node.printOrder == 0: + max_print_order += 1 + node.printOrder = max_print_order + + @staticmethod + def updatePrintOrdersAfterGroupOperation( + all_nodes: List[CuraSceneNode], + group_node: CuraSceneNode, + grouped_nodes: List[CuraSceneNode] + ) -> None: + group_node.printOrder = min(map(lambda n: n.printOrder, grouped_nodes)) + + all_nodes.append(group_node) + for node in grouped_nodes: + all_nodes.remove(node) + + # reassign print orders so there won't be gaps like 1 2 5 6 7 + sorted_nodes = sorted(all_nodes, key=lambda n: n.printOrder) + for i, node in enumerate(sorted_nodes): + node.printOrder = i + 1 + + @staticmethod + def updatePrintOrdersAfterUngroupOperation( + all_nodes: List[CuraSceneNode], + group_node: CuraSceneNode, + ungrouped_nodes: List[CuraSceneNode] + ) -> None: + all_nodes.remove(group_node) + nodes_to_update_print_order = filter(lambda n: n.printOrder > group_node.printOrder, all_nodes) + for node in nodes_to_update_print_order: + node.printOrder += len(ungrouped_nodes) - 1 + + for i, child in enumerate(ungrouped_nodes): + child.printOrder = group_node.printOrder + i + all_nodes.append(child) + + def _swapPrintOrders(self, node1: CuraSceneNode, node2: CuraSceneNode) -> None: + if node1 and node2: + node1.printOrder, node2.printOrder = node2.printOrder, node1.printOrder # swap print orders + self.printOrderChanged.emit() # update object list first + self._uiActionsOutdated.emit() # then update UI actions + + def _getSelectedAndNeighborNodes(self + ) -> (Optional[CuraSceneNode], Optional[CuraSceneNode], Optional[CuraSceneNode]): + nodes = self._get_nodes() + ordered_nodes = sorted(nodes, key=lambda n: n.printOrder) + selected_node = PrintOrderManager._getSingleSelectedNode() + if selected_node and selected_node in ordered_nodes: + selected_node_index = ordered_nodes.index(selected_node) + else: + selected_node_index = None + + if selected_node_index is not None and selected_node_index - 1 >= 0: + previous_node = ordered_nodes[selected_node_index - 1] + else: + previous_node = None + + if selected_node_index is not None and selected_node_index + 1 < len(ordered_nodes): + next_node = ordered_nodes[selected_node_index + 1] + else: + next_node = None + + return selected_node, previous_node, next_node + + @staticmethod + def _getNodeName(node: CuraSceneNode, max_length: int = 30) -> str: + node_name = node.getName() if node else "" + truncated_node_name = node_name[:max_length] + return truncated_node_name + + @staticmethod + def _getSingleSelectedNode() -> Optional[CuraSceneNode]: + if len(Selection.getAllSelectedObjects()) == 1: + selected_node = Selection.getSelectedObject(0) + return selected_node + return None + + def _configureEvents(self) -> None: + Selection.selectionChanged.connect(self._onSelectionChanged) + self._global_stack = None + Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged) + self._onGlobalStackChanged() + + def _onGlobalStackChanged(self) -> None: + if self._global_stack: + self._global_stack.propertyChanged.disconnect(self._onSettingsChanged) + self._global_stack.containersChanged.disconnect(self._onSettingsChanged) + + self._global_stack = Application.getInstance().getGlobalContainerStack() + + if self._global_stack: + self._global_stack.propertyChanged.connect(self._onSettingsChanged) + self._global_stack.containersChanged.connect(self._onSettingsChanged) + + def _onSettingsChanged(self, *args: Any) -> None: + self._settingsChanged.emit() + + def _onSelectionChanged(self) -> None: + self._uiActionsOutdated.emit() diff --git a/cura/Scene/CuraSceneNode.py b/cura/Scene/CuraSceneNode.py index 5fbaded650..9b412c7d4f 100644 --- a/cura/Scene/CuraSceneNode.py +++ b/cura/Scene/CuraSceneNode.py @@ -25,10 +25,19 @@ class CuraSceneNode(SceneNode): if not no_setting_override: self.addDecorator(SettingOverrideDecorator()) # Now we always have a getActiveExtruderPosition, unless explicitly disabled self._outside_buildarea = False + self._print_order = 0 def setOutsideBuildArea(self, new_value: bool) -> None: self._outside_buildarea = new_value + @property + def printOrder(self): + return self._print_order + + @printOrder.setter + def printOrder(self, new_value): + self._print_order = new_value + def isOutsideBuildArea(self) -> bool: return self._outside_buildarea or self.callDecoration("getBuildPlateNumber") < 0 @@ -157,3 +166,6 @@ class CuraSceneNode(SceneNode): def transformChanged(self) -> None: self._transformChanged() + + def __repr__(self) -> str: + return "{print_order}. {name}".format(print_order = self._print_order, name = self.getName()) diff --git a/cura/SingleInstance.py b/cura/SingleInstance.py index 61ab1204fe..0448ddc647 100644 --- a/cura/SingleInstance.py +++ b/cura/SingleInstance.py @@ -5,16 +5,18 @@ import json import os from typing import List, Optional +from PyQt6.QtCore import QUrl from PyQt6.QtNetwork import QLocalServer, QLocalSocket -from UM.Qt.QtApplication import QtApplication #For typing. +from UM.Qt.QtApplication import QtApplication # For typing. from UM.Logger import Logger class SingleInstance: - def __init__(self, application: QtApplication, files_to_open: Optional[List[str]]) -> None: + def __init__(self, application: QtApplication, files_to_open: Optional[List[str]], url_to_open: Optional[List[str]]) -> None: self._application = application self._files_to_open = files_to_open + self._url_to_open = url_to_open self._single_instance_server = None @@ -33,7 +35,7 @@ class SingleInstance: return False # We only send the files that need to be opened. - if not self._files_to_open: + if not self._files_to_open and not self._url_to_open: Logger.log("i", "No file need to be opened, do nothing.") return True @@ -55,8 +57,12 @@ class SingleInstance: payload = {"command": "open", "filePath": os.path.abspath(filename)} single_instance_socket.write(bytes(json.dumps(payload) + "\n", encoding = "ascii")) + for url in self._url_to_open: + payload = {"command": "open-url", "urlPath": url.toString()} + single_instance_socket.write(bytes(json.dumps(payload) + "\n", encoding="ascii")) + payload = {"command": "close-connection"} - single_instance_socket.write(bytes(json.dumps(payload) + "\n", encoding = "ascii")) + single_instance_socket.write(bytes(json.dumps(payload) + "\n", encoding="ascii")) single_instance_socket.flush() single_instance_socket.waitForDisconnected() @@ -72,7 +78,7 @@ class SingleInstance: def _onClientConnected(self) -> None: Logger.log("i", "New connection received on our single-instance server") - connection = None #type: Optional[QLocalSocket] + connection = None # type: Optional[QLocalSocket] if self._single_instance_server: connection = self._single_instance_server.nextPendingConnection() @@ -81,7 +87,7 @@ class SingleInstance: def __readCommands(self, connection: QLocalSocket) -> None: line = connection.readLine() - while len(line) != 0: # There is also a .canReadLine() + while len(line) != 0: # There is also a .canReadLine() try: payload = json.loads(str(line, encoding = "ascii").strip()) command = payload["command"] @@ -94,13 +100,19 @@ class SingleInstance: elif command == "open": self._application.callLater(lambda f = payload["filePath"]: self._application._openFile(f)) + #command: Load a url link in Cura + elif command == "open-url": + url = QUrl(payload["urlPath"]) + self._application.callLater(lambda: self._application._openUrl(url)) + + # Command: Activate the window and bring it to the top. elif command == "focus": # Operating systems these days prevent windows from moving around by themselves. # 'alert' or flashing the icon in the taskbar is the best thing we do now. main_window = self._application.getMainWindow() if main_window is not None: - self._application.callLater(lambda: main_window.alert(0)) # type: ignore # I don't know why MyPy complains here + self._application.callLater(lambda: main_window.alert(0)) # type: ignore # I don't know why MyPy complains here # Command: Close the socket connection. We're done. elif command == "close-connection": diff --git a/cura/UI/ObjectsModel.py b/cura/UI/ObjectsModel.py index 4f64270247..4d5a4dfc81 100644 --- a/cura/UI/ObjectsModel.py +++ b/cura/UI/ObjectsModel.py @@ -14,6 +14,9 @@ from UM.Scene.SceneNode import SceneNode from UM.Scene.Selection import Selection from UM.i18n import i18nCatalog +from cura.PrintOrderManager import PrintOrderManager +from cura.Scene.CuraSceneNode import CuraSceneNode + catalog = i18nCatalog("cura") @@ -76,6 +79,9 @@ class ObjectsModel(ListModel): self._build_plate_number = nr self._update() + def getNodes(self) -> List[CuraSceneNode]: + return list(map(lambda n: n["node"], self.items)) + def _updateSceneDelayed(self, source) -> None: if not isinstance(source, Camera): self._update_timer.start() @@ -175,6 +181,10 @@ class ObjectsModel(ListModel): all_nodes = self._renameNodes(name_to_node_info_dict) + user_defined_print_order_enabled = PrintOrderManager.isUserDefinedPrintOrderEnabled() + if user_defined_print_order_enabled: + PrintOrderManager.initializePrintOrders(all_nodes) + for node in all_nodes: if hasattr(node, "isOutsideBuildArea"): is_outside_build_area = node.isOutsideBuildArea() # type: ignore @@ -223,8 +233,13 @@ class ObjectsModel(ListModel): # for anti overhang meshes and groups the extruder nr is irrelevant extruder_number = -1 + if not user_defined_print_order_enabled: + name = node.getName() + else: + name = "{print_order}. {name}".format(print_order = node.printOrder, name = node.getName()) + nodes.append({ - "name": node.getName(), + "name": name, "selected": Selection.isSelected(node), "outside_build_area": is_outside_build_area, "buildplate_number": node_build_plate_number, @@ -234,5 +249,5 @@ class ObjectsModel(ListModel): "node": node }) - nodes = sorted(nodes, key=lambda n: n["name"]) + nodes = sorted(nodes, key=lambda n: n["name"] if not user_defined_print_order_enabled else n["node"].printOrder) self.setItems(nodes) diff --git a/plugins/3MFReader/SpecificSettingsModel.py b/plugins/3MFReader/SpecificSettingsModel.py new file mode 100644 index 0000000000..fd5719d6b3 --- /dev/null +++ b/plugins/3MFReader/SpecificSettingsModel.py @@ -0,0 +1,38 @@ +# Copyright (c) 2024 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from PyQt6.QtCore import Qt + +from UM.Settings.SettingDefinition import SettingDefinition +from UM.Qt.ListModel import ListModel + + +class SpecificSettingsModel(ListModel): + CategoryRole = Qt.ItemDataRole.UserRole + 1 + LabelRole = Qt.ItemDataRole.UserRole + 2 + ValueRole = Qt.ItemDataRole.UserRole + 3 + + def __init__(self, parent = None): + super().__init__(parent = parent) + self.addRoleName(self.CategoryRole, "category") + self.addRoleName(self.LabelRole, "label") + self.addRoleName(self.ValueRole, "value") + + self._i18n_catalog = None + + def addSettingsFromStack(self, stack, category, settings): + for setting, value in settings.items(): + unit = stack.getProperty(setting, "unit") + + setting_type = stack.getProperty(setting, "type") + if setting_type is not None: + # This is not very good looking, but will do for now + value = SettingDefinition.settingValueToString(setting_type, value) + " " + unit + else: + value = str(value) + + self.appendItem({ + "category": category, + "label": stack.getProperty(setting, "label"), + "value": value + }) diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index 13a97d5a89..ac94282136 100755 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -41,7 +41,7 @@ class ThreeMFReader(MeshReader): MimeTypeDatabase.addMimeType( MimeType( - name = "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", + name="application/vnd.ms-package.3dmanufacturing-3dmodel+xml", comment="3MF", suffixes=["3mf"] ) @@ -177,6 +177,9 @@ class ThreeMFReader(MeshReader): else: Logger.log("w", "Unable to find extruder in position %s", setting_value) continue + if key == "print_order": + um_node.printOrder = int(setting_value) + continue if key in known_setting_keys: setting_container.setProperty(key, "value", setting_value) else: diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index b97cb34b01..25e2afa8bd 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -5,6 +5,7 @@ from configparser import ConfigParser import zipfile import os import json +import re from typing import cast, Dict, List, Optional, Tuple, Any, Set import xml.etree.ElementTree as ET @@ -57,6 +58,7 @@ _ignored_machine_network_metadata: Set[str] = { "is_abstract_machine" } +USER_SETTINGS_PATH = "Cura/user-settings.json" class ContainerInfo: def __init__(self, file_name: Optional[str], serialized: Optional[str], parser: Optional[ConfigParser]) -> None: @@ -141,10 +143,15 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._old_new_materials: Dict[str, str] = {} self._machine_info = None + self._load_profile = False + self._user_settings: Dict[str, Dict[str, Any]] = {} + def _clearState(self): self._id_mapping = {} self._old_new_materials = {} self._machine_info = None + self._load_profile = False + self._user_settings = {} def getNewId(self, old_id: str): """Get a unique name based on the old_id. This is different from directly calling the registry in that it caches results. @@ -228,11 +235,14 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._resolve_strategies = {k: None for k in resolve_strategy_keys} containers_found_dict = {k: False for k in resolve_strategy_keys} + # Check whether the file is a UCP, which changes some import options + is_ucp = USER_SETTINGS_PATH in cura_file_names + # # Read definition containers # machine_definition_id = None - updatable_machines = [] + updatable_machines = None if is_ucp else [] machine_definition_container_count = 0 extruder_definition_container_count = 0 definition_container_files = [name for name in cura_file_names if name.endswith(self._definition_container_suffix)] @@ -250,7 +260,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if definition_container_type == "machine": machine_definition_id = container_id machine_definition_containers = self._container_registry.findDefinitionContainers(id = machine_definition_id) - if machine_definition_containers: + if machine_definition_containers and updatable_machines is not None: updatable_machines = [machine for machine in self._container_registry.findContainerStacks(type = "machine") if machine.definition == machine_definition_containers[0]] machine_type = definition_container["name"] variant_type_name = definition_container.get("variants_name", variant_type_name) @@ -597,6 +607,37 @@ class ThreeMFWorkspaceReader(WorkspaceReader): package_metadata = self._parse_packages_metadata(archive) missing_package_metadata = self._filter_missing_package_metadata(package_metadata) + # Load the user specifically exported settings + self._dialog.exportedSettingModel.clear() + if is_ucp: + try: + self._user_settings = json.loads(archive.open("Cura/user-settings.json").read().decode("utf-8")) + any_extruder_stack = ExtruderManager.getInstance().getExtruderStack(0) + actual_global_stack = CuraApplication.getInstance().getGlobalContainerStack() + + for stack_name, settings in self._user_settings.items(): + if stack_name == 'global': + self._dialog.exportedSettingModel.addSettingsFromStack(actual_global_stack, i18n_catalog.i18nc("@label", "Global"), settings) + else: + extruder_match = re.fullmatch('extruder_([0-9]+)', stack_name) + if extruder_match is not None: + extruder_nr = int(extruder_match.group(1)) + self._dialog.exportedSettingModel.addSettingsFromStack(any_extruder_stack, + i18n_catalog.i18nc("@label", + "Extruder {0}", extruder_nr + 1), + settings) + except KeyError as e: + # If there is no user settings file, it's not a UCP, so notify user of failure. + Logger.log("w", "File %s is not a valid UCP.", file_name) + message = Message( + i18n_catalog.i18nc("@info:error Don't translate the XML tags or !", + "Project file {0} is corrupt: {1}.", + file_name, str(e)), + title=i18n_catalog.i18nc("@info:title", "Can't Open Project File"), + message_type=Message.MessageType.ERROR) + message.show() + return WorkspaceReader.PreReadResult.failed + # Show the dialog, informing the user what is about to happen. self._dialog.setMachineConflict(machine_conflict) self._dialog.setIsPrinterGroup(is_printer_group) @@ -617,8 +658,11 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._dialog.setVariantType(variant_type_name) self._dialog.setHasObjectsOnPlate(Application.getInstance().platformActivity) self._dialog.setMissingPackagesMetadata(missing_package_metadata) + self._dialog.setHasVisibleSelectSameProfileChanged(is_ucp) + self._dialog.setAllowCreatemachine(not is_ucp) self._dialog.show() + # Choosing the initially selected printer in MachineSelector is_networked_machine = False is_abstract_machine = False @@ -648,6 +692,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._dialog.setIsNetworkedMachine(is_networked_machine) self._dialog.setIsAbstractMachine(is_abstract_machine) self._dialog.setMachineName(machine_name) + self._dialog.updateCompatibleMachine() + self._dialog.setSelectSameProfileChecked(self._dialog.isCompatibleMachine) # Block until the dialog is closed. self._dialog.waitForClose() @@ -655,6 +701,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if self._dialog.getResult() == {}: return WorkspaceReader.PreReadResult.cancelled + self._load_profile = not is_ucp or (self._dialog.selectSameProfileChecked and self._dialog.isCompatibleMachine) + self._resolve_strategies = self._dialog.getResult() # # There can be 3 resolve strategies coming from the dialog: @@ -690,16 +738,16 @@ class ThreeMFWorkspaceReader(WorkspaceReader): except EnvironmentError as e: message = Message(i18n_catalog.i18nc("@info:error Don't translate the XML tags or !", "Project file {0} is suddenly inaccessible: {1}.", file_name, str(e)), - title = i18n_catalog.i18nc("@info:title", "Can't Open Project File"), - message_type = Message.MessageType.ERROR) + title = i18n_catalog.i18nc("@info:title", "Can't Open Project File"), + message_type = Message.MessageType.ERROR) message.show() self.setWorkspaceName("") return [], {} except zipfile.BadZipFile as e: message = Message(i18n_catalog.i18nc("@info:error Don't translate the XML tags or !", "Project file {0} is corrupt: {1}.", file_name, str(e)), - title = i18n_catalog.i18nc("@info:title", "Can't Open Project File"), - message_type = Message.MessageType.ERROR) + title = i18n_catalog.i18nc("@info:title", "Can't Open Project File"), + message_type = Message.MessageType.ERROR) message.show() self.setWorkspaceName("") return [], {} @@ -761,9 +809,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # Find the machine which will be overridden global_stacks = self._container_registry.findContainerStacks(id = self._dialog.getMachineToOverride(), type = "machine") if not global_stacks: - message = Message(i18n_catalog.i18nc("@info:error Don't translate the XML tag !", + message = Message(i18n_catalog.i18nc("@info:error Don't translate the XML tag !", "Project file {0} is made using profiles that are unknown to this version of UltiMaker Cura.", file_name), - message_type = Message.MessageType.ERROR) + message_type = Message.MessageType.ERROR) message.show() self.setWorkspaceName("") return [], {} @@ -777,84 +825,89 @@ class ThreeMFWorkspaceReader(WorkspaceReader): for stack in extruder_stacks: stack.setNextStack(global_stack, connect_signals = False) - Logger.log("d", "Workspace loading is checking definitions...") - # Get all the definition files & check if they exist. If not, add them. - definition_container_files = [name for name in cura_file_names if name.endswith(self._definition_container_suffix)] - for definition_container_file in definition_container_files: - container_id = self._stripFileToId(definition_container_file) + if self._load_profile: + Logger.log("d", "Workspace loading is checking definitions...") + # Get all the definition files & check if they exist. If not, add them. + definition_container_files = [name for name in cura_file_names if name.endswith(self._definition_container_suffix)] + for definition_container_file in definition_container_files: + container_id = self._stripFileToId(definition_container_file) - definitions = self._container_registry.findDefinitionContainersMetadata(id = container_id) - if not definitions: - definition_container = DefinitionContainer(container_id) - try: - definition_container.deserialize(archive.open(definition_container_file).read().decode("utf-8"), - file_name = definition_container_file) - except ContainerFormatError: - # We cannot just skip the definition file because everything else later will just break if the - # machine definition cannot be found. - Logger.logException("e", "Failed to deserialize definition file %s in project file %s", - definition_container_file, file_name) - definition_container = self._container_registry.findDefinitionContainers(id = "fdmprinter")[0] #Fall back to defaults. - self._container_registry.addContainer(definition_container) - Job.yieldThread() - QCoreApplication.processEvents() # Ensure that the GUI does not freeze. - - Logger.log("d", "Workspace loading is checking materials...") - # Get all the material files and check if they exist. If not, add them. - xml_material_profile = self._getXmlProfileClass() - if self._material_container_suffix is None: - self._material_container_suffix = ContainerRegistry.getMimeTypeForContainer(xml_material_profile).suffixes[0] - if xml_material_profile: - material_container_files = [name for name in cura_file_names if name.endswith(self._material_container_suffix)] - for material_container_file in material_container_files: - to_deserialize_material = False - container_id = self._stripFileToId(material_container_file) - need_new_name = False - materials = self._container_registry.findInstanceContainers(id = container_id) - - if not materials: - # No material found, deserialize this material later and add it - to_deserialize_material = True - else: - material_container = materials[0] - old_material_root_id = material_container.getMetaDataEntry("base_file") - if old_material_root_id is not None and not self._container_registry.isReadOnly(old_material_root_id): # Only create new materials if they are not read only. - to_deserialize_material = True - - if self._resolve_strategies["material"] == "override": - # Remove the old materials and then deserialize the one from the project - root_material_id = material_container.getMetaDataEntry("base_file") - application.getContainerRegistry().removeContainer(root_material_id) - elif self._resolve_strategies["material"] == "new": - # Note that we *must* deserialize it with a new ID, as multiple containers will be - # auto created & added. - container_id = self.getNewId(container_id) - self._old_new_materials[old_material_root_id] = container_id - need_new_name = True - - if to_deserialize_material: - material_container = xml_material_profile(container_id) + definitions = self._container_registry.findDefinitionContainersMetadata(id = container_id) + if not definitions: + definition_container = DefinitionContainer(container_id) try: - material_container.deserialize(archive.open(material_container_file).read().decode("utf-8"), - file_name = container_id + "." + self._material_container_suffix) + definition_container.deserialize(archive.open(definition_container_file).read().decode("utf-8"), + file_name = definition_container_file) except ContainerFormatError: - Logger.logException("e", "Failed to deserialize material file %s in project file %s", - material_container_file, file_name) - continue - if need_new_name: - new_name = ContainerRegistry.getInstance().uniqueName(material_container.getName()) - material_container.setName(new_name) - material_container.setDirty(True) - self._container_registry.addContainer(material_container) + # We cannot just skip the definition file because everything else later will just break if the + # machine definition cannot be found. + Logger.logException("e", "Failed to deserialize definition file %s in project file %s", + definition_container_file, file_name) + definition_container = self._container_registry.findDefinitionContainers(id = "fdmprinter")[0] #Fall back to defaults. + self._container_registry.addContainer(definition_container) Job.yieldThread() QCoreApplication.processEvents() # Ensure that the GUI does not freeze. - if global_stack: - # Handle quality changes if any - self._processQualityChanges(global_stack) + Logger.log("d", "Workspace loading is checking materials...") + # Get all the material files and check if they exist. If not, add them. + xml_material_profile = self._getXmlProfileClass() + if self._material_container_suffix is None: + self._material_container_suffix = ContainerRegistry.getMimeTypeForContainer(xml_material_profile).suffixes[0] + if xml_material_profile: + material_container_files = [name for name in cura_file_names if name.endswith(self._material_container_suffix)] + for material_container_file in material_container_files: + to_deserialize_material = False + container_id = self._stripFileToId(material_container_file) + need_new_name = False + materials = self._container_registry.findInstanceContainers(id = container_id) - # Prepare the machine - self._applyChangesToMachine(global_stack, extruder_stack_dict) + if not materials: + # No material found, deserialize this material later and add it + to_deserialize_material = True + else: + material_container = materials[0] + old_material_root_id = material_container.getMetaDataEntry("base_file") + if old_material_root_id is not None and not self._container_registry.isReadOnly(old_material_root_id): # Only create new materials if they are not read only. + to_deserialize_material = True + + if self._resolve_strategies["material"] == "override": + # Remove the old materials and then deserialize the one from the project + root_material_id = material_container.getMetaDataEntry("base_file") + application.getContainerRegistry().removeContainer(root_material_id) + elif self._resolve_strategies["material"] == "new": + # Note that we *must* deserialize it with a new ID, as multiple containers will be + # auto created & added. + container_id = self.getNewId(container_id) + self._old_new_materials[old_material_root_id] = container_id + need_new_name = True + + if to_deserialize_material: + material_container = xml_material_profile(container_id) + try: + material_container.deserialize(archive.open(material_container_file).read().decode("utf-8"), + file_name = container_id + "." + self._material_container_suffix) + except ContainerFormatError: + Logger.logException("e", "Failed to deserialize material file %s in project file %s", + material_container_file, file_name) + continue + if need_new_name: + new_name = ContainerRegistry.getInstance().uniqueName(material_container.getName()) + material_container.setName(new_name) + material_container.setDirty(True) + self._container_registry.addContainer(material_container) + Job.yieldThread() + QCoreApplication.processEvents() # Ensure that the GUI does not freeze. + + if global_stack: + if self._load_profile: + # Handle quality changes if any + self._processQualityChanges(global_stack) + + # Prepare the machine + self._applyChangesToMachine(global_stack, extruder_stack_dict) + else: + # Just clear the settings now, so that we can change the active machine without conflicts + self._clearMachineSettings(global_stack, extruder_stack_dict) Logger.log("d", "Workspace loading is notifying rest of the code of changes...") # Actually change the active machine. @@ -866,6 +919,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # To solve this, we schedule _updateActiveMachine() for later so it will have the latest data. self._updateActiveMachine(global_stack) + if not self._load_profile: + # Now we have switched, apply the user settings + self._applyUserSettings(global_stack, extruder_stack_dict, self._user_settings) + # Load all the nodes / mesh data of the workspace nodes = self._3mf_mesh_reader.read(file_name) if nodes is None: @@ -1177,21 +1234,44 @@ class ThreeMFWorkspaceReader(WorkspaceReader): material_node = machine_node.variants[extruder_stack.variant.getName()].materials[root_material_id] extruder_stack.material = material_node.container - def _applyChangesToMachine(self, global_stack, extruder_stack_dict): - # Clear all first + def _clearMachineSettings(self, global_stack, extruder_stack_dict): self._clearStack(global_stack) for extruder_stack in extruder_stack_dict.values(): self._clearStack(extruder_stack) + self._quality_changes_to_apply = None + self._quality_type_to_apply = None + self._intent_category_to_apply = None + self._user_settings_to_apply = None + + def _applyUserSettings(self, global_stack, extruder_stack_dict, user_settings): + for stack_name, settings in user_settings.items(): + if stack_name == 'global': + ThreeMFWorkspaceReader._applyUserSettingsOnStack(global_stack, settings) + else: + extruder_match = re.fullmatch('extruder_([0-9]+)', stack_name) + if extruder_match is not None: + extruder_nr = extruder_match.group(1) + if extruder_nr in extruder_stack_dict: + ThreeMFWorkspaceReader._applyUserSettingsOnStack(extruder_stack_dict[extruder_nr], settings) + + @staticmethod + def _applyUserSettingsOnStack(stack, user_settings): + user_settings_container = stack.userChanges + + for setting_to_import, setting_value in user_settings.items(): + user_settings_container.setProperty(setting_to_import, 'value', setting_value) + + def _applyChangesToMachine(self, global_stack, extruder_stack_dict): + # Clear all first + self._clearMachineSettings(global_stack, extruder_stack_dict) + self._applyDefinitionChanges(global_stack, extruder_stack_dict) self._applyUserChanges(global_stack, extruder_stack_dict) self._applyVariants(global_stack, extruder_stack_dict) self._applyMaterials(global_stack, extruder_stack_dict) # prepare the quality to select - self._quality_changes_to_apply = None - self._quality_type_to_apply = None - self._intent_category_to_apply = None if self._machine_info.quality_changes_info is not None: self._quality_changes_to_apply = self._machine_info.quality_changes_info.name else: diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index 0203fc92b5..c0ea950915 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -22,6 +22,8 @@ import time from cura.CuraApplication import CuraApplication +from .SpecificSettingsModel import SpecificSettingsModel + i18n_catalog = i18nCatalog("cura") @@ -71,6 +73,11 @@ class WorkspaceDialog(QObject): self._install_missing_package_dialog: Optional[QObject] = None self._is_abstract_machine = False self._is_networked_machine = False + self._is_compatible_machine = False + self._has_visible_select_same_profile = False + self._select_same_profile_checked = True + self._allow_create_machine = True + self._exported_settings_model = SpecificSettingsModel() machineConflictChanged = pyqtSignal() qualityChangesConflictChanged = pyqtSignal() @@ -94,6 +101,9 @@ class WorkspaceDialog(QObject): extrudersChanged = pyqtSignal() isPrinterGroupChanged = pyqtSignal() missingPackagesChanged = pyqtSignal() + isCompatibleMachineChanged = pyqtSignal() + hasVisibleSelectSameProfileChanged = pyqtSignal() + selectSameProfileCheckedChanged = pyqtSignal() @pyqtProperty(bool, notify = isPrinterGroupChanged) def isPrinterGroup(self) -> bool: @@ -292,6 +302,50 @@ class WorkspaceDialog(QObject): @pyqtSlot(str) def setMachineToOverride(self, machine_name: str) -> None: self._override_machine = machine_name + self.updateCompatibleMachine() + + def updateCompatibleMachine(self): + registry = ContainerRegistry.getInstance() + containers_expected = registry.findDefinitionContainers(name=self._machine_type) + containers_selected = registry.findContainerStacks(id=self._override_machine) + if len(containers_expected) == 1 and len(containers_selected) == 1: + new_compatible_machine = (containers_expected[0] == containers_selected[0].definition) + if new_compatible_machine != self._is_compatible_machine: + self._is_compatible_machine = new_compatible_machine + self.isCompatibleMachineChanged.emit() + + @pyqtProperty(bool, notify = isCompatibleMachineChanged) + def isCompatibleMachine(self) -> bool: + return self._is_compatible_machine + + def setHasVisibleSelectSameProfileChanged(self, has_visible_select_same_profile): + if has_visible_select_same_profile != self._has_visible_select_same_profile: + self._has_visible_select_same_profile = has_visible_select_same_profile + self.hasVisibleSelectSameProfileChanged.emit() + + @pyqtProperty(bool, notify = hasVisibleSelectSameProfileChanged) + def hasVisibleSelectSameProfile(self): + return self._has_visible_select_same_profile + + def setSelectSameProfileChecked(self, select_same_profile_checked): + if select_same_profile_checked != self._select_same_profile_checked: + self._select_same_profile_checked = select_same_profile_checked + self.selectSameProfileCheckedChanged.emit() + + @pyqtProperty(bool, notify = selectSameProfileCheckedChanged, fset = setSelectSameProfileChecked) + def selectSameProfileChecked(self): + return self._select_same_profile_checked + + def setAllowCreatemachine(self, allow_create_machine): + self._allow_create_machine = allow_create_machine + + @pyqtProperty(bool, constant = True) + def allowCreateMachine(self): + return self._allow_create_machine + + @pyqtProperty(QObject, constant = True) + def exportedSettingModel(self): + return self._exported_settings_model @pyqtSlot() def closeBackend(self) -> None: @@ -299,6 +353,11 @@ class WorkspaceDialog(QObject): Application.getInstance().getBackend().close() + @pyqtSlot(bool) + def setDropToBuildPlateForModel(self, drop_to_buildplate: bool) -> None: + CuraApplication.getInstance().getWorkplaceDropToBuildplate(drop_to_buildplate) + + def setMaterialConflict(self, material_conflict: bool) -> None: if self._has_material_conflict != material_conflict: self._has_material_conflict = material_conflict diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index d5f9b1817d..334317e0dc 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -6,7 +6,7 @@ import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import QtQuick.Window 2.2 -import UM 1.5 as UM +import UM 1.6 as UM import Cura 1.1 as Cura UM.Dialog @@ -120,13 +120,17 @@ UM.Dialog minDropDownWidth: machineSelector.width - buttons: [ + Component + { + id: componentNewPrinter + Cura.SecondaryButton { id: createNewPrinter text: catalog.i18nc("@button", "Create new") fixedWidthMode: true width: parent.width - leftPadding * 1.5 + visible: manager.allowCreateMachine onClicked: { toggleContent() @@ -136,7 +140,9 @@ UM.Dialog manager.setIsNetworkedMachine(false) } } - ] + } + + buttons: manager.allowCreateMachine ? [componentNewPrinter.createObject()] : [] onSelectPrinter: function(machine) { @@ -165,26 +171,71 @@ UM.Dialog { leftLabelText: catalog.i18nc("@action:label", "Name") rightLabelText: manager.qualityName + visible: manager.isCompatibleMachine } WorkspaceRow { leftLabelText: catalog.i18nc("@action:label", "Intent") rightLabelText: manager.intentName + visible: manager.isCompatibleMachine } WorkspaceRow { leftLabelText: catalog.i18nc("@action:label", "Not in profile") rightLabelText: catalog.i18ncp("@action:label", "%1 override", "%1 overrides", manager.numUserSettings).arg(manager.numUserSettings) - visible: manager.numUserSettings != 0 + visible: manager.numUserSettings != 0 && manager.selectSameProfileChecked && manager.isCompatibleMachine } WorkspaceRow { leftLabelText: catalog.i18nc("@action:label", "Derivative from") rightLabelText: catalog.i18ncp("@action:label", "%1, %2 override", "%1, %2 overrides", manager.numSettingsOverridenByQualityChanges).arg(manager.qualityType).arg(manager.numSettingsOverridenByQualityChanges) - visible: manager.numSettingsOverridenByQualityChanges != 0 + visible: manager.numSettingsOverridenByQualityChanges != 0 && manager.selectSameProfileChecked && manager.isCompatibleMachine + } + + WorkspaceRow + { + leftLabelText: catalog.i18nc("@action:label", "Specific settings") + rightLabelText: catalog.i18ncp("@action:label", "%1 override", "%1 overrides", manager.exportedSettingModel.rowCount()).arg(manager.exportedSettingModel.rowCount()) + buttonText: tableViewSpecificSettings.shouldBeVisible ? catalog.i18nc("@action:button", "Hide settings") : catalog.i18nc("@action:button", "Show settings") + visible: !manager.selectSameProfileChecked || !manager.isCompatibleMachine + onButtonClicked: tableViewSpecificSettings.shouldBeVisible = !tableViewSpecificSettings.shouldBeVisible + } + + Cura.TableView + { + id: tableViewSpecificSettings + width: parent.width - parent.leftPadding - UM.Theme.getSize("default_margin").width + height: UM.Theme.getSize("card").height + visible: shouldBeVisible && (!manager.selectSameProfileChecked || !manager.isCompatibleMachine) + property bool shouldBeVisible: false + + columnHeaders: + [ + catalog.i18nc("@title:column", "Applies on"), + catalog.i18nc("@title:column", "Setting"), + catalog.i18nc("@title:column", "Value") + ] + + model: UM.TableModel + { + id: tableModel + headers: ["category", "label", "value"] + rows: manager.exportedSettingModel.items + } + } + + UM.CheckBox + { + text: catalog.i18nc("@action:checkbox", "Select the same profile") + onEnabledChanged: manager.selectSameProfileChecked = enabled + tooltip: enabled ? "" : catalog.i18nc("@tooltip", "You can use the same profile only if you have the same printer as the project was published with") + visible: manager.hasVisibleSelectSameProfile && manager.isCompatibleMachine + + checked: manager.selectSameProfileChecked + onCheckedChanged: manager.selectSameProfileChecked = checked } } @@ -300,6 +351,25 @@ UM.Dialog } } + Row + { + id: dropToBuildPlate + width: parent.width + height: childrenRect.height + spacing: UM.Theme.getSize("default_margin").width + UM.CheckBox + { + id: checkDropModels + text: catalog.i18nc("@text:window", "Drop models to buildplate") + checked: UM.Preferences.getValue("physics/automatic_drop_down") + onCheckedChanged: manager.setDropToBuildPlateForModel(checked) + } + function reloadValue() + { + checkDropModels.checked = UM.Preferences.getValue("physics/automatic_drop_down") + } + } + Row { id: clearBuildPlateWarning @@ -422,6 +492,7 @@ UM.Dialog materialSection.reloadValues() profileSection.reloadValues() printerSection.reloadValues() + dropToBuildPlate.reloadValue() } } } diff --git a/plugins/3MFReader/WorkspaceRow.qml b/plugins/3MFReader/WorkspaceRow.qml index 8d9f1f25b3..855b8c18b0 100644 --- a/plugins/3MFReader/WorkspaceRow.qml +++ b/plugins/3MFReader/WorkspaceRow.qml @@ -9,26 +9,38 @@ import QtQuick.Window 2.2 import UM 1.5 as UM import Cura 1.1 as Cura -Row +RowLayout { + id: root + property alias leftLabelText: leftLabel.text property alias rightLabelText: rightLabel.text + property alias buttonText: button.text + signal buttonClicked width: parent.width - height: visible ? childrenRect.height : 0 UM.Label { id: leftLabel text: catalog.i18nc("@action:label", "Type") - width: Math.round(parent.width / 4) + Layout.preferredWidth: Math.round(parent.width / 4) wrapMode: Text.WordWrap } + UM.Label { id: rightLabel text: manager.machineType - width: Math.round(parent.width / 3) wrapMode: Text.WordWrap } + + Cura.TertiaryButton + { + id: button + visible: !text.isEmpty + Layout.maximumHeight: leftLabel.implicitHeight + Layout.fillWidth: true + onClicked: root.buttonClicked() + } } \ No newline at end of file diff --git a/plugins/3MFReader/WorkspaceSection.qml b/plugins/3MFReader/WorkspaceSection.qml index 0c94ab5d6a..63b5e89b41 100644 --- a/plugins/3MFReader/WorkspaceSection.qml +++ b/plugins/3MFReader/WorkspaceSection.qml @@ -5,7 +5,7 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 -import UM 1.5 as UM +import UM 1.8 as UM Item @@ -80,34 +80,13 @@ Item sourceComponent: combobox } - MouseArea + UM.HelpIcon { - id: helpIconMouseArea anchors.right: parent.right anchors.verticalCenter: comboboxLabel.verticalCenter - width: childrenRect.width - height: childrenRect.height - hoverEnabled: true - UM.ColorImage - { - width: UM.Theme.getSize("section_icon").width - height: width - - visible: comboboxTooltipText != "" - source: UM.Theme.getIcon("Help") - color: UM.Theme.getColor("text") - - UM.ToolTip - { - text: comboboxTooltipText - visible: helpIconMouseArea.containsMouse - targetPoint: Qt.point(parent.x + Math.round(parent.width / 2), parent.y) - x: 0 - y: parent.y + parent.height + UM.Theme.getSize("default_margin").height - width: UM.Theme.getSize("tooltip").width - } - } + text: comboboxTooltipText + visible: comboboxTooltipText != "" } } diff --git a/plugins/3MFWriter/SettingExport.py b/plugins/3MFWriter/SettingExport.py new file mode 100644 index 0000000000..6702aa1f68 --- /dev/null +++ b/plugins/3MFWriter/SettingExport.py @@ -0,0 +1,38 @@ +# Copyright (c) 2024 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from PyQt6.QtCore import QObject, pyqtProperty, pyqtSignal + + +class SettingExport(QObject): + + def __init__(self, id, name, value, selectable): + super().__init__() + self.id = id + self._name = name + self._value = value + self._selected = selectable + self._selectable = selectable + + @pyqtProperty(str, constant=True) + def name(self): + return self._name + + @pyqtProperty(str, constant=True) + def value(self): + return self._value + + selectedChanged = pyqtSignal(bool) + + def setSelected(self, selected): + if selected != self._selected: + self._selected = selected + self.selectedChanged.emit(self._selected) + + @pyqtProperty(bool, fset = setSelected, notify = selectedChanged) + def selected(self): + return self._selected + + @pyqtProperty(bool, constant=True) + def selectable(self): + return self._selectable diff --git a/plugins/3MFWriter/SettingSelection.qml b/plugins/3MFWriter/SettingSelection.qml new file mode 100644 index 0000000000..478c2d393c --- /dev/null +++ b/plugins/3MFWriter/SettingSelection.qml @@ -0,0 +1,38 @@ +// Copyright (c) 2024 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.3 +import QtQuick.Window 2.2 + +import UM 1.8 as UM +import Cura 1.1 as Cura + +RowLayout +{ + id: settingSelection + + UM.CheckBox + { + text: modelData.name + Layout.preferredWidth: UM.Theme.getSize("setting").width + checked: modelData.selected + onClicked: modelData.selected = checked + enabled: modelData.selectable + } + + UM.Label + { + text: modelData.value + } + + UM.HelpIcon + { + UM.I18nCatalog { id: catalog; name: "cura" } + + text: catalog.i18nc("@tooltip", + "This setting can't be exported because it depends on the used printer capacities") + visible: !modelData.selectable + } +} diff --git a/plugins/3MFWriter/SettingsExportGroup.py b/plugins/3MFWriter/SettingsExportGroup.py new file mode 100644 index 0000000000..cc3fc7b4f5 --- /dev/null +++ b/plugins/3MFWriter/SettingsExportGroup.py @@ -0,0 +1,49 @@ +# Copyright (c) 2024 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from enum import IntEnum + +from PyQt6.QtCore import QObject, pyqtProperty, pyqtEnum + + +class SettingsExportGroup(QObject): + + @pyqtEnum + class Category(IntEnum): + Global = 0 + Extruder = 1 + Model = 2 + + def __init__(self, stack, name, category, settings, category_details = '', extruder_index = 0, extruder_color = ''): + super().__init__() + self.stack = stack + self._name = name + self._settings = settings + self._category = category + self._category_details = category_details + self._extruder_index = extruder_index + self._extruder_color = extruder_color + + @pyqtProperty(str, constant=True) + def name(self): + return self._name + + @pyqtProperty(list, constant=True) + def settings(self): + return self._settings + + @pyqtProperty(int, constant=True) + def category(self): + return self._category + + @pyqtProperty(str, constant=True) + def category_details(self): + return self._category_details + + @pyqtProperty(int, constant=True) + def extruder_index(self): + return self._extruder_index + + @pyqtProperty(str, constant=True) + def extruder_color(self): + return self._extruder_color diff --git a/plugins/3MFWriter/SettingsExportModel.py b/plugins/3MFWriter/SettingsExportModel.py new file mode 100644 index 0000000000..3b034236c8 --- /dev/null +++ b/plugins/3MFWriter/SettingsExportModel.py @@ -0,0 +1,130 @@ +# Copyright (c) 2024 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from dataclasses import asdict +from typing import Optional, cast, List, Dict, Pattern, Set + +from PyQt6.QtCore import QObject, pyqtProperty + +from UM.Settings.SettingDefinition import SettingDefinition +from UM.Settings.InstanceContainer import InstanceContainer +from UM.Settings.SettingFunction import SettingFunction + +from cura.CuraApplication import CuraApplication +from cura.Settings.ExtruderManager import ExtruderManager +from cura.Settings.GlobalStack import GlobalStack + +from .SettingsExportGroup import SettingsExportGroup +from .SettingExport import SettingExport + + +class SettingsExportModel(QObject): + + EXPORTABLE_SETTINGS = {'infill_sparse_density', + 'adhesion_type', + 'support_enable', + 'infill_pattern', + 'support_type', + 'support_structure', + 'support_angle', + 'support_infill_rate', + 'ironing_enabled', + 'fill_outline_gaps', + 'coasting_enable', + 'skin_monotonic', + 'z_seam_position', + 'infill_before_walls', + 'ironing_only_highest_layer', + 'xy_offset', + 'adaptive_layer_height_enabled', + 'brim_gap', + 'support_offset', + 'brim_outside_only', + 'magic_spiralize', + 'slicing_tolerance', + 'outer_inset_first', + 'magic_fuzzy_skin_outside_only', + 'conical_overhang_enabled', + 'min_infill_area', + 'small_hole_max_size', + 'magic_mesh_surface_mode', + 'carve_multiple_volumes', + 'meshfix_union_all_remove_holes', + 'support_tree_rest_preference', + 'small_feature_max_length', + 'draft_shield_enabled', + 'brim_smart_ordering', + 'ooze_shield_enabled', + 'bottom_skin_preshrink', + 'skin_edge_support_thickness', + 'alternate_carve_order', + 'top_skin_preshrink', + 'interlocking_enable'} + + def __init__(self, parent = None): + super().__init__(parent) + self._settings_groups = [] + + application = CuraApplication.getInstance() + + # Display global settings + global_stack = application.getGlobalContainerStack() + self._settings_groups.append(SettingsExportGroup(global_stack, + "Global settings", + SettingsExportGroup.Category.Global, + self._exportSettings(global_stack))) + + # Display per-extruder settings + extruders_stacks = ExtruderManager.getInstance().getUsedExtruderStacks() + for extruder_stack in extruders_stacks: + color = "" + if extruder_stack.material: + color = extruder_stack.material.getMetaDataEntry("color_code") + + self._settings_groups.append(SettingsExportGroup(extruder_stack, + "Extruder settings", + SettingsExportGroup.Category.Extruder, + self._exportSettings(extruder_stack), + extruder_index=extruder_stack.position, + extruder_color=color)) + + # Display per-model settings + scene_root = application.getController().getScene().getRoot() + for scene_node in scene_root.getChildren(): + per_model_stack = scene_node.callDecoration("getStack") + if per_model_stack is not None: + self._settings_groups.append(SettingsExportGroup(per_model_stack, + "Model settings", + SettingsExportGroup.Category.Model, + self._exportSettings(per_model_stack), + scene_node.getName())) + + @pyqtProperty(list, constant=True) + def settingsGroups(self) -> List[SettingsExportGroup]: + return self._settings_groups + + @staticmethod + def _exportSettings(settings_stack): + user_settings_container = settings_stack.userChanges + user_keys = user_settings_container.getAllKeys() + + settings_export = [] + + for setting_to_export in user_keys: + label = settings_stack.getProperty(setting_to_export, "label") + value = settings_stack.getProperty(setting_to_export, "value") + unit = settings_stack.getProperty(setting_to_export, "unit") + + setting_type = settings_stack.getProperty(setting_to_export, "type") + if setting_type is not None: + # This is not very good looking, but will do for now + value = f"{str(SettingDefinition.settingValueToString(setting_type, value))} {unit}" + else: + value = str(value) + + settings_export.append(SettingExport(setting_to_export, + label, + value, + setting_to_export in SettingsExportModel.EXPORTABLE_SETTINGS)) + + return settings_export diff --git a/plugins/3MFWriter/SettingsSelectionGroup.qml b/plugins/3MFWriter/SettingsSelectionGroup.qml new file mode 100644 index 0000000000..e77ba692bc --- /dev/null +++ b/plugins/3MFWriter/SettingsSelectionGroup.qml @@ -0,0 +1,87 @@ +// Copyright (c) 2024 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.3 +import QtQuick.Window 2.2 + +import UM 1.5 as UM +import Cura 1.1 as Cura +import ThreeMFWriter 1.0 as ThreeMFWriter + +ColumnLayout +{ + id: settingsGroup + spacing: UM.Theme.getSize("narrow_margin").width + + RowLayout + { + id: settingsGroupTitleRow + spacing: UM.Theme.getSize("default_margin").width + + Item + { + id: icon + height: UM.Theme.getSize("medium_button_icon").height + width: height + + UM.ColorImage + { + id: settingsMainImage + anchors.fill: parent + source: + { + switch(modelData.category) + { + case ThreeMFWriter.SettingsExportGroup.Global: + return UM.Theme.getIcon("Sliders") + case ThreeMFWriter.SettingsExportGroup.Model: + return UM.Theme.getIcon("View3D") + default: + return "" + } + } + + color: UM.Theme.getColor("text") + } + + Cura.ExtruderIcon + { + id: settingsExtruderIcon + anchors.fill: parent + visible: modelData.category === ThreeMFWriter.SettingsExportGroup.Extruder + text: (modelData.extruder_index + 1).toString() + font: UM.Theme.getFont("tiny_emphasis") + materialColor: modelData.extruder_color + } + } + + UM.Label + { + id: settingsTitle + text: modelData.name + (modelData.category_details ? ' (%1)'.arg(modelData.category_details) : '') + font: UM.Theme.getFont("default_bold") + } + } + + ListView + { + id: settingsExportList + Layout.fillWidth: true + Layout.preferredHeight: contentHeight + spacing: 0 + model: modelData.settings + visible: modelData.settings.length > 0 + + delegate: SettingSelection { } + } + + UM.Label + { + UM.I18nCatalog { id: catalog; name: "cura" } + + text: catalog.i18nc("@label", "No specific value has been set") + visible: modelData.settings.length === 0 + } +} diff --git a/plugins/3MFWriter/ThreeMFWorkspaceWriter.py b/plugins/3MFWriter/ThreeMFWorkspaceWriter.py index e89af5c70a..2536f5dacb 100644 --- a/plugins/3MFWriter/ThreeMFWorkspaceWriter.py +++ b/plugins/3MFWriter/ThreeMFWorkspaceWriter.py @@ -1,9 +1,13 @@ # Copyright (c) 2020 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from typing import Optional + import configparser from io import StringIO +from threading import Lock import zipfile +from typing import Dict, Any from UM.Application import Application from UM.Logger import Logger @@ -13,15 +17,23 @@ from UM.Workspace.WorkspaceWriter import WorkspaceWriter from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") -from cura.Utils.Threading import call_on_qt_thread +from .ThreeMFWriter import ThreeMFWriter +from .SettingsExportModel import SettingsExportModel +from .SettingsExportGroup import SettingsExportGroup + +USER_SETTINGS_PATH = "Cura/user-settings.json" class ThreeMFWorkspaceWriter(WorkspaceWriter): def __init__(self): super().__init__() + self._ucp_model: Optional[SettingsExportModel] = None - @call_on_qt_thread - def write(self, stream, nodes, mode=WorkspaceWriter.OutputMode.BinaryMode): + def setExportModel(self, model: SettingsExportModel) -> None: + if self._ucp_model != model: + self._ucp_model = model + + def _write(self, stream, nodes, mode=WorkspaceWriter.OutputMode.BinaryMode): application = Application.getInstance() machine_manager = application.getMachineManager() @@ -34,20 +46,20 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter): global_stack = machine_manager.activeMachine if global_stack is None: - self.setInformation(catalog.i18nc("@error", "There is no workspace yet to write. Please add a printer first.")) + self.setInformation( + catalog.i18nc("@error", "There is no workspace yet to write. Please add a printer first.")) Logger.error("Tried to write a 3MF workspace before there was a global stack.") return False # Indicate that the 3mf mesh writer should not close the archive just yet (we still need to add stuff to it). mesh_writer.setStoreArchive(True) - if not mesh_writer.write(stream, nodes, mode): + if not mesh_writer.write(stream, nodes, mode, self._ucp_model): self.setInformation(mesh_writer.getInformation()) return False archive = mesh_writer.getArchive() if archive is None: # This happens if there was no mesh data to write. - archive = zipfile.ZipFile(stream, "w", compression = zipfile.ZIP_DEFLATED) - + archive = zipfile.ZipFile(stream, "w", compression=zipfile.ZIP_DEFLATED) try: # Add global container stack data to the archive. @@ -62,15 +74,21 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter): self._writeContainerToArchive(extruder_stack, archive) for container in extruder_stack.getContainers(): self._writeContainerToArchive(container, archive) + + # Write user settings data + if self._ucp_model is not None: + user_settings_data = self._getUserSettings(self._ucp_model) + ThreeMFWriter._storeMetadataJson(user_settings_data, archive, USER_SETTINGS_PATH) except PermissionError: self.setInformation(catalog.i18nc("@error:zip", "No permission to write the workspace here.")) Logger.error("No permission to write workspace to this stream.") return False # Write preferences to archive - original_preferences = Application.getInstance().getPreferences() #Copy only the preferences that we use to the workspace. + original_preferences = Application.getInstance().getPreferences() # Copy only the preferences that we use to the workspace. temp_preferences = Preferences() - for preference in {"general/visible_settings", "cura/active_mode", "cura/categories_expanded", "metadata/setting_version"}: + for preference in {"general/visible_settings", "cura/active_mode", "cura/categories_expanded", + "metadata/setting_version"}: temp_preferences.addPreference(preference, None) temp_preferences.setValue(preference, original_preferences.getValue(preference)) preferences_string = StringIO() @@ -81,7 +99,7 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter): # Save Cura version version_file = zipfile.ZipInfo("Cura/version.ini") - version_config_parser = configparser.ConfigParser(interpolation = None) + version_config_parser = configparser.ConfigParser(interpolation=None) version_config_parser.add_section("versions") version_config_parser.set("versions", "cura_version", application.getVersion()) version_config_parser.set("versions", "build_type", application.getBuildType()) @@ -101,11 +119,17 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter): return False except EnvironmentError as e: self.setInformation(catalog.i18nc("@error:zip", str(e))) - Logger.error("EnvironmentError when writing workspace to this stream: {err}".format(err = str(e))) + Logger.error("EnvironmentError when writing workspace to this stream: {err}".format(err=str(e))) return False mesh_writer.setStoreArchive(False) + return True + def write(self, stream, nodes, mode=WorkspaceWriter.OutputMode.BinaryMode): + success = self._write(stream, nodes, mode=WorkspaceWriter.OutputMode.BinaryMode) + self._ucp_model = None + return success + @staticmethod def _writePluginMetadataToArchive(archive: zipfile.ZipFile) -> None: file_name_template = "%s/plugin_metadata.json" @@ -165,4 +189,27 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter): archive.writestr(file_in_archive, serialized_data) except (FileNotFoundError, EnvironmentError): Logger.error("File became inaccessible while writing to it: {archive_filename}".format(archive_filename = archive.fp.name)) - return \ No newline at end of file + return + + @staticmethod + def _getUserSettings(model: SettingsExportModel) -> Dict[str, Dict[str, Any]]: + user_settings = {} + + for group in model.settingsGroups: + category = '' + if group.category == SettingsExportGroup.Category.Global: + category = 'global' + elif group.category == SettingsExportGroup.Category.Extruder: + category = f"extruder_{group.extruder_index}" + + if len(category) > 0: + settings_values = {} + stack = group.stack + + for setting in group.settings: + if setting.selected: + settings_values[setting.id] = stack.getProperty(setting.id, "value") + + user_settings[category] = settings_values + + return user_settings \ No newline at end of file diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 0a939e5b8a..6fda1742f8 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -10,6 +10,9 @@ from UM.Math.Vector import Vector from UM.Logger import Logger from UM.Math.Matrix import Matrix from UM.Application import Application +from UM.OutputDevice import OutputDeviceError +from UM.Message import Message +from UM.Resources import Resources from UM.Scene.SceneNode import SceneNode from UM.Settings.ContainerRegistry import ContainerRegistry @@ -17,12 +20,14 @@ from cura.CuraApplication import CuraApplication from cura.CuraPackageManager import CuraPackageManager from cura.Settings import CuraContainerStack from cura.Utils.Threading import call_on_qt_thread +from cura.Scene.CuraSceneNode import CuraSceneNode from cura.Snapshot import Snapshot -from PyQt6.QtCore import QBuffer +from PyQt6.QtCore import Qt, QBuffer +from PyQt6.QtGui import QImage, QPainter import pySavitar as Savitar - +from .UCPDialog import UCPDialog import numpy import datetime @@ -37,6 +42,9 @@ except ImportError: import zipfile import UM.Application +from .SettingsExportModel import SettingsExportModel +from .SettingsExportGroup import SettingsExportGroup + from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") @@ -84,7 +92,9 @@ class ThreeMFWriter(MeshWriter): self._store_archive = store_archive @staticmethod - def _convertUMNodeToSavitarNode(um_node, transformation=Matrix()): + def _convertUMNodeToSavitarNode(um_node, + transformation = Matrix(), + exported_settings: Optional[Dict[str, Set[str]]] = None): """Convenience function that converts an Uranium SceneNode object to a SavitarSceneNode :returns: Uranium Scene node. @@ -126,13 +136,25 @@ class ThreeMFWriter(MeshWriter): if stack is not None: changed_setting_keys = stack.getTop().getAllKeys() - # Ensure that we save the extruder used for this object in a multi-extrusion setup - if stack.getProperty("machine_extruder_count", "value") > 1: - changed_setting_keys.add("extruder_nr") + if exported_settings is None: + # Ensure that we save the extruder used for this object in a multi-extrusion setup + if stack.getProperty("machine_extruder_count", "value") > 1: + changed_setting_keys.add("extruder_nr") - # Get values for all changed settings & save them. - for key in changed_setting_keys: - savitar_node.setSetting("cura:" + key, str(stack.getProperty(key, "value"))) + # Get values for all changed settings & save them. + for key in changed_setting_keys: + savitar_node.setSetting("cura:" + key, str(stack.getProperty(key, "value"))) + else: + # We want to export only the specified settings + if um_node.getName() in exported_settings: + model_exported_settings = exported_settings[um_node.getName()] + + # Get values for all exported settings & save them. + for key in model_exported_settings: + savitar_node.setSetting("cura:" + key, str(stack.getProperty(key, "value"))) + + if isinstance(um_node, CuraSceneNode): + savitar_node.setSetting("cura:print_order", str(um_node.printOrder)) # Store the metadata. for key, value in um_node.metadata.items(): @@ -142,7 +164,8 @@ class ThreeMFWriter(MeshWriter): # only save the nodes on the active build plate if child_node.callDecoration("getBuildPlateNumber") != active_build_plate_nr: continue - savitar_child_node = ThreeMFWriter._convertUMNodeToSavitarNode(child_node) + savitar_child_node = ThreeMFWriter._convertUMNodeToSavitarNode(child_node, + exported_settings = exported_settings) if savitar_child_node is not None: savitar_node.addChild(savitar_child_node) @@ -151,7 +174,24 @@ class ThreeMFWriter(MeshWriter): def getArchive(self): return self._archive - def write(self, stream, nodes, mode = MeshWriter.OutputMode.BinaryMode) -> bool: + def _addShareLogoToThumbnail(self, primary_image): + # Load the icon png image + icon_image = QImage(Resources.getPath(Resources.Images, "cura-share.png")) + + # Resize icon_image to be 1/4 of primary_image size + new_width = int(primary_image.width() / 4) + new_height = int(primary_image.height() / 4) + icon_image = icon_image.scaled(new_width, new_height, Qt.AspectRatioMode.KeepAspectRatio) + # Create a QPainter to draw on the image + painter = QPainter(primary_image) + + # Draw the icon in the top-left corner (adjust coordinates as needed) + icon_position = (10, 10) + painter.drawImage(icon_position[0], icon_position[1], icon_image) + + painter.end() + + def write(self, stream, nodes, mode = MeshWriter.OutputMode.BinaryMode, export_settings_model = None) -> bool: self._archive = None # Reset archive archive = zipfile.ZipFile(stream, "w", compression = zipfile.ZIP_DEFLATED) try: @@ -175,6 +215,8 @@ class ThreeMFWriter(MeshWriter): # Attempt to add a thumbnail snapshot = self._createSnapshot() if snapshot: + if export_settings_model != None: + self._addShareLogoToThumbnail(snapshot) thumbnail_buffer = QBuffer() thumbnail_buffer.open(QBuffer.OpenModeFlag.ReadWrite) snapshot.save(thumbnail_buffer, "PNG") @@ -229,14 +271,19 @@ class ThreeMFWriter(MeshWriter): transformation_matrix.preMultiply(translation_matrix) root_node = UM.Application.Application.getInstance().getController().getScene().getRoot() + exported_model_settings = ThreeMFWriter._extractModelExportedSettings(export_settings_model) for node in nodes: if node == root_node: for root_child in node.getChildren(): - savitar_node = ThreeMFWriter._convertUMNodeToSavitarNode(root_child, transformation_matrix) + savitar_node = ThreeMFWriter._convertUMNodeToSavitarNode(root_child, + transformation_matrix, + exported_model_settings) if savitar_node: savitar_scene.addSceneNode(savitar_node) else: - savitar_node = self._convertUMNodeToSavitarNode(node, transformation_matrix) + savitar_node = self._convertUMNodeToSavitarNode(node, + transformation_matrix, + exported_model_settings) if savitar_node: savitar_scene.addSceneNode(savitar_node) @@ -392,3 +439,59 @@ class ThreeMFWriter(MeshWriter): parser = Savitar.ThreeMFParser() scene_string = parser.sceneToString(savitar_scene) return scene_string + + @staticmethod + def _extractModelExportedSettings(model: Optional[SettingsExportModel]) -> Dict[str, Set[str]]: + extra_settings = {} + + if model is not None: + for group in model.settingsGroups: + if group.category == SettingsExportGroup.Category.Model: + exported_model_settings = set() + + for exported_setting in group.settings: + if exported_setting.selected: + exported_model_settings.add(exported_setting.id) + + extra_settings[group.category_details] = exported_model_settings + + return extra_settings + + def exportUcp(self): + preferences = CuraApplication.getInstance().getPreferences() + if preferences.getValue("cura/dialog_on_ucp_project_save"): + self._config_dialog = UCPDialog() + self._config_dialog.show() + else: + application = CuraApplication.getInstance() + workspace_handler = application.getInstance().getWorkspaceFileHandler() + + # Set the model to the workspace writer + mesh_writer = workspace_handler.getWriter("3MFWriter") + mesh_writer.setExportModel(SettingsExportModel()) + + # Open file dialog and write the file + device = application.getOutputDeviceManager().getOutputDevice("local_file") + nodes = [application.getController().getScene().getRoot()] + + file_name = CuraApplication.getInstance().getPrintInformation().baseName + + try: + device.requestWrite( + nodes, + file_name, + ["application/vnd.ms-package.3dmanufacturing-3dmodel+xml"], + workspace_handler, + preferred_mimetype_list="application/vnd.ms-package.3dmanufacturing-3dmodel+xml" + ) + except OutputDeviceError.UserCanceledError: + self._onRejected() + except Exception as e: + message = Message( + catalog.i18nc("@info:error", "Unable to write to file: {0}", file_name), + title=catalog.i18nc("@info:title", "Error"), + message_type=Message.MessageType.ERROR + ) + message.show() + Logger.logException("e", "Unable to write to file %s: %s", file_name, e) + self._onRejected() diff --git a/plugins/3MFWriter/UCPDialog.py b/plugins/3MFWriter/UCPDialog.py new file mode 100644 index 0000000000..bedfb4d0da --- /dev/null +++ b/plugins/3MFWriter/UCPDialog.py @@ -0,0 +1,114 @@ +# Copyright (c) 2024 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import os + +from PyQt6.QtCore import pyqtSignal, QObject + +import UM +from UM.FlameProfiler import pyqtSlot +from UM.OutputDevice import OutputDeviceError +from UM.Workspace.WorkspaceWriter import WorkspaceWriter +from UM.i18n import i18nCatalog +from UM.Logger import Logger +from UM.Message import Message + +from cura.CuraApplication import CuraApplication + +from .SettingsExportModel import SettingsExportModel + +i18n_catalog = i18nCatalog("cura") + + +class UCPDialog(QObject): + finished = pyqtSignal(bool) + + def __init__(self, parent = None) -> None: + super().__init__(parent) + + plugin_path = os.path.dirname(__file__) + dialog_path = os.path.join(plugin_path, 'UCPDialog.qml') + self._model = SettingsExportModel() + self._view = CuraApplication.getInstance().createQmlComponent( + dialog_path, + { + "manager": self, + "settingsExportModel": self._model + } + ) + self._view.accepted.connect(self._onAccepted) + self._view.rejected.connect(self._onRejected) + self._finished = False + self._accepted = False + + def show(self) -> None: + self._finished = False + self._accepted = False + self._view.show() + + def getModel(self) -> SettingsExportModel: + return self._model + + @pyqtSlot() + def notifyClosed(self): + self._onFinished() + + def save3mf(self): + application = CuraApplication.getInstance() + workspace_handler = application.getInstance().getWorkspaceFileHandler() + + # Set the model to the workspace writer + mesh_writer = workspace_handler.getWriter("3MFWriter") + mesh_writer.setExportModel(self._model) + + # Open file dialog and write the file + device = application.getOutputDeviceManager().getOutputDevice("local_file") + nodes = [application.getController().getScene().getRoot()] + + device.writeError.connect(lambda: self._onRejected()) + device.writeSuccess.connect(lambda: self._onSuccess()) + device.writeFinished.connect(lambda: self._onFinished()) + + file_name = CuraApplication.getInstance().getPrintInformation().baseName + + try: + device.requestWrite( + nodes, + file_name, + ["application/vnd.ms-package.3dmanufacturing-3dmodel+xml"], + workspace_handler, + preferred_mimetype_list="application/vnd.ms-package.3dmanufacturing-3dmodel+xml" + ) + except OutputDeviceError.UserCanceledError: + self._onRejected() + except Exception as e: + message = Message( + i18n_catalog.i18nc("@info:error", "Unable to write to file: {0}", file_name), + title=i18n_catalog.i18nc("@info:title", "Error"), + message_type=Message.MessageType.ERROR + ) + message.show() + Logger.logException("e", "Unable to write to file %s: %s", file_name, e) + self._onRejected() + + def _onAccepted(self): + self.save3mf() + + def _onRejected(self): + self._onFinished() + + def _onSuccess(self): + self._accepted = True + self._onFinished() + + def _onFinished(self): + # Make sure we don't send the finished signal twice, whatever happens + if self._finished: + return + self._finished = True + + # Reset the model to the workspace writer + mesh_writer = CuraApplication.getInstance().getInstance().getWorkspaceFileHandler().getWriter("3MFWriter") + mesh_writer.setExportModel(None) + + self.finished.emit(self._accepted) diff --git a/plugins/3MFWriter/UCPDialog.qml b/plugins/3MFWriter/UCPDialog.qml new file mode 100644 index 0000000000..3a0e6bf842 --- /dev/null +++ b/plugins/3MFWriter/UCPDialog.qml @@ -0,0 +1,125 @@ +// Copyright (c) 2024 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.3 +import QtQuick.Window 2.2 + +import UM 1.5 as UM +import Cura 1.1 as Cura + +UM.Dialog +{ + id: exportDialog + title: catalog.i18nc("@title:window", "Export Universal Cura Project") + + margin: UM.Theme.getSize("default_margin").width + minimumWidth: UM.Theme.getSize("modal_window_minimum").width + minimumHeight: UM.Theme.getSize("modal_window_minimum").height + + backgroundColor: UM.Theme.getColor("detail_background") + property bool dontShowAgain: false + + function storeDontShowAgain() + { + UM.Preferences.setValue("cura/dialog_on_ucp_project_save", !dontShowAgainCheckbox.checked) + UM.Preferences.setValue("cura/asked_dialog_on_ucp_project_save", false) + } + + onVisibleChanged: + { + if(visible && UM.Preferences.getValue("cura/asked_dialog_on_ucp_project_save")) + { + dontShowAgain = !UM.Preferences.getValue("cura/dialog_on_ucp_project_save") + } + } + + headerComponent: Rectangle + { + height: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height + color: UM.Theme.getColor("main_background") + + ColumnLayout + { + id: headerColumn + + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + anchors.topMargin: UM.Theme.getSize("default_margin").height + anchors.leftMargin: UM.Theme.getSize("default_margin").width + anchors.rightMargin: anchors.leftMargin + + UM.Label + { + id: titleLabel + text: catalog.i18nc("@action:title", "Summary - Universal Cura Project") + font: UM.Theme.getFont("large") + } + + UM.Label + { + id: descriptionLabel + text: catalog.i18nc("@action:description", "When exporting a Universal Cura Project, all the models present on the build plate will be included with their current position, orientation and scale. You can also select which per-extruder or per-model settings should be included to ensure a proper printing of the batch, even on different printers.") + font: UM.Theme.getFont("default") + wrapMode: Text.Wrap + Layout.maximumWidth: headerColumn.width + } + } + } + + Rectangle + { + anchors.fill: parent + color: UM.Theme.getColor("main_background") + + UM.I18nCatalog { id: catalog; name: "cura" } + + ListView + { + id: settingsExportList + anchors.fill: parent + anchors.margins: UM.Theme.getSize("default_margin").width + spacing: UM.Theme.getSize("thick_margin").height + model: settingsExportModel.settingsGroups + clip: true + + ScrollBar.vertical: UM.ScrollBar { id: verticalScrollBar } + + delegate: SettingsSelectionGroup { Layout.margins: 0 } + } + } + leftButtons: + [ + UM.CheckBox + { + id: dontShowAgainCheckbox + text: catalog.i18nc("@action:label", "Don't show project summary on save again") + checked: dontShowAgain + } + ] + rightButtons: + [ + Cura.TertiaryButton + { + text: catalog.i18nc("@action:button", "Cancel") + onClicked: reject() + }, + Cura.PrimaryButton + { + text: catalog.i18nc("@action:button", "Save project") + onClicked: accept() + } + ] + + buttonSpacing: UM.Theme.getSize("wide_margin").width + + onClosing: + { + storeDontShowAgain() + manager.notifyClosed() + } + onRejected: storeDontShowAgain() + onAccepted: storeDontShowAgain() +} diff --git a/plugins/3MFWriter/__init__.py b/plugins/3MFWriter/__init__.py index eb8a596afe..0b2976c386 100644 --- a/plugins/3MFWriter/__init__.py +++ b/plugins/3MFWriter/__init__.py @@ -2,9 +2,12 @@ # Uranium is released under the terms of the LGPLv3 or higher. import sys +from PyQt6.QtQml import qmlRegisterType + from UM.Logger import Logger try: from . import ThreeMFWriter + from .SettingsExportGroup import SettingsExportGroup threemf_writer_was_imported = True except ImportError: Logger.log("w", "Could not import ThreeMFWriter; libSavitar may be missing") @@ -23,20 +26,24 @@ def getMetaData(): if threemf_writer_was_imported: metaData["mesh_writer"] = { - "output": [{ - "extension": "3mf", - "description": i18n_catalog.i18nc("@item:inlistbox", "3MF file"), - "mime_type": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", - "mode": ThreeMFWriter.ThreeMFWriter.OutputMode.BinaryMode - }] + "output": [ + { + "extension": "3mf", + "description": i18n_catalog.i18nc("@item:inlistbox", "3MF file"), + "mime_type": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", + "mode": ThreeMFWriter.ThreeMFWriter.OutputMode.BinaryMode + } + ] } metaData["workspace_writer"] = { - "output": [{ - "extension": workspace_extension, - "description": i18n_catalog.i18nc("@item:inlistbox", "Cura Project 3MF file"), - "mime_type": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", - "mode": ThreeMFWorkspaceWriter.ThreeMFWorkspaceWriter.OutputMode.BinaryMode - }] + "output": [ + { + "extension": workspace_extension, + "description": i18n_catalog.i18nc("@item:inlistbox", "Cura Project 3MF file"), + "mime_type": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", + "mode": ThreeMFWorkspaceWriter.ThreeMFWorkspaceWriter.OutputMode.BinaryMode + } + ] } return metaData @@ -44,6 +51,8 @@ def getMetaData(): def register(app): if "3MFWriter.ThreeMFWriter" in sys.modules: + qmlRegisterType(SettingsExportGroup, "ThreeMFWriter", 1, 0, "SettingsExportGroup") + return {"mesh_writer": ThreeMFWriter.ThreeMFWriter(), "workspace_writer": ThreeMFWorkspaceWriter.ThreeMFWorkspaceWriter()} else: diff --git a/plugins/3MFWriter/plugin.json b/plugins/3MFWriter/plugin.json index b59d4ef8e1..254384dc25 100644 --- a/plugins/3MFWriter/plugin.json +++ b/plugins/3MFWriter/plugin.json @@ -2,7 +2,7 @@ "name": "3MF Writer", "author": "Ultimaker B.V.", "version": "1.0.1", - "description": "Provides support for writing 3MF files.", + "description": "Provides support for writing 3MF and UCP files.", "api": 8, "i18n-catalog": "cura" } diff --git a/plugins/LegacyProfileReader/DictionaryOfDoom.json b/plugins/LegacyProfileReader/DictionaryOfDoom.json index f65cc271d1..90e973b779 100644 --- a/plugins/LegacyProfileReader/DictionaryOfDoom.json +++ b/plugins/LegacyProfileReader/DictionaryOfDoom.json @@ -68,7 +68,7 @@ "meshfix_keep_open_polygons": "fix_horrible_use_open_bits", "magic_mesh_surface_mode": "\"surface\" if simple_mode else \"normal\"", "magic_spiralize": "spiralize", - "prime_tower_enable": "wipe_tower", + "prime_tower_mode": "\"normal\" if wipe_tower else \"none\"", "prime_tower_size": "math.sqrt(float(wipe_tower_volume) / float(layer_height))", "ooze_shield_enabled": "ooze_shield", "skin_overlap": "fill_overlap" diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index be021251da..f61f5cf295 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -263,7 +263,7 @@ class SliceInfo(QObject, Extension): print_settings["retraction_enable"] = global_stack.getProperty("retraction_enable", "value") # Prime tower settings - print_settings["prime_tower_enable"] = global_stack.getProperty("prime_tower_enable", "value") + print_settings["prime_tower_mode"] = global_stack.getProperty("prime_tower_mode", "value") # Infill settings print_settings["infill_sparse_density"] = global_stack.getProperty("infill_sparse_density", "value") diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 41beb88419..98c0f95e10 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -579,8 +579,9 @@ class XmlMaterialProfile(InstanceContainer): meta_data[tag_name] = entry.text - if tag_name in self.__material_metadata_setting_map: - common_setting_values[self.__material_metadata_setting_map[tag_name]] = entry.text + for tag_name, value in meta_data.items(): + if tag_name in self.__material_metadata_setting_map: + common_setting_values[self.__material_metadata_setting_map[tag_name]] = value if "description" not in meta_data: meta_data["description"] = "" @@ -1222,7 +1223,9 @@ class XmlMaterialProfile(InstanceContainer): "diameter": "material_diameter" } __material_metadata_setting_map = { - "GUID": "material_guid" + "GUID": "material_guid", + "material": "material_type", + "brand": "material_brand", } # Map of recognised namespaces with a proper prefix. diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index cd59e1c169..0b8761a62c 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -110,7 +110,7 @@ "min_infill_area": { "value": "5.0" }, "minimum_polygon_circumference": { "value": "0.2" }, "optimize_wall_printing_order": { "value": "True" }, - "prime_tower_enable": { "value": "True" }, + "prime_tower_mode": { "value": "'normal'" }, "retraction_amount": { "value": "1" }, "retraction_combing": { "value": "'noskin'" }, "retraction_combing_max_distance": { "value": "10" }, diff --git a/resources/definitions/creality_ender3v3se.def.json b/resources/definitions/creality_ender3v3se.def.json index 5769e3e493..86d6818166 100644 --- a/resources/definitions/creality_ender3v3se.def.json +++ b/resources/definitions/creality_ender3v3se.def.json @@ -45,7 +45,7 @@ "machine_max_feedrate_y": { "value": 500 }, "machine_max_feedrate_z": { "value": 30 }, "machine_name": { "default_value": "Creality Ender-3 V3 SE" }, - "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nM420 S1; Enable mesh leveling\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S[material_print_temperature_layer_0]\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 E-1.0000 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0.0000 F1800 \n" }, + "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nM420 S1; Use saved mesh leveling data\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nM109 S{material_print_temperature_layer_0} ; Set hotend temperature and wait\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 E-1.0000 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0.0000 F1800 \n" }, "machine_width": { "default_value": 220 }, "retraction_amount": { "value": 0.8 }, "retraction_speed": { "default_value": 40 }, diff --git a/resources/definitions/deltacomb_dc20flux.def.json b/resources/definitions/deltacomb_dc20flux.def.json index f81909dae5..f76ba3e4cd 100644 --- a/resources/definitions/deltacomb_dc20flux.def.json +++ b/resources/definitions/deltacomb_dc20flux.def.json @@ -31,8 +31,8 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" }, - "prime_tower_enable": { "value": true }, "prime_tower_min_volume": { "value": "50" }, + "prime_tower_mode": { "value": "'normal'" }, "switch_extruder_retraction_amount": { "value": "0" } } } \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc21flux.def.json b/resources/definitions/deltacomb_dc21flux.def.json index dbcdf3ad37..3c2080a87b 100644 --- a/resources/definitions/deltacomb_dc21flux.def.json +++ b/resources/definitions/deltacomb_dc21flux.def.json @@ -31,8 +31,8 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" }, - "prime_tower_enable": { "value": true }, "prime_tower_min_volume": { "value": "50" }, + "prime_tower_mode": { "value": "'normal'" }, "switch_extruder_retraction_amount": { "value": "0" } } } \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc30flux.def.json b/resources/definitions/deltacomb_dc30flux.def.json index 4a42ae4d63..69249e42fd 100644 --- a/resources/definitions/deltacomb_dc30flux.def.json +++ b/resources/definitions/deltacomb_dc30flux.def.json @@ -31,8 +31,8 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" }, - "prime_tower_enable": { "value": "1" }, "prime_tower_min_volume": { "value": "50" }, + "prime_tower_mode": { "value": "'normal'" }, "switch_extruder_retraction_amount": { "value": "0" } } } \ No newline at end of file diff --git a/resources/definitions/dxu_dual.def.json b/resources/definitions/dxu_dual.def.json index 6d30af005f..b81d148f80 100644 --- a/resources/definitions/dxu_dual.def.json +++ b/resources/definitions/dxu_dual.def.json @@ -5,7 +5,6 @@ "overrides": { "machine_end_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" }, - "machine_start_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\n;end of startup sequence\\n\"" }, - "prime_tower_enable": { "default_value": true } + "machine_start_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\n;end of startup sequence\\n\"" } } } \ No newline at end of file diff --git a/resources/definitions/elegoo_neptune_2D.def.json b/resources/definitions/elegoo_neptune_2D.def.json index c9aa5a0184..dbdf066b21 100644 --- a/resources/definitions/elegoo_neptune_2D.def.json +++ b/resources/definitions/elegoo_neptune_2D.def.json @@ -55,7 +55,6 @@ "settable_per_extruder": false }, "prime_blob_enable": { "default_value": false }, - "prime_tower_enable": { "default_value": true }, "prime_tower_min_volume": { "default_value": 90 }, "prime_tower_size": { "default_value": 30 }, "raft_airgap": { "default_value": 0.25 }, diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 36590649d0..1d453456a8 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -76,6 +76,22 @@ "type": "str", "enabled": false }, + "material_type": + { + "label": "Material Type", + "description": "The type of material used.", + "default_value": "", + "type": "str", + "enabled": false + }, + "material_brand": + { + "label": "Material Brand", + "description": "The brand of material used.", + "default_value": "", + "type": "str", + "enabled": false + }, "material_diameter": { "label": "Diameter", @@ -963,7 +979,7 @@ "description": "Width of a single prime tower line.", "type": "float", "unit": "mm", - "enabled": "resolveOrValue('prime_tower_enable')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none'", "default_value": 0.4, "value": "line_width", "minimum_value": "0.001", @@ -3347,7 +3363,7 @@ "description": "The speed at which the prime tower is printed. Printing the prime tower slower can make it more stable when the adhesion between the different filaments is suboptimal.", "type": "float", "unit": "mm/s", - "enabled": "resolveOrValue('prime_tower_enable')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none'", "default_value": 60, "value": "speed_print", "minimum_value": "0.1", @@ -3725,7 +3741,7 @@ "maximum_value_warning": "10000", "default_value": 3000, "value": "acceleration_print", - "enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('acceleration_enabled')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('acceleration_enabled')", "settable_per_mesh": false } } @@ -4044,7 +4060,7 @@ "maximum_value_warning": "50", "default_value": 20, "value": "jerk_print", - "enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('jerk_enabled')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('jerk_enabled')", "settable_per_mesh": false } } @@ -5135,7 +5151,7 @@ "unit": "mm", "type": "float", "minimum_value": "0", - "maximum_value_warning": "machine_nozzle_size", + "maximum_value_warning": "5*layer_height", "default_value": 0.1, "limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", "enabled": "support_enable or support_meshes_present", @@ -6778,14 +6794,20 @@ "description": "Settings used for printing with multiple extruders.", "children": { - "prime_tower_enable": + "prime_tower_mode": { - "label": "Enable Prime Tower", - "description": "Print a tower next to the print which serves to prime the material after each nozzle switch.", - "type": "bool", + "label": "Prime Tower", + "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.
  • None: do not generate a prime tower
  • Normal: generate a bucket in which secondary materials are primed
  • Interleaved: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
", + "type": "enum", + "value": "'none' if (extruders_enabled_count < 2) else ('interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal')", + "options": + { + "none": "None", + "normal": "Normal", + "interleaved": "Interleaved" + }, + "default_value": "none", "enabled": "extruders_enabled_count > 1", - "default_value": false, - "resolve": "(extruders_enabled_count > 1) and any(extruderValues('prime_tower_enable'))", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -6795,7 +6817,7 @@ "description": "The width of the prime tower.", "type": "float", "unit": "mm", - "enabled": "resolveOrValue('prime_tower_enable')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none'", "default_value": 20, "resolve": "max(extruderValues('prime_tower_size'))", "minimum_value": "0", @@ -6814,7 +6836,20 @@ "default_value": 6, "minimum_value": "0", "maximum_value_warning": "(resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height') - sum(extruderValues('prime_tower_min_volume')) + prime_tower_min_volume", - "enabled": "resolveOrValue('prime_tower_enable')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none'", + "settable_per_mesh": false, + "settable_per_extruder": true + }, + "prime_tower_max_bridging_distance": + { + "label": "Prime Tower Maximum Bridging Distance", + "description": "The maximum length of the branches which may be printed over the air.", + "unit": "mm", + "type": "float", + "default_value": 5, + "minimum_value": "line_width", + "maximum_value_warning": "10.0", + "enabled": "resolveOrValue('prime_tower_mode') != 'none'", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -6824,7 +6859,7 @@ "description": "The x coordinate of the position of the prime tower.", "type": "float", "unit": "mm", - "enabled": "resolveOrValue('prime_tower_enable')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none'", "default_value": 200, "value": "(resolveOrValue('machine_width') / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (resolveOrValue('machine_width') - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('machine_nozzle_offset_x')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (resolveOrValue('machine_width') / 2 if resolveOrValue('machine_center_is_zero') else 0)", "maximum_value": "(machine_width / 2 if machine_center_is_zero else machine_width) - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0)", @@ -6838,7 +6873,7 @@ "description": "The y coordinate of the position of the prime tower.", "type": "float", "unit": "mm", - "enabled": "resolveOrValue('prime_tower_enable')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none'", "default_value": 200, "value": "machine_depth - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('machine_nozzle_offset_y')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (resolveOrValue('machine_depth') / 2 if resolveOrValue('machine_center_is_zero') else 0)", "maximum_value": "(machine_depth / 2 - resolveOrValue('prime_tower_size') if machine_center_is_zero else machine_depth - resolveOrValue('prime_tower_size')) - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0)", @@ -6851,7 +6886,7 @@ "label": "Wipe Inactive Nozzle on Prime Tower", "description": "After printing the prime tower with one nozzle, wipe the oozed material from the other nozzle off on the prime tower.", "type": "bool", - "enabled": "resolveOrValue('prime_tower_enable')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none'", "default_value": true, "settable_per_mesh": false, "settable_per_extruder": true @@ -6862,7 +6897,7 @@ "label": "Prime Tower Base", "description": "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height.", "type": "bool", - "enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('adhesion_type') != 'raft'", + "enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('adhesion_type') != 'raft'", "default_value": false, "settable_per_mesh": false, "settable_per_extruder": false @@ -6874,7 +6909,7 @@ "description": "The width of the prime tower brim/base. A larger base enhances adhesion to the build plate, but also reduces the effective print area.", "type": "float", "unit": "mm", - "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none' and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')", "default_value": 1.2, "minimum_value": "0", "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)", @@ -6888,7 +6923,7 @@ "description": "The height of the prime tower base. Increasing this value will result in a more sturdy prime tower because the base will be wider. If this setting is too low, the prime tower will not have a sturdy base.", "type": "float", "unit": "mm", - "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none' and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')", "default_value": 0, "minimum_value": "0", "maximum_value": "machine_height", @@ -6900,7 +6935,7 @@ "label": "Prime Tower Base Slope", "description": "The magnitude factor used for the slope of the prime tower base. If you increase this value, the base will become slimmer. If you decrease it, the base will become thicker.", "type": "float", - "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')", + "enabled": "resolveOrValue('prime_tower_mode') != 'none' and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')", "default_value": 4, "minimum_value": "0", "maximum_value": "10", @@ -6918,7 +6953,7 @@ "minimum_value": "0", "minimum_value_warning": "raft_base_line_width", "maximum_value_warning": "100", - "enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('adhesion_type') == 'raft'", + "enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, "settable_per_extruder": true, "limit_to_extruder": "raft_base_extruder_nr" @@ -7246,6 +7281,16 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, + "user_defined_print_order_enabled": + { + "label": "Set Print Sequence Manually", + "description": "Allows to order the object list to set the print sequence manually. First object from the list will be printed first.", + "type": "bool", + "default_value": false, + "settable_per_mesh": false, + "settable_per_extruder": false, + "enabled": "print_sequence == 'one_at_a_time'" + }, "infill_mesh": { "label": "Infill Mesh", diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json index e4a13217e5..449967072f 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -80,7 +80,7 @@ "material_final_print_temperature": { "value": "default_material_print_temperature" }, "material_initial_print_temperature": { "value": "default_material_print_temperature" }, "material_standby_temperature": { "enabled": false }, - "prime_tower_enable": { "resolve": "extruders_enabled_count > 1" }, + "prime_tower_mode": { "resolve": "'normal' if extruders_enabled_count > 1 else 'none'" }, "retraction_amount": { "default_value": 2 }, "retraction_combing": { "value": "'all'" }, "skirt_line_count": { "default_value": 3 }, diff --git a/resources/definitions/lotmaxx_sc60.def.json b/resources/definitions/lotmaxx_sc60.def.json index f4ce358be1..64220c372e 100644 --- a/resources/definitions/lotmaxx_sc60.def.json +++ b/resources/definitions/lotmaxx_sc60.def.json @@ -44,8 +44,8 @@ "machine_width": { "default_value": 235 }, "meshfix_maximum_resolution": { "value": 0.25 }, "optimize_wall_printing_order": { "value": true }, - "prime_tower_enable": { "value": true }, "prime_tower_min_volume": { "value": 30 }, + "prime_tower_mode": { "value": "'normal'" }, "retract_at_layer_change": { "value": false }, "retraction_amount": { "value": 4.5 }, "roofing_layer_count": { "value": 1 }, diff --git a/resources/definitions/strateo3d_IDEX420.def.json b/resources/definitions/strateo3d_IDEX420.def.json index d4236c126e..47a3af714b 100644 --- a/resources/definitions/strateo3d_IDEX420.def.json +++ b/resources/definitions/strateo3d_IDEX420.def.json @@ -112,7 +112,6 @@ "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, "machine_width": { "default_value": 420 }, "material_diameter": { "default_value": 1.75 }, - "prime_tower_enable": { "default_value": true }, "prime_tower_min_volume": { "default_value": 35.6 }, "raft_acceleration": { "value": "machine_acceleration" }, "raft_base_acceleration": { "value": "machine_acceleration" }, diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index f62e98f30f..9f99b878be 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -103,6 +103,7 @@ "retraction_combing_max_distance": { "value": 15 }, "retraction_count_max": { "value": 25 }, "retraction_extrusion_window": { "value": 1 }, + "retraction_min_travel": { "value": 5 }, "roofing_layer_count": { "value": "1" }, "roofing_material_flow": { "value": "material_flow" }, "skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" }, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 19df92c08d..43f718e2db 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -149,14 +149,12 @@ "enabled": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, - "prime_tower_enable": { "default_value": true }, "prime_tower_position_x": { "value": "185" }, "prime_tower_wipe_enabled": { "default_value": false }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" }, "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, - "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, "skin_overlap": { "value": "10" }, "speed_prime_tower": { "value": "speed_topbottom" }, diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 07a5a3d253..5dc417f4fa 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -28,7 +28,6 @@ "generic_hips_175", "generic_pc_175", "ultimaker_rapidrinse_175", - "ultimaker_sr30_175", "generic_tpu_175", "goofoo_", "ideagen3D_", @@ -346,9 +345,9 @@ "prime_tower_base_curve_magnitude": { "value": 2 }, "prime_tower_base_height": { "value": 6 }, "prime_tower_base_size": { "value": 10 }, - "prime_tower_enable": { "value": false }, "prime_tower_flow": { "value": "material_flow" }, "prime_tower_line_width": { "value": 1 }, + "prime_tower_mode": { "value": "none" }, "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, "prime_tower_wipe_enabled": { "value": true }, "print_sequence": { "enabled": false }, @@ -373,7 +372,6 @@ "retraction_hop": { "value": 0.4 }, "retraction_hop_enabled": { "value": true }, "retraction_hop_only_when_collides": { "value": false }, - "retraction_min_travel": { "value": "line_width * 4" }, "retraction_prime_speed": { "value": "retraction_speed" }, "retraction_speed": { "value": 5 }, "roofing_layer_count": { "value": 2 }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index a6708a0421..9828ba96f2 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -35,7 +35,6 @@ "generic_nylon_175", "generic_hips_175", "generic_pc_175", - "ultimaker_sr30_175", "generic_tpu_175", "goofoo_", "ideagen3D_", diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index add1782368..ca40788581 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -103,12 +103,11 @@ "default_value": false, "enabled": true }, - "prime_tower_enable": { "value": "True" }, + "prime_tower_mode": { "value": "'normal'" }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" }, "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, - "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, "retraction_speed": { "value": "45" }, "speed_prime_tower": { "value": "speed_topbottom" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index ec82e6b630..73854f2890 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -104,13 +104,12 @@ "default_value": false, "enabled": true }, - "prime_tower_enable": { "value": "True" }, + "prime_tower_mode": { "value": "'normal'" }, "retraction_amount": { "value": "6.5" }, "retraction_combing": { "value": "'no_outer_surfaces'" }, "retraction_hop": { "value": "2" }, "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, - "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, "retraction_speed": { "value": "45" }, "speed_prime_tower": { "value": "speed_topbottom" }, diff --git a/resources/extruders/geeetech_A20_1.def.json b/resources/extruders/geeetech_A20_1.def.json new file mode 100644 index 0000000000..96e94fe2f6 --- /dev/null +++ b/resources/extruders/geeetech_A20_1.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "geeetech_A20", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/i18n/cs_CZ/cura.po b/resources/i18n/cs_CZ/cura.po index 715af3ea84..3267139490 100644 --- a/resources/i18n/cs_CZ/cura.po +++ b/resources/i18n/cs_CZ/cura.po @@ -4946,6 +4946,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Rozdělit modely" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Tisknout před" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Tisknout po" + msgctxt "@button" msgid "Uninstall" msgstr "Odinstalovat" diff --git a/resources/i18n/cs_CZ/fdmprinter.def.json.po b/resources/i18n/cs_CZ/fdmprinter.def.json.po index 7588e81c52..4b697c9cea 100644 --- a/resources/i18n/cs_CZ/fdmprinter.def.json.po +++ b/resources/i18n/cs_CZ/fdmprinter.def.json.po @@ -2583,6 +2583,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Tisková sekvence" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Nastavit tiskovou sekvenci ručně" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Umožňuje řadit seznam objektů pro ruční nastavení tiskové sekvence. První objekt ze seznamu bude vytisknut jako první." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Rychlost tisku" diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 7d5b5f94d6..2fabd97f7e 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -4565,6 +4565,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "" + msgctxt "@button" msgid "Uninstall" msgstr "" diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index f006c75fb6..8ca4de67b4 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -4930,6 +4930,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Gruppierung für Modelle aufheben" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Vor dem Drucken" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Nach dem Drucken" + msgctxt "@button" msgid "Uninstall" msgstr "Deinstallieren" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index ca893ad149..ff44a4837d 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -2580,6 +2580,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Druckreihenfolge" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Druckreihenfolge manuell einstellen" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Ermöglicht das Ordnen der Objektliste, um die Druckreihenfolge manuell festzulegen. Das erste Objekt aus der Liste wird zuerst gedruckt." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Druckgeschwindigkeit" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 07d4ad2d79..aa4c727441 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -4931,6 +4931,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar modelos" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Imprimir antes" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Imprimir después" + msgctxt "@button" msgid "Uninstall" msgstr "Desinstalar" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index 4b797652ed..6811ca05a8 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -2580,6 +2580,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Secuencia de impresión" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Establecer secuencia de impresión manualmente" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Permite ordenar la lista de objetos para establecer la secuencia de impresión manualmente. El primer objeto de la lista se imprimirá primero." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Velocidad de impresión" diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot index ab63530018..4e858de0a7 100644 --- a/resources/i18n/fdmprinter.def.json.pot +++ b/resources/i18n/fdmprinter.def.json.pot @@ -4588,6 +4588,14 @@ msgctxt "print_sequence option one_at_a_time" msgid "One at a Time" msgstr "" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "" + msgctxt "infill_mesh label" msgid "Infill Mesh" msgstr "" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index c3f331c1ef..55a60d50ae 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -4899,6 +4899,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Poista mallien ryhmitys" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Tulosta ennen" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Tulosta jälkeen" + msgctxt "@button" msgid "Uninstall" msgstr "" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index 19a83d2f6a..a1e4ab420e 100644 --- a/resources/i18n/fi_FI/fdmprinter.def.json.po +++ b/resources/i18n/fi_FI/fdmprinter.def.json.po @@ -2578,6 +2578,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Tulostusjärjestys" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Aseta tulostusjärjestys manuaalisesti" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Mahdollistaa kohteiden järjestämisen tulostusjärjestyksen manuaaliseen asettamiseen. Listan ensimmäinen kohde tulostetaan ensin." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Tulostusnopeus" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index b597b2d540..af46346d63 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -4928,6 +4928,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Dégrouper les modèles" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Imprimer avant" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Imprimer après" + msgctxt "@button" msgid "Uninstall" msgstr "Désinstaller" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index e4018d33e5..2376820b7c 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -2580,6 +2580,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Séquence d'impression" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Définir la séquence d'impression manuellement" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Permet de classer la liste des objets pour définir manuellement la séquence d'impression. Le premier objet de la liste sera imprimé en premier." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Vitesse d’impression" diff --git a/resources/i18n/hu_HU/cura.po b/resources/i18n/hu_HU/cura.po index 9a502fbdf6..d5f06599a1 100644 --- a/resources/i18n/hu_HU/cura.po +++ b/resources/i18n/hu_HU/cura.po @@ -4913,6 +4913,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Csoport bontása" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Nyomtatás előtt" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Nyomtatás után" + msgctxt "@button" msgid "Uninstall" msgstr "" diff --git a/resources/i18n/hu_HU/fdmprinter.def.json.po b/resources/i18n/hu_HU/fdmprinter.def.json.po index 789454be37..27eabd4bbc 100644 --- a/resources/i18n/hu_HU/fdmprinter.def.json.po +++ b/resources/i18n/hu_HU/fdmprinter.def.json.po @@ -2585,6 +2585,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Nyomtatási sorrend" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Nyomtatási sorrend kézi beállítása" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Lehetővé teszi az objektumlista rendezését a nyomtatási sorrend kézi beállításához. A lista első objektuma lesz először nyomtatva." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Nyomtatási sebesség" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 1a131973bf..48918d3883 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -4931,6 +4931,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Separa modelli" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Stampa prima" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Stampa dopo" + msgctxt "@button" msgid "Uninstall" msgstr "Disinstalla" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index 4565e30aa9..e9fc77ca3c 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -2580,6 +2580,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Sequenza di stampa" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Imposta manualmente la sequenza di stampa" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Consente di ordinare l'elenco degli oggetti per impostare manualmente la sequenza di stampa. Il primo oggetto dell'elenco sarà stampato per primo." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Velocità di stampa" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 7826e4df9e..bc2f27e825 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -4914,6 +4914,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "モデルを非グループ化" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "印刷前" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "印刷後" + msgctxt "@button" msgid "Uninstall" msgstr "アンインストール" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 8e473e72ae..a4311a63bd 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -2580,6 +2580,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "印刷頻度" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "手動で印刷順序を設定する" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "オブジェクトリストを並べ替えて、手動で印刷順序を設定することができます。リストの最初のオブジェクトが最初に印刷されます。" + msgctxt "speed_print label" msgid "Print Speed" msgstr "印刷速度" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 5926b7c442..6bfbd1bae7 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -4917,6 +4917,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "모델 그룹 해제" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "인쇄 전" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "인쇄 후" + msgctxt "@button" msgid "Uninstall" msgstr "설치 제거" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index 7e2974dd37..0cf075c854 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -2580,6 +2580,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "프린팅 순서" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "수동으로 인쇄 순서 설정" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "객체 목록을 정렬하여 수동으로 인쇄 순서를 설정할 수 있습니다. 목록의 첫 번째 객체가 먼저 인쇄됩니다." + msgctxt "speed_print label" msgid "Print Speed" msgstr "프린팅 속도" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index f831c7989f..43ca87b01e 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -4925,6 +4925,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Groeperen van Modellen Opheffen" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Afdrukken voor" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Afdrukken na" + msgctxt "@button" msgid "Uninstall" msgstr "De-installeren" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index 7d6b32e0ac..8c4ef463a8 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -2580,6 +2580,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Printvolgorde" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Handmatig afdrukvolgorde instellen" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Maakt het mogelijk de objectlijst te ordenen om de afdrukvolgorde handmatig in te stellen. Het eerste object van de lijst wordt als eerste afgedrukt." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Printsnelheid" diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index ed823e183c..fe9f606141 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -4916,6 +4916,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Rozgrupuj modele" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Drukuj przed" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Drukuj po" + msgctxt "@button" msgid "Uninstall" msgstr "" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index b772775d09..7f093c859c 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -2584,6 +2584,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Sekwencja Wydruku" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Ręczne ustawienie kolejności drukowania" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Umożliwia ręczne ustawienie kolejności drukowania na liście obiektów. Pierwszy obiekt z listy zostanie wydrukowany jako pierwszy." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Prędkość Druku" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 1c4590a016..0ae0a56cfd 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -4942,6 +4942,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar Modelos" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Imprimir antes" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Imprimir depois" + msgctxt "@button" msgid "Uninstall" msgstr "Desinstalar" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 651837f458..412a020a7e 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -2585,6 +2585,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Sequência de Impressão" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Definir sequência de impressão manualmente" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Permite ordenar a lista de objetos para definir a sequência de impressão manualmente. O primeiro objeto da lista será impresso primeiro." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Velocidade de Impressão" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index 48ea1e7c2c..d6e19b222d 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -4932,6 +4932,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar Modelos" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Imprimir antes" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Imprimir depois" + msgctxt "@button" msgid "Uninstall" msgstr "Desinstalar" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index dea593ffe4..36283bc9de 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -2580,6 +2580,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Sequência de impressão" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Definir sequência de impressão manualmente" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Permite ordenar a lista de objetos para definir a sequência de impressão manualmente. O primeiro objeto da lista será impresso primeiro." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Velocidade de Impressão" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 6494d6b5d2..2960193d7e 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -4955,6 +4955,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Разгруппировать модели" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Печатать до" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Печатать после" + msgctxt "@button" msgid "Uninstall" msgstr "Удалить" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index 99036d4865..bba90e21ef 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -2580,6 +2580,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Последовательная печать" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Установить последовательность печати вручную" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Позволяет упорядочить список объектов для ручной настройки последовательности печати. Первый объект из списка будет напечатан первым." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Скорость печати" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index d98ff91e72..c3afd0c7c1 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -4931,6 +4931,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Model Grubunu Çöz" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "Önce Yazdır" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "Sonra Yazdır" + msgctxt "@button" msgid "Uninstall" msgstr "Kaldır" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index b57a0cd0bb..0e11895512 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -2580,6 +2580,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "Yazdırma Dizisi" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "Baskı Sırasını Manuel Olarak Ayarla" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "Nesne listesini sıralayarak baskı sırasını manuel olarak ayarlamayı sağlar. Listeden ilk nesne ilk olarak basılacak." + msgctxt "speed_print label" msgid "Print Speed" msgstr "Yazdırma Hızı" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 34b4f1d4dc..cf2ed81f9b 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -4919,6 +4919,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "拆分模型" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "打印前" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "打印后" + msgctxt "@button" msgid "Uninstall" msgstr "卸载" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index 1042199d5b..4696832051 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -2580,6 +2580,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "打印序列" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "手动设置打印顺序" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "允许对对象列表进行排序，以手动设置打印顺序。列表中的第一个对象将首先被打印。" + msgctxt "speed_print label" msgid "Print Speed" msgstr "打印速度" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index a461fd1fa3..741bde1d14 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -4911,6 +4911,14 @@ msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "取消模型群組" +msgctxt "@action:inmenu menubar:edit" +msgid "Print Before" +msgstr "列印前" + +msgctxt "@action:inmenu menubar:edit" +msgid "Print After" +msgstr "列印後" + msgctxt "@button" msgid "Uninstall" msgstr "" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po index c92a7f861a..aa02299fc1 100644 --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -2585,6 +2585,14 @@ msgctxt "print_sequence label" msgid "Print Sequence" msgstr "列印順序" +msgctxt "user_defined_print_order_enabled label" +msgid "Set Print Sequence Manually" +msgstr "手動設置列印順序" + +msgctxt "user_defined_print_order_enabled description" +msgid "Allows to order the object list to set the print sequence manually. First object from the list will be printed first." +msgstr "允許手動設置物件列表以設定列印順序。列表中的第一個物件將首先被列印。" + msgctxt "speed_print label" msgid "Print Speed" msgstr "列印速度" diff --git a/resources/images/cura-share.png b/resources/images/cura-share.png new file mode 100644 index 0000000000..60de85194c Binary files /dev/null and b/resources/images/cura-share.png differ diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..23c8807afd --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = intent +variant = 1C + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..cdff2f30ce --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_nylon12-cf_175 +quality_type = draft +setting_version = 22 +type = intent +variant = 1C + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..3a781b61aa --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = intent +variant = 1XA + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..a833556bd8 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_sr30_175 +quality_type = draft +setting_version = 22 +type = intent +variant = 2XA + +[values] +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..87823a01a6 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = intent +variant = LABS + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..bb76919888 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_nylon12-cf_175 +quality_type = draft +setting_version = 22 +type = intent +variant = LABS + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..12bc3f2708 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = intent +variant = 1C + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..5533672636 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_nylon12-cf_175 +quality_type = draft +setting_version = 22 +type = intent +variant = 1C + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..82aa8e9bad --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = intent +variant = 1XA + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..01a55c85a4 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_sr30_175 +quality_type = draft +setting_version = 22 +type = intent +variant = 2XA + +[values] +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..ae7100bc86 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = intent +variant = LABS + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..af43c95cd2 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +intent_category = solid +is_experimental = True +material = ultimaker_nylon12-cf_175 +quality_type = draft +setting_version = 22 +type = intent +variant = LABS + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 1be715164c..8fe4a11847 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -35,6 +35,9 @@ Item property alias mergeObjects: mergeObjectsAction //property alias unMergeObjects: unMergeObjectsAction + property alias printObjectBeforePrevious: printObjectBeforePreviousAction + property alias printObjectAfterNext: printObjectAfterNextAction + property alias multiplyObject: multiplyObjectAction property alias selectAll: selectAllAction @@ -405,6 +408,26 @@ Item onTriggered: CuraApplication.ungroupSelected() } + Action + { + id: printObjectBeforePreviousAction + text: catalog.i18nc("@action:inmenu menubar:edit","Print Before") + " " + PrintOrderManager.previousNodeName + enabled: PrintOrderManager.shouldEnablePrintBeforeAction + icon.name: "print-before" + shortcut: "PgUp" + onTriggered: PrintOrderManager.swapSelectedAndPreviousNodes() + } + + Action + { + id: printObjectAfterNextAction + text: catalog.i18nc("@action:inmenu menubar:edit","Print After") + " " + PrintOrderManager.nextNodeName + enabled: PrintOrderManager.shouldEnablePrintAfterAction + icon.name: "print-after" + shortcut: "PgDown" + onTriggered: PrintOrderManager.swapSelectedAndNextNodes() + } + Action { id: mergeObjectsAction diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml index a174959807..1eca2f395c 100644 --- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml +++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml @@ -25,7 +25,7 @@ UM.Dialog function storeDontShowAgain() { UM.Preferences.setValue("cura/dialog_on_project_save", !dontShowAgainCheckbox.checked) - UM.Preferences.setValue("asked_dialog_on_project_save", true) + UM.Preferences.setValue("cura/asked_dialog_on_project_save", true) } onClosing: storeDontShowAgain() diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 3231d924ee..bd15df7848 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -15,6 +15,7 @@ Item property int iconSize: UM.Theme.getSize("extruder_icon").width property string iconVariant: "medium" property alias font: extruderNumberText.font + property alias text: extruderNumberText.text implicitWidth: iconSize implicitHeight: iconSize diff --git a/resources/qml/Menus/ContextMenu.qml b/resources/qml/Menus/ContextMenu.qml index 2de2795a74..1b32c24254 100644 --- a/resources/qml/Menus/ContextMenu.qml +++ b/resources/qml/Menus/ContextMenu.qml @@ -78,6 +78,19 @@ Cura.Menu Cura.MenuItem { action: Cura.Actions.mergeObjects } Cura.MenuItem { action: Cura.Actions.unGroupObjects } + // Edit print sequence actions + Cura.MenuSeparator { visible: PrintOrderManager.shouldShowEditPrintOrderActions } + Cura.MenuItem + { + action: Cura.Actions.printObjectBeforePrevious + visible: PrintOrderManager.shouldShowEditPrintOrderActions + } + Cura.MenuItem + { + action: Cura.Actions.printObjectAfterNext + visible: PrintOrderManager.shouldShowEditPrintOrderActions + } + Connections { target: UM.Controller diff --git a/resources/qml/Menus/EditMenu.qml b/resources/qml/Menus/EditMenu.qml index 522c6b27d1..728b3b212b 100644 --- a/resources/qml/Menus/EditMenu.qml +++ b/resources/qml/Menus/EditMenu.qml @@ -25,4 +25,17 @@ Cura.Menu Cura.MenuItem { action: Cura.Actions.groupObjects } Cura.MenuItem { action: Cura.Actions.mergeObjects } Cura.MenuItem { action: Cura.Actions.unGroupObjects } + + // Edit print sequence actions + Cura.MenuSeparator { visible: PrintOrderManager.shouldShowEditPrintOrderActions } + Cura.MenuItem + { + action: Cura.Actions.printObjectBeforePrevious + visible: PrintOrderManager.shouldShowEditPrintOrderActions + } + Cura.MenuItem + { + action: Cura.Actions.printObjectAfterNext + visible: PrintOrderManager.shouldShowEditPrintOrderActions + } } \ No newline at end of file diff --git a/resources/qml/Menus/FileMenu.qml b/resources/qml/Menus/FileMenu.qml index 0884053ef3..67edcc5962 100644 --- a/resources/qml/Menus/FileMenu.qml +++ b/resources/qml/Menus/FileMenu.qml @@ -47,8 +47,12 @@ Cura.Menu enabled: UM.WorkspaceFileHandler.enabled && saveProjectMenu.model.count == 1 onTriggered: { - var args = { "filter_by_machine": false, "file_type": "workspace", "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml" }; - if(UM.Preferences.getValue("cura/dialog_on_project_save")) + const args = { + "filter_by_machine": false, + "file_type": "workspace", + "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", + }; + if (UM.Preferences.getValue("cura/dialog_on_project_save")) { saveWorkspaceDialog.args = args saveWorkspaceDialog.open() @@ -70,6 +74,14 @@ Cura.Menu enabled: UM.WorkspaceFileHandler.enabled } + Cura.MenuItem + { + id: saveUCPMenu + text: catalog.i18nc("@title:menu menubar:file", "&Save Universal Cura Project...") + enabled: UM.WorkspaceFileHandler.enabled && CuraApplication.getPackageManager().allEnabledPackages.includes("3MFWriter") + onTriggered: CuraApplication.exportUcp() + } + Cura.MenuSeparator { } Cura.MenuItem @@ -78,8 +90,11 @@ Cura.Menu text: catalog.i18nc("@title:menu menubar:file", "&Export...") onTriggered: { - var localDeviceId = "local_file" - UM.OutputDeviceManager.requestWriteToDevice(localDeviceId, PrintInformation.jobName, { "filter_by_machine": false, "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml"}) + const args = { + "filter_by_machine": false, + "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", + }; + UM.OutputDeviceManager.requestWriteToDevice("local_file", PrintInformation.jobName, args); } } @@ -89,7 +104,13 @@ Cura.Menu text: catalog.i18nc("@action:inmenu menubar:file", "Export Selection...") enabled: UM.Selection.hasSelection icon.name: "document-save-as" - onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file", PrintInformation.jobName, { "filter_by_machine": false, "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml"}) + onTriggered: { + const args = { + "filter_by_machine": false, + "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", + }; + UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file", PrintInformation.jobName, args); + } } Cura.MenuSeparator { } diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 8871944523..d87ecac0b3 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -101,6 +101,7 @@ UM.PreferencesPage centerOnSelectCheckbox.checked = boolCheck(UM.Preferences.getValue("view/center_on_select")) UM.Preferences.resetPreference("view/invert_zoom"); invertZoomCheckbox.checked = boolCheck(UM.Preferences.getValue("view/invert_zoom")) + UM.Preferences.resetPreference("view/navigation_style"); UM.Preferences.resetPreference("view/zoom_to_mouse"); zoomToMouseCheckbox.checked = boolCheck(UM.Preferences.getValue("view/zoom_to_mouse")) //UM.Preferences.resetPreference("view/top_layer_count"); @@ -509,11 +510,14 @@ UM.PreferencesPage id: dropDownCheckbox text: catalog.i18nc("@option:check", "Automatically drop models to the build plate") checked: boolCheck(UM.Preferences.getValue("physics/automatic_drop_down")) - onCheckedChanged: UM.Preferences.setValue("physics/automatic_drop_down", checked) + onCheckedChanged: + { + UM.Preferences.setValue("physics/automatic_drop_down", checked) + CuraApplication.getWorkplaceDropToBuildplate(checked) + } } } - UM.TooltipArea { width: childrenRect.width; @@ -611,6 +615,55 @@ UM.PreferencesPage } } + UM.TooltipArea + { + width: childrenRect.width + height: childrenRect.height + text: catalog.i18nc("@info:tooltip", "What type of camera navigation should be used?") + Column + { + spacing: UM.Theme.getSize("narrow_margin").height + + UM.Label + { + text: catalog.i18nc("@window:text", "Camera navigation:") + } + ListModel + { + id: navigationStylesList + Component.onCompleted: + { + append({ text: catalog.i18n("Cura"), code: "cura" }) + append({ text: catalog.i18n("FreeCAD trackpad"), code: "freecad_trackpad" }) + } + } + + Cura.ComboBox + { + id: cameraNavigationComboBox + + model: navigationStylesList + textRole: "text" + width: UM.Theme.getSize("combobox").width + height: UM.Theme.getSize("combobox").height + + currentIndex: + { + var code = UM.Preferences.getValue("view/navigation_style"); + for(var i = 0; i < comboBoxList.count; ++i) + { + if(model.get(i).code == code) + { + return i + } + } + return 0 + } + onActivated: UM.Preferences.setValue("view/navigation_style", model.get(index).code) + } + } + } + Item { //: Spacer @@ -627,6 +680,8 @@ UM.PreferencesPage UM.TooltipArea { width: childrenRect.width + // Mac only allows applications to run as a single instance, so providing the option for this os doesn't make much sense + visible: Qt.platform.os !== "osx" height: childrenRect.height text: catalog.i18nc("@info:tooltip","Should opening files from the desktop or external applications open in the same instance of Cura?") @@ -730,6 +785,20 @@ UM.PreferencesPage } } + UM.TooltipArea + { + width: childrenRect.width + height: childrenRect.height + text: catalog.i18nc("@info:tooltip", "Should a summary be shown when saving a UCP project file?") + + UM.CheckBox + { + text: catalog.i18nc("@option:check", "Show summary dialog when saving a UCP project") + checked: boolCheck(UM.Preferences.getValue("cura/dialog_on_ucp_project_save")) + onCheckedChanged: UM.Preferences.setValue("cura/dialog_on_ucp_project_save", checked) + } + } + UM.TooltipArea { width: childrenRect.width diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 845c6cf492..1e287e74a0 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -12,7 +12,6 @@ import Cura 1.0 as Cura UM.ManagementPage { id: base - property var machineActionManager: CuraApplication.getMachineActionManager() Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} } title: catalog.i18nc("@title:tab", "Printers") @@ -63,7 +62,7 @@ UM.ManagementPage Repeater { id: machineActionRepeater - model: base.currentItem.id ? machineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id)) : null + model: base.currentItem ? CuraApplication.getSupportedActionMachineList(base.currentItem.id) : null Item { diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index 1af4e958f4..81f6c5d682 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -222,7 +222,7 @@ Item UM.Label { id: toolHint - text: UM.Controller.properties.getValue("ToolHint") != undefined ? UM.ActiveTool.properties.getValue("ToolHint") : "" + text: UM.Controller.properties.getValue("ToolHint") != undefined ? UM.Controller.properties.getValue("ToolHint") : "" color: UM.Theme.getColor("tooltip_text") anchors.horizontalCenter: parent.horizontalCenter } diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg index f4da80ded9..54807c88b3 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg @@ -38,8 +38,8 @@ line_width = 0.4 min_infill_area = 0 optimize_wall_printing_order = True prime_tower_brim_enable = True -prime_tower_enable = True prime_tower_min_volume = 6 +prime_tower_mode = normal prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg index a052562cd3..312313c9c5 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg @@ -38,8 +38,8 @@ line_width = 0.4 min_infill_area = 0 optimize_wall_printing_order = True prime_tower_brim_enable = True -prime_tower_enable = True prime_tower_min_volume = 6 +prime_tower_mode = normal prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg index 145cd34ead..485e82345a 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg @@ -36,8 +36,8 @@ line_width = 0.4 min_infill_area = 0 optimize_wall_printing_order = True prime_tower_brim_enable = True -prime_tower_enable = True prime_tower_min_volume = 6 +prime_tower_mode = normal prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg index e6e2cb78a0..7fb90fd093 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg @@ -36,8 +36,8 @@ line_width = 0.4 min_infill_area = 0 optimize_wall_printing_order = True prime_tower_brim_enable = True -prime_tower_enable = True prime_tower_min_volume = 6 +prime_tower_mode = normal prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg index 56587fe883..ce3fe8c60b 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg @@ -35,8 +35,8 @@ line_width = 0.4 min_infill_area = 0 optimize_wall_printing_order = True prime_tower_brim_enable = True -prime_tower_enable = True prime_tower_min_volume = 6 +prime_tower_mode = normal prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg index 10353f6110..a95c6ce5d3 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg @@ -35,8 +35,8 @@ line_width = 0.4 min_infill_area = 0 optimize_wall_printing_order = True prime_tower_brim_enable = True -prime_tower_enable = True prime_tower_min_volume = 6 +prime_tower_mode = normal prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg index 33b5c2c111..2e0d11b6eb 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg @@ -13,7 +13,7 @@ variant = DBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg index 5be0dc9527..fc487f97e4 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg @@ -13,7 +13,7 @@ variant = DBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg index 76aa867f8f..3eef71ef41 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg @@ -13,7 +13,7 @@ variant = DBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg index 20bb125cd9..35534c090e 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg @@ -13,7 +13,7 @@ variant = DBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg index cc0224cf23..d61061ff55 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg @@ -13,7 +13,7 @@ variant = DBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg index ec2ebdc647..df09da8d68 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg @@ -13,7 +13,7 @@ variant = DBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg index 136ec93d16..be38167856 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg @@ -13,7 +13,7 @@ variant = DBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg index 3a0a94782c..24299680ad 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg @@ -13,7 +13,7 @@ variant = DBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg index 719a4bdcbd..2c89d60680 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg @@ -13,7 +13,7 @@ variant = DBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg index 4486a1d3bc..c3cbb96ae7 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg @@ -13,7 +13,7 @@ variant = FBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg index b938502e85..5e062678c3 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg @@ -13,7 +13,7 @@ variant = FBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg index 3b88ca6b67..b9651ddf53 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg @@ -13,7 +13,7 @@ variant = FBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg index 4134717770..3e36641037 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg @@ -13,7 +13,7 @@ variant = FBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg index e267e7c6eb..bdb9ca3ce5 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg @@ -13,7 +13,7 @@ variant = FBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg index 35e2e07b41..741e6c613a 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg @@ -13,7 +13,7 @@ variant = FBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_D.inst.cfg index dd944cbfd1..c8421e34a5 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_D.inst.cfg @@ -13,7 +13,7 @@ variant = FBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_E.inst.cfg index 8aa462e206..39bafd45c6 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_E.inst.cfg @@ -13,7 +13,7 @@ variant = FBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_F.inst.cfg index 0691a01deb..c73c5baecd 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_F.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_F.inst.cfg @@ -13,7 +13,7 @@ variant = FBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_D.inst.cfg index a4d0582c3a..b9f63dff35 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_D.inst.cfg @@ -13,7 +13,7 @@ variant = V-DBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_E.inst.cfg index 831e17c018..86e03b328c 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_E.inst.cfg @@ -13,7 +13,7 @@ variant = V-DBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_F.inst.cfg index d9a57d6012..b51b54cb62 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_F.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_F.inst.cfg @@ -13,7 +13,7 @@ variant = V-DBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_G.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_G.inst.cfg index 8408fbc014..82ad7d5d49 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_G.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_G.inst.cfg @@ -13,7 +13,7 @@ variant = V-DBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_D.inst.cfg index 18c813a79a..dcc7dfcd48 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_D.inst.cfg @@ -13,7 +13,7 @@ variant = V-FBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_E.inst.cfg index 660c536a5e..d0fb6ec6e2 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_E.inst.cfg @@ -13,7 +13,7 @@ variant = V-FBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_F.inst.cfg index 5dbea58c49..1817111e2a 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_F.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_F.inst.cfg @@ -13,7 +13,7 @@ variant = V-FBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_G.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_G.inst.cfg index 9bfd649e99..8ba8f905d6 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_G.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_G.inst.cfg @@ -13,7 +13,7 @@ variant = V-FBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 diff --git a/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg index d5a2f73729..82cfb879dd 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg @@ -13,7 +13,7 @@ variant = 0.40mm_Elegoo_Nozzle [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg index e86f454664..3b8cc5bb5f 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg @@ -13,7 +13,7 @@ variant = 0.40mm_Elegoo_Nozzle [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 70 diff --git a/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg index db7e5a43c7..23e6730f11 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg @@ -17,7 +17,7 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg index d84cc9e656..f305930448 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0_40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg @@ -20,7 +20,7 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg index b6c63fad0f..cfc8fb9b32 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg @@ -15,7 +15,7 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg index 1e3eec080a..52ebc5566b 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg @@ -15,7 +15,7 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True +prime_tower_mode = normal speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg index 09bc57ffea..683bfe317a 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0_80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg @@ -15,7 +15,7 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True +prime_tower_mode = normal speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg index 66eb9f49c0..40cc88859a 100644 --- a/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg @@ -11,7 +11,7 @@ type = quality variant = 0.40mm_Elegoo_Nozzle [values] -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 skin_overlap = 10 speed_topbottom = =math.ceil(speed_print * 35 / 70) diff --git a/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg index 209ce52fa2..6043a569d0 100644 --- a/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg @@ -11,7 +11,7 @@ type = quality variant = 0.40mm_Elegoo_Nozzle [values] -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) diff --git a/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg index 9805a1ae5a..3076011555 100644 --- a/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg @@ -12,7 +12,7 @@ variant = 0.40mm_Elegoo_Nozzle [values] infill_sparse_density = 15 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 skin_overlap = 20 top_bottom_thickness = 0.8 diff --git a/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg index cb6ca323e6..562b84bf02 100644 --- a/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg @@ -14,7 +14,7 @@ variant = 0.40mm_Elegoo_Nozzle infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_sparse_density = 15 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 skin_overlap = 20 top_bottom_thickness = 0.9 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg index d9f0a0aaea..7178468de7 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg @@ -30,7 +30,7 @@ material_standby_temperature = =material_print_temperature - 10 ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True -prime_tower_enable = False +prime_tower_mode = none retraction_amount = 0.75 retraction_combing = off retraction_speed = 70 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg index 620622e555..cb966418ec 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg @@ -30,7 +30,7 @@ material_standby_temperature = =material_print_temperature - 10 ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True -prime_tower_enable = False +prime_tower_mode = none retraction_amount = 0.75 retraction_combing = off retraction_speed = 70 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg index 05eeb68305..23733ea85e 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg @@ -30,7 +30,7 @@ material_standby_temperature = =material_print_temperature - 10 ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True -prime_tower_enable = False +prime_tower_mode = none retraction_amount = 0.75 retraction_combing = off retraction_speed = 70 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg index b63ef09a6b..01577a46d0 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg @@ -29,7 +29,7 @@ material_standby_temperature = =material_print_temperature - 10 ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True -prime_tower_enable = False +prime_tower_mode = none retraction_amount = 0.75 retraction_combing = off retraction_speed = 70 diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg index 038affd56f..dc279c6232 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg @@ -18,7 +18,7 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 20 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 20 speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg index 5091d36813..d5684e3ccb 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg @@ -19,7 +19,7 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = False +prime_tower_mode = none speed_infill = =math.ceil(speed_print * 45 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_print = 60 diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg index 0420284fa8..bd43496eb4 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg @@ -19,7 +19,7 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg index 927bdbe7b9..420b8a9d9c 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg @@ -18,7 +18,7 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_initial_print_temperature = =material_print_temperature - 15 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False +prime_tower_mode = none speed_infill = =math.ceil(speed_print * 40 / 55) speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_print = 55 diff --git a/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg index 02d1292c17..ec682feabd 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg @@ -36,7 +36,7 @@ material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 raft_interface_thickness = =max(layer_height * 1.5, 0.225) diff --git a/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg index b1c540d01e..591e6e2964 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg @@ -35,7 +35,7 @@ material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 raft_interface_thickness = =max(layer_height * 1.5, 0.225) diff --git a/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg index 6aac1f4972..604e491db3 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg @@ -36,7 +36,7 @@ material_print_temperature = =default_material_print_temperature - 10 material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 raft_interface_thickness = =max(layer_height * 1.5, 0.225) diff --git a/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg index e831dfb254..e610dcf495 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg @@ -34,7 +34,7 @@ material_initial_print_temperature = =material_print_temperature - 5 material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 raft_interface_thickness = =max(layer_height * 1.5, 0.225) diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg index 6e0ac10718..37d77be67c 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg @@ -24,7 +24,7 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_print = 70 diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg index 5e84c3e1a1..f27381d0e3 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg @@ -20,7 +20,7 @@ layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg index 8974dcbb03..1c49689b2a 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg @@ -22,7 +22,7 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg index cbada0be18..82b3f109f4 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg @@ -21,7 +21,7 @@ layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) top_bottom_thickness = 1 diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg index 70817b06e3..e6e18da492 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg @@ -24,7 +24,7 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_print = 70 diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg index b6991202b2..50b8662604 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg @@ -20,7 +20,7 @@ layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg index 930f5cf3fd..baf7af3fdc 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg @@ -22,7 +22,7 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg index 6595446fee..bf5fb6b1c9 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg @@ -21,7 +21,7 @@ layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) top_bottom_thickness = 1 diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg index 1904758532..86216145d9 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg @@ -36,7 +36,7 @@ material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature + 5 material_standby_temperature = 100 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 12 diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg index 2a0a5729ec..7d4abe2d3f 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg @@ -36,7 +36,7 @@ material_print_temperature = =default_material_print_temperature - 13 material_print_temperature_layer_0 = =material_print_temperature + 3 material_standby_temperature = 100 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 12 diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg index 304c4f17f0..3aace2ea38 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg @@ -36,7 +36,7 @@ material_print_temperature = =default_material_print_temperature - 15 material_print_temperature_layer_0 = =material_print_temperature + 3 material_standby_temperature = 100 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 12 diff --git a/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg index bc712bf999..04b769ec81 100644 --- a/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg @@ -26,7 +26,7 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg index c51c068ae2..5f7216e9b8 100644 --- a/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg @@ -26,7 +26,7 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg index 3b6749dfb9..0f4b43d1ad 100644 --- a/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg @@ -26,7 +26,7 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg index 45418e5994..bf262d9b0d 100644 --- a/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg @@ -26,7 +26,7 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg index 90424ee65e..6f15ddf686 100644 --- a/resources/quality/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg @@ -17,7 +17,7 @@ jerk_travel = 20 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 15 material_standby_temperature = 100 -prime_tower_enable = True +prime_tower_mode = normal retraction_combing_max_distance = 50 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) diff --git a/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg index 7857ed00e7..e56ee10a98 100644 --- a/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg @@ -17,7 +17,7 @@ jerk_travel = 20 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 20 material_standby_temperature = 100 -prime_tower_enable = True +prime_tower_mode = normal retraction_combing_max_distance = 50 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg index 4194c6f3b7..c8c93a744f 100644 --- a/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg @@ -17,7 +17,7 @@ jerk_travel = 20 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 17 material_standby_temperature = 100 -prime_tower_enable = True +prime_tower_mode = normal retraction_combing_max_distance = 50 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) diff --git a/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg index 87dd876588..70db87df10 100644 --- a/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg @@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_standby_temperature = 100 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_acceleration = =acceleration_layer_0 raft_airgap = =round(layer_height_0 * 0.85, 2) raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) diff --git a/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg index 891a20540d..a134533c46 100644 --- a/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg @@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_standby_temperature = 100 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_acceleration = =acceleration_layer_0 raft_airgap = =round(layer_height_0 * 0.85, 2) raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) diff --git a/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg index e009094760..d8c5450478 100644 --- a/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg @@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_standby_temperature = 100 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_acceleration = =acceleration_layer_0 raft_airgap = =round(layer_height_0 * 0.85, 2) raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) diff --git a/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg index 947c042b8c..f941d5a55d 100644 --- a/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg @@ -25,7 +25,7 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg index 08cb14cb26..d96bf8d17e 100644 --- a/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg @@ -25,7 +25,7 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True +prime_tower_mode = normal raft_margin = 10 retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg index 187ed1f212..53142e5348 100644 --- a/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg @@ -25,7 +25,7 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg index 10b6e8185a..5a4cb62ee2 100644 --- a/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg @@ -25,7 +25,7 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg index ed0fc7fd8a..4168b05c61 100644 --- a/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg @@ -25,7 +25,7 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True +prime_tower_mode = normal raft_margin = 10 retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg index 9def9ecb97..af930c749a 100644 --- a/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg @@ -25,7 +25,7 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg index 4c3f60a240..dab7612a6c 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg @@ -26,9 +26,9 @@ material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =default_material_print_temperature + 2 material_standby_temperature = 100 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 10 +prime_tower_mode = normal retract_at_layer_change = False retraction_count_max = 12 retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg index 1b7c05ac3c..7ec446e803 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg @@ -26,9 +26,9 @@ material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature + 2 material_standby_temperature = 100 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 20 +prime_tower_mode = normal retract_at_layer_change = False retraction_count_max = 12 retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg index 7cbb60c3aa..9913ea3779 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg @@ -25,9 +25,9 @@ material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 2 material_standby_temperature = 100 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 15 +prime_tower_mode = normal retract_at_layer_change = False retraction_count_max = 12 retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg index 4994e3f9f4..54d9c23b98 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg @@ -30,8 +30,8 @@ material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature + 19 material_standby_temperature = 100 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retract_at_layer_change = False retraction_count_max = 12 retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg index fd15d041b8..289e9d48b7 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg @@ -31,8 +31,8 @@ material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =material_print_temperature + 15 material_standby_temperature = 100 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retract_at_layer_change = False retraction_count_max = 12 retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg index 5c88fb165f..c8cad9bb3f 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg @@ -30,8 +30,8 @@ material_initial_print_temperature = =material_print_temperature material_print_temperature_layer_0 = =material_print_temperature + 17 material_standby_temperature = 100 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retract_at_layer_change = False retraction_count_max = 12 retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/nps/nps_ABS_B.inst.cfg b/resources/quality/nps/nps_ABS_B.inst.cfg index 3f700405bd..520bda4b05 100644 --- a/resources/quality/nps/nps_ABS_B.inst.cfg +++ b/resources/quality/nps/nps_ABS_B.inst.cfg @@ -22,7 +22,7 @@ material_bed_temperature = 100 material_flow = 96 material_print_temperature = =default_material_print_temperature + 13 material_print_temperature_layer_0 = =243 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/nps/nps_ABS_C.inst.cfg b/resources/quality/nps/nps_ABS_C.inst.cfg index 6138e4004c..1131f61d36 100644 --- a/resources/quality/nps/nps_ABS_C.inst.cfg +++ b/resources/quality/nps/nps_ABS_C.inst.cfg @@ -22,7 +22,7 @@ material_bed_temperature = 100 material_flow = 91 material_print_temperature = =default_material_print_temperature + 15 material_print_temperature_layer_0 = =245 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/nps/nps_PC_A.inst.cfg b/resources/quality/nps/nps_PC_A.inst.cfg index 8665f8ceae..90cc71d951 100644 --- a/resources/quality/nps/nps_PC_A.inst.cfg +++ b/resources/quality/nps/nps_PC_A.inst.cfg @@ -32,7 +32,7 @@ material_bed_temperature = 110 material_flow = 100 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =280 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/nps/nps_PC_B.inst.cfg b/resources/quality/nps/nps_PC_B.inst.cfg index 9ccb5cea53..3761d802d7 100644 --- a/resources/quality/nps/nps_PC_B.inst.cfg +++ b/resources/quality/nps/nps_PC_B.inst.cfg @@ -32,7 +32,7 @@ material_bed_temperature = 110 material_flow = 88 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = 275 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/nps/nps_PC_C.inst.cfg b/resources/quality/nps/nps_PC_C.inst.cfg index 30267d4237..85752e78c2 100644 --- a/resources/quality/nps/nps_PC_C.inst.cfg +++ b/resources/quality/nps/nps_PC_C.inst.cfg @@ -32,7 +32,7 @@ material_bed_temperature = 110 material_flow = 88 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = 275 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/nps/nps_PETG_A.inst.cfg b/resources/quality/nps/nps_PETG_A.inst.cfg index 3cae430f1c..0985dd1b3a 100644 --- a/resources/quality/nps/nps_PETG_A.inst.cfg +++ b/resources/quality/nps/nps_PETG_A.inst.cfg @@ -22,7 +22,7 @@ material_bed_temperature = 80 material_flow = 98 material_print_temperature = =default_material_print_temperature + 20 material_print_temperature_layer_0 = =230 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/nps/nps_PETG_B.inst.cfg b/resources/quality/nps/nps_PETG_B.inst.cfg index 5860f65414..e3a5f165ad 100644 --- a/resources/quality/nps/nps_PETG_B.inst.cfg +++ b/resources/quality/nps/nps_PETG_B.inst.cfg @@ -22,7 +22,7 @@ material_bed_temperature = 80 material_flow = 95 material_print_temperature = =default_material_print_temperature + 20 material_print_temperature_layer_0 = =230 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_A.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_A.inst.cfg index 39ba32a332..0569a356f3 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_A.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_B.inst.cfg index dd0d167e6b..e906508f7f 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 96 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_C.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_C.inst.cfg index f894a7dc13..a883aba2ec 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_C.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS-X_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_A.inst.cfg index 7642489c2a..dc595e8c5d 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_B.inst.cfg index bf5c18405b..a84b12135f 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 96 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 1 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_C.inst.cfg index 6756384e4a..ef6358a6a0 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ABS_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 91 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature +3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_A.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_A.inst.cfg index 978484d813..7a0cd7ee8d 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_A.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_B.inst.cfg index bcec4fe68f..4fa5d070aa 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 95 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature + 0 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_C.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_C.inst.cfg index 85f79ebe7a..7944c44371 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_C.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ACETATE_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 93 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_A.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_A.inst.cfg index 9b29e49624..fb2ee81c9f 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_A.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_B.inst.cfg index 07a46f0d05..4e63f1513d 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 96 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_C.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_C.inst.cfg index 60410d8d34..5e158007ab 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_ASA-X_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 91 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_A.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_A.inst.cfg index 9304630630..f73adbfa51 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_A.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_A.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_B.inst.cfg index d39d91c91a..da2aa05237 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_B.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_C.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_C.inst.cfg index e716824cf0..e636a5ebee 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_C.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_COPA_C.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_A.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_A.inst.cfg index bd964bed2a..a997ac74dd 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_A.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_B.inst.cfg index cd27f77737..7055e3dadd 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_C.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_C.inst.cfg index 78191af7be..6c66ffd76c 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_HIPS_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_A.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_A.inst.cfg index f37a3b4d6d..f451618a28 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_A.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_A.inst.cfg @@ -34,7 +34,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 88 material_print_temperature = 260 material_print_temperature_layer_0 = 265 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_B.inst.cfg index 75fed99b1e..5866dad50b 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_B.inst.cfg @@ -34,7 +34,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 88 material_print_temperature = 270 material_print_temperature_layer_0 = 275 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_C.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_C.inst.cfg index 51911c3811..502dd8be07 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_C.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PC_C.inst.cfg @@ -34,7 +34,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 88 material_print_temperature = 270 material_print_temperature_layer_0 = 275 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PEKK_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PEKK_B.inst.cfg index e4596d9def..5279228105 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PEKK_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PEKK_B.inst.cfg @@ -33,7 +33,7 @@ material_flow = 105 material_flow_layer_0 = 120 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 15 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_A.inst.cfg index d0faf6eb66..92c62d2b43 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_A.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_B.inst.cfg index 3a64a52254..92811521ac 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_C.inst.cfg index debf74ed0d..234d33c2eb 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PETG_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_A.inst.cfg index 990d5cf645..76ea2997ba 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_A.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_B.inst.cfg index 82f26cd66d..fc3d8e47ec 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_C.inst.cfg index a91b035e38..f4bfb4c698 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_A.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_A.inst.cfg index c7194e18d2..82715060a6 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_A.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_A.inst.cfg @@ -29,7 +29,7 @@ material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 10 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 2 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_B.inst.cfg index 078e213a26..ca19b0ee14 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_B.inst.cfg @@ -29,7 +29,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 2 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_C.inst.cfg index bfb4c46c46..f61b83ab7b 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_C.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_PLA_HT_C.inst.cfg @@ -29,7 +29,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 2 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_A.inst.cfg index 8dd1c17ea6..85097b4506 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_A.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.38 material_flow = 107 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature - 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = False retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_B.inst.cfg index cca98aa599..967f7c21a5 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.38 material_flow = 103 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = False retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_C.inst.cfg index 5a343d6893..9110650629 100644 --- a/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/HT0_4/s3d_ht0.4_TPU98A_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.38 material_flow = 101 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = False retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_A.inst.cfg index e6be881341..de6356694f 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_B.inst.cfg index c4342c149a..ec119cba9f 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 96 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_C.inst.cfg index e3581e0823..0b4df9f3a3 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS-X_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_A.inst.cfg index 4c451894bd..ad5d8c8586 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_B.inst.cfg index 65c2c9e81f..e0600e72d8 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 96 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 1 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_C.inst.cfg index 2f5cf9cfa3..5827b15cf9 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ABS_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 91 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature +3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_A.inst.cfg index 36d6697edb..3ee7204b92 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_B.inst.cfg index e92561350a..4834ca9eef 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 95 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature + 0 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_C.inst.cfg index e61775fde0..4850f68dc0 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ACETATE_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 93 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_A.inst.cfg index 020b95dad2..ec7cbcc0fd 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_B.inst.cfg index 6688d82ec8..6f086f0605 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 96 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_C.inst.cfg index 2c8d6a82d3..ff5016d543 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_ASA-X_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 91 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_A.inst.cfg index fe012ff873..e324931269 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_B.inst.cfg index c0adce0f84..5aea3605f5 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_C.inst.cfg index 5b58c2f37b..24a1faed48 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_BVOH_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_A.inst.cfg index f986831fd5..d73b6ac796 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_A.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_B.inst.cfg index 5d360b244b..14d3867950 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_B.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_C.inst.cfg index 3875e668f4..26e6ebc4df 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_COPA_C.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_A.inst.cfg index d4d0e1c17e..54954ff567 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_B.inst.cfg index f2bb237ea2..057fb1b8cc 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_C.inst.cfg index f6780fbded..63f71cff82 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_HIPS_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_A.inst.cfg index 6e726932a6..afef00df11 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_A.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_B.inst.cfg index 7ef50ff5b1..7b81803b0c 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_B.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_C.inst.cfg index 4d4af1e0f7..c0ac99423d 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6CF_C.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_A.inst.cfg index 0d88c99c85..bd0f177b1b 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_A.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_B.inst.cfg index de476e6e46..586d49b7db 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_B.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_C.inst.cfg index 3fe7ff347c..16c8c5e6aa 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PA6GF_C.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_A.inst.cfg index 9dd3039b65..71a70f0849 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_A.inst.cfg @@ -34,7 +34,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 88 material_print_temperature = 260 material_print_temperature_layer_0 = 265 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_B.inst.cfg index 346f33bafb..ad26bba4cb 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_B.inst.cfg @@ -34,7 +34,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 88 material_print_temperature = 270 material_print_temperature_layer_0 = 275 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_C.inst.cfg index 8571e8c4b0..e4da72d39a 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PC_C.inst.cfg @@ -34,7 +34,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 88 material_print_temperature = 270 material_print_temperature_layer_0 = 275 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_A.inst.cfg index 4231e1b3a1..b7bebe13b7 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_B.inst.cfg index c141a0ab07..f3bc48c8c9 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_C.inst.cfg index 9cd4262c55..70c2d3044c 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PETG_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_A.inst.cfg index 6f49ec9e3b..d52ceb51ea 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_B.inst.cfg index 415379417c..6124b1dfed 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_C.inst.cfg index c4ce86563f..b4a8bc21f4 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_A.inst.cfg index dc4505591f..a764026ca7 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_A.inst.cfg @@ -29,7 +29,7 @@ material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 10 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 2 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_B.inst.cfg index 224fa18cd6..11b9d689c8 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_B.inst.cfg @@ -29,7 +29,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 2 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_C.inst.cfg index 44737981b0..7521ef5d62 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PLA_HT_C.inst.cfg @@ -29,7 +29,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 2 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_A.inst.cfg index 8bf71b5cf5..6de69d4eba 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_B.inst.cfg index 3102afdc2c..e2b282ab2a 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_C.inst.cfg index ad6e361582..60d02fac6d 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-M_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_A.inst.cfg index b7445aee86..4969aad456 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_B.inst.cfg index cc849df9ba..7bf8dc30d4 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_C.inst.cfg index 10cbd3a4cf..27cef2d7c9 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_PVA-S_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_A.inst.cfg index 055bbb7623..24e3a1f238 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_A.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.38 material_flow = 107 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature - 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = False retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_B.inst.cfg index 028586beb4..4211634c6d 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.38 material_flow = 103 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = False retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_C.inst.cfg index 8bc0b97bc5..bd2c12c3f1 100644 --- a/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_4/s3d_std0.4_TPU98A_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.38 material_flow = 101 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = False retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_B.inst.cfg index ec355cec15..589f27a221 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_C.inst.cfg index 3ab4df020c..bca586491d 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 98 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_D.inst.cfg index 455cb44a7b..2e90b6fd6f 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS-X_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 96 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_B.inst.cfg index 3475c621c3..e2f63845ee 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_C.inst.cfg index d7d937fdef..bc9df5fa14 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 98 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 1 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_D.inst.cfg index e83067bdc8..7216eb093c 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ABS_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 96 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_B.inst.cfg index 188cddf0d6..a90e755a49 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_C.inst.cfg index 6127c2ec43..1d54fd6b3c 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 93 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature + 0 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_D.inst.cfg index ca38be0476..90d3d00507 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ACETATE_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 91 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_B.inst.cfg index caa9003cb3..ca2b4a9c9e 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 101 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_C.inst.cfg index a10cbdac7d..b297719ba1 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 99 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_D.inst.cfg index 85fe174e95..34882ab1af 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_ASA-X_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_B.inst.cfg index 9b48be1b8b..07969b958a 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_C.inst.cfg index 0440a0a34a..ecd3384a5b 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_D.inst.cfg index 7f124ae4ec..a4a87bc3f3 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_BVOH_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_B.inst.cfg index f662c41048..c0f93168da 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_B.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 3 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_C.inst.cfg index dae0dda098..4116205747 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_C.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 3 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_D.inst.cfg index 1079c746ec..df1fb6e2e7 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_COPA_D.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 3 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_B.inst.cfg index 04991249e9..aa5bfa30f2 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_C.inst.cfg index 685778f3f1..887a35f80e 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_D.inst.cfg index ab5eca1d47..a9a4bcb18f 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_HIPS_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_Nylon-1030_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_Nylon-1030_C.inst.cfg index a5a2addbc6..d73114c313 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_Nylon-1030_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_Nylon-1030_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 93 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_B.inst.cfg index 6ecc9a3265..e3f0657f1f 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_B.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_C.inst.cfg index 9e060959dd..542f9405b1 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_C.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_D.inst.cfg index 322d30a975..43ff676c46 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6CF_D.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_B.inst.cfg index 5ae6c32cb8..2cca8a5c45 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_B.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_C.inst.cfg index 3fbe1f6370..951e26d841 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_C.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_D.inst.cfg index 46aacdf22c..f408c5a293 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PA6GF_D.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_B.inst.cfg index 6997dae536..8b72022a0d 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_B.inst.cfg @@ -33,7 +33,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 87 material_print_temperature = 270 material_print_temperature_layer_0 = 275 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 2 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_C.inst.cfg index 70bb7206af..2540f2bea9 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_C.inst.cfg @@ -33,7 +33,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 87 material_print_temperature = 270 material_print_temperature_layer_0 = 275 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 2 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_D.inst.cfg index eb89937ded..c6bd8cc70e 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PC_D.inst.cfg @@ -33,7 +33,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 87 material_print_temperature = 270 material_print_temperature_layer_0 = 275 -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 2 retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_B.inst.cfg index 4bc567a2d9..02b8e45e22 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 93 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_C.inst.cfg index f08c2e68b7..26e2eb5029 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 92 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_D.inst.cfg index 4a9a1472b8..f97462d99c 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PETG_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_B.inst.cfg index 41edbc8e32..540e14ba23 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 93 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_C.inst.cfg index 10356ad344..af851371a1 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 92 material_print_temperature = =default_material_print_temperature + 8 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_D.inst.cfg index 9f04791ac2..e2470b9ecf 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_B.inst.cfg index 56e09ac385..21c4f9eccc 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_B.inst.cfg @@ -29,7 +29,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_C.inst.cfg index 6c8a5462aa..b210d0fd30 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_C.inst.cfg @@ -29,7 +29,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_D.inst.cfg index be4a045e0d..6b6a5923ce 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PLA_HT_D.inst.cfg @@ -29,7 +29,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_B.inst.cfg index 6b107e9c9b..f677ac9e32 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_C.inst.cfg index ca169572b9..9ed4c381c9 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_D.inst.cfg index 7e7a3ed9d1..3f928f436d 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-M_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_B.inst.cfg index a08e251fe0..d8e702dc7a 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_C.inst.cfg index 2bcf4d4b1d..53516d4617 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_D.inst.cfg index 1352a75a8a..e7298a71d3 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_PVA-S_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_B.inst.cfg index ad699959aa..cd9de526ec 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_B.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.55 material_flow = 105 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature - 2 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = False retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_C.inst.cfg index 6fdabc1a83..4de06235da 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.55 material_flow = 103 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = False retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_D.inst.cfg index 1954931cc7..431623b7c6 100644 --- a/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_6/s3d_std0.6_TPU98A_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.55 material_flow = 101 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.2 retraction_hop_only_when_collides = False retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_C.inst.cfg index 913af1994b..e0c29062d7 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 1 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_D.inst.cfg index 573834fc79..9230df64e3 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 96 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_E.inst.cfg index 3d5d1781ae..7117a889ed 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS-X_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 95 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_C.inst.cfg index 4910a69272..97d2209bda 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_D.inst.cfg index 28d395019a..111504ad7b 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 96 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 2 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_E.inst.cfg index b91ceb1f85..d5322c039a 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ABS_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 95 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_C.inst.cfg index 4a32ddceaf..74d0fa3869 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_D.inst.cfg index e45a8970f7..80dfbe8dbc 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 96 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_E.inst.cfg index c0a9632b95..26decee7ba 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_ASA-X_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_C.inst.cfg index bce7e2891f..850458ed36 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_D.inst.cfg index 0a053f123e..06f9ed6686 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_E.inst.cfg index 4f167ecacc..36398c0cfc 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_BVOH_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_C.inst.cfg index 8efea7e264..8dd9bc10fb 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_C.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop = 2 retraction_hop_enabled = True diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_D.inst.cfg index d2f6973da7..fb149908d1 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_D.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop = 2 retraction_hop_enabled = True diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_E.inst.cfg index 57e9fc27a4..47d9a50940 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_COPA_E.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop = 2 retraction_hop_enabled = True diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_C.inst.cfg index 2ef4a5b479..e57fefc2b9 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_D.inst.cfg index a7549a851c..0cbddce4c9 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_E.inst.cfg index 322f31e986..965c08e8f9 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_HIPS_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_C.inst.cfg index 6f3fa578bf..4062997ba0 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_C.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_D.inst.cfg index ee3166e7da..e6acfe27b8 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_D.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_E.inst.cfg index 05eabcc6a3..602837f410 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6CF_E.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_C.inst.cfg index d10b2df53b..d5bb0ac8ba 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_C.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_D.inst.cfg index 181d89f957..022a6f36bf 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_D.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_E.inst.cfg index 38bd72884b..35421e68d6 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PA6GF_E.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_C.inst.cfg index d8b2e660fc..65217b7ff9 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_C.inst.cfg @@ -35,7 +35,7 @@ material_print_temperature = 280 material_print_temperature_layer_0 = 285 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_speed = 35 diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_D.inst.cfg index c39338eeca..118acb433f 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_D.inst.cfg @@ -35,7 +35,7 @@ material_print_temperature = 280 material_print_temperature_layer_0 = 285 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_speed = 35 diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_E.inst.cfg index f88eff1615..c8102ecdf9 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PC_E.inst.cfg @@ -35,7 +35,7 @@ material_print_temperature = 280 material_print_temperature_layer_0 = 285 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_speed = 35 diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_C.inst.cfg index 59a6db473d..df178b1807 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.4 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_D.inst.cfg index 9a94498b12..95973a4428 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.4 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_E.inst.cfg index 2611e1deba..32073574ea 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PETG_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 93 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.4 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_C.inst.cfg index 35644e47a8..4b306434b9 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 99 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_D.inst.cfg index a820dd8467..99a245dfb4 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 98 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_E.inst.cfg index a4f135a4fa..d7ecb95748 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_C.inst.cfg index ee58caf9e6..9a973d225d 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_C.inst.cfg @@ -27,7 +27,7 @@ material_flow = 93 material_initial_print_temperature = =default_material_print_temperature material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_D.inst.cfg index 6399e7fd1f..6ff6a8dd0e 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_D.inst.cfg @@ -29,7 +29,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_E.inst.cfg index e034d49e6e..5f19e2ab77 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PLA_HT_E.inst.cfg @@ -29,7 +29,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_C.inst.cfg index 632c45a51f..5ea81eab76 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_D.inst.cfg index e882d42015..cc5ecebffe 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_E.inst.cfg index 7b52c7bb2d..d133a60b41 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-M_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_C.inst.cfg index a0fcdc4a52..1e243bbea4 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_D.inst.cfg index 496e5fe215..54889f9923 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_E.inst.cfg index 9c676c934b..8f484b0616 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_PVA-S_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_C.inst.cfg index 0b4c3c0281..f328b88645 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.7 material_flow = 105 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_D.inst.cfg index ffbb925a22..9d11111b78 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.7 material_flow = 103 material_print_temperature = =default_material_print_temperature + 6 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_E.inst.cfg index 60af5617e3..ed25c0fb46 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU98A_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.7 material_flow = 101 material_print_temperature = =default_material_print_temperature + 9 material_print_temperature_layer_0 = =default_material_print_temperature +5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_C.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_C.inst.cfg index 71581b46ad..0b70ff0384 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_C.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.7 material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_D.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_D.inst.cfg index bcbb45062a..f519ec66d5 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.7 material_flow = 100 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_E.inst.cfg b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_E.inst.cfg index 827ae4a7ba..83c109070a 100644 --- a/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0_8/s3d_std0.8_TPU_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.7 material_flow = 100 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature +3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_D.inst.cfg index 29f88f6e15..09ffbaed98 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_E.inst.cfg index 316e5d4447..ff50fd3deb 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_F.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_F.inst.cfg index 44203ad144..fbbc7a0187 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ABS_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_D.inst.cfg index e322951476..95a6d4e732 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.4 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_E.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_E.inst.cfg index b4ee9ea985..2c0caa6a06 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.4 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_F.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_F.inst.cfg index 708896fdb7..c896adef1b 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_ASA-X_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 100 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.4 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_D.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_D.inst.cfg index 63ca3d88ff..0dcc4405d7 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_E.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_E.inst.cfg index 62ed1914db..73dce76c2e 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_F.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_F.inst.cfg index ac9ec6324e..36902a619f 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_BVOH_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_D.inst.cfg index b225d8a911..b0bc012110 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_E.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_E.inst.cfg index 6e859c8dd0..baf4211645 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_F.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_F.inst.cfg index 6b8ebd9d20..754d20c802 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_HIPS_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_D.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_D.inst.cfg index f168d4cf46..717aed8e49 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_D.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_E.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_E.inst.cfg index 652876d6b2..d41dea9d7b 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_E.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_F.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_F.inst.cfg index 482b99c2f6..b708481aeb 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6CF_F.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_D.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_D.inst.cfg index 551e79a8e4..5e604e6f65 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_D.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_E.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_E.inst.cfg index 5709736147..31f7a30f3f 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_E.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_F.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_F.inst.cfg index 38f3b2b2ef..f35389424c 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PA6GF_F.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_D.inst.cfg index 54a6d54cc0..902e42aef1 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_E.inst.cfg index abdd37d98d..f1fc4dd877 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_F.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_F.inst.cfg index 50f3b04e16..03c73269f8 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PETG_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 95 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_D.inst.cfg index 35e9d19957..ddf8abc4c1 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_E.inst.cfg index 6e59384a4d..77eb559e6e 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 100 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_F.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_F.inst.cfg index 9df5f69d75..5053e91cbb 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PLA_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 100 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_D.inst.cfg index 45b5a9e415..0e658a7bd2 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_E.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_E.inst.cfg index 70ec1234ff..f30a55729c 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_F.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_F.inst.cfg index 6327502027..eca2362651 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-M_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_D.inst.cfg index d7056a3f11..ec460ac49e 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_E.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_E.inst.cfg index a5ec67621f..1e85473f67 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_F.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_F.inst.cfg index 4ddc98ddd2..9650dac1c0 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_PVA-S_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.0 material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_D.inst.cfg index 1b3a77ab8b..38cf5927f0 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_D.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.9 material_flow = 107 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_E.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_E.inst.cfg index be45c084a5..60baaa1038 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_E.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.9 material_flow = 107 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_F.inst.cfg b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_F.inst.cfg index c02401c4d5..385d21e44d 100644 --- a/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_0_Experimental/s3d_std1.0_TPU98A_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*0.9 material_flow = 107 material_print_temperature = =default_material_print_temperature + 8 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_F.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_F.inst.cfg index ba91c749d5..ef7573779d 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 103 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_G.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_G.inst.cfg index b1d4c72a34..86e4022a27 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_G.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 102 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_H.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_H.inst.cfg index 4fac7e687d..aa2af46845 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ABS_H.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 101 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_F.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_F.inst.cfg index 91b4699598..915523eadf 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_G.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_G.inst.cfg index 8d84bc4fd5..d258496552 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_G.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_H.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_H.inst.cfg index eafe3eef80..93420a5103 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_ASA-X_H.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_F.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_F.inst.cfg index 3286e7fb08..41764726df 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_G.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_G.inst.cfg index bb164bcd99..2e4bb516b0 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_G.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_H.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_H.inst.cfg index 82ad174a95..700c0102c2 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_BVOH_H.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_F.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_F.inst.cfg index f33abf1ec3..941f0a6c81 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 103 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_G.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_G.inst.cfg index 2edb0e32f8..4cd7728a69 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_G.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 102 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_H.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_H.inst.cfg index 30d7139eb9..01b584afcd 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_HIPS_H.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 101 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_F.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_F.inst.cfg index 1bf36453d1..a4c6fd4046 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_F.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_G.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_G.inst.cfg index f413dd3e17..376c9b1d51 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_G.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_H.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_H.inst.cfg index 9b228f7b05..5e27fec150 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6CF_H.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_F.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_F.inst.cfg index 68c8604a95..5ca32bd655 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_F.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_G.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_G.inst.cfg index 66fc7c2f92..bdebb9a0ac 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_G.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_H.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_H.inst.cfg index aceba867c2..01c65f4586 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PA6GF_H.inst.cfg @@ -37,7 +37,7 @@ material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 5 meshfix_maximum_deviation = 0.04 meshfix_maximum_resolution = 0.5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.1 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_F.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_F.inst.cfg index a34c3a4d45..9a8aaeb18e 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_G.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_G.inst.cfg index bd41a808d0..ba4d2b22ec 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_G.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_H.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_H.inst.cfg index 6036150353..2b1b5fb2f9 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PETG_H.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 95 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_F.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_F.inst.cfg index c150380c74..6e05ba15a6 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 107 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_G.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_G.inst.cfg index 74ce8559d2..56765cb156 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_G.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 105 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_H.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_H.inst.cfg index f59b68f675..36d6248682 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PLA_H.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 103 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.5 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_F.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_F.inst.cfg index 689c1fe076..d88ff841d0 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_G.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_G.inst.cfg index 514cdcbfde..9bb1258fc8 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_G.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_H.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_H.inst.cfg index 123dc9a953..7a662ec6d1 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-M_H.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_F.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_F.inst.cfg index 9c3f620a2d..767b72a566 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_G.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_G.inst.cfg index 0b841dfb09..da088dc345 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_G.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_H.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_H.inst.cfg index adfe816125..1ae6c25ebb 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_PVA-S_H.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.2 material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = True retraction_min_travel = =3*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_F.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_F.inst.cfg index 4b6108e51d..a9eb8331c8 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_F.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.1 material_flow = 111 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_G.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_G.inst.cfg index 99af35534f..03cb145944 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_G.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.1 material_flow = 111 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_H.inst.cfg b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_H.inst.cfg index 21043cae58..ac77c87265 100644 --- a/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1_2_Experimental/s3d_std1.2_TPU98A_H.inst.cfg @@ -24,7 +24,7 @@ line_width = =machine_nozzle_size/machine_nozzle_size*1.1 material_flow = 111 material_print_temperature = =default_material_print_temperature + 8 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_extra_prime_amount = 0.3 retraction_hop_only_when_collides = False retraction_min_travel = =2*line_width diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg index ac5f3e5bee..538bcfedb9 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg @@ -22,8 +22,8 @@ material_final_print_temperature = =material_print_temperature material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True -prime_tower_enable = True prime_tower_flow = 110 +prime_tower_mode = normal prime_tower_size = 35 retraction_min_travel = 2 skirt_gap = 2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg index eca85becc6..86c4cd1894 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg @@ -19,8 +19,8 @@ material_final_print_temperature = =material_print_temperature material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True -prime_tower_enable = True prime_tower_flow = 110 +prime_tower_mode = normal prime_tower_size = 35 retraction_hop_enabled = False support_enable = True diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg index 8071d7193e..83ec574663 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg @@ -30,8 +30,8 @@ material_flow_layer_0 = 93 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True -prime_tower_enable = True prime_tower_flow = 110 +prime_tower_mode = normal prime_tower_size = 35 retraction_amount = 5 retraction_hop_enabled = False diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg index 8354fba5e0..2269a480a5 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg @@ -30,8 +30,8 @@ material_flow_layer_0 = 93 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True -prime_tower_enable = True prime_tower_flow = 110 +prime_tower_mode = normal prime_tower_size = 35 retraction_amount = 5 retraction_hop_enabled = False diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg index 074632abda..4fed169568 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg @@ -19,8 +19,8 @@ material_final_print_temperature = =material_print_temperature material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True -prime_tower_enable = True prime_tower_flow = 110 +prime_tower_mode = normal prime_tower_size = 35 retraction_hop_enabled = False support_enable = True diff --git a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg index eeb924906f..632a1fb46d 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg @@ -21,7 +21,7 @@ machine_min_cool_heat_time_window = 15 material_print_temperature = =default_material_print_temperature - 10 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg index a64c8298a2..0667ef961d 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg @@ -21,7 +21,7 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 2 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg index 16be0db845..d93ba61d9d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg @@ -15,7 +15,7 @@ weight = -2 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 20 speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg index 916b283c9c..b92a826f5a 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg @@ -15,7 +15,7 @@ weight = -1 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 10 -prime_tower_enable = False +prime_tower_mode = none speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg index 5dcbe80bbb..2fe35f1a2e 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg @@ -15,7 +15,7 @@ weight = 1 machine_nozzle_cool_down_speed = 0.8 machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 20 -prime_tower_enable = False +prime_tower_mode = none speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg index 1420880995..fcecc2701b 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -15,7 +15,7 @@ weight = 0 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 15 -prime_tower_enable = False +prime_tower_mode = none speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index e0dd43cc28..cf417a84b6 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -16,7 +16,7 @@ brim_replaces_support = False machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +prime_tower_mode = ='normal' if (min(extruderValues('material_surface_energy')) < 100) else 'none' skin_overlap = 20 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 16ece7c2dd..363a43975e 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -15,7 +15,7 @@ weight = -1 brim_replaces_support = False machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +prime_tower_mode = ='normal' if (min(extruderValues('material_surface_energy')) < 100) else 'none' speed_print = 80 speed_topbottom = =math.ceil(speed_print * 30 / 80) speed_wall = =math.ceil(speed_print * 40 / 80) diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index ca7fd8cbf3..92dae4a19f 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -15,7 +15,7 @@ weight = 0 brim_replaces_support = False machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +prime_tower_mode = ='normal' if (min(extruderValues('material_surface_energy')) < 100) else 'none' skin_overlap = 10 support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg index 5de59e58c9..2540a78b21 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -18,7 +18,7 @@ infill_wipe_dist = 0 layer_height = 0.2 machine_min_cool_heat_time_window = 15 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg index b2020831d7..37e8df992d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -18,7 +18,7 @@ infill_wipe_dist = 0 layer_height = 0.15 machine_min_cool_heat_time_window = 15 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg index 4be3a9c13a..5ba84b0564 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg @@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 8 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg index 2e24f485d0..0fb115b548 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -20,7 +20,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg index 28e8ccbf75..d0d447acdf 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg @@ -24,7 +24,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg index 5113277ab2..e55a49baba 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg @@ -23,7 +23,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg index 636ce41e71..ee55427cf7 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg @@ -25,7 +25,7 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 20 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg index a7c533bfea..15410514cd 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg @@ -23,7 +23,7 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 10 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg index 1d44e48193..a79b715ee0 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg @@ -15,7 +15,7 @@ weight = -2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 20 speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg index 6b99ed5a70..a838352f48 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg @@ -14,7 +14,7 @@ weight = -1 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none speed_print = 80 speed_topbottom = =math.ceil(speed_print * 30 / 80) speed_wall = =math.ceil(speed_print * 40 / 80) diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg index 97be45babc..e5a10d9222 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg @@ -15,7 +15,7 @@ weight = 1 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 10 speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg index f305caa82d..486b74c1b2 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 10 top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg index c82043d3af..4293ca81f1 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg @@ -24,7 +24,7 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 8 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_amount = 6.5 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg index 74a628f7cb..1b396f5417 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg @@ -23,7 +23,7 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg index fa9b4c54ea..6c4ee71b82 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg @@ -23,7 +23,7 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 2 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg index cffd1e6075..d8fca155d3 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -14,7 +14,7 @@ weight = -2 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 20 speed_print = 50 speed_roofing = =math.ceil(speed_wall * 20 / 24) diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg index 94fe824f5e..5ea9fe9336 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -14,7 +14,7 @@ weight = -1 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg index 05a6896646..4e03569ca6 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -15,7 +15,7 @@ weight = 0 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none skin_overlap = 10 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg index dcca81f3ef..0443afa3f6 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -17,7 +17,7 @@ brim_width = 14 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 20 -prime_tower_enable = True +prime_tower_mode = normal retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 585ae8eefe..ccae2cc5d8 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -18,7 +18,7 @@ layer_height = 0.4 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 15 -prime_tower_enable = True +prime_tower_mode = normal retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg index 2280a837ae..9596b00d33 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -18,7 +18,7 @@ layer_height = 0.3 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 17 -prime_tower_enable = True +prime_tower_mode = normal retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg index b1f867807b..4a7e29ec36 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg @@ -14,7 +14,7 @@ weight = -2 [values] brim_width = 15 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg index a75ae74ada..5c5b732990 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -15,7 +15,7 @@ weight = -4 brim_width = 15 layer_height = 0.4 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True +prime_tower_mode = normal speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg index c1544a00e2..9a48e11a7b 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -15,7 +15,7 @@ weight = -3 brim_width = 15 layer_height = 0.3 material_print_temperature = =default_material_print_temperature + 12 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg index a0fc036566..747730c0a7 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -17,7 +17,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.45 support_angle = 70 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg index 547ab013fb..40f0779369 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -18,7 +18,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.45 support_angle = 70 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg index b17789ad0f..03116ec10d 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -18,7 +18,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.45 support_angle = 70 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg index 3eafff9a07..aab2e25ac2 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg @@ -14,7 +14,7 @@ weight = -2 [values] brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_combing = all speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg index fe36a86948..45ec96e089 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -15,7 +15,7 @@ weight = -4 brim_width = 7 layer_height = 0.4 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_combing = all speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg index 2bba762e2d..ee92c6add7 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -15,7 +15,7 @@ weight = -3 brim_width = 7 layer_height = 0.3 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = True +prime_tower_mode = normal retraction_combing = all speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg index 57a830402a..84a9b9a5fb 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg @@ -17,7 +17,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg index 40f710327f..ae59471ff3 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -18,7 +18,7 @@ layer_height = 0.4 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True +prime_tower_mode = normal speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg index 702c64bb78..2a4c093dca 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -18,7 +18,7 @@ layer_height = 0.3 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg index 145389fbe4..c9e31486c0 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg @@ -16,9 +16,9 @@ brim_width = 25 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_print_temperature = =default_material_print_temperature + 11 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 10 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg index 68d54bd406..e821581360 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -16,9 +16,9 @@ brim_width = 25 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_print_temperature = =default_material_print_temperature + 15 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 20 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg index 2aa79cad79..a5817651d8 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -17,9 +17,9 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' layer_height = 0.3 material_print_temperature = =default_material_print_temperature + 13 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 15 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg index a9b7a92918..5e0816ef9a 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -17,7 +17,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False +prime_tower_mode = none speed_print = 45 support_angle = 70 top_bottom_thickness = =layer_height * 6 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg index 16e17c500e..36e25d258a 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -17,7 +17,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = False +prime_tower_mode = none speed_infill = =math.ceil(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg index 96dec4f1c5..ffbc413b6e 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -17,7 +17,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = False +prime_tower_mode = none speed_infill = =math.ceil(speed_print * 30 / 35) speed_topbottom = =math.ceil(speed_print * 20 / 35) speed_wall = =math.ceil(speed_print * 25/ 35) diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg index 859eb3b33a..d8f7812d75 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg @@ -23,8 +23,8 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 4 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg index 61ace7da80..a689035132 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -23,8 +23,8 @@ material_final_print_temperature = =material_print_temperature - 10 material_flow = 105 material_initial_print_temperature = =material_print_temperature - 10 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg index e45b8f2d1d..f4b61cac5d 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -24,8 +24,8 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 2 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg index eab1a39931..64ad8ff7f3 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg @@ -15,7 +15,7 @@ weight = -2 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skin_overlap = 20 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index ad1e26c7da..2cdc81a5d9 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg @@ -14,7 +14,7 @@ weight = -1 [values] brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skin_overlap = 15 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index e5ae49b17d..fa2b7026a1 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg @@ -15,7 +15,7 @@ weight = 1 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_infill_sparse_thickness = =3*layer_height diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index 38334b4358..d16740c8ef 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -15,7 +15,7 @@ weight = 0 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_infill_sparse_thickness = =2*layer_height 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 new file mode 100644 index 0000000000..f0e0a4fded --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg @@ -0,0 +1,50 @@ +[general] +definition = ultimaker_methodx +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = False +material_print_temperature_layer_0 = =default_material_print_temperature+5 +raft_airgap = 0.3 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 98.0 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 250.0 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + 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 new file mode 100644 index 0000000000..32d64ed5b1 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -0,0 +1,53 @@ +[general] +definition = ultimaker_methodx +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_nylon12-cf_175 +quality_type = draft +setting_version = 22 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = False +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_line_spacing = 3 +raft_base_line_width = 1.2 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 100 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 250.0 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + 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 new file mode 100644 index 0000000000..e032e3a3b8 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg @@ -0,0 +1,50 @@ +[general] +definition = ultimaker_methodx +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = quality +variant = 1XA +weight = -2 + +[values] +cool_fan_enabled = False +material_print_temperature_layer_0 = =default_material_print_temperature+5 +raft_airgap = 0.3 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 98.0 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 250.0 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + 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 new file mode 100644 index 0000000000..5ebc2b4560 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = ultimaker_methodx +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_sr30_175 +quality_type = draft +setting_version = 22 +type = quality +variant = 2XA +weight = -2 + +[values] +brim_replaces_support = False +cool_fan_enabled = False +cool_min_temperature = =material_print_temperature +raft_airgap = 0.0 +raft_interface_line_width = 0.7 +raft_interface_speed = 70 +raft_surface_speed = 90 +retract_at_layer_change = True +retraction_amount = 0.5 +speed_prime_tower = 25.0 +speed_print = 50 +speed_roofing = 50 +speed_support = 50 +speed_support_bottom = 30 +speed_support_interface = 80 +speed_topbottom = 50 +speed_wall_0 = 50 +speed_wall_x = 50 +support_bottom_wall_count = 5 +support_fan_enable = False +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_enable = True +support_wall_count = 1 +support_xy_distance = 0.2 +support_z_distance = 0 + 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 new file mode 100644 index 0000000000..3c9f4500fc --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg @@ -0,0 +1,50 @@ +[general] +definition = ultimaker_methodx +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = False +material_print_temperature_layer_0 = =default_material_print_temperature+5 +raft_airgap = 0.3 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 98.0 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 250.0 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + 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 new file mode 100644 index 0000000000..7bb14d9107 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -0,0 +1,53 @@ +[general] +definition = ultimaker_methodx +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_nylon12-cf_175 +quality_type = draft +setting_version = 22 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = False +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_line_spacing = 3 +raft_base_line_width = 1.2 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 100 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 250.0 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + 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 7b5daf0d20..2688d88ad3 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 @@ -12,9 +12,7 @@ variant = 1C weight = -2 [values] -build_volume_temperature = 85 cool_fan_enabled = False -default_material_bed_temperature = 95 raft_airgap = 0.3 speed_prime_tower = 30.0 speed_print = 120.0 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 new file mode 100644 index 0000000000..5aaee1f2c6 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg @@ -0,0 +1,51 @@ +[general] +definition = ultimaker_methodxl +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = False +material_print_temperature_layer_0 = =default_material_print_temperature+5 +raft_airgap = 0.3 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 98.0 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + 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 new file mode 100644 index 0000000000..575189deae --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -0,0 +1,53 @@ +[general] +definition = ultimaker_methodxl +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_nylon12-cf_175 +quality_type = draft +setting_version = 22 +type = quality +variant = 1C +weight = -2 + +[values] +cool_fan_enabled = False +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_line_spacing = 3 +raft_base_line_width = 1.2 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 100 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 250.0 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +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 7445bd2d42..fd224e8798 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 @@ -12,9 +12,7 @@ variant = 1XA weight = -2 [values] -build_volume_temperature = 85 cool_fan_enabled = False -default_material_bed_temperature = 95 raft_airgap = 0.3 speed_prime_tower = 30.0 speed_print = 120.0 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 new file mode 100644 index 0000000000..504ab8c10b --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg @@ -0,0 +1,51 @@ +[general] +definition = ultimaker_methodxl +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = quality +variant = 1XA +weight = -2 + +[values] +cool_fan_enabled = False +material_print_temperature_layer_0 = =default_material_print_temperature+5 +raft_airgap = 0.3 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 98.0 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + 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 new file mode 100644 index 0000000000..ebc6ecfe98 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = ultimaker_methodxl +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_sr30_175 +quality_type = draft +setting_version = 22 +type = quality +variant = 2XA +weight = -2 + +[values] +brim_replaces_support = False +cool_fan_enabled = False +cool_min_temperature = =material_print_temperature +raft_airgap = 0.0 +raft_interface_line_width = 0.7 +raft_interface_speed = 70 +raft_surface_speed = 90 +retract_at_layer_change = True +retraction_amount = 0.5 +speed_prime_tower = 25.0 +speed_print = 50 +speed_roofing = 50 +speed_support = 50 +speed_support_bottom = 30 +speed_support_interface = 80 +speed_topbottom = 50 +speed_wall_0 = 50 +speed_wall_x = 50 +support_bottom_wall_count = 5 +support_fan_enable = False +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_enable = True +support_wall_count = 1 +support_xy_distance = 0.2 +support_z_distance = 0 + 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 2114be0ff4..4af8230b24 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 @@ -12,9 +12,7 @@ variant = LABS weight = -2 [values] -build_volume_temperature = 85 cool_fan_enabled = False -default_material_bed_temperature = 95 raft_airgap = 0.3 speed_prime_tower = 30.0 speed_print = 120.0 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 new file mode 100644 index 0000000000..14c15fd3c5 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg @@ -0,0 +1,51 @@ +[general] +definition = ultimaker_methodxl +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_asa_175 +quality_type = draft +setting_version = 22 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = False +material_print_temperature_layer_0 = =default_material_print_temperature+5 +raft_airgap = 0.3 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 98.0 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + 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 new file mode 100644 index 0000000000..110fa5e4b5 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -0,0 +1,53 @@ +[general] +definition = ultimaker_methodxl +name = Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_nylon12-cf_175 +quality_type = draft +setting_version = 22 +type = quality +variant = LABS +weight = -2 + +[values] +cool_fan_enabled = False +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_line_spacing = 3 +raft_base_line_width = 1.2 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 100 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 250.0 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg index c6d99b63b5..e0d3aa4d50 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg @@ -17,7 +17,6 @@ machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 20 ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_min_travel = 5 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg index ec86494397..acad5a484b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg @@ -20,12 +20,11 @@ machine_min_cool_heat_time_window = 15 material_print_temperature = =default_material_print_temperature - 10 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg index 77082932a5..262e4f4b54 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg @@ -21,14 +21,13 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 2 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.2 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 retraction_prime_speed = 15 speed_print = 25 speed_wall = =math.ceil(speed_print * 25 / 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 8557b08b1b..f989bcc3f6 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 @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 1aa26ebcfc..e3965d9c5c 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 @@ -63,7 +63,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 3343f7627a..9589f2f915 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 @@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 d0d532f410..b8aec4972f 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 @@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg index 6877d9b6a2..ad25724904 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg @@ -16,7 +16,7 @@ machine_nozzle_cool_down_speed = 0.8 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_print_temperature = =default_material_print_temperature - 10 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg index de1905e410..c0890c9740 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg @@ -15,7 +15,7 @@ weight = -1 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 speed_infill = =math.ceil(speed_print * 45 / 60) speed_print = 60 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg index ae5c9bcbc1..fbe263ab43 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg @@ -16,7 +16,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 speed_infill = =math.ceil(speed_print * 40 / 55) speed_print = 55 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg index 701a2db84d..059d39f6c1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg @@ -16,7 +16,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 speed_infill = =math.ceil(speed_print * 50 / 60) speed_print = 60 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.3mm.inst.cfg index 684336d1eb..cb741764d6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.3mm.inst.cfg @@ -16,7 +16,7 @@ weight = -3 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_print_temperature = =default_material_print_temperature + 7 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 support_bottom_distance = =support_z_distance support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg index a7a17e5f69..3af6b9a69d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg @@ -15,7 +15,7 @@ weight = -1 brim_replaces_support = False machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +prime_tower_mode = ='normal' if (min(extruderValues('material_surface_energy')) < 100) else 'none' speed_print = 80 speed_topbottom = =math.ceil(speed_print * 30 / 80) speed_wall = =math.ceil(speed_print * 40 / 80) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg index a3b8129ed7..1526b46ba5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg @@ -15,7 +15,7 @@ weight = 0 brim_replaces_support = False machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +prime_tower_mode = ='normal' if (min(extruderValues('material_surface_energy')) < 100) else 'none' support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_infill_sparse_thickness = =2 * layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg index 5c051039d0..999e2ce9c9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg @@ -16,7 +16,7 @@ brim_replaces_support = False machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +prime_tower_mode = ='normal' if (min(extruderValues('material_surface_energy')) < 100) else 'none' speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg index 61073067fc..42b98f5be7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg @@ -17,7 +17,7 @@ brim_replaces_support = False machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +prime_tower_mode = ='normal' if (min(extruderValues('material_surface_energy')) < 100) else 'none' speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg index 880461bccf..864421ed78 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg @@ -18,7 +18,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 8 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg index 5dd5e61f82..2591f15abb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg @@ -15,7 +15,7 @@ weight = -1 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg index 7617b35b3b..ab0354f9ea 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg @@ -18,7 +18,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg index 7ed1fcd298..7ac2d06998 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg @@ -15,7 +15,7 @@ weight = -2 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg index f46f816cfb..9968edc74c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg @@ -21,12 +21,11 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 20 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg index 2c23449373..0138115976 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg @@ -20,12 +20,11 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg index e0899c8dc2..f2a006ce6c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg @@ -21,12 +21,11 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 10 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg index 329bd095d5..0e72f56e02 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg @@ -20,12 +20,11 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg index 4b8f9f433b..d313f08887 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg @@ -15,7 +15,7 @@ weight = 1 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg index 5581284de4..73105ed512 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg @@ -14,7 +14,7 @@ weight = -1 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 70 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg index 30af138465..b6eac28eb9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed support_bottom_distance = =support_z_distance diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg index e5dc960d98..7ee4df3cac 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,7 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_topbottom = =math.ceil(speed_print * 40 / 70) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg index 719adc820b..80a564e05a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg @@ -22,7 +22,7 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg index eee8fc31b6..775e8420df 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg @@ -21,14 +21,13 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg index fa87825718..f8448e868b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg @@ -22,14 +22,13 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 2 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg index 6c90ec685f..e561a64075 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg @@ -22,14 +22,13 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 8 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg index b5253cb077..26cce4fcad 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg @@ -15,7 +15,7 @@ weight = 1 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none retraction_prime_speed = =retraction_speed speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg index 69cf85f349..86d98cfd6c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg @@ -14,7 +14,7 @@ weight = -1 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none retraction_prime_speed = =retraction_speed speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg index 397992c551..2715630b07 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg @@ -15,7 +15,7 @@ weight = 0 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none retraction_prime_speed = =retraction_speed speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg index 773da6d3ac..8446a7957f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg @@ -14,7 +14,7 @@ weight = -2 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none retraction_prime_speed = =retraction_speed speed_print = 50 speed_roofing = =math.ceil(speed_wall * 20 / 24) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg index 10e43b5699..8e4d4596af 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg @@ -22,7 +22,7 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg index 15018203e9..601886a065 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg @@ -28,7 +28,6 @@ prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 skin_line_width = =round(line_width / 0.8, 2) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg index 1b9912c1d6..bb303eeb33 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg @@ -29,7 +29,6 @@ prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 skin_line_width = =round(line_width / 0.8, 2) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg index 971cee7b3a..85c37d439d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg @@ -28,7 +28,6 @@ prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 skin_line_width = =round(line_width / 0.8, 2) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) 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 85dc32801e..95f9c84609 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 @@ -42,7 +42,7 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.8 material_max_flowrate = 20 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 retraction_amount = 6.5 retraction_prime_speed = 15 @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 ee0525c13e..447b6dfee5 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 @@ -43,7 +43,7 @@ material_extrusion_cool_down_speed = 0.8 material_max_flowrate = 20 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 retraction_amount = 6.5 retraction_prime_speed = 15 @@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 ca1d9d7afc..49a6120c8f 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 @@ -42,7 +42,7 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.8 material_max_flowrate = 20 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 retraction_amount = 6.5 retraction_prime_speed = 15 @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 57413c4b30..2f595d38d0 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 @@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 bridge_wall_speed = 30 cool_min_layer_time = 4 +infill_material_flow = =1.05 * material_flow infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' infill_sparse_density = 15 jerk_infill = =jerk_print @@ -44,11 +45,12 @@ material_max_flowrate = 20 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 retraction_amount = 6.5 retraction_prime_speed = 15 retraction_speed = 45 +skin_material_flow = =material_flow small_skin_on_surface = False small_skin_width = 4 speed_infill = =speed_print @@ -67,9 +69,11 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 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 0052ce90cd..5aa2ff791b 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 @@ -44,7 +44,7 @@ material_max_flowrate = 20 material_print_temperature = =default_material_print_temperature + 7 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 retraction_amount = 6.5 retraction_prime_speed = 15 @@ -67,7 +67,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +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) 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 0e9ceaf9e3..7eb5de8b64 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 @@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 8732c3ad63..170e2199be 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 @@ -43,7 +43,7 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 20 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none retraction_amount = 8 retraction_prime_speed = 15 retraction_speed = 45 @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 6f8db11141..bb7de56356 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 @@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 e7e50350c0..aae7ff42a2 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 @@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 bridge_wall_speed = 30 cool_min_layer_time = 4 +infill_material_flow = =1.1 * material_flow infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' infill_sparse_density = 15 jerk_infill = =jerk_print @@ -44,10 +45,11 @@ material_max_flowrate = 20 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none retraction_amount = 8 retraction_prime_speed = 15 retraction_speed = 45 +skin_material_flow = =1.05 * material_flow small_skin_on_surface = False small_skin_width = 4 speed_infill = =speed_print @@ -66,9 +68,11 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 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 5ecaa739db..96c3513a97 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 @@ -44,7 +44,7 @@ material_max_flowrate = 20 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none retraction_amount = 8 retraction_prime_speed = 15 retraction_speed = 45 @@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +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) 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 25887f19d7..3a87267e37 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 @@ -42,7 +42,7 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 136a3bed42..17dd161346 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 @@ -43,7 +43,7 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 e8820673ea..70b9a95dd4 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 @@ -42,7 +42,7 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 dcbb580edb..564b251c4b 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 @@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 bridge_wall_speed = 30 cool_min_layer_time = 6 +infill_material_flow = =1.1 * material_flow infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' infill_sparse_density = 15 jerk_infill = =jerk_print @@ -44,11 +45,12 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed retraction_speed = 45 +skin_material_flow = =1.05 * material_flow small_skin_on_surface = False small_skin_width = 4 speed_infill = =speed_print @@ -67,9 +69,11 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 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 fc2a185be4..5d27f8e05e 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 @@ -44,7 +44,7 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -67,7 +67,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +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) 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 73f25eae0f..b1ac45f1b0 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 @@ -42,7 +42,7 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 14 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 2aa24f805d..6201f53938 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 @@ -43,7 +43,7 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 14 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.35 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 e51d440c31..4c9e939ccc 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 @@ -42,7 +42,7 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 14 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 151af3ed50..dc07130b6c 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 @@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 bridge_wall_speed = 30 cool_min_layer_time = 6 +infill_material_flow = =1.1 * material_flow infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' infill_sparse_density = 15 jerk_infill = =jerk_print @@ -43,11 +44,12 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 14 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed retraction_speed = 45 +skin_material_flow = =1.05 * material_flow small_skin_on_surface = False small_skin_width = 4 speed_infill = =speed_print @@ -66,9 +68,11 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.35 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 56c097d890..cbaf3cd89a 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 @@ -44,7 +44,7 @@ material_max_flowrate = 14 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -67,7 +67,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +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) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.2mm.inst.cfg index c2d04c9bad..ff96a0df68 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.2mm.inst.cfg @@ -17,7 +17,7 @@ brim_width = 14 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 20 -prime_tower_enable = True +prime_tower_mode = normal retraction_hop = 0.1 retraction_hop_enabled = False speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.3mm.inst.cfg index caf16e5f94..a3d9b394b9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.3mm.inst.cfg @@ -17,7 +17,7 @@ brim_width = 14 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 17 -prime_tower_enable = True +prime_tower_mode = normal retraction_hop = 0.1 retraction_hop_enabled = False speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.4mm.inst.cfg index 1cd46fab48..dc46682c39 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe-plus_0.4mm.inst.cfg @@ -17,7 +17,7 @@ brim_width = 14 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 15 -prime_tower_enable = True +prime_tower_mode = normal retraction_hop = 0.1 retraction_hop_enabled = False speed_infill = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.2mm.inst.cfg index f9ee324f33..f2ea43800e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.2mm.inst.cfg @@ -14,7 +14,7 @@ weight = -2 [values] brim_width = 15 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.3mm.inst.cfg index f883fe1998..58193faaaf 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.3mm.inst.cfg @@ -14,7 +14,7 @@ weight = -3 [values] brim_width = 15 material_print_temperature = =default_material_print_temperature + 12 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.4mm.inst.cfg index a5c059c5e6..7e58326c02 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_cpe_0.4mm.inst.cfg @@ -14,7 +14,7 @@ weight = -4 [values] brim_width = 15 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True +prime_tower_mode = normal speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.2mm.inst.cfg index e7d656dcc4..5b33c9854f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.2mm.inst.cfg @@ -17,7 +17,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.45 support_angle = 70 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.3mm.inst.cfg index 08c1f4933b..6ac1edf4e9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.3mm.inst.cfg @@ -17,7 +17,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.45 support_angle = 70 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.4mm.inst.cfg index c4d2894885..536a00cc00 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_nylon_0.4mm.inst.cfg @@ -17,7 +17,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.45 support_angle = 70 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.2mm.inst.cfg index d901c6c0dd..539a8c5a7c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.2mm.inst.cfg @@ -15,7 +15,7 @@ weight = -2 brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.3mm.inst.cfg index 0279882346..bf92354310 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.3mm.inst.cfg @@ -15,7 +15,7 @@ weight = -3 brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.4mm.inst.cfg index 373d6a0b78..138369ef63 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_petg_0.4mm.inst.cfg @@ -15,7 +15,7 @@ weight = -4 brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = True +prime_tower_mode = normal speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg index 1feae070fc..a3935c55f7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg @@ -16,7 +16,7 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg index f93f0848db..9f7162abe0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg @@ -16,7 +16,7 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg index 67f9cdfcf0..997095fcbf 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg @@ -16,7 +16,7 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True +prime_tower_mode = normal speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.2mm.inst.cfg index 163f32a36d..2ec19359cf 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.2mm.inst.cfg @@ -18,13 +18,12 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 11 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 10 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 -retraction_min_travel = 1.5 retraction_prime_speed = 15 speed_wall_x = =math.ceil(speed_wall * 30 / 30) switch_extruder_prime_speed = 15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.3mm.inst.cfg index 3f75c3366e..6726d34585 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.3mm.inst.cfg @@ -18,13 +18,12 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 13 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 15 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 -retraction_min_travel = 1.5 retraction_prime_speed = 15 speed_wall_x = =math.ceil(speed_wall * 30 / 30) switch_extruder_prime_speed = 15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.4mm.inst.cfg index b2c5dab3c4..0bf76412b2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pp_0.4mm.inst.cfg @@ -18,13 +18,12 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 15 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 20 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 -retraction_min_travel = 1.5 retraction_prime_speed = 15 speed_infill = =math.ceil(speed_wall * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.2mm.inst.cfg index 1f706632ce..a59a80d04a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.2mm.inst.cfg @@ -17,7 +17,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False +prime_tower_mode = none speed_print = 45 speed_topbottom = =round(speed_print * 35 / 45) speed_wall = =round(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.3mm.inst.cfg index b1437e9160..c840722681 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.3mm.inst.cfg @@ -17,7 +17,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = False +prime_tower_mode = none speed_infill = =math.ceil(speed_print * 30 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.4mm.inst.cfg index 7c3c4ff6e9..1865589991 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_tough-pla_0.4mm.inst.cfg @@ -17,7 +17,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = False +prime_tower_mode = none speed_infill = =math.ceil(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.2mm.inst.cfg index 75949f45aa..437fc03997 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.2mm.inst.cfg @@ -21,13 +21,12 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 4 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 retraction_hop_only_when_collides = False -retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 speed_print = 30 speed_topbottom = =math.ceil(speed_print * 25 / 30) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.3mm.inst.cfg index 034bda5d09..05401c0d34 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.3mm.inst.cfg @@ -22,13 +22,12 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 2 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 retraction_hop_only_when_collides = False -retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 speed_print = 30 speed_topbottom = =math.ceil(speed_print * 23 / 30) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.4mm.inst.cfg index e7189d5467..a77cde65e6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.4mm.inst.cfg @@ -21,13 +21,12 @@ material_final_print_temperature = =material_print_temperature - 10 material_flow = 105 material_initial_print_temperature = =material_print_temperature - 10 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 retraction_hop_only_when_collides = False -retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 speed_infill = =speed_print speed_print = 30 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 9d7b4455d6..79f23f9c2c 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 @@ -47,7 +47,7 @@ material_max_flowrate = 22 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.15 retraction_amount = 4 retraction_prime_speed = 15 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 e2a5c54c66..a187dc3179 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 22 material_print_temperature = =default_material_print_temperature + 7 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.15 retraction_amount = 4 retraction_prime_speed = 15 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 26d3dc7fb8..cc2c57bcff 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 22 material_print_temperature = =default_material_print_temperature + 10 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.15 retraction_amount = 4 retraction_prime_speed = 15 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 b1dae1cb7a..9649f71775 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 @@ -47,7 +47,7 @@ material_max_flowrate = 23 material_print_temperature = =default_material_print_temperature - 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 3.5 retraction_prime_speed = 15 retraction_speed = 45 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 4d4ffa0059..a0d9dbdee7 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 @@ -46,7 +46,7 @@ material_flow = 93 material_max_flowrate = 23 material_print_temperature = =default_material_print_temperature - 5 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 3.5 retraction_prime_speed = 15 retraction_speed = 45 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 5cc6a43e13..840008f60d 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 @@ -46,7 +46,7 @@ material_flow = 93 material_max_flowrate = 23 material_print_temperature = =default_material_print_temperature - 5 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 3.5 retraction_prime_speed = 15 retraction_speed = 45 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 59f8409483..c0719e38b3 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 @@ -47,7 +47,7 @@ material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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 a4cdd898f1..8f045a1238 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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 79dc105f86..b1e8b913fd 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 15 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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 a76864a1a3..176cfb2cb2 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 @@ -47,7 +47,7 @@ material_max_flowrate = 17 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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 d364232726..404435e21b 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 17 material_print_temperature = =default_material_print_temperature + 15 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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 02a71fa9b7..76724ad958 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 17 material_print_temperature = =default_material_print_temperature + 15 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg index 12b815d5ab..b69ddd1011 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg @@ -15,7 +15,7 @@ weight = 1 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_infill_sparse_thickness = =3 * layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg index 5390b3ecb7..67a101d2bc 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg @@ -14,7 +14,7 @@ weight = -1 [values] brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_infill_sparse_thickness = =2 * layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg index b15b5958a7..66c0486b0f 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg @@ -15,7 +15,7 @@ weight = 0 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_infill_sparse_thickness = =2 * layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg index e273e85eb5..6e36d9578f 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg @@ -15,7 +15,7 @@ weight = -2 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg index ea2902cd6c..9b81b09599 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg index bbbad9be1f..e596c6fcd0 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg index 300e2ebaed..5c9671c99e 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg index 84040ede4e..872368142c 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg index 402ae15eba..2b76474e5f 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg index 0c9154a233..dc84108298 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg index e7b72d6cd0..3706d83424 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg index 38c857de5e..6e03ebd7e5 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg index 38267fcf24..ea86a9a9a6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg @@ -17,7 +17,6 @@ machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 20 ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_min_travel = 5 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg index 5779142162..dc6dc3906d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg @@ -20,12 +20,11 @@ machine_min_cool_heat_time_window = 15 material_print_temperature = =default_material_print_temperature - 10 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg index 64b1be79aa..69a5af3102 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg @@ -21,14 +21,13 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 2 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.2 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 retraction_prime_speed = 15 speed_print = 25 speed_wall = =math.ceil(speed_print * 25 / 25) 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 d725b5aa15..29057ff13b 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 @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 82e07b6fdf..a2233703d4 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 @@ -63,7 +63,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 789d186f77..44f6670085 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 @@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 307869d494..997f823e51 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 @@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg index 573b758705..f96f28e71f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg @@ -16,7 +16,7 @@ machine_nozzle_cool_down_speed = 0.8 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_print_temperature = =default_material_print_temperature - 10 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg index 926ef49922..9cc0a12b5a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg @@ -15,7 +15,7 @@ weight = -1 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 speed_infill = =math.ceil(speed_print * 45 / 60) speed_print = 60 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg index 598e83d922..651c780d32 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg @@ -16,7 +16,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 speed_infill = =math.ceil(speed_print * 40 / 55) speed_print = 55 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg index 5f5e9e2fd3..28bd4cddff 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg @@ -16,7 +16,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 speed_infill = =math.ceil(speed_print * 50 / 60) speed_print = 60 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.3mm.inst.cfg index 8656a28067..49e70ecb1c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.3mm.inst.cfg @@ -16,7 +16,7 @@ weight = -3 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 20 material_print_temperature = =default_material_print_temperature + 7 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 support_bottom_distance = =support_z_distance support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg index a4381e0e3b..b2dd10f321 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg @@ -15,7 +15,7 @@ weight = -1 brim_replaces_support = False machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +prime_tower_mode = ='normal' if (min(extruderValues('material_surface_energy')) < 100) else 'none' speed_print = 80 speed_topbottom = =math.ceil(speed_print * 30 / 80) speed_wall = =math.ceil(speed_print * 40 / 80) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg index 5f4c480fa4..ba704aa34b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg @@ -15,7 +15,7 @@ weight = 0 brim_replaces_support = False machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +prime_tower_mode = ='normal' if (min(extruderValues('material_surface_energy')) < 100) else 'none' support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_infill_sparse_thickness = =2 * layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg index 9e3c0153b1..ccccb2d3e8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg @@ -16,7 +16,7 @@ brim_replaces_support = False machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +prime_tower_mode = ='normal' if (min(extruderValues('material_surface_energy')) < 100) else 'none' speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg index bd4e13ebaf..cc6e8f9453 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg @@ -17,7 +17,7 @@ brim_replaces_support = False machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +prime_tower_mode = ='normal' if (min(extruderValues('material_surface_energy')) < 100) else 'none' speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg index a77d1b4233..0b11bc463b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg @@ -18,7 +18,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 8 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg index 805fb08ead..476cdad5ce 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg @@ -15,7 +15,7 @@ weight = -1 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg index 77f775d672..6a18d6a859 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg @@ -18,7 +18,7 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg index 877c48c42d..dcd01b1084 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg @@ -15,7 +15,7 @@ weight = -2 infill_wipe_dist = 0 machine_min_cool_heat_time_window = 15 multiple_mesh_overlap = 0 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True retraction_hop = 0.2 retraction_hop_enabled = False diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg index 0b471a8c75..c2d943bb77 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg @@ -21,12 +21,11 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 20 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg index 6c9710e436..30b1896528 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg @@ -20,12 +20,11 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg index 945b77e699..aa58bd07b3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg @@ -21,12 +21,11 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 10 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg index b523e3c646..e74d6a6532 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg @@ -20,12 +20,11 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 multiple_mesh_overlap = 0 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal prime_tower_wipe_enabled = True raft_airgap = 0.25 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg index f34549bc78..e724f809d5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg @@ -15,7 +15,7 @@ weight = 1 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg index 4a9e914b99..2cce79480c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg @@ -14,7 +14,7 @@ weight = -1 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 70 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg index dc73f13bb5..5a730aba3a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed support_bottom_distance = =support_z_distance diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg index ead512bb50..a1bde9d68d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,7 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_topbottom = =math.ceil(speed_print * 40 / 70) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg index c6641e7a08..e0070ff73b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg @@ -22,7 +22,7 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg index 85e892628d..0f06f432d4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg @@ -21,14 +21,13 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg index 531f946ba8..68aeea4c25 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg @@ -22,14 +22,13 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 2 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg index a7f63a76b1..2f7a70bfa0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg @@ -22,14 +22,13 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 8 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_size = 16 prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = 0.8 speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg index cf7a8335b8..2bf08e3489 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg @@ -15,7 +15,7 @@ weight = 1 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none retraction_prime_speed = =retraction_speed speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg index a7dcb61128..3b44a9eb37 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg @@ -14,7 +14,7 @@ weight = -1 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none retraction_prime_speed = =retraction_speed speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg index f053b33478..3167f39563 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg @@ -15,7 +15,7 @@ weight = 0 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none retraction_prime_speed = =retraction_speed speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg index 4e98b6005a..238468f784 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg @@ -14,7 +14,7 @@ weight = -2 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False +prime_tower_mode = none retraction_prime_speed = =retraction_speed speed_print = 50 speed_roofing = =math.ceil(speed_wall * 20 / 24) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg index 5c6ed28548..208277dc9b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg @@ -22,7 +22,7 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg index 0b69ae0c43..db01865cf8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg @@ -28,7 +28,6 @@ prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 skin_line_width = =round(line_width / 0.8, 2) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg index 29aa42a436..27a8bb863b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg @@ -29,7 +29,6 @@ prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 skin_line_width = =round(line_width / 0.8, 2) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg index 48e6ffb81b..cf3069ee0f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg @@ -28,7 +28,6 @@ prime_tower_wipe_enabled = True retraction_count_max = 15 retraction_extra_prime_amount = 0.8 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 skin_line_width = =round(line_width / 0.8, 2) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) 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 fbe230fb2e..e7d58a1001 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 @@ -42,7 +42,7 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.8 material_max_flowrate = 20 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 retraction_amount = 6.5 retraction_prime_speed = 15 @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 9c7ceca13b..20e10b3e78 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 @@ -43,7 +43,7 @@ material_extrusion_cool_down_speed = 0.8 material_max_flowrate = 20 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 retraction_amount = 6.5 retraction_prime_speed = 15 @@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 8ef78a6fb5..fe37499b76 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 @@ -42,7 +42,7 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.8 material_max_flowrate = 20 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 retraction_amount = 6.5 retraction_prime_speed = 15 @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 f430e6bc16..5f85f0b6d1 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 @@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 bridge_wall_speed = 30 cool_min_layer_time = 4 +infill_material_flow = =1.05 * material_flow infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' infill_sparse_density = 15 jerk_infill = =jerk_print @@ -44,11 +45,12 @@ material_max_flowrate = 20 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 retraction_amount = 6.5 retraction_prime_speed = 15 retraction_speed = 45 +skin_material_flow = =material_flow small_skin_on_surface = False small_skin_width = 4 speed_infill = =speed_print @@ -67,9 +69,11 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 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 98ca8927b6..7d9bd13d07 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 @@ -44,7 +44,7 @@ material_max_flowrate = 20 material_print_temperature = =default_material_print_temperature + 7 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.15 retraction_amount = 6.5 retraction_prime_speed = 15 @@ -67,7 +67,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +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) 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 aea8906877..ef58c14663 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 @@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 201c663d5c..4673f7dddc 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 @@ -43,7 +43,7 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 20 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none retraction_amount = 8 retraction_prime_speed = 15 retraction_speed = 45 @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 a9d239bf3a..d23a7b8cea 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 @@ -64,7 +64,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1.2 , layer_height * 6) wall_0_wipe_dist = 0.8 z_seam_relative = 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 55696eccb4..7ffa9aa60a 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 @@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 bridge_wall_speed = 30 cool_min_layer_time = 4 +infill_material_flow = =1.1 * material_flow infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' infill_sparse_density = 15 jerk_infill = =jerk_print @@ -44,10 +45,11 @@ material_max_flowrate = 20 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none retraction_amount = 8 retraction_prime_speed = 15 retraction_speed = 45 +skin_material_flow = =1.05 * material_flow small_skin_on_surface = False small_skin_width = 4 speed_infill = =speed_print @@ -66,9 +68,11 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 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 fe3eeb67ad..5cf1740ad1 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 @@ -44,7 +44,7 @@ material_max_flowrate = 20 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none retraction_amount = 8 retraction_prime_speed = 15 retraction_speed = 45 @@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +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) 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 a9043c7372..cc05029e74 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 @@ -42,7 +42,7 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 713f94219f..a7bebed472 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 @@ -43,7 +43,7 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 4e451d4165..1d07e0f63c 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 @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 02d22b06b8..4ca8ccaa86 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 @@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 bridge_wall_speed = 30 cool_min_layer_time = 6 +infill_material_flow = =1.1 * material_flow infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' infill_sparse_density = 15 jerk_infill = =jerk_print @@ -44,11 +45,12 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed retraction_speed = 45 +skin_material_flow = =1.05 * material_flow small_skin_on_surface = False small_skin_width = 4 speed_infill = =speed_print @@ -67,9 +69,11 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 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 b0d5d41d0f..c1ea2d98dd 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 @@ -44,7 +44,7 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -67,7 +67,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +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) 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 641c1279e4..597bf3b302 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 @@ -42,7 +42,7 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 14 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 55e724da9d..81f4e207be 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 @@ -43,7 +43,7 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 14 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -66,7 +66,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.35 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 35e8c0903c..a38a73679d 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 @@ -42,7 +42,7 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 14 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -65,7 +65,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.3 top_bottom_thickness = =max(1 , layer_height * 5) wall_0_wipe_dist = 0.8 z_seam_relative = 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 ee0ee279e6..f045d5425d 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 @@ -28,6 +28,7 @@ bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 bridge_wall_speed = 30 cool_min_layer_time = 6 +infill_material_flow = =1.1 * material_flow infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' infill_sparse_density = 15 jerk_infill = =jerk_print @@ -43,11 +44,12 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 14 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed retraction_speed = 45 +skin_material_flow = =1.05 * material_flow small_skin_on_surface = False small_skin_width = 4 speed_infill = =speed_print @@ -66,9 +68,11 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +support_z_distance = 0.35 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 875bd5a669..79e8161047 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 @@ -44,7 +44,7 @@ material_max_flowrate = 14 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False +prime_tower_mode = none raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed @@ -67,7 +67,7 @@ support_bottom_distance = =support_z_distance support_interface_enable = True support_structure = tree support_top_distance = =support_z_distance -support_z_distance = =math.ceil(0.3/layer_height)*layer_height +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) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.2mm.inst.cfg index 0dd369e4dd..a7877d90e1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.2mm.inst.cfg @@ -17,7 +17,7 @@ brim_width = 14 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 20 -prime_tower_enable = True +prime_tower_mode = normal retraction_hop = 0.1 retraction_hop_enabled = False speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.3mm.inst.cfg index e6ce183f4a..2b5b521f02 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.3mm.inst.cfg @@ -17,7 +17,7 @@ brim_width = 14 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 17 -prime_tower_enable = True +prime_tower_mode = normal retraction_hop = 0.1 retraction_hop_enabled = False speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.4mm.inst.cfg index 0c3abc6e3f..ff9a049f7e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe-plus_0.4mm.inst.cfg @@ -17,7 +17,7 @@ brim_width = 14 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 15 -prime_tower_enable = True +prime_tower_mode = normal retraction_hop = 0.1 retraction_hop_enabled = False speed_infill = =math.ceil(speed_print * 40 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.2mm.inst.cfg index eb6e07e080..a3340f81a8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.2mm.inst.cfg @@ -14,7 +14,7 @@ weight = -2 [values] brim_width = 15 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.3mm.inst.cfg index e7958d9841..7c80d16f24 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.3mm.inst.cfg @@ -14,7 +14,7 @@ weight = -3 [values] brim_width = 15 material_print_temperature = =default_material_print_temperature + 12 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.4mm.inst.cfg index 0683b2959b..18ec3e9dbe 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_cpe_0.4mm.inst.cfg @@ -14,7 +14,7 @@ weight = -4 [values] brim_width = 15 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True +prime_tower_mode = normal speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.2mm.inst.cfg index 5a774e0750..798db0dfc8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.2mm.inst.cfg @@ -17,7 +17,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.45 support_angle = 70 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.3mm.inst.cfg index bed4ac46d7..86d6130a70 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.3mm.inst.cfg @@ -17,7 +17,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.45 support_angle = 70 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.4mm.inst.cfg index a0d58757da..2d9c3ebabe 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_nylon_0.4mm.inst.cfg @@ -17,7 +17,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 ooze_shield_angle = 40 -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.45 support_angle = 70 switch_extruder_prime_speed = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.2mm.inst.cfg index 6208ad9bec..7f51af7154 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.2mm.inst.cfg @@ -15,7 +15,7 @@ weight = -2 brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.3mm.inst.cfg index 98b0d3f5f8..81d08397f3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.3mm.inst.cfg @@ -15,7 +15,7 @@ weight = -3 brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.4mm.inst.cfg index 156113b809..689455183f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_petg_0.4mm.inst.cfg @@ -15,7 +15,7 @@ weight = -4 brim_width = 7 cool_fan_speed = 20 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = True +prime_tower_mode = normal speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg index 10bf06fbb5..d00e5235ba 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg @@ -16,7 +16,7 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg index 1a63005ced..a22439011e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg @@ -16,7 +16,7 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg index 5e22cee246..7a97620cb4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg @@ -16,7 +16,7 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True +prime_tower_mode = normal speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.2mm.inst.cfg index 149104700e..355e3afa78 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.2mm.inst.cfg @@ -18,13 +18,12 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 11 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 10 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 -retraction_min_travel = 1.5 retraction_prime_speed = 15 speed_wall_x = =math.ceil(speed_wall * 30 / 30) switch_extruder_prime_speed = 15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.3mm.inst.cfg index 670ec78d51..e89b5d717b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.3mm.inst.cfg @@ -18,13 +18,12 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 13 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 15 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 -retraction_min_travel = 1.5 retraction_prime_speed = 15 speed_wall_x = =math.ceil(speed_wall * 30 / 30) switch_extruder_prime_speed = 15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.4mm.inst.cfg index c9b5c26d64..542ba0bb5b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pp_0.4mm.inst.cfg @@ -18,13 +18,12 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 15 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 20 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 -retraction_min_travel = 1.5 retraction_prime_speed = 15 speed_infill = =math.ceil(speed_wall * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.2mm.inst.cfg index 26c20268ea..1c5161a635 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.2mm.inst.cfg @@ -17,7 +17,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False +prime_tower_mode = none speed_print = 45 speed_topbottom = =round(speed_print * 35 / 45) speed_wall = =round(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.3mm.inst.cfg index cc28dc5150..0a4c4ad2c7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.3mm.inst.cfg @@ -17,7 +17,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = False +prime_tower_mode = none speed_infill = =math.ceil(speed_print * 30 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.4mm.inst.cfg index eb338d1e1d..2fc8aaf746 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_tough-pla_0.4mm.inst.cfg @@ -17,7 +17,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = False +prime_tower_mode = none speed_infill = =math.ceil(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.2mm.inst.cfg index 43436cd4c7..3deb8f57a0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.2mm.inst.cfg @@ -21,13 +21,12 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 4 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 retraction_hop_only_when_collides = False -retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 speed_print = 30 speed_topbottom = =math.ceil(speed_print * 25 / 30) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.3mm.inst.cfg index 58b524dd2a..fd30dfc228 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.3mm.inst.cfg @@ -22,13 +22,12 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 2 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 retraction_hop_only_when_collides = False -retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 speed_print = 30 speed_topbottom = =math.ceil(speed_print * 23 / 30) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.4mm.inst.cfg index d17ec5486a..2f21317657 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.4mm.inst.cfg @@ -21,13 +21,12 @@ material_final_print_temperature = =material_print_temperature - 10 material_flow = 105 material_initial_print_temperature = =material_print_temperature - 10 multiple_mesh_overlap = 0.2 -prime_tower_enable = True prime_tower_flow = 100 +prime_tower_mode = normal retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 retraction_hop_only_when_collides = False -retraction_min_travel = =line_width * 2 speed_infill = =speed_print speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) 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 9ba4a38c6e..e308015dd8 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 @@ -47,7 +47,7 @@ material_max_flowrate = 22 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.15 retraction_amount = 4 retraction_prime_speed = 15 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 4ab74980ef..3d7cabe23d 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 22 material_print_temperature = =default_material_print_temperature + 7 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.15 retraction_amount = 4 retraction_prime_speed = 15 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 269d51dd4b..f7ab03fac0 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 22 material_print_temperature = =default_material_print_temperature + 10 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.15 retraction_amount = 4 retraction_prime_speed = 15 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 4f56167ffd..692f4f8aa7 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 @@ -47,7 +47,7 @@ material_max_flowrate = 23 material_print_temperature = =default_material_print_temperature - 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 3.5 retraction_prime_speed = 15 retraction_speed = 45 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 9fdf9a665b..93e4e071f5 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 @@ -46,7 +46,7 @@ material_flow = 93 material_max_flowrate = 23 material_print_temperature = =default_material_print_temperature - 5 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 3.5 retraction_prime_speed = 15 retraction_speed = 45 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 3368ae6e2d..592c835689 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 @@ -46,7 +46,7 @@ material_flow = 93 material_max_flowrate = 23 material_print_temperature = =default_material_print_temperature - 5 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal retraction_amount = 3.5 retraction_prime_speed = 15 retraction_speed = 45 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 ca93df9dc1..fd0b6da130 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 @@ -47,7 +47,7 @@ material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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 4461ae0772..a6b7ac0439 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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 1acdad53a0..c873edfacb 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 15 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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 4973ec35bb..413903a8e8 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 @@ -47,7 +47,7 @@ material_max_flowrate = 17 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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 2bcf3fa82d..f0c5169389 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 17 material_print_temperature = =default_material_print_temperature + 15 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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 3e4693c115..cb12b8740c 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 @@ -44,7 +44,7 @@ material_flow = 93 material_max_flowrate = 17 material_print_temperature = =default_material_print_temperature + 15 optimize_wall_printing_order = False -prime_tower_enable = True +prime_tower_mode = normal raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg index 2bc28f4c1a..022e91ed9f 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg @@ -15,7 +15,7 @@ weight = 1 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_infill_sparse_thickness = =3 * layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg index f5b8c35298..40cf72eff4 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg @@ -14,7 +14,7 @@ weight = -1 [values] brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_infill_sparse_thickness = =2 * layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg index 6457f97c9c..8b5a3e9f67 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg @@ -15,7 +15,7 @@ weight = 0 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_infill_sparse_thickness = =2 * layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg index eef90f5f17..1ff95a0e3b 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg @@ -15,7 +15,7 @@ weight = -2 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg index e1862ce3c4..58796a07a4 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg @@ -16,7 +16,7 @@ weight = -3 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +prime_tower_mode = none retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_infill_sparse_thickness = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg index 8b807c1eb5..b7d9b2a05f 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg index ebc58413e2..e3e8d486b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg index 1204be4c15..f01921353b 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg index 6a7d52af4b..0a1cc1204d 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg index 40d414cbcb..4437f2c531 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg index 6144a2c3f0..3796177bc5 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg index 5bf5d910e8..1ec4911676 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg index 21407b6e66..36b56b6513 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg @@ -18,7 +18,7 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True +prime_tower_mode = normal speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index c3451d2c98..57698bf252 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -127,7 +127,7 @@ brim_line_count brim_outside_only [dual] -prime_tower_enable +prime_tower_mode prime_tower_position_x prime_tower_position_y prime_tower_brim_enable @@ -136,6 +136,7 @@ prime_tower_brim_enable [blackmagic] print_sequence +user_defined_print_order_enabled magic_mesh_surface_mode magic_spiralize smooth_spiralized_contours diff --git a/resources/setting_visibility/basic.cfg b/resources/setting_visibility/basic.cfg index 0193eb26ba..f5552f3cd8 100644 --- a/resources/setting_visibility/basic.cfg +++ b/resources/setting_visibility/basic.cfg @@ -53,7 +53,7 @@ adhesion_type adhesion_extruder_nr [dual] -prime_tower_enable +prime_tower_mode prime_tower_position_x prime_tower_position_y diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 52c08f70ba..0a07fff449 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -356,7 +356,7 @@ raft_fan_speed raft_is_shrink_plate [dual] -prime_tower_enable +prime_tower_mode prime_tower_size prime_tower_min_volume prime_tower_position_x @@ -367,6 +367,7 @@ prime_tower_base_size prime_tower_base_height prime_tower_base_curve_magnitude prime_tower_raft_base_line_spacing +prime_tower_max_bridging_distance ooze_shield_enabled ooze_shield_angle ooze_shield_dist @@ -391,6 +392,7 @@ meshfix_fluid_motion_angle [blackmagic] print_sequence +user_defined_print_order_enabled infill_mesh infill_mesh_order cutting_mesh diff --git a/resources/variants/liquid/liquid_vo08.inst.cfg b/resources/variants/liquid/liquid_vo08.inst.cfg index 58cbea1b9d..a69a0f806e 100644 --- a/resources/variants/liquid/liquid_vo08.inst.cfg +++ b/resources/variants/liquid/liquid_vo08.inst.cfg @@ -37,7 +37,7 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_standby_temperature = 100 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_wipe_enabled = True retract_at_layer_change = =not magic_spiralize retraction_amount = 3 diff --git a/resources/variants/strateo3d/strateo3d_high_temp_04.inst.cfg b/resources/variants/strateo3d/strateo3d_high_temp_04.inst.cfg index 4bf51a967a..b66b984346 100644 --- a/resources/variants/strateo3d/strateo3d_high_temp_04.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_high_temp_04.inst.cfg @@ -14,7 +14,7 @@ layer_height_0 = 0.3 machine_nozzle_id = HT0.4 machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.0 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = False support_angle = 45 support_use_towers = True diff --git a/resources/variants/strateo3d/strateo3d_standard_04.inst.cfg b/resources/variants/strateo3d/strateo3d_standard_04.inst.cfg index 3d705453d8..968c7c7262 100644 --- a/resources/variants/strateo3d/strateo3d_standard_04.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_standard_04.inst.cfg @@ -14,7 +14,7 @@ layer_height_0 = 0.3 machine_nozzle_id = Standard 0.4 machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.0 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = False support_angle = 60 support_use_towers = True diff --git a/resources/variants/strateo3d/strateo3d_standard_06.inst.cfg b/resources/variants/strateo3d/strateo3d_standard_06.inst.cfg index 3443f64531..9b6d921d70 100644 --- a/resources/variants/strateo3d/strateo3d_standard_06.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_standard_06.inst.cfg @@ -14,7 +14,7 @@ layer_height_0 = 0.4 machine_nozzle_id = Standard 0.6 machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.5 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = False support_angle = 55 support_use_towers = True diff --git a/resources/variants/strateo3d/strateo3d_standard_08.inst.cfg b/resources/variants/strateo3d/strateo3d_standard_08.inst.cfg index f436ce1fe7..11ff582ef1 100644 --- a/resources/variants/strateo3d/strateo3d_standard_08.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_standard_08.inst.cfg @@ -14,7 +14,7 @@ layer_height_0 = 0.5 machine_nozzle_id = Standard 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = True support_angle = 50 support_use_towers = True diff --git a/resources/variants/strateo3d/strateo3d_standard_10.inst.cfg b/resources/variants/strateo3d/strateo3d_standard_10.inst.cfg index b957d58d9f..c9d50d91c3 100644 --- a/resources/variants/strateo3d/strateo3d_standard_10.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_standard_10.inst.cfg @@ -14,7 +14,7 @@ layer_height_0 = 0.6 machine_nozzle_id = Standard 1.0 Experimental machine_nozzle_size = 1.0 machine_nozzle_tip_outer_diameter = 2.5 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = True support_angle = 50 support_use_towers = True diff --git a/resources/variants/strateo3d/strateo3d_standard_12.inst.cfg b/resources/variants/strateo3d/strateo3d_standard_12.inst.cfg index 3a35f9c4a2..f1f03bfcb4 100644 --- a/resources/variants/strateo3d/strateo3d_standard_12.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_standard_12.inst.cfg @@ -14,7 +14,7 @@ layer_height_0 = 0.7 machine_nozzle_id = Standard 1.2 Experimental machine_nozzle_size = 1.2 machine_nozzle_tip_outer_diameter = 3.0 -prime_tower_enable = True +prime_tower_mode = normal retract_at_layer_change = True support_angle = 50 support_use_towers = True diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index 4190aab0cd..baf5f4043a 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -23,7 +23,7 @@ machine_nozzle_id = AA 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_wipe_enabled = True raft_surface_layers = 1 retraction_amount = 6.5 diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 62227f50f6..5250dff5e9 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -26,7 +26,7 @@ machine_nozzle_id = BB 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_wipe_enabled = True raft_surface_layers = 1 retraction_hop = 2 diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index 941634e3a6..109cd55a9d 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -23,7 +23,7 @@ machine_nozzle_id = AA 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_wipe_enabled = True raft_surface_layers = 1 retraction_amount = 6.5 diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index 2a88f165e6..c40c69ff62 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -26,7 +26,7 @@ machine_nozzle_id = BB 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_wipe_enabled = True raft_surface_layers = 1 retraction_hop = 2 diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg index 1f3baa432f..97b303035c 100644 --- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg @@ -16,7 +16,6 @@ machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = AA 0.25 machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.65 -retraction_min_travel = 0.7 retraction_prime_speed = =retraction_speed speed_print = 55 speed_topbottom = 20 diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index c30365897b..5385e5e540 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -23,13 +23,12 @@ machine_nozzle_id = AA 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_wipe_enabled = True raft_surface_layers = 1 retraction_amount = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 retraction_speed = 25 speed_print = 35 speed_topbottom = =math.ceil(speed_print * 25 / 35) diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg index b3f76758f4..76992b5805 100644 --- a/resources/variants/ultimaker_s3_aa04.inst.cfg +++ b/resources/variants/ultimaker_s3_aa04.inst.cfg @@ -14,7 +14,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = AA 0.4 machine_nozzle_tip_outer_diameter = 1.0 retraction_amount = 6.5 -retraction_min_travel = =line_width * 2 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index 34e1b6d308..56b1ea9af7 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -25,12 +25,11 @@ machine_nozzle_id = BB 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_wipe_enabled = True raft_surface_layers = 1 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 3 speed_prime_tower = =math.ceil(speed_print * 7 / 35) speed_print = 35 speed_support = =math.ceil(speed_print * 25 / 35) diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index e50241aa3a..4e232cbb5e 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -16,7 +16,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 -retraction_min_travel = =3 * line_width speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) speed_support_interface = =math.ceil(speed_support * 20 / 25) diff --git a/resources/variants/ultimaker_s3_cc04.inst.cfg b/resources/variants/ultimaker_s3_cc04.inst.cfg index 19192bfba6..38f04547aa 100644 --- a/resources/variants/ultimaker_s3_cc04.inst.cfg +++ b/resources/variants/ultimaker_s3_cc04.inst.cfg @@ -13,7 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = CC 0.4 machine_nozzle_size = 0.4 -retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed speed_infill = =speed_print speed_print = 45 diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg index 925a9f68d6..e42817e8f8 100644 --- a/resources/variants/ultimaker_s3_cc06.inst.cfg +++ b/resources/variants/ultimaker_s3_cc06.inst.cfg @@ -13,7 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = CC 0.6 machine_nozzle_size = 0.6 -retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed speed_infill = =speed_print speed_print = 45 diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg index 519b21c920..08ed6132f5 100644 --- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg @@ -16,7 +16,6 @@ machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = AA 0.25 machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.65 -retraction_min_travel = 0.7 retraction_prime_speed = =retraction_speed speed_print = 55 speed_topbottom = 20 diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index b482c418f0..4bb5eda5db 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -23,13 +23,12 @@ machine_nozzle_id = AA 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_wipe_enabled = True raft_surface_layers = 1 retraction_amount = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 retraction_speed = 25 speed_print = 35 speed_topbottom = =math.ceil(speed_print * 25 / 35) diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg index 09f528162d..fd4f1ff778 100644 --- a/resources/variants/ultimaker_s5_aa04.inst.cfg +++ b/resources/variants/ultimaker_s5_aa04.inst.cfg @@ -14,7 +14,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = AA 0.4 machine_nozzle_tip_outer_diameter = 1.0 retraction_amount = 6.5 -retraction_min_travel = =line_width * 2 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index 660a6b10f4..b833c4bcf3 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -25,12 +25,11 @@ machine_nozzle_id = BB 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_wipe_enabled = True raft_surface_layers = 1 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 3 speed_prime_tower = =math.ceil(speed_print * 7 / 35) speed_print = 35 speed_support = =math.ceil(speed_print * 25 / 35) diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index 2058185bb8..7959fc75c2 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -16,7 +16,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 -retraction_min_travel = =3 * line_width speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) speed_support_interface = =math.ceil(speed_support * 20 / 25) diff --git a/resources/variants/ultimaker_s5_cc04.inst.cfg b/resources/variants/ultimaker_s5_cc04.inst.cfg index ef64dc0ae4..5510d0126f 100644 --- a/resources/variants/ultimaker_s5_cc04.inst.cfg +++ b/resources/variants/ultimaker_s5_cc04.inst.cfg @@ -13,7 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = CC 0.4 machine_nozzle_size = 0.4 -retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed speed_infill = =speed_print speed_print = 45 diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg index ba33bab17b..a49c790e4f 100644 --- a/resources/variants/ultimaker_s5_cc06.inst.cfg +++ b/resources/variants/ultimaker_s5_cc06.inst.cfg @@ -13,7 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = CC 0.6 machine_nozzle_size = 0.6 -retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed speed_infill = =speed_print speed_print = 45 diff --git a/resources/variants/ultimaker_s7_aa0.25.inst.cfg b/resources/variants/ultimaker_s7_aa0.25.inst.cfg index 1495af6c48..fc1bdcfef2 100644 --- a/resources/variants/ultimaker_s7_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s7_aa0.25.inst.cfg @@ -16,7 +16,6 @@ machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = AA 0.25 machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.65 -retraction_min_travel = 0.7 retraction_prime_speed = =retraction_speed speed_print = 55 speed_topbottom = 20 diff --git a/resources/variants/ultimaker_s7_aa0.8.inst.cfg b/resources/variants/ultimaker_s7_aa0.8.inst.cfg index a5b6a66516..1feea8c676 100644 --- a/resources/variants/ultimaker_s7_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s7_aa0.8.inst.cfg @@ -23,13 +23,12 @@ machine_nozzle_id = AA 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_wipe_enabled = True raft_surface_layers = 1 retraction_amount = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 retraction_speed = 25 speed_print = 35 speed_topbottom = =math.ceil(speed_print * 25 / 35) diff --git a/resources/variants/ultimaker_s7_aa04.inst.cfg b/resources/variants/ultimaker_s7_aa04.inst.cfg index a9079c975e..6aee6597e0 100644 --- a/resources/variants/ultimaker_s7_aa04.inst.cfg +++ b/resources/variants/ultimaker_s7_aa04.inst.cfg @@ -14,7 +14,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = AA 0.4 machine_nozzle_tip_outer_diameter = 1.0 retraction_amount = 6.5 -retraction_min_travel = =line_width * 2 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) diff --git a/resources/variants/ultimaker_s7_bb0.8.inst.cfg b/resources/variants/ultimaker_s7_bb0.8.inst.cfg index 6823fe18a4..17a9971002 100644 --- a/resources/variants/ultimaker_s7_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s7_bb0.8.inst.cfg @@ -25,13 +25,12 @@ machine_nozzle_id = BB 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 multiple_mesh_overlap = 0 -prime_tower_enable = False +prime_tower_mode = none prime_tower_wipe_enabled = True raft_surface_layers = 1 retraction_amount = 4.5 retraction_hop = 2 retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 3 speed_prime_tower = =math.ceil(speed_print * 7 / 35) speed_print = 35 speed_support = =math.ceil(speed_print * 25 / 35) diff --git a/resources/variants/ultimaker_s7_bb04.inst.cfg b/resources/variants/ultimaker_s7_bb04.inst.cfg index bead299de3..1ec0dfab98 100644 --- a/resources/variants/ultimaker_s7_bb04.inst.cfg +++ b/resources/variants/ultimaker_s7_bb04.inst.cfg @@ -17,7 +17,6 @@ machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 retraction_amount = 4.5 -retraction_min_travel = =3 * line_width speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) speed_support_interface = =math.ceil(speed_support * 20 / 25) diff --git a/resources/variants/ultimaker_s7_cc04.inst.cfg b/resources/variants/ultimaker_s7_cc04.inst.cfg index d46d387330..6949c5be74 100644 --- a/resources/variants/ultimaker_s7_cc04.inst.cfg +++ b/resources/variants/ultimaker_s7_cc04.inst.cfg @@ -13,7 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = CC 0.4 machine_nozzle_size = 0.4 -retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed speed_infill = =speed_print speed_print = 45 diff --git a/resources/variants/ultimaker_s7_cc06.inst.cfg b/resources/variants/ultimaker_s7_cc06.inst.cfg index d0c0d3670f..576701fc2b 100644 --- a/resources/variants/ultimaker_s7_cc06.inst.cfg +++ b/resources/variants/ultimaker_s7_cc06.inst.cfg @@ -13,7 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = CC 0.6 machine_nozzle_size = 0.6 -retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed speed_infill = =speed_print speed_print = 45 diff --git a/tests/TestHitChecker.py b/tests/TestHitChecker.py new file mode 100644 index 0000000000..59ee1d8162 --- /dev/null +++ b/tests/TestHitChecker.py @@ -0,0 +1,141 @@ +from unittest.mock import patch + +from cura.HitChecker import HitChecker +from cura.OneAtATimeIterator import OneAtATimeIterator +from cura.Scene.CuraSceneNode import CuraSceneNode + + +def test_anyTwoNodesBlockEachOther_True(): + node1 = CuraSceneNode(no_setting_override=True) + node2 = CuraSceneNode(no_setting_override=True) + # node1 and node2 block each other + hit_map = { + node1: {node1: 0, node2: 1}, + node2: {node1: 1, node2: 0} + } + + with patch.object(HitChecker, "_buildHitMap", return_value=hit_map): + hit_checker = HitChecker([node1, node2]) + assert hit_checker.anyTwoNodesBlockEachOther([node1, node2]) + assert hit_checker.anyTwoNodesBlockEachOther([node2, node1]) + + +def test_anyTwoNodesBlockEachOther_False(): + node1 = CuraSceneNode(no_setting_override=True) + node2 = CuraSceneNode(no_setting_override=True) + # node1 blocks node2, but node2 doesn't block node1 + hit_map = { + node1: {node1: 0, node2: 1}, + node2: {node1: 0, node2: 0} + } + + with patch.object(HitChecker, "_buildHitMap", return_value=hit_map): + hit_checker = HitChecker([node1, node2]) + assert not hit_checker.anyTwoNodesBlockEachOther([node1, node2]) + assert not hit_checker.anyTwoNodesBlockEachOther([node2, node1]) + + +def test_canPrintBefore(): + node1 = CuraSceneNode(no_setting_override=True) + node2 = CuraSceneNode(no_setting_override=True) + node3 = CuraSceneNode(no_setting_override=True) + # nodes can be printed only in order node1 -> node2 -> node3 + hit_map = { + node1: {node1: 0, node2: 0, node3: 0}, + node2: {node1: 1, node2: 0, node3: 0}, + node3: {node1: 1, node2: 1, node3: 0}, + } + + with patch.object(HitChecker, "_buildHitMap", return_value=hit_map): + hit_checker = HitChecker([node1, node2, node3]) + + assert hit_checker.canPrintBefore(node1, [node2]) + assert hit_checker.canPrintBefore(node1, [node3]) + assert hit_checker.canPrintBefore(node1, [node2, node3]) + assert hit_checker.canPrintBefore(node1, [node3, node2]) + + assert hit_checker.canPrintBefore(node2, [node3]) + assert not hit_checker.canPrintBefore(node2, [node1]) + assert not hit_checker.canPrintBefore(node2, [node1, node3]) + assert not hit_checker.canPrintBefore(node2, [node3, node1]) + + assert not hit_checker.canPrintBefore(node3, [node1]) + assert not hit_checker.canPrintBefore(node3, [node2]) + assert not hit_checker.canPrintBefore(node3, [node1, node2]) + assert not hit_checker.canPrintBefore(node3, [node2, node1]) + + +def test_canPrintAfter(): + node1 = CuraSceneNode(no_setting_override=True) + node2 = CuraSceneNode(no_setting_override=True) + node3 = CuraSceneNode(no_setting_override=True) + + # nodes can be printed only in order node1 -> node2 -> node3 + hit_map = { + node1: {node1: 0, node2: 0, node3: 0}, + node2: {node1: 1, node2: 0, node3: 0}, + node3: {node1: 1, node2: 1, node3: 0}, + } + + with patch.object(HitChecker, "_buildHitMap", return_value=hit_map): + hit_checker = HitChecker([node1, node2, node3]) + + assert not hit_checker.canPrintAfter(node1, [node2]) + assert not hit_checker.canPrintAfter(node1, [node3]) + assert not hit_checker.canPrintAfter(node1, [node2, node3]) + assert not hit_checker.canPrintAfter(node1, [node3, node2]) + + assert hit_checker.canPrintAfter(node2, [node1]) + assert not hit_checker.canPrintAfter(node2, [node3]) + assert not hit_checker.canPrintAfter(node2, [node1, node3]) + assert not hit_checker.canPrintAfter(node2, [node3, node1]) + + assert hit_checker.canPrintAfter(node3, [node1]) + assert hit_checker.canPrintAfter(node3, [node2]) + assert hit_checker.canPrintAfter(node3, [node1, node2]) + assert hit_checker.canPrintAfter(node3, [node2, node1]) + + +def test_calculateScore(): + node1 = CuraSceneNode(no_setting_override=True) + node2 = CuraSceneNode(no_setting_override=True) + node3 = CuraSceneNode(no_setting_override=True) + + hit_map = { + node1: {node1: 0, node2: 0, node3: 0}, # sum is 0 + node2: {node1: 1, node2: 0, node3: 0}, # sum is 1 + node3: {node1: 1, node2: 1, node3: 0}, # sum is 2 + } + + with patch.object(HitChecker, "_buildHitMap", return_value=hit_map): + hit_checker = HitChecker([node1, node2, node3]) + + # score is a diff between sums + assert hit_checker.calculateScore(node1, node2) == -1 + assert hit_checker.calculateScore(node2, node1) == 1 + assert hit_checker.calculateScore(node1, node3) == -2 + assert hit_checker.calculateScore(node3, node1) == 2 + assert hit_checker.calculateScore(node2, node3) == -1 + assert hit_checker.calculateScore(node3, node2) == 1 + + +def test_canPrintNodesInProvidedOrder(): + node1 = CuraSceneNode(no_setting_override=True) + node2 = CuraSceneNode(no_setting_override=True) + node3 = CuraSceneNode(no_setting_override=True) + + # nodes can be printed only in order node1 -> node2 -> node3 + hit_map = { + node1: {node1: 0, node2: 0, node3: 0}, # 0 + node2: {node1: 1, node2: 0, node3: 0}, # 1 + node3: {node1: 1, node2: 1, node3: 0}, # 2 + } + + with patch.object(HitChecker, "_buildHitMap", return_value=hit_map): + hit_checker = HitChecker([node1, node2, node3]) + assert hit_checker.canPrintNodesInProvidedOrder([node1, node2, node3]) + assert not hit_checker.canPrintNodesInProvidedOrder([node1, node3, node2]) + assert not hit_checker.canPrintNodesInProvidedOrder([node2, node1, node3]) + assert not hit_checker.canPrintNodesInProvidedOrder([node2, node3, node1]) + assert not hit_checker.canPrintNodesInProvidedOrder([node3, node1, node2]) + assert not hit_checker.canPrintNodesInProvidedOrder([node3, node2, node1]) \ No newline at end of file diff --git a/tests/TestOAuth2.py b/tests/TestOAuth2.py index 09fa555af4..41edaebbf7 100644 --- a/tests/TestOAuth2.py +++ b/tests/TestOAuth2.py @@ -97,7 +97,7 @@ def test__parseJWTNoRefreshToken(): mock_reply = Mock() # The user profile that the service should respond with. mock_reply.error = Mock(return_value = QNetworkReply.NetworkError.NoError) http_mock = Mock() - http_mock.get = lambda url, headers_dict, callback, error_callback: callback(mock_reply) + http_mock.get = lambda url, headers_dict, callback, error_callback, timeout: callback(mock_reply) http_mock.readJSON = Mock(return_value = {"data": {"user_id": "id_ego_or_superego", "username": "Ghostkeeper"}}) with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance", MagicMock(return_value = http_mock)): @@ -119,8 +119,8 @@ def test__parseJWTFailOnRefresh(): mock_reply = Mock() # The response that the request should give, containing an error about it failing to authenticate. mock_reply.error = Mock(return_value = QNetworkReply.NetworkError.AuthenticationRequiredError) # The reply is 403: Authentication required, meaning the server responded with a "Can't do that, Dave". http_mock = Mock() - http_mock.get = lambda url, headers_dict, callback, error_callback: callback(mock_reply) - http_mock.post = lambda url, data, headers_dict, callback, error_callback: callback(mock_reply) + http_mock.get = lambda url, headers_dict, callback, error_callback, timeout: callback(mock_reply) + http_mock.post = lambda url, data, headers_dict, callback, error_callback, urgent, timeout: callback(mock_reply) with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.readJSON", Mock(return_value = {"error_description": "Mock a failed request!"})): with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance", MagicMock(return_value = http_mock)): @@ -142,7 +142,7 @@ def test__parseJWTSucceedOnRefresh(): mock_reply_failure = Mock() mock_reply_failure.error = Mock(return_value = QNetworkReply.NetworkError.AuthenticationRequiredError) http_mock = Mock() - def mock_get(url, headers_dict, callback, error_callback): + def mock_get(url, headers_dict, callback, error_callback, timeout): if(headers_dict == {"Authorization": "Bearer beep"}): callback(mock_reply_success) else: @@ -181,8 +181,8 @@ def test_refreshAccessTokenFailed(): mock_reply = Mock() # The response that the request should give, containing an error about it failing to authenticate. mock_reply.error = Mock(return_value = QNetworkReply.NetworkError.AuthenticationRequiredError) # The reply is 403: Authentication required, meaning the server responded with a "Can't do that, Dave". http_mock = Mock() - http_mock.get = lambda url, headers_dict, callback, error_callback: callback(mock_reply) - http_mock.post = lambda url, data, headers_dict, callback, error_callback: callback(mock_reply) + http_mock.get = lambda url, headers_dict, callback, error_callback, timeout: callback(mock_reply) + http_mock.post = lambda url, data, headers_dict, callback, error_callback, urgent, timeout: callback(mock_reply) with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.readJSON", Mock(return_value = {"error_description": "Mock a failed request!"})): with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance", MagicMock(return_value = http_mock)): @@ -263,7 +263,7 @@ def test_loginAndLogout() -> None: mock_reply = Mock() # The user profile that the service should respond with. mock_reply.error = Mock(return_value = QNetworkReply.NetworkError.NoError) http_mock = Mock() - http_mock.get = lambda url, headers_dict, callback, error_callback: callback(mock_reply) + http_mock.get = lambda url, headers_dict, callback, error_callback, timeout: callback(mock_reply) http_mock.readJSON = Mock(return_value = {"data": {"user_id": "di_resu", "username": "Emanresu"}}) # Let the service think there was a successful response diff --git a/tests/TestPrintOrderManager.py b/tests/TestPrintOrderManager.py new file mode 100644 index 0000000000..8b2c0475b2 --- /dev/null +++ b/tests/TestPrintOrderManager.py @@ -0,0 +1,175 @@ +from unittest.mock import patch, MagicMock + +from cura.PrintOrderManager import PrintOrderManager +from cura.Scene.CuraSceneNode import CuraSceneNode + + +def test_getNodeName(): + node1 = CuraSceneNode(name="cat", no_setting_override=True) + node2 = CuraSceneNode(name="dog", no_setting_override=True) + assert PrintOrderManager._getNodeName(node1) == "cat" + assert PrintOrderManager._getNodeName(node2) == "dog" + assert PrintOrderManager._getNodeName(None) == "" + + +def test_getNodeName_truncatesLongName(): + node = CuraSceneNode(name="some_name_longer_than_30_characters", no_setting_override=True) + assert PrintOrderManager._getNodeName(node) == "some_name_longer_than_30_chara" + assert PrintOrderManager._getNodeName(node, max_length=10) == "some_name_" + + +def test_getSingleSelectedNode(): + node1 = CuraSceneNode(no_setting_override=True) + with patch("UM.Scene.Selection.Selection.getAllSelectedObjects", MagicMock(return_value=[node1])): + with patch("UM.Scene.Selection.Selection.getSelectedObject", MagicMock(return_value=node1)): + assert PrintOrderManager._getSingleSelectedNode() == node1 + + +def test_getSingleSelectedNode_returnsNoneIfNothingSelected(): + with patch("UM.Scene.Selection.Selection.getAllSelectedObjects", MagicMock(return_value=[])): + assert PrintOrderManager._getSingleSelectedNode() is None + + +def test_getSingleSelectedNode_returnsNoneIfMultipleObjectsSelected(): + node1 = CuraSceneNode(no_setting_override=True) + node2 = CuraSceneNode(no_setting_override=True) + with patch("UM.Scene.Selection.Selection.getAllSelectedObjects", MagicMock(return_value=[node1, node2])): + assert PrintOrderManager._getSingleSelectedNode() is None + + +def test_neighborNodeNamesCorrect_WhenSomeNodeSelected(): + node1 = CuraSceneNode(no_setting_override=True, name="node1") + node2 = CuraSceneNode(no_setting_override=True, name="node2") + node3 = CuraSceneNode(no_setting_override=True, name="node3") + node1.printOrder = 1 + node2.printOrder = 2 + node3.printOrder = 3 + with patch.object(PrintOrderManager, "_configureEvents", return_value=None): + with patch.object(PrintOrderManager, "_getSingleSelectedNode", return_value=node1): + print_order_manager = PrintOrderManager(get_nodes=lambda: [node1, node2, node3]) + + assert print_order_manager.previousNodeName == "" + assert print_order_manager.nextNodeName == "node2" + assert not print_order_manager.shouldEnablePrintBeforeAction + assert print_order_manager.shouldEnablePrintAfterAction + + print_order_manager.swapSelectedAndNextNodes() # swaps node1 with node2, result: [node2, node1, node3] + assert print_order_manager.previousNodeName == "node2" + assert print_order_manager.nextNodeName == "node3" + assert print_order_manager.shouldEnablePrintBeforeAction + assert print_order_manager.shouldEnablePrintAfterAction + + print_order_manager.swapSelectedAndNextNodes() # swaps node1 with node3, result: [node2, node3, node1] + assert print_order_manager.previousNodeName == "node3" + assert print_order_manager.nextNodeName == "" + assert print_order_manager.shouldEnablePrintBeforeAction + assert not print_order_manager.shouldEnablePrintAfterAction + + print_order_manager.swapSelectedAndPreviousNodes() # swaps node1 with node3, result: [node2, node1, node3] + assert print_order_manager.previousNodeName == "node2" + assert print_order_manager.nextNodeName == "node3" + assert print_order_manager.shouldEnablePrintBeforeAction + assert print_order_manager.shouldEnablePrintAfterAction + + print_order_manager.swapSelectedAndPreviousNodes() # swaps node1 with node2, result: [node1, node2, node3] + assert print_order_manager.previousNodeName == "" + assert print_order_manager.nextNodeName == "node2" + assert not print_order_manager.shouldEnablePrintBeforeAction + assert print_order_manager.shouldEnablePrintAfterAction + + +def test_neighborNodeNamesEmpty_WhenNothingSelected(): + node1 = CuraSceneNode(no_setting_override=True, name="node1") + node2 = CuraSceneNode(no_setting_override=True, name="node2") + node3 = CuraSceneNode(no_setting_override=True, name="node3") + node1.printOrder = 1 + node2.printOrder = 2 + node3.printOrder = 3 + with patch.object(PrintOrderManager, "_configureEvents", return_value=None): + with patch.object(PrintOrderManager, "_getSingleSelectedNode", return_value=None): + print_order_manager = PrintOrderManager(get_nodes=lambda: [node1, node2, node3]) + assert print_order_manager.previousNodeName == "" + assert print_order_manager.nextNodeName == "" + assert not print_order_manager.shouldEnablePrintBeforeAction + assert not print_order_manager.shouldEnablePrintAfterAction + + +def test_initializePrintOrders(): + node1 = CuraSceneNode(no_setting_override=True) + node2 = CuraSceneNode(no_setting_override=True) + + # assume print orders are 0 + assert node1.printOrder == 0 + assert node2.printOrder == 0 + + PrintOrderManager.initializePrintOrders([node1, node2]) + + # assert print orders initialized + assert node1.printOrder == 1 + assert node2.printOrder == 2 + + node3 = CuraSceneNode(no_setting_override=True) + node4 = CuraSceneNode(no_setting_override=True) + # assume print orders are 0 + assert node3.printOrder == 0 + assert node4.printOrder == 0 + + PrintOrderManager.initializePrintOrders([node2, node1, node3, node4]) + + # assert print orders not changed for node1 and node2 and initialized for node3 and node4 + assert node1.printOrder == 1 + assert node2.printOrder == 2 + assert node3.printOrder == 3 + assert node4.printOrder == 4 + + +def test_updatePrintOrdersAfterGroupOperation(): + node1 = CuraSceneNode(no_setting_override=True) + node2 = CuraSceneNode(no_setting_override=True) + node3 = CuraSceneNode(no_setting_override=True) + node4 = CuraSceneNode(no_setting_override=True) + node5 = CuraSceneNode(no_setting_override=True) + node1.printOrder = 1 + node2.printOrder = 2 + node3.printOrder = 3 + node4.printOrder = 4 + node5.printOrder = 5 + + all_nodes = [node1, node2, node3, node4, node5] + grouped_nodes = [node2, node4] + group_node = CuraSceneNode(no_setting_override=True) + + PrintOrderManager.updatePrintOrdersAfterGroupOperation(all_nodes, group_node, grouped_nodes) + + assert node1.printOrder == 1 + assert group_node.printOrder == 2 + assert node3.printOrder == 3 + assert node5.printOrder == 4 + + +def test_updatePrintOrdersAfterUngroupOperation(): + node1 = CuraSceneNode(no_setting_override=True) + node2 = CuraSceneNode(no_setting_override=True) + node3 = CuraSceneNode(no_setting_override=True) + node1.printOrder = 1 + node2.printOrder = 2 + node3.printOrder = 3 + + all_nodes = [node1, node2, node3] + node4 = CuraSceneNode(no_setting_override=True) + node5 = CuraSceneNode(no_setting_override=True) + + group_node = node2 + ungrouped_nodes = [node4, node5] + PrintOrderManager.updatePrintOrdersAfterUngroupOperation(all_nodes, group_node, ungrouped_nodes) + + assert node1.printOrder == 1 + assert node4.printOrder == 2 + assert node5.printOrder == 3 + assert node3.printOrder == 4 + + assert node1 in all_nodes + assert node2 not in all_nodes + assert node3 in all_nodes + assert node4 in all_nodes + assert node5 in all_nodes