diff options
142 files changed, 1031 insertions, 206 deletions
diff --git a/.github/ISSUE_TEMPLATE/bugreport.yaml b/.github/ISSUE_TEMPLATE/bugreport.yaml index 87c82c982a..f31971ab2a 100644 --- a/.github/ISSUE_TEMPLATE/bugreport.yaml +++ b/.github/ISSUE_TEMPLATE/bugreport.yaml @@ -64,7 +64,7 @@ body: You can find your log file here: Windows: `%APPDATA%\cura\<Cura version>\cura.log` or usually `C:\Users\\<your username>\AppData\Roaming\cura\<Cura version>\cura.log` MacOS: `$USER/Library/Application Support/cura/<Cura version>/cura.log` - Ubuntu/Linus: `$USER/.local/share/cura/<Cura version>/cura.log` + Ubuntu/Linux: `$USER/.local/share/cura/<Cura version>/cura.log` If the Cura user interface still starts, you can also reach this directory from the application menu in Help -> Show settings folder - type: checkboxes diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py index fdac63cd9d..ebe96202f2 100644 --- a/cura/Arranging/Nest2DArrange.py +++ b/cura/Arranging/Nest2DArrange.py @@ -110,18 +110,11 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV return found_solution_for_all, node_items -def arrange(nodes_to_arrange: List["SceneNode"], build_volume: "BuildVolume", fixed_nodes: Optional[List["SceneNode"]] = None, factor = 10000, add_new_nodes_in_scene: bool = False) -> bool: - """ - Find placement for a set of scene nodes, and move them by using a single grouped operation. - :param nodes_to_arrange: The list of nodes that need to be moved. - :param build_volume: The build volume that we want to place the nodes in. It gets size & disallowed areas from this. - :param fixed_nodes: List of nods that should not be moved, but should be used when deciding where the others nodes - are placed. - :param factor: The library that we use is int based. This factor defines how accuracte we want it to be. - :param add_new_nodes_in_scene: Whether to create new scene nodes before applying the transformations and rotations - - :return: found_solution_for_all: Whether the algorithm found a place on the buildplate for all the objects - """ +def createGroupOperationForArrange(nodes_to_arrange: List["SceneNode"], + build_volume: "BuildVolume", + fixed_nodes: Optional[List["SceneNode"]] = None, + factor = 10000, + add_new_nodes_in_scene: bool = False) -> Tuple[GroupedOperation, int]: scene_root = Application.getInstance().getController().getScene().getRoot() found_solution_for_all, node_items = findNodePlacement(nodes_to_arrange, build_volume, fixed_nodes, factor) @@ -143,6 +136,27 @@ def arrange(nodes_to_arrange: List["SceneNode"], build_volume: "BuildVolume", fi grouped_operation.addOperation( TranslateOperation(node, Vector(200, node.getWorldPosition().y, -not_fit_count * 20), set_position = True)) not_fit_count += 1 - grouped_operation.push() - return found_solution_for_all + return grouped_operation, not_fit_count + + +def arrange(nodes_to_arrange: List["SceneNode"], + build_volume: "BuildVolume", + fixed_nodes: Optional[List["SceneNode"]] = None, + factor = 10000, + add_new_nodes_in_scene: bool = False) -> bool: + """ + Find placement for a set of scene nodes, and move them by using a single grouped operation. + :param nodes_to_arrange: The list of nodes that need to be moved. + :param build_volume: The build volume that we want to place the nodes in. It gets size & disallowed areas from this. + :param fixed_nodes: List of nods that should not be moved, but should be used when deciding where the others nodes + are placed. + :param factor: The library that we use is int based. This factor defines how accuracte we want it to be. + :param add_new_nodes_in_scene: Whether to create new scene nodes before applying the transformations and rotations + + :return: found_solution_for_all: Whether the algorithm found a place on the buildplate for all the objects + """ + + grouped_operation, not_fit_count = createGroupOperationForArrange(nodes_to_arrange, build_volume, fixed_nodes, factor, add_new_nodes_in_scene) + grouped_operation.push() + return not_fit_count != 0 diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index cf397e395e..e0c43c4876 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -1078,9 +1078,10 @@ class BuildVolume(SceneNode): # setting does *not* have a limit_to_extruder setting (which means that we can't ask the global extruder what # the value is. adhesion_extruder = self._global_container_stack.getProperty("adhesion_extruder_nr", "value") - skirt_brim_line_width = self._global_container_stack.extruderList[int(adhesion_extruder)].getProperty("skirt_brim_line_width", "value") + adhesion_stack = self._global_container_stack.extruderList[int(adhesion_extruder)] + skirt_brim_line_width = adhesion_stack.getProperty("skirt_brim_line_width", "value") - initial_layer_line_width_factor = self._global_container_stack.getProperty("initial_layer_line_width_factor", "value") + initial_layer_line_width_factor = adhesion_stack.getProperty("initial_layer_line_width_factor", "value") # Use brim width if brim is enabled OR the prime tower has a brim. if adhesion_type == "brim": brim_line_count = self._global_container_stack.getProperty("brim_line_count", "value") diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 01ded93124..3d4ec1209f 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -750,7 +750,9 @@ class CuraApplication(QtApplication): @pyqtSlot(str, result = QUrl) def getDefaultPath(self, key): default_path = self.getPreferences().getValue("local_file/%s" % key) - return QUrl.fromLocalFile(default_path) + if os.path.exists(default_path): + return QUrl.fromLocalFile(default_path) + return QUrl() @pyqtSlot(str, str) def setDefaultPath(self, key, default_path): diff --git a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 7aa30c6f82..f7316e9c09 100644 --- a/cura/Machines/Models/QualityProfilesDropDownMenuModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -41,10 +41,6 @@ class QualityProfilesDropDownMenuModel(ListModel): machine_manager.activeQualityGroupChanged.connect(self._onChange) machine_manager.activeMaterialChanged.connect(self._onChange) machine_manager.activeVariantChanged.connect(self._onChange) - machine_manager.extruderChanged.connect(self._onChange) - - extruder_manager = application.getExtruderManager() - extruder_manager.extrudersChanged.connect(self._onChange) self._layer_height_unit = "" # This is cached diff --git a/cura/MultiplyObjectsJob.py b/cura/MultiplyObjectsJob.py index 4c1caf137c..1446ae687e 100644 --- a/cura/MultiplyObjectsJob.py +++ b/cura/MultiplyObjectsJob.py @@ -6,11 +6,15 @@ from typing import List from UM.Application import Application from UM.Job import Job +from UM.Math.Vector import Vector from UM.Message import Message +from UM.Operations.AddSceneNodeOperation import AddSceneNodeOperation +from UM.Operations.GroupedOperation import GroupedOperation +from UM.Operations.TranslateOperation import TranslateOperation from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Scene.SceneNode import SceneNode from UM.i18n import i18nCatalog -from cura.Arranging.Nest2DArrange import arrange +from cura.Arranging.Nest2DArrange import arrange, createGroupOperationForArrange i18n_catalog = i18nCatalog("cura") @@ -43,11 +47,11 @@ class MultiplyObjectsJob(Job): # Only count sliceable objects if node_.callDecoration("isSliceable"): fixed_nodes.append(node_) - + nodes_to_add_without_arrange = [] for node in self._objects: # If object is part of a group, multiply group current_node = node - while current_node.getParent() and (current_node.getParent().callDecoration("isGroup") or current_node.getParent().callDecoration("isSliceable")): + while current_node.getParent() and current_node.getParent().callDecoration("isGroup"): current_node = current_node.getParent() if current_node in processed_nodes: @@ -56,19 +60,38 @@ class MultiplyObjectsJob(Job): for _ in range(self._count): new_node = copy.deepcopy(node) - # Same build plate build_plate_number = current_node.callDecoration("getBuildPlateNumber") new_node.callDecoration("setBuildPlateNumber", build_plate_number) for child in new_node.getChildren(): child.callDecoration("setBuildPlateNumber", build_plate_number) - - nodes.append(new_node) + if not current_node.getParent().callDecoration("isSliceable"): + nodes.append(new_node) + else: + # The node we're trying to place has another node that is sliceable as a parent. + # As such, we shouldn't arrange it (but it should be added to the scene!) + nodes_to_add_without_arrange.append(new_node) + new_node.setParent(current_node.getParent()) found_solution_for_all = True + group_operation = GroupedOperation() if nodes: - found_solution_for_all = arrange(nodes, Application.getInstance().getBuildVolume(), fixed_nodes, - factor = 10000, add_new_nodes_in_scene = True) + group_operation, not_fit_count = createGroupOperationForArrange(nodes, + Application.getInstance().getBuildVolume(), + fixed_nodes, + factor = 10000, + add_new_nodes_in_scene = True) + found_solution_for_all = not_fit_count == 0 + + if nodes_to_add_without_arrange: + for nested_node in nodes_to_add_without_arrange: + group_operation.addOperation(AddSceneNodeOperation(nested_node, nested_node.getParent())) + # Move the node a tiny bit so it doesn't overlap with the existing one. + # This doesn't fix it if someone creates more than one duplicate, but it at least shows that something + # happened (and after moving it, it's clear that there are more underneath) + group_operation.addOperation(TranslateOperation(nested_node, Vector(2.5, 2.5, 2.5))) + + group_operation.push() status_message.hide() if not found_solution_for_all: diff --git a/plugins/PerObjectSettingsTool/SettingPickDialog.qml b/plugins/PerObjectSettingsTool/SettingPickDialog.qml index 28ddb7e642..1bba094e49 100644 --- a/plugins/PerObjectSettingsTool/SettingPickDialog.qml +++ b/plugins/PerObjectSettingsTool/SettingPickDialog.qml @@ -96,11 +96,11 @@ UM.Dialog } showAll: toggleShowAll.checked || filterInput.text !== "" } - delegate:Loader + delegate: Loader { id: loader - width: parent.width + width: listview.width height: model.type != undefined ? UM.Theme.getSize("section").height : 0 property var definition: model diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py index 712af63b07..3a46fcabdf 100644 --- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py +++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py @@ -9,7 +9,7 @@ # Modified by Ricardo Gomez, ricardoga@otulook.com, to add Bed Temperature and make it work with Cura_13.06.04+ # Modified by Stefan Heule, Dim3nsioneer@gmx.ch since V3.0 (see changelog below) # Modified by Jaime van Kessel (Ultimaker), j.vankessel@ultimaker.com to make it work for 15.10 / 2.x -# Modified by Ruben Dulek (Ultimaker), r.dulek@ultimaker.com, to debug. +# Modified by Ghostkeeper (Ultimaker), rubend@tutanota.com, to debug. # Modified by Wes Hanney, https://github.com/novamxd, Retract Length + Speed, Clean up # history / changelog: diff --git a/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py b/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py index a0c3648304..40a56ace57 100644 --- a/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py +++ b/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Ruben Dulek +# Copyright (c) 2017 Ghostkeeper # The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. import re #To perform the search and replace. diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 02e71207e0..0e8db0f88a 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -130,6 +130,7 @@ class SliceInfo(QObject, Extension): data["cura_version"] = self._application.getVersion() data["cura_build_type"] = ApplicationMetadata.CuraBuildType org_id = user_profile.get("organization_id", None) if user_profile else None + data["is_logged_in"] = self._application.getCuraAPI().account.isLoggedIn data["organization_id"] = org_id if org_id else None data["subscriptions"] = user_profile.get("subscriptions", []) if user_profile else [] diff --git a/plugins/SliceInfoPlugin/example_data.html b/plugins/SliceInfoPlugin/example_data.html index 5b97f1cba6..85a9f554ff 100644 --- a/plugins/SliceInfoPlugin/example_data.html +++ b/plugins/SliceInfoPlugin/example_data.html @@ -7,6 +7,7 @@ <b>Intent Profile:</b> Default<br/> <b>Quality Profile:</b> Fast<br/> <b>Using Custom Settings:</b> No<br/> + <b>Is Logged In:</b> Yes<br/> <b>Organization ID (if any):</b> ABCDefGHIjKlMNOpQrSTUvYxWZ0-1234567890abcDE=<br/> <b>Subscriptions (if any):</b> <ul> diff --git a/resources/definitions/arjunpro300.def.json b/resources/definitions/arjunpro300.def.json new file mode 100644 index 0000000000..7f7160f777 --- /dev/null +++ b/resources/definitions/arjunpro300.def.json @@ -0,0 +1,52 @@ +{ + "version": 2, + "name": "Arjun Pro 300", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Venkat Kamesh", + "manufacturer": "Sri Vignan Technologies", + "weight": 3, + "file_formats": "text/x-gcode", + "platform": "arjunpro300_platform.STL", + "platform_offset": [-155, -6, 190], + "has_material": true, + "has_variants": true, + "preferred_variant_name": "0.4 mm Nozzle", + "machine_extruder_trains": + { + "0": "arjunpro_extruder_0", + "1": "arjunpro_extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Arjun Pro 300" }, + "machine_width": { "default_value": 300 }, + "machine_height": { "default_value": 293 }, + "machine_depth": { "default_value": 300 }, + "machine_center_is_zero": {"default_value": false}, + "machine_heated_bed": { "default_value": true }, + "machine_nozzle_size": {"default_value": 0.4}, + "machine_show_variants": {"default_value": true}, + "machine_acceleration": {"default_value": 2000}, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 300 }, + "machine_max_feedrate_z": { "value": 15 }, + "machine_max_feedrate_e": { "value": 150 }, + "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, + "line_width": {"value": "machine_nozzle_size"}, + "speed_travel": {"maximum_value": "300", "value": "200"}, + "optimize_wall_printing_order": { "value": "True" }, + "material_diameter": { "default_value": 1.75}, + "retraction_amount": {"default_value": 6.5}, + "retraction_speed": { "default_value": 30}, + + "adhesion_type": { "default_value": "skirt" }, + "machine_gcode_flavor": { "default_value": "Marlin"}, + "ironing_enabled":{"default_value": true}, + "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28 \nG29 \nG1 X0 Y5 F2000\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n"}, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84"}, + "machine_extruder_count": { "default_value": 2 } + } +} diff --git a/resources/definitions/arjunpro_duplication.def.json b/resources/definitions/arjunpro_duplication.def.json new file mode 100644 index 0000000000..9aebd197a7 --- /dev/null +++ b/resources/definitions/arjunpro_duplication.def.json @@ -0,0 +1,49 @@ +{ + "version": 2, + "name": "Arjun Pro 300 Duplication", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Venkat Kamesh", + "manufacturer": "Sri Vignan Technologies", + "weight": 3, + "file_formats": "text/x-gcode", + "has_material": true, + "has_variants": true, + "preferred_variant_name": "0.4 mm Nozzle", + "machine_extruder_trains": + { + "0": "arjunpro_dm_extruder" + } + }, + + "overrides": { + "machine_name": { "default_value": "Arjunpro 300 Duplication" }, + "machine_width": { "default_value": 120 }, + "machine_height": { "default_value": 293 }, + "machine_depth": { "default_value": 300 }, + "machine_center_is_zero": {"default_value": false}, + "machine_heated_bed": { "default_value": true }, + "machine_nozzle_size": {"default_value": 0.4}, + "machine_show_variants": {"default_value": true}, + "machine_acceleration": {"default_value": 2000}, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 300 }, + "machine_max_feedrate_z": { "value": 15 }, + "machine_max_feedrate_e": { "value": 150 }, + "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, + "line_width": {"value": "machine_nozzle_size"}, + "speed_travel": {"maximum_value": "300", "value": "200"}, + "optimize_wall_printing_order": { "value": "True" }, + "material_diameter": { "default_value": 1.75}, + "retraction_amount": {"default_value": 6.5}, + "retraction_speed": { "default_value": 30}, + + "adhesion_type": { "default_value": "skirt" }, + "machine_gcode_flavor": { "default_value": "Marlin"}, + "ironing_enabled":{"default_value": true}, + "machine_start_gcode": {"default_value": "M605 S2 R0 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n"}, + "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"}, + "machine_extruder_count": { "default_value": 1 } + } +} diff --git a/resources/definitions/arjunpro_mirrored.def.json b/resources/definitions/arjunpro_mirrored.def.json new file mode 100644 index 0000000000..5502708186 --- /dev/null +++ b/resources/definitions/arjunpro_mirrored.def.json @@ -0,0 +1,49 @@ +{ + "version": 2, + "name": "Arjun Pro 300 Mirror", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Venkat Kamesh", + "manufacturer": "Sri Vignan Technologies", + "weight": 3, + "file_formats": "text/x-gcode", + "has_material": true, + "has_variants": true, + "preferred_variant_name": "0.4 mm Nozzle", + "machine_extruder_trains": + { + "0": "arjunpro_mm_extruder" + } + }, + + "overrides": { + "machine_name": { "default_value": "Arjunpro 300 Mirror" }, + "machine_width": { "default_value": 120 }, + "machine_height": { "default_value": 293 }, + "machine_depth": { "default_value": 300 }, + "machine_center_is_zero": {"default_value": false}, + "machine_heated_bed": { "default_value": true }, + "machine_nozzle_size": {"default_value": 0.4}, + "machine_show_variants": {"default_value": true}, + "machine_acceleration": {"default_value": 2000}, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 300 }, + "machine_max_feedrate_z": { "value": 15 }, + "machine_max_feedrate_e": { "value": 150 }, + "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, + "line_width": {"value": "machine_nozzle_size"}, + "speed_travel": {"maximum_value": "300", "value": "200"}, + "optimize_wall_printing_order": { "value": "True" }, + "material_diameter": { "default_value": 1.75}, + "retraction_amount": {"default_value": 6.5}, + "retraction_speed": { "default_value": 30}, + + "adhesion_type": { "default_value": "skirt" }, + "machine_gcode_flavor": { "default_value": "Marlin"}, + "ironing_enabled":{"default_value": true}, + "machine_start_gcode": {"default_value": "M605 S2 R0 X125\nM605 S3 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n"}, + "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"}, + "machine_extruder_count": { "default_value": 1 } + } +} diff --git a/resources/definitions/creasee_cs50spro.def.json b/resources/definitions/creasee_cs50spro.def.json new file mode 100644 index 0000000000..a2be3d0a52 --- /dev/null +++ b/resources/definitions/creasee_cs50spro.def.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "name": "Creasee CS50s Pro", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "Creasee", + "machine_extruder_trains": + { + "0": "creasee_cs50spro_extruder" + } + }, + + "overrides": { + "machine_name": { "default_value": "Creasee CS50s Pro" }, + "machine_width": { + "default_value": 500 + }, + "machine_depth": { + "default_value": 500 + }, + "machine_height": { + "default_value": 600 + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" + } + } +} diff --git a/resources/definitions/creasee_phoenix.def.json b/resources/definitions/creasee_phoenix.def.json new file mode 100644 index 0000000000..05e134b6b8 --- /dev/null +++ b/resources/definitions/creasee_phoenix.def.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "name": "Creasee Phoenix", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "Creasee", + "machine_extruder_trains": + { + "0": "creasee_phoenix_extruder" + } + }, + + "overrides": { + "machine_name": { "default_value": "Creasee Phoenix" }, + "machine_width": { + "default_value": 350 + }, + "machine_depth": { + "default_value": 350 + }, + "machine_height": { + "default_value": 350 + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" + } + } +} diff --git a/resources/definitions/creasee_skywalker.def.json b/resources/definitions/creasee_skywalker.def.json new file mode 100644 index 0000000000..3120e6b116 --- /dev/null +++ b/resources/definitions/creasee_skywalker.def.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "name": "Creasee Skywalker", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "Creasee", + "machine_extruder_trains": + { + "0": "creasee_skywalker_extruder" + } + }, + + "overrides": { + "machine_name": { "default_value": "Creasee Skywalker" }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" + } + } +} diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 0906deefb7..064f589e26 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1890,7 +1890,7 @@ "infill_pattern": { "label": "Infill Pattern", - "description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction.", + "description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction. Lightning infill tries to minimize the infill, by only supporting the (internal) roofs of the object. As such, the infill percentage is only 'valid' one layer below whatever it needs to support of the model.", "type": "enum", "options": { diff --git a/resources/definitions/malyan_m180.def.json b/resources/definitions/malyan_m180.def.json index bb812b6dd6..7c32ebfba0 100644 --- a/resources/definitions/malyan_m180.def.json +++ b/resources/definitions/malyan_m180.def.json @@ -4,7 +4,7 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "Ruben Dulek", + "author": "Ghostkeeper", "manufacturer": "Malyan", "machine_x3g_variant": "r1d", "file_formats": "application/x3g", diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index c028363239..ca44f154e2 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -86,6 +86,18 @@ }, "machine_acceleration": { "default_value": 3000 + }, + "infill_before_walls": { + "value": false + }, + "retraction_combing": { + "value": "'no_outer_surfaces'" + }, + "skin_monotonic" : { + "value": true + }, + "top_bottom_pattern" : { + "value": "'zigzag'" } } } diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index c0ddcf813f..be143516ad 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -63,17 +63,23 @@ "optimize_wall_printing_order": { "value": "True" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, "speed_support": { "value": "speed_wall_0" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { + "value": "material_print_temperature", + "maximum_value": 260 + }, + "material_final_print_temperature": { + "value": "material_print_temperature", + "maximum_value": 260 + }, + "material_print_temperature_layer_0": { + "value": "material_print_temperature", + "maximum_value": 260 + }, "machine_start_gcode": { "value": "''" }, "machine_end_gcode": { "value": "''" }, "material_bed_temperature": { "maximum_value": 110 }, "material_bed_temperature_layer_0": { "maximum_value": 110 }, "material_print_temperature": { "maximum_value": 260 }, - "material_print_temperature_layer_0": { "maximum_value": 260 }, - "material_initial_print_temperature": { "maximum_value": 260 }, - "material_final_print_temperature": { "maximum_value": 260 }, "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "meshfix_maximum_travel_resolution": { "value": 0.5 }, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 46ade6d85b..5d974cb4e3 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -96,20 +96,28 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "infill_before_walls": { "value": false }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, - "jerk_layer_0": { "value": "jerk_topbottom" }, - "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_print": { "value": "25" }, - "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, - "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, - "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, + "jerk_print": { "value": "20", "minimum_value_warning": 20 }, + "jerk_infill": {"minimum_value_warning": 20 }, + "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, + "jerk_roofing": {"minimum_value_warning": 20 }, + "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support_infill": {"minimum_value_warning": 20 }, + "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, + "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_travel": {"minimum_value_warning": 20 }, + "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, + "jerk_print_layer_0": {"minimum_value_warning": 20 }, + "jerk_travel_layer_0": {"minimum_value_warning": 20 }, + "jerk_skirt_brim": {"minimum_value_warning": 20 }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, @@ -132,6 +140,7 @@ "raft_margin": { "value": "10" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, + "retraction_combing": {"value": "'no_outer_surfaces'"}, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -140,6 +149,7 @@ "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, "skin_overlap": { "value": "10" }, + "skin_monotonic" : { "value": true }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, @@ -158,6 +168,7 @@ "support_z_distance": { "value": "0" }, "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, + "top_bottom_pattern" : {"value": "'zigzag'"}, "top_bottom_thickness": { "value": "1" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 2a17f212d2..da11ddf0d5 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -89,19 +89,27 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "infill_before_walls": { "value": false }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "jerk_layer_0": { "value": "jerk_topbottom" }, - "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_print": { "value": "25" }, - "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, - "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, - "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, + "jerk_print": { "value": "20", "minimum_value_warning": 20 }, + "jerk_infill": {"minimum_value_warning": 20 }, + "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, + "jerk_roofing": {"minimum_value_warning": 20 }, + "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support_infill": {"minimum_value_warning": 20 }, + "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, + "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_travel": {"minimum_value_warning": 20 }, + "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, + "jerk_print_layer_0": {"minimum_value_warning": 20 }, + "jerk_travel_layer_0": {"minimum_value_warning": 20 }, + "jerk_skirt_brim": {"minimum_value_warning": 20 }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, @@ -110,6 +118,7 @@ "default_material_print_temperature": { "value": "200" }, "material_standby_temperature": { "value": "100" }, "multiple_mesh_overlap": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, "prime_tower_enable": { "value": "True" }, "raft_airgap": { "value": "0" }, "raft_base_speed": { "value": "20" }, @@ -123,6 +132,7 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, + "retraction_combing": { "value": "'no_outer_surfaces'"}, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -130,6 +140,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, + "skin_monotonic" : { "value": true }, "skin_overlap": { "value": "10" }, "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, @@ -149,6 +160,7 @@ "support_z_distance": { "value": "0" }, "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, + "top_bottom_pattern" : {"value": "'zigzag'"}, "top_bottom_thickness": { "value": "1" }, "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 74f0f305cb..9493a25add 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -91,19 +91,27 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "infill_before_walls": { "value": false }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "jerk_layer_0": { "value": "jerk_topbottom" }, - "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_print": { "value": "25" }, - "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, - "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, - "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, + "jerk_print": { "value": "20", "minimum_value_warning": 20 }, + "jerk_infill": {"minimum_value_warning": 20 }, + "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, + "jerk_roofing": {"minimum_value_warning": 20 }, + "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support_infill": {"minimum_value_warning": 20 }, + "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, + "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_travel": {"minimum_value_warning": 20 }, + "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, + "jerk_print_layer_0": {"minimum_value_warning": 20 }, + "jerk_travel_layer_0": {"minimum_value_warning": 20 }, + "jerk_skirt_brim": {"minimum_value_warning": 20 }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, @@ -125,6 +133,7 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, + "retraction_combing": { "value": "'no_outer_surfaces'"}, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -132,6 +141,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, + "skin_monotonic" : { "value": true }, "skin_overlap": { "value": "10" }, "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, @@ -151,6 +161,7 @@ "support_z_distance": { "value": "0" }, "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, + "top_bottom_pattern" : {"value": "'zigzag'"}, "top_bottom_thickness": { "value": "1" }, "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, diff --git a/resources/extruders/arjunpro_dm_extruder.def.json b/resources/extruders/arjunpro_dm_extruder.def.json new file mode 100644 index 0000000000..9ea7bbe27b --- /dev/null +++ b/resources/extruders/arjunpro_dm_extruder.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Duplication Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "arjunpro_duplication", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } + } +} diff --git a/resources/extruders/arjunpro_extruder_0.def.json b/resources/extruders/arjunpro_extruder_0.def.json new file mode 100644 index 0000000000..b4ba094804 --- /dev/null +++ b/resources/extruders/arjunpro_extruder_0.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "arjunpro300", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": -51 }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_code": { "default_value": "T0" } + } +} diff --git a/resources/extruders/arjunpro_extruder_1.def.json b/resources/extruders/arjunpro_extruder_1.def.json new file mode 100644 index 0000000000..b5177807b8 --- /dev/null +++ b/resources/extruders/arjunpro_extruder_1.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "arjunpro300", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": 257 }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_code": { "default_value": "T1" } + } +} diff --git a/resources/extruders/arjunpro_mm_extruder.def.json b/resources/extruders/arjunpro_mm_extruder.def.json new file mode 100644 index 0000000000..c101ede4ca --- /dev/null +++ b/resources/extruders/arjunpro_mm_extruder.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Mirror Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "arjunpro_mirrored", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } + } +} diff --git a/resources/extruders/creasee_cs50spro_extruder.def.json b/resources/extruders/creasee_cs50spro_extruder.def.json new file mode 100644 index 0000000000..8fdd42186a --- /dev/null +++ b/resources/extruders/creasee_cs50spro_extruder.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creasee_cs50spro", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/creasee_phoenix_extruder.def.json b/resources/extruders/creasee_phoenix_extruder.def.json new file mode 100644 index 0000000000..9eed5943e4 --- /dev/null +++ b/resources/extruders/creasee_phoenix_extruder.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creasee_phoenix", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/creasee_skywalker_extruder.def.json b/resources/extruders/creasee_skywalker_extruder.def.json new file mode 100644 index 0000000000..0e240665ec --- /dev/null +++ b/resources/extruders/creasee_skywalker_extruder.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creasee_skywalker", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/i18n/cs_CZ/cura.po b/resources/i18n/cs_CZ/cura.po index 6c651714d2..c4bada9c78 100644 --- a/resources/i18n/cs_CZ/cura.po +++ b/resources/i18n/cs_CZ/cura.po @@ -1,12 +1,12 @@ # Cura # Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. -# Ruben Dulek <r.dulek@ultimaker.com>, 2020. +# Ultimaker <plugins@ultimaker.com>, 2020. # msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-04-04 15:31+0200\n" "Last-Translator: Miroslav Šustek <sustmidown@centrum.cz>\n" diff --git a/resources/i18n/cs_CZ/fdmextruder.def.json.po b/resources/i18n/cs_CZ/fdmextruder.def.json.po index 9d0fe7af08..def60713ad 100644 --- a/resources/i18n/cs_CZ/fdmextruder.def.json.po +++ b/resources/i18n/cs_CZ/fdmextruder.def.json.po @@ -1,12 +1,12 @@ # Cura # Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. -# Ruben Dulek <r.dulek@ultimaker.com>, 2020. +# Ultimaker <plugins@ultimaker.com>, 2020. # msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2020-02-20 17:30+0100\n" "Last-Translator: DenyCZ <www.github.com/DenyCZ>\n" diff --git a/resources/i18n/cs_CZ/fdmprinter.def.json.po b/resources/i18n/cs_CZ/fdmprinter.def.json.po index c49ead79c6..61511df879 100644 --- a/resources/i18n/cs_CZ/fdmprinter.def.json.po +++ b/resources/i18n/cs_CZ/fdmprinter.def.json.po @@ -1,12 +1,12 @@ # Cura # Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. -# Ruben Dulek <r.dulek@ultimaker.com>, 2020. +# Ultimaker <plugins@ultimaker.com>, 2020. # msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-04 19:37+0200\n" "Last-Translator: Miroslav Šustek <sustmidown@centrum.cz>\n" diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index e97148a38c..e21f834c9d 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 6cb4dbafab..2078b327d6 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-09-07 07:41+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/de_DE/fdmextruder.def.json.po b/resources/i18n/de_DE/fdmextruder.def.json.po index 3196e4e873..298b009347 100644 --- a/resources/i18n/de_DE/fdmextruder.def.json.po +++ b/resources/i18n/de_DE/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:15+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index a4db59cb52..8f26ecc2db 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:16+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 0c4697e432..dd0c259f90 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-09-07 07:43+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/es_ES/fdmextruder.def.json.po b/resources/i18n/es_ES/fdmextruder.def.json.po index 07993d655f..3057759188 100644 --- a/resources/i18n/es_ES/fdmextruder.def.json.po +++ b/resources/i18n/es_ES/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index 732289c9e7..562b93165c 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:15+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/fdmextruder.def.json.pot b/resources/i18n/fdmextruder.def.json.pot index 284b033c49..6f496b5ad3 100644 --- a/resources/i18n/fdmextruder.def.json.pot +++ b/resources/i18n/fdmextruder.def.json.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot index 8cbd4d5d1d..2c05787546 100644 --- a/resources/i18n/fdmprinter.def.json.pot +++ b/resources/i18n/fdmprinter.def.json.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index 406db14a12..b74ec234c0 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/fi_FI/fdmextruder.def.json.po b/resources/i18n/fi_FI/fdmextruder.def.json.po index f1d8767b81..28fd84b7ca 100644 --- a/resources/i18n/fi_FI/fdmextruder.def.json.po +++ b/resources/i18n/fi_FI/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2017-08-11 14:31+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index 52558d0db4..acd995d7d0 100644 --- a/resources/i18n/fi_FI/fdmprinter.def.json.po +++ b/resources/i18n/fi_FI/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index a0cb30bc72..41df93d778 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-09-07 07:48+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/fr_FR/fdmextruder.def.json.po b/resources/i18n/fr_FR/fdmextruder.def.json.po index 7caa73f8f5..7947f8efb7 100644 --- a/resources/i18n/fr_FR/fdmextruder.def.json.po +++ b/resources/i18n/fr_FR/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:16+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index 0e02469dcc..bc0f03be3a 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:16+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/hu_HU/cura.po b/resources/i18n/hu_HU/cura.po index a4781df59b..cab7d0e7f1 100644 --- a/resources/i18n/hu_HU/cura.po +++ b/resources/i18n/hu_HU/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2020-03-24 09:36+0100\n" "Last-Translator: Nagy Attila <vokroot@gmail.com>\n" diff --git a/resources/i18n/hu_HU/fdmextruder.def.json.po b/resources/i18n/hu_HU/fdmextruder.def.json.po index e153967ccf..6bbc53b33c 100644 --- a/resources/i18n/hu_HU/fdmextruder.def.json.po +++ b/resources/i18n/hu_HU/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2020-03-24 09:27+0100\n" "Last-Translator: Nagy Attila <vokroot@gmail.com>\n" diff --git a/resources/i18n/hu_HU/fdmprinter.def.json.po b/resources/i18n/hu_HU/fdmprinter.def.json.po index e1dddf829d..3c5871a749 100644 --- a/resources/i18n/hu_HU/fdmprinter.def.json.po +++ b/resources/i18n/hu_HU/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2020-03-24 09:43+0100\n" "Last-Translator: Nagy Attila <vokroot@gmail.com>\n" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index e4b973e436..9825abd294 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-09-07 07:57+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/it_IT/fdmextruder.def.json.po b/resources/i18n/it_IT/fdmextruder.def.json.po index 58e76cc1a8..35c2aaa2f9 100644 --- a/resources/i18n/it_IT/fdmextruder.def.json.po +++ b/resources/i18n/it_IT/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 14:58+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index e72b81f693..2d5ff8a607 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 14:58+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 984b90d3e8..f26b08ab04 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-09-07 08:00+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/ja_JP/fdmextruder.def.json.po b/resources/i18n/ja_JP/fdmextruder.def.json.po index 99a1ce54b1..cf9ade8be8 100644 --- a/resources/i18n/ja_JP/fdmextruder.def.json.po +++ b/resources/i18n/ja_JP/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 14:59+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index ab5a6e9d40..0669bfc4df 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:00+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 3dd4d02557..19a48d2159 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-04-16 15:01+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/ko_KR/fdmextruder.def.json.po b/resources/i18n/ko_KR/fdmextruder.def.json.po index 08f803dda0..5b9c3e4fb5 100644 --- a/resources/i18n/ko_KR/fdmextruder.def.json.po +++ b/resources/i18n/ko_KR/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:01+0200\n" "Last-Translator: Korean <info@bothof.nl>\n" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index 329a4a840a..29316aed55 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:02+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index eb7e234e4e..00ef90fa8a 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-09-07 08:01+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/nl_NL/fdmextruder.def.json.po b/resources/i18n/nl_NL/fdmextruder.def.json.po index d83f7fa915..2eb41f59e2 100644 --- a/resources/i18n/nl_NL/fdmextruder.def.json.po +++ b/resources/i18n/nl_NL/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:03+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index f2c72d2c6d..d9ab749078 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:03+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index 3e46e02a78..9331746276 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-09-07 08:02+0200\n" "Last-Translator: Mariusz Matłosz <matliks@gmail.com>\n" diff --git a/resources/i18n/pl_PL/fdmextruder.def.json.po b/resources/i18n/pl_PL/fdmextruder.def.json.po index 2dffba2cce..c5e732052c 100644 --- a/resources/i18n/pl_PL/fdmextruder.def.json.po +++ b/resources/i18n/pl_PL/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Mariusz 'Virgin71' Matłosz <matliks@gmail.com>\n" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index 30e3ae185b..1e73a90362 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2019-11-15 15:34+0100\n" "Last-Translator: Mariusz Matłosz <matliks@gmail.com>\n" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index a5a2678ea1..529c54001c 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-09-07 08:07+0200\n" "Last-Translator: Cláudio Sampaio <patola@gmail.com>\n" diff --git a/resources/i18n/pt_BR/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po index e98904fd6f..66e4731de6 100644 --- a/resources/i18n/pt_BR/fdmextruder.def.json.po +++ b/resources/i18n/pt_BR/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-11 17:09+0200\n" "Last-Translator: Cláudio Sampaio <patola@gmail.com>\n" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 15b06de7be..b39ab59718 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-08-18 02:56+0200\n" "Last-Translator: Cláudio Sampaio <patola@gmail.com>\n" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index 06190424f9..a1a6545a46 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-04-16 14:56+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/pt_PT/fdmextruder.def.json.po b/resources/i18n/pt_PT/fdmextruder.def.json.po index cc58862076..9371c355ef 100644 --- a/resources/i18n/pt_PT/fdmextruder.def.json.po +++ b/resources/i18n/pt_PT/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 14:56+0200\n" "Last-Translator: Portuguese <info@bothof.nl>\n" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index 1a38b8d1e0..038828891f 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 14:56+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 31faaceb24..3514db23e6 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-09-07 08:08+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/ru_RU/fdmextruder.def.json.po b/resources/i18n/ru_RU/fdmextruder.def.json.po index fe71cb985a..138a2e496d 100644 --- a/resources/i18n/ru_RU/fdmextruder.def.json.po +++ b/resources/i18n/ru_RU/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 14:58+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index 01cc81513e..496b2f487d 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 14:58+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index dac15afb60..87cdc2f421 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-04-16 14:58+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/tr_TR/fdmextruder.def.json.po b/resources/i18n/tr_TR/fdmextruder.def.json.po index a0042eead5..1f3473c867 100644 --- a/resources/i18n/tr_TR/fdmextruder.def.json.po +++ b/resources/i18n/tr_TR/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:03+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index cf68ffbda1..af97e84728 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:03+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index e61a189352..e9de36f8c3 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-04-16 15:04+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/zh_CN/fdmextruder.def.json.po b/resources/i18n/zh_CN/fdmextruder.def.json.po index 028a571491..ec53ba0197 100644 --- a/resources/i18n/zh_CN/fdmextruder.def.json.po +++ b/resources/i18n/zh_CN/fdmextruder.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof <info@bothof.nl>\n" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index a0a6900281..568e8d0df0 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 15:04+0200\n" "Last-Translator: Lionbridge <info@lionbridge.com>\n" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index ad28ebb1f8..214e913dab 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -1,12 +1,12 @@ # Cura # Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. -# Ruben Dulek <r.dulek@ultimaker.com>, 2021. +# Ultimaker <plugins@ultimaker.com>, 2021. # msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:59+0200\n" "PO-Revision-Date: 2021-08-16 19:58+0800\n" "Last-Translator: Valen Chang <carf17771@gmail.com>\n" diff --git a/resources/i18n/zh_TW/fdmextruder.def.json.po b/resources/i18n/zh_TW/fdmextruder.def.json.po index ebfbcb47b5..8aa19940a9 100644 --- a/resources/i18n/zh_TW/fdmextruder.def.json.po +++ b/resources/i18n/zh_TW/fdmextruder.def.json.po @@ -1,12 +1,12 @@ # Cura JSON setting files # Copyright (C) 2021 Ultimaker # This file is distributed under the same license as the Cura package. -# Ruben Dulek <r.dulek@ultimaker.com>, 2021. +# Ultimaker <plugins@ultimaker.com>, 2021. # msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-04-16 20:13+0200\n" "Last-Translator: Valen Chang <carf17771@gmail.com>\n" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po index 16b3580942..7ffc615071 100644 --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -1,12 +1,12 @@ # Cura JSON setting files # Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. -# Ruben Dulek <r.dulek@ultimaker.com>, 2021. +# Ultimaker <plugins@ultimaker.com>, 2021. # msgid "" msgstr "" "Project-Id-Version: Cura 4.11\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"Report-Msgid-Bugs-To: plugins@ultimaker.com\n" "POT-Creation-Date: 2021-08-11 09:58+0000\n" "PO-Revision-Date: 2021-08-16 20:48+0800\n" "Last-Translator: Valen Chang <carf17771@gmail.com>\n" diff --git a/resources/meshes/arjunpro300_platform.STL b/resources/meshes/arjunpro300_platform.STL Binary files differnew file mode 100644 index 0000000000..47d7165fee --- /dev/null +++ b/resources/meshes/arjunpro300_platform.STL diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml index f0ee3bdc00..36288f0f4f 100644 --- a/resources/qml/Widgets/ComboBox.qml +++ b/resources/qml/Widgets/ComboBox.qml @@ -15,12 +15,6 @@ ComboBox { id: control - UM.I18nCatalog - { - id: catalog - name: "cura" - } - property var defaultTextOnEmptyModel: catalog.i18nc("@label", "No items to select from") // Text displayed in the combobox when the model is empty property var defaultTextOnEmptyIndex: "" // Text displayed in the combobox when the model has items but no item is selected enabled: delegateModel.count > 0 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 30a09a2eda..87f432b80a 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 @@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =default_material_print_temperature + 2 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 eb1fcc4ba0..042eb806be 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 @@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature + 2 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 36452d80bc..3a61f887ee 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 @@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) layer_height = 0.3 material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 2 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 0b51f0f015..df1f349d7e 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 @@ -20,9 +20,6 @@ infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d infill_sparse_density = 10 -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 material_final_print_temperature = =material_print_temperature 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 1add1de269..7783a639f3 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 @@ -20,9 +20,6 @@ infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d infill_sparse_density = 10 -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) layer_height = 0.4 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.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 0a1d578a41..fcbbf61e64 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 @@ -20,9 +20,6 @@ infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d infill_sparse_density = 10 -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) layer_height = 0.3 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg index 122e58c713..04568434bd 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg @@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =default_material_print_temperature + 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg index 26d5644111..fc42b6fbd6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature + 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg index 9bac0c2663..b4c6cfdf02 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 2 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg index 17924c2a66..2afe0ec9cb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg @@ -18,9 +18,6 @@ top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 material_final_print_temperature = =material_print_temperature diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg index 250b169dcd..222f356e8b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -19,9 +19,6 @@ infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d infill_sparse_density = 10 -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 material_final_print_temperature = =material_print_temperature diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg index 2e65f153e0..272e8f50b4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -19,9 +19,6 @@ infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d infill_sparse_density = 10 -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 material_final_print_temperature = =material_print_temperature diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg index 61298615f2..6fc530d8da 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg @@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =default_material_print_temperature + 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg index 18108c8e9f..5a8a47212d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg @@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature + 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg index d349b4bc12..f1cc5604f3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg @@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 2 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg index 4b532c150e..ffc21e7071 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg @@ -18,9 +18,6 @@ top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 material_final_print_temperature = =material_print_temperature diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg index 3a05d723a3..6ed2dd23e8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -19,9 +19,6 @@ infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d infill_sparse_density = 10 -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 material_final_print_temperature = =material_print_temperature diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg index 021c9d9175..834230cc59 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -19,9 +19,6 @@ infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d infill_sparse_density = 10 -jerk_prime_tower = =math.ceil(jerk_print * 25 / 25) -jerk_support = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25) machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 material_final_print_temperature = =material_print_temperature diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 55a3ab6ce9..ba986c8263 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -358,6 +358,10 @@ magic_mesh_surface_mode magic_spiralize smooth_spiralized_contours relative_extrusion +lightning_infill_support_angle +lightning_infill_overhang_angle +lightning_infill_prune_angle +lightning_infill_straightening_angle [experimental] support_tree_wall_thickness diff --git a/resources/variants/arjunpro300_0.2.inst.cfg b/resources/variants/arjunpro300_0.2.inst.cfg new file mode 100644 index 0000000000..51b359bfab --- /dev/null +++ b/resources/variants/arjunpro300_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.2 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/arjunpro300_0.3.inst.cfg b/resources/variants/arjunpro300_0.3.inst.cfg new file mode 100644 index 0000000000..4d647df100 --- /dev/null +++ b/resources/variants/arjunpro300_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.3 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/arjunpro300_0.4.inst.cfg b/resources/variants/arjunpro300_0.4.inst.cfg new file mode 100644 index 0000000000..d17e90e245 --- /dev/null +++ b/resources/variants/arjunpro300_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/arjunpro300_0.5.inst.cfg b/resources/variants/arjunpro300_0.5.inst.cfg new file mode 100644 index 0000000000..61bdaf0ab9 --- /dev/null +++ b/resources/variants/arjunpro300_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.5 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/arjunpro300_0.6.inst.cfg b/resources/variants/arjunpro300_0.6.inst.cfg new file mode 100644 index 0000000000..905162b547 --- /dev/null +++ b/resources/variants/arjunpro300_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/arjunpro300_0.8.inst.cfg b/resources/variants/arjunpro300_0.8.inst.cfg new file mode 100644 index 0000000000..f12ef67d30 --- /dev/null +++ b/resources/variants/arjunpro300_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/arjunpro300_dm_0.2.inst.cfg b/resources/variants/arjunpro300_dm_0.2.inst.cfg new file mode 100644 index 0000000000..6b61519d07 --- /dev/null +++ b/resources/variants/arjunpro300_dm_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.2 mm Nozzle +version = 4 +definition = arjunpro_duplication + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/arjunpro300_dm_0.3.inst.cfg b/resources/variants/arjunpro300_dm_0.3.inst.cfg new file mode 100644 index 0000000000..3570f3b57f --- /dev/null +++ b/resources/variants/arjunpro300_dm_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.3 mm Nozzle +version = 4 +definition = arjunpro_duplication + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/arjunpro300_dm_0.4.inst.cfg b/resources/variants/arjunpro300_dm_0.4.inst.cfg new file mode 100644 index 0000000000..e3ede604ab --- /dev/null +++ b/resources/variants/arjunpro300_dm_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = arjunpro_duplication + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/arjunpro300_dm_0.5.inst.cfg b/resources/variants/arjunpro300_dm_0.5.inst.cfg new file mode 100644 index 0000000000..ada64e3553 --- /dev/null +++ b/resources/variants/arjunpro300_dm_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.5 mm Nozzle +version = 4 +definition = arjunpro_duplication + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/arjunpro300_dm_0.6.inst.cfg b/resources/variants/arjunpro300_dm_0.6.inst.cfg new file mode 100644 index 0000000000..47d80f5a4f --- /dev/null +++ b/resources/variants/arjunpro300_dm_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = arjunpro_duplication + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/arjunpro300_dm_0.8.inst.cfg b/resources/variants/arjunpro300_dm_0.8.inst.cfg new file mode 100644 index 0000000000..a34524e268 --- /dev/null +++ b/resources/variants/arjunpro300_dm_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = arjunpro_duplication + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/arjunpro300_mm_0.2.inst.cfg b/resources/variants/arjunpro300_mm_0.2.inst.cfg new file mode 100644 index 0000000000..9630a9e30b --- /dev/null +++ b/resources/variants/arjunpro300_mm_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.2 mm Nozzle +version = 4 +definition = arjunpro_mirrored + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/arjunpro300_mm_0.3.inst.cfg b/resources/variants/arjunpro300_mm_0.3.inst.cfg new file mode 100644 index 0000000000..09d397ddea --- /dev/null +++ b/resources/variants/arjunpro300_mm_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.3 mm Nozzle +version = 4 +definition = arjunpro_mirrored + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/arjunpro300_mm_0.4.inst.cfg b/resources/variants/arjunpro300_mm_0.4.inst.cfg new file mode 100644 index 0000000000..49b7851df7 --- /dev/null +++ b/resources/variants/arjunpro300_mm_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = arjunpro_mirrored + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/arjunpro300_mm_0.5.inst.cfg b/resources/variants/arjunpro300_mm_0.5.inst.cfg new file mode 100644 index 0000000000..dfbf3662c3 --- /dev/null +++ b/resources/variants/arjunpro300_mm_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.5 mm Nozzle +version = 4 +definition = arjunpro_mirrored + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/arjunpro300_mm_0.6.inst.cfg b/resources/variants/arjunpro300_mm_0.6.inst.cfg new file mode 100644 index 0000000000..c13c5cf82b --- /dev/null +++ b/resources/variants/arjunpro300_mm_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = arjunpro_mirrored + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/arjunpro300_mm_0.8.inst.cfg b/resources/variants/arjunpro300_mm_0.8.inst.cfg new file mode 100644 index 0000000000..feffb6846c --- /dev/null +++ b/resources/variants/arjunpro300_mm_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = arjunpro_mirrored + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/arjunpro300_pva_0.2.inst.cfg b/resources/variants/arjunpro300_pva_0.2.inst.cfg new file mode 100644 index 0000000000..1abc708060 --- /dev/null +++ b/resources/variants/arjunpro300_pva_0.2.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.2 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric
\ No newline at end of file diff --git a/resources/variants/arjunpro300_pva_0.3.inst.cfg b/resources/variants/arjunpro300_pva_0.3.inst.cfg new file mode 100644 index 0000000000..5cb59930c1 --- /dev/null +++ b/resources/variants/arjunpro300_pva_0.3.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.3 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric
\ No newline at end of file diff --git a/resources/variants/arjunpro300_pva_0.4.inst.cfg b/resources/variants/arjunpro300_pva_0.4.inst.cfg new file mode 100644 index 0000000000..c2f5c68480 --- /dev/null +++ b/resources/variants/arjunpro300_pva_0.4.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.4 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric
\ No newline at end of file diff --git a/resources/variants/arjunpro300_pva_0.5.inst.cfg b/resources/variants/arjunpro300_pva_0.5.inst.cfg new file mode 100644 index 0000000000..6b985fb06b --- /dev/null +++ b/resources/variants/arjunpro300_pva_0.5.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.5 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric
\ No newline at end of file diff --git a/resources/variants/arjunpro300_pva_0.6.inst.cfg b/resources/variants/arjunpro300_pva_0.6.inst.cfg new file mode 100644 index 0000000000..6bfea88e1a --- /dev/null +++ b/resources/variants/arjunpro300_pva_0.6.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.6 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric
\ No newline at end of file diff --git a/resources/variants/arjunpro300_pva_0.8.inst.cfg b/resources/variants/arjunpro300_pva_0.8.inst.cfg new file mode 100644 index 0000000000..7cc066e19d --- /dev/null +++ b/resources/variants/arjunpro300_pva_0.8.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.8 mm Nozzle +version = 4 +definition = arjunpro300 + +[metadata] + +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric
\ No newline at end of file diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index 4c154c126d..cb8b95b0fb 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -23,9 +23,6 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 -jerk_topbottom = =math.ceil(jerk_print * 25 / 25) -jerk_wall = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25) layer_height = 0.2 line_width = =machine_nozzle_size machine_min_cool_heat_time_window = 15 diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 7deb2d65e5..97e16a2afa 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -25,7 +25,6 @@ infill_overlap = 0 infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True -jerk_prime_tower = =math.ceil(jerk_print * 2 / 25) jerk_print = 25 jerk_support = =math.ceil(jerk_print * 15 / 25) jerk_support_interface = =math.ceil(jerk_support * 10 / 15) diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 97089635b3..76156b5e1e 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -15,7 +15,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) cool_fan_speed_max = =cool_fan_speed gradual_support_infill_steps = 2 -jerk_prime_tower = =math.ceil(jerk_print * 2 / 25) jerk_support = =math.ceil(jerk_print * 15 / 25) jerk_support_interface = =math.ceil(jerk_support * 10 / 15) jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index ec6c6822bb..5a1259fc35 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -23,9 +23,6 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 -jerk_topbottom = =math.ceil(jerk_print * 25 / 25) -jerk_wall = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25) layer_height = 0.2 line_width = =machine_nozzle_size machine_min_cool_heat_time_window = 15 diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index 1f75ca9773..bc86c63461 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -25,7 +25,6 @@ infill_overlap = 0 infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True -jerk_prime_tower = =math.ceil(jerk_print * 2 / 25) jerk_print = 25 jerk_support = =math.ceil(jerk_print * 15 / 25) jerk_support_interface = =math.ceil(jerk_support * 10 / 15) diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index be3d5ef8c5..df9a1aa062 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -15,7 +15,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) cool_fan_speed_max = =cool_fan_speed gradual_support_infill_steps = 2 -jerk_prime_tower = =math.ceil(jerk_print * 2 / 25) jerk_support = =math.ceil(jerk_print * 15 / 25) jerk_support_interface = =math.ceil(jerk_support * 10 / 15) jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index 2b34f4b8f6..7fac331e72 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -23,9 +23,6 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 -jerk_topbottom = =math.ceil(jerk_print * 25 / 25) -jerk_wall = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25) layer_height = 0.2 line_width = =machine_nozzle_size machine_min_cool_heat_time_window = 15 diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index d069625145..c68b46a6ae 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -25,7 +25,6 @@ infill_overlap = 0 infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True -jerk_prime_tower = =math.ceil(jerk_print * 2 / 25) jerk_print = 25 jerk_support = =math.ceil(jerk_print * 15 / 25) jerk_support_interface = =math.ceil(jerk_support * 10 / 15) diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index a7c66ca525..a2b8eb1b7e 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -15,7 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) cool_fan_speed_max = =cool_fan_speed gradual_support_infill_steps = 2 -jerk_prime_tower = =math.ceil(jerk_print * 2 / 25) jerk_support = =math.ceil(jerk_print * 15 / 25) jerk_support_interface = =math.ceil(jerk_support * 10 / 15) jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index 4f30ddb8c0..7a6bf3deb5 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -23,9 +23,6 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 -jerk_topbottom = =math.ceil(jerk_print * 25 / 25) -jerk_wall = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25) layer_height = 0.2 line_width = =machine_nozzle_size machine_min_cool_heat_time_window = 15 diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index 8407b94d41..7bb613a2b4 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -25,7 +25,6 @@ infill_overlap = 0 infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True -jerk_prime_tower = =math.ceil(jerk_print * 2 / 25) jerk_print = 25 jerk_support = =math.ceil(jerk_print * 15 / 25) jerk_support_interface = =math.ceil(jerk_support * 10 / 15) diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index 722f50e6d7..380e634c93 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -15,7 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) cool_fan_speed_max = =cool_fan_speed gradual_support_infill_steps = 2 -jerk_prime_tower = =math.ceil(jerk_print * 2 / 25) jerk_support = =math.ceil(jerk_print * 15 / 25) jerk_support_interface = =math.ceil(jerk_support * 10 / 15) jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) |