From e2e7006ee761746b09b76075006162c0c6f699c9 Mon Sep 17 00:00:00 2001 From: Brad Date: Sat, 4 Feb 2023 20:30:03 +0300 Subject: [PATCH 01/35] Addition of Longer3D LK4 X Vendor provided this information as a custom file for Cura 4; I have taken that input and adjusted to suit Cura 5 --- resources/definitions/longer_lk4_x.def.json | 38 +++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 resources/definitions/longer_lk4_x.def.json diff --git a/resources/definitions/longer_lk4_x.def.json b/resources/definitions/longer_lk4_x.def.json new file mode 100644 index 0000000000..236b8c24dd --- /dev/null +++ b/resources/definitions/longer_lk4_x.def.json @@ -0,0 +1,38 @@ +{ + "version": 2, + "name": "Longer LK4 X", + "inherits": "longer_base", + "metadata": + { + "visible": true, + "platform": "longer_235mm_platform.stl", + "platform_offset": [ + -117.5, + -3, + 117.5 + ], + "quality_definition": "longer_base" + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 220 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-55, 20], + [-55, -36], + [35, -36], + [35, 20] + ] + }, + "machine_start_gcode": { "default_value": "; -- LONGER BL-TOUCH Start G-code --\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\n\n; confirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm release\nG4 P100 ; Delay for BL-Touch\n\n; homing\nG28 X0 Y0 ; move X/Y to min endstops\nG28 Z0 ; move Z to min endstops\n\n; reconfirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm realease\nG4 P100 ; Delay for BL-Touch\n\n; bed leveling\nG29; Auto leveling\nM420 Z5 ; set LEVELING_FADE_HEIGHT\nM500 ; save data of G29 and M420\nM420 S1 ; enable bed leveling\n\n; prepare hot-end\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y150.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y150.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n; -- end of LONGER BL-TOUCH Start G-code --" }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "LONGER LK4 X" }, + "machine_width": { "default_value": 220 }, + "speed_travel": { "value": 65 } + "retraction_amount": { "value": 2.0 }, + "z_seam_type": { "value": "'shortest'" }, + "retraction_combing": { "value": "'noskin'" } + } +} From 92bcacfaaa529bcbdd02c9da46d7cfa8222d867a Mon Sep 17 00:00:00 2001 From: Brad Date: Sat, 4 Feb 2023 20:31:14 +0300 Subject: [PATCH 02/35] Create longer_lk4x_0.4.inst.cfg --- resources/variants/longer/longer_lk4x_0.4.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/longer/longer_lk4x_0.4.inst.cfg diff --git a/resources/variants/longer/longer_lk4x_0.4.inst.cfg b/resources/variants/longer/longer_lk4x_0.4.inst.cfg new file mode 100644 index 0000000000..399b02ce70 --- /dev/null +++ b/resources/variants/longer/longer_lk4x_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = longer_lk4x +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 19 +type = variant + +[values] +machine_nozzle_size = 0.4 From e93dd8857d90d3b663f395cc7f57c1df8cf3e0e9 Mon Sep 17 00:00:00 2001 From: Brad Date: Sat, 4 Feb 2023 20:31:51 +0300 Subject: [PATCH 03/35] Rename longer_lk4_x.def.json to longer_lk4x.def.json --- .../definitions/{longer_lk4_x.def.json => longer_lk4x.def.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/definitions/{longer_lk4_x.def.json => longer_lk4x.def.json} (100%) diff --git a/resources/definitions/longer_lk4_x.def.json b/resources/definitions/longer_lk4x.def.json similarity index 100% rename from resources/definitions/longer_lk4_x.def.json rename to resources/definitions/longer_lk4x.def.json From 18020338eaef30b5d00af678d4ae6f96c26c6ba5 Mon Sep 17 00:00:00 2001 From: Brad Date: Sat, 4 Feb 2023 20:41:23 +0300 Subject: [PATCH 04/35] Fixed linter error --- resources/definitions/longer_lk4x.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/longer_lk4x.def.json b/resources/definitions/longer_lk4x.def.json index 236b8c24dd..b98dbeca06 100644 --- a/resources/definitions/longer_lk4x.def.json +++ b/resources/definitions/longer_lk4x.def.json @@ -30,7 +30,7 @@ "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "LONGER LK4 X" }, "machine_width": { "default_value": 220 }, - "speed_travel": { "value": 65 } + "speed_travel": { "value": 65 }, "retraction_amount": { "value": 2.0 }, "z_seam_type": { "value": "'shortest'" }, "retraction_combing": { "value": "'noskin'" } From 7dd6335f4b4378981767cb4c1fe40461bd1f4639 Mon Sep 17 00:00:00 2001 From: Brad Date: Sat, 4 Feb 2023 20:50:37 +0300 Subject: [PATCH 05/35] Outdated definition was updated --- resources/variants/longer/longer_lk4x_0.4.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/variants/longer/longer_lk4x_0.4.inst.cfg b/resources/variants/longer/longer_lk4x_0.4.inst.cfg index 399b02ce70..c5e7cdb230 100644 --- a/resources/variants/longer/longer_lk4x_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk4x_0.4.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 19 +setting_version = 21 type = variant [values] From 957ea8541fcfdafee2358549c8c56e17cecfc1c3 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Thu, 9 Feb 2023 09:43:19 +0100 Subject: [PATCH 06/35] enable support brim by default remove all support brim mention in the profiles and move this to ultimaker.def.json PP-249 --- resources/definitions/ultimaker.def.json | 1 + resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg | 1 - resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg | 1 - .../quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg | 1 - resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg | 1 - resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg | 1 - resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg | 1 - .../quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg | 1 - resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg | 1 - .../quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg | 1 - .../quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg | 1 - 35 files changed, 1 insertion(+), 34 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 655ff0e4ec..fe1ba52ff0 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -111,6 +111,7 @@ "speed_layer_0": { "value": "min(30, layer_height / layer_height_0 * speed_wall_0)" }, "speed_slowdown_layers": { "value": 1 }, "speed_travel_layer_0": { "value": "speed_travel" }, + "support_brim_enable": { "value": "True" }, "support_infill_rate": { "value": "0 if support_structure == 'tree' else 80 if gradual_support_infill_steps != 0 else 15" }, "support_initial_layer_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" }, "support_interface_height": { "value": "2 * layer_height" }, diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index 480c8fa090..ff204a452d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -23,7 +23,6 @@ speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index c9c26ade18..07035296e1 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -22,7 +22,6 @@ speed_wall = =math.ceil(speed_print * 40 / 80) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True support_infill_sparse_thickness = =2*layer_height support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index bccbd8b063..3e6ab7099e 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -19,7 +19,6 @@ prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True support_infill_sparse_thickness = =2*layer_height support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg index 5a0e2d20cb..16ff1df884 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg @@ -19,6 +19,5 @@ prime_tower_enable = False retraction_count_max = 5 skin_overlap = 20 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index 78d3f70cfe..7da1abbd2e 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg @@ -19,7 +19,6 @@ prime_tower_enable = False retraction_count_max = 5 skin_overlap = 15 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -support_brim_enable = True support_infill_sparse_thickness = =2*layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index 1833790825..2683d91c73 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg @@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru prime_tower_enable = False retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -support_brim_enable = True support_infill_sparse_thickness = =3*layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index 11e18722dd..b54fd2ec9f 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru prime_tower_enable = False retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -support_brim_enable = True support_infill_sparse_thickness = =2*layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg index 046f49887e..801364c379 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg @@ -17,6 +17,5 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg index e6a616150e..3508386da6 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -16,6 +16,5 @@ brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg index e5d469ae21..2673a61bc2 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -16,6 +16,5 @@ brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg index 2c7adc4e88..7f7ce91722 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg @@ -22,7 +22,6 @@ speed_wall = =math.ceil(speed_print * 40 / 80) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True support_infill_sparse_thickness = =2 * layer_height support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg index 647523cbf0..3bcec88290 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg @@ -19,7 +19,6 @@ prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True support_infill_sparse_thickness = =2 * layer_height support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg index 179cfb7d04..60de541b7f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg @@ -23,7 +23,6 @@ speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg index 1b26bafaf4..ddd659afe0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg @@ -24,7 +24,6 @@ speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) support_angle = 45 support_bottom_distance = 0.3 -support_brim_enable = True support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True support_top_distance = 0.3 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg index 0663d89fec..73af8bb5dd 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg @@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru prime_tower_enable = False retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_infill_sparse_thickness = =3 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg index fb5c2d273d..58608d0abb 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg @@ -19,7 +19,6 @@ prime_tower_enable = False retraction_count_max = 5 skin_overlap = 15 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg index 18dfbd7fa2..cb443e030f 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg @@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru prime_tower_enable = False retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg index a15847a5a5..694725c8d5 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg @@ -19,6 +19,5 @@ prime_tower_enable = False retraction_count_max = 5 skin_overlap = 20 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg index 05308cc369..62edb18d50 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg @@ -17,7 +17,6 @@ brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg index 8b19eeb89b..61d22b4bc0 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg @@ -17,6 +17,5 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg index 1518ed0335..06c2666a71 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg @@ -16,7 +16,6 @@ brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg index 38a11076a3..19dcfb82b8 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg @@ -16,6 +16,5 @@ brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg index d2c64fef36..76f078dae0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg @@ -22,7 +22,6 @@ speed_wall = =math.ceil(speed_print * 40 / 80) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True support_infill_sparse_thickness = =2 * layer_height support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg index e57eafbd48..ee599fd6f3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg @@ -19,7 +19,6 @@ prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True support_infill_sparse_thickness = =2 * layer_height support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg index 4d629d99c9..153ea699cb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg @@ -23,7 +23,6 @@ speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) support_angle = 45 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_brim_enable = True support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg index 77347e56c2..fde3f8ef16 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg @@ -24,7 +24,6 @@ speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) support_angle = 45 support_bottom_distance = 0.3 -support_brim_enable = True support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_enable = True support_top_distance = 0.3 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg index dc224b65b4..048c0e030f 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg @@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru prime_tower_enable = False retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_infill_sparse_thickness = =3 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg index 994c0e818d..5e25d29e10 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg @@ -19,7 +19,6 @@ prime_tower_enable = False retraction_count_max = 5 skin_overlap = 15 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg index 7d0fb3f53f..0e475a0fa8 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg @@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru prime_tower_enable = False retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg index c27642a783..8528da96f5 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg @@ -19,6 +19,5 @@ prime_tower_enable = False retraction_count_max = 5 skin_overlap = 20 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg index ace2f47c14..925bf152a3 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg @@ -18,7 +18,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru prime_tower_enable = False retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg index 3263d763c5..c2e81fb6e0 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg @@ -17,6 +17,5 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg index 6a80ad401c..8cf7c9a0dc 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg @@ -16,7 +16,6 @@ brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg index 61215c4e85..9e9eb537e1 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg @@ -16,6 +16,5 @@ brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) -support_brim_enable = True support_interface_enable = True From 033e4c8073ea31a090231fae581552f014fa8769 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Thu, 9 Feb 2023 09:45:36 +0100 Subject: [PATCH 07/35] set support brim width to 3 line widths PP-249 --- resources/definitions/ultimaker.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index fe1ba52ff0..de9d8d26ba 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -112,6 +112,7 @@ "speed_slowdown_layers": { "value": 1 }, "speed_travel_layer_0": { "value": "speed_travel" }, "support_brim_enable": { "value": "True" }, + "support_brim_width": { "value": "skirt_brim_line_width * 3"}, "support_infill_rate": { "value": "0 if support_structure == 'tree' else 80 if gradual_support_infill_steps != 0 else 15" }, "support_initial_layer_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" }, "support_interface_height": { "value": "2 * layer_height" }, From bd2f09dc42d76bfce46da85b021505d1fca61e4f Mon Sep 17 00:00:00 2001 From: rijkvanmanen Date: Thu, 9 Feb 2023 08:46:47 +0000 Subject: [PATCH 08/35] Applied printer-linter format --- resources/definitions/ultimaker.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index de9d8d26ba..33805c9cb9 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -112,7 +112,7 @@ "speed_slowdown_layers": { "value": 1 }, "speed_travel_layer_0": { "value": "speed_travel" }, "support_brim_enable": { "value": "True" }, - "support_brim_width": { "value": "skirt_brim_line_width * 3"}, + "support_brim_width": { "value": "skirt_brim_line_width * 3" }, "support_infill_rate": { "value": "0 if support_structure == 'tree' else 80 if gradual_support_infill_steps != 0 else 15" }, "support_initial_layer_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" }, "support_interface_height": { "value": "2 * layer_height" }, From 63f5916cfbe6a47e8bc5b97b8da6d16cce4167de Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Wed, 15 Feb 2023 13:27:58 +0100 Subject: [PATCH 09/35] move support brim to fdmprinter PP-249 --- resources/definitions/fdmprinter.def.json | 10 +++++----- resources/definitions/ultimaker.def.json | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 3d07faf5cb..c1964af6e5 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4825,8 +4825,7 @@ "label": "Enable Support Brim", "description": "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate.", "type": "bool", - "default_value": false, - "value": "support_structure == 'tree'", + "default_value": true, "enabled": "support_enable or support_meshes_present", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, @@ -4838,9 +4837,10 @@ "description": "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material.", "type": "float", "unit": "mm", - "default_value": 8.0, + "default_value": 1.2, "minimum_value": "0.0", "maximum_value_warning": "50.0", + "value": "(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3", "enabled": "(support_enable or support_meshes_present) and support_brim_enable", "settable_per_mesh": false, "settable_per_extruder": true, @@ -4852,10 +4852,10 @@ "label": "Support Brim Line Count", "description": "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material.", "type": "int", - "default_value": 20, + "default_value": 3, "minimum_value": "0", "maximum_value_warning": "50 / skirt_brim_line_width", - "value": "math.ceil(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))", + "value": "round(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))", "enabled": "(support_enable or support_meshes_present) and support_brim_enable", "settable_per_mesh": false, "settable_per_extruder": true, diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 33805c9cb9..655ff0e4ec 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -111,8 +111,6 @@ "speed_layer_0": { "value": "min(30, layer_height / layer_height_0 * speed_wall_0)" }, "speed_slowdown_layers": { "value": 1 }, "speed_travel_layer_0": { "value": "speed_travel" }, - "support_brim_enable": { "value": "True" }, - "support_brim_width": { "value": "skirt_brim_line_width * 3" }, "support_infill_rate": { "value": "0 if support_structure == 'tree' else 80 if gradual_support_infill_steps != 0 else 15" }, "support_initial_layer_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" }, "support_interface_height": { "value": "2 * layer_height" }, From 434b6f13c1d90a6f4ca513e82839d9d1c05392d8 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 17 Feb 2023 09:54:08 +0100 Subject: [PATCH 10/35] Consistent max. and warning for the build plate temperature. S-line + Colorado warning >120C and error >140C UM3 family error > 115C UM2 family error > 110C Relates to PP-324 --- resources/definitions/ultimaker.def.json | 9 +++++++-- resources/definitions/ultimaker2.def.json | 9 +++++++++ .../definitions/ultimaker2_plus_connect.def.json | 2 -- resources/definitions/ultimaker3.def.json | 11 +++++++++-- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index a1be0e9dfe..e32fda31d1 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -69,10 +69,15 @@ "machine_max_feedrate_e": { "default_value": 45 }, "material_bed_temperature": { - "maximum_value_warning": "125", + "maximum_value": "140", + "maximum_value_warning": "120", + "minimum_value": "0" + }, + "material_bed_temperature_layer_0": { + "maximum_value": "140", + "maximum_value_warning": "120", "minimum_value": "0" }, - "material_bed_temperature_layer_0": { "maximum_value_warning": "125" }, "material_print_temperature": { "minimum_value": "0" }, "material_standby_temperature": { diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index f68d51dd6c..f45e6b6859 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -90,6 +90,15 @@ ] }, "machine_heated_bed": { "default_value": true }, + "material_bed_temperature": + { + "maximum_value": "110", + "maximum_value_warning": "110" + }, + "material_bed_temperature_layer_0": { + "maximum_value": "110", + "maximum_value_warning": "110" + }, "machine_height": { "default_value": 205 }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index fbcbcc6dc8..2e7a98fdd6 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -99,8 +99,6 @@ "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "value": "''" }, "machine_width": { "default_value": 223 }, - "material_bed_temperature": { "maximum_value": 110 }, - "material_bed_temperature_layer_0": { "maximum_value": 110 }, "material_initial_print_temperature": { "maximum_value": 260, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index a929e28258..4ee344b924 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -135,8 +135,15 @@ "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, "machine_start_gcode": { "default_value": "" }, "machine_width": { "default_value": 233 }, - "material_bed_temperature": { "maximum_value": "115" }, - "material_bed_temperature_layer_0": { "maximum_value": "115" }, + "material_bed_temperature": + { + "maximum_value": "115", + "maximum_value_warning": "115" + }, + "material_bed_temperature_layer_0": { + "maximum_value": "115", + "maximum_value_warning": "115" + }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, "prime_blob_enable": From 167b9a0ef33936f4f0645a2ca006bcacb4d65040 Mon Sep 17 00:00:00 2001 From: pkuiper-ultimaker Date: Fri, 17 Feb 2023 08:55:10 +0000 Subject: [PATCH 11/35] Applied printer-linter format --- resources/definitions/ultimaker.def.json | 3 ++- resources/definitions/ultimaker2.def.json | 19 ++++++++++--------- resources/definitions/ultimaker3.def.json | 3 ++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index e32fda31d1..4a19376b67 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -73,7 +73,8 @@ "maximum_value_warning": "120", "minimum_value": "0" }, - "material_bed_temperature_layer_0": { + "material_bed_temperature_layer_0": + { "maximum_value": "140", "maximum_value_warning": "120", "minimum_value": "0" diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index f45e6b6859..bc7f945001 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -90,15 +90,6 @@ ] }, "machine_heated_bed": { "default_value": true }, - "material_bed_temperature": - { - "maximum_value": "110", - "maximum_value_warning": "110" - }, - "material_bed_temperature_layer_0": { - "maximum_value": "110", - "maximum_value_warning": "110" - }, "machine_height": { "default_value": 205 }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, @@ -109,6 +100,16 @@ "machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 223 }, + "material_bed_temperature": + { + "maximum_value": "110", + "maximum_value_warning": "110" + }, + "material_bed_temperature_layer_0": + { + "maximum_value": "110", + "maximum_value_warning": "110" + }, "speed_slowdown_layers": { "value": 2 }, "support_z_distance": { "value": "0.1" } } diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 4ee344b924..5e6575a871 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -140,7 +140,8 @@ "maximum_value": "115", "maximum_value_warning": "115" }, - "material_bed_temperature_layer_0": { + "material_bed_temperature_layer_0": + { "maximum_value": "115", "maximum_value_warning": "115" }, From f7fd02cde972cc785b4c2f534389dadde29660a7 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Mon, 20 Feb 2023 17:06:49 +0100 Subject: [PATCH 12/35] warnings at same value as max don't make sense PP-324 --- resources/definitions/ultimaker2.def.json | 12 ++---------- resources/definitions/ultimaker3.def.json | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index bc7f945001..def26c9b6f 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -100,16 +100,8 @@ "machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 223 }, - "material_bed_temperature": - { - "maximum_value": "110", - "maximum_value_warning": "110" - }, - "material_bed_temperature_layer_0": - { - "maximum_value": "110", - "maximum_value_warning": "110" - }, + "material_bed_temperature": { "maximum_value": "110" }, + "material_bed_temperature_layer_0": { "maximum_value": "110" }, "speed_slowdown_layers": { "value": 2 }, "support_z_distance": { "value": "0.1" } } diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 5e6575a871..a929e28258 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -135,16 +135,8 @@ "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, "machine_start_gcode": { "default_value": "" }, "machine_width": { "default_value": 233 }, - "material_bed_temperature": - { - "maximum_value": "115", - "maximum_value_warning": "115" - }, - "material_bed_temperature_layer_0": - { - "maximum_value": "115", - "maximum_value_warning": "115" - }, + "material_bed_temperature": { "maximum_value": "115" }, + "material_bed_temperature_layer_0": { "maximum_value": "115" }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, "prime_blob_enable": From 8560a9b57ce0c8844fc642953716554a9d6ca7ac Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 24 Mar 2023 15:14:48 +0100 Subject: [PATCH 13/35] Stop postprocessing plugin creating unnecessary script folders The idea is to only create scripts in the configuration folder, not in all plugins that register their own resource folder. --- .../PostProcessingPlugin.py | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.py b/plugins/PostProcessingPlugin/PostProcessingPlugin.py index 845ad45341..5e37ede4c7 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.py +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.py @@ -139,22 +139,26 @@ class PostProcessingPlugin(QObject, Extension): if self._loaded_scripts: # Already loaded. return - # The PostProcessingPlugin path is for built-in scripts. - # The Resources path is where the user should store custom scripts. - # The Preferences path is legacy, where the user may previously have stored scripts. - resource_folders = [PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), Resources.getStoragePath(Resources.Preferences)] - resource_folders.extend(Resources.getAllPathsForType(Resources.Resources)) - for root in resource_folders: - if root is None: - continue - path = os.path.join(root, "scripts") + # Make sure a "scripts" folder exists in the main configuration folder and the preferences folder. + # On some platforms the resources and preferences folders resolve to the same folder, + # but on Linux they can be different. + for path in set([os.path.join(Resources.getStoragePath(r), "scripts") for r in [Resources.Resources, Resources.Preferences]]): if not os.path.isdir(path): try: os.makedirs(path) except OSError: Logger.log("w", "Unable to create a folder for scripts: " + path) - continue + # The PostProcessingPlugin path is for built-in scripts. + # The Resources path is where the user should store custom scripts. + # The Preferences path is legacy, where the user may previously have stored scripts. + resource_folders = [PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), Resources.getStoragePath(Resources.Preferences)] + resource_folders.extend(Resources.getAllPathsForType(Resources.Resources)) + + for root in resource_folders: + if root is None: + continue + path = os.path.join(root, "scripts") self.loadScripts(path) def loadScripts(self, path: str) -> None: From 807f407d9f8fd07ccefc308a5f9976f121b9770a Mon Sep 17 00:00:00 2001 From: Bryan Foley Date: Fri, 14 Apr 2023 11:31:57 +0200 Subject: [PATCH 14/35] SEM-166 Add extra BOM numbers to UMs3, UMs5 and UMs7 --- resources/definitions/ultimaker_s3.def.json | 2 +- resources/definitions/ultimaker_s5.def.json | 3 ++- resources/definitions/ultimaker_s7.def.json | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 61652b23a6..4ddb76c7fe 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -9,7 +9,7 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s3_platform.obj", - "bom_numbers": [213482, 213483], + "bom_numbers": [213482, 213483, 213484], "exclude_materials": [ "generic_hips", "generic_petg", diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 44ca7d7018..8bb086a654 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -12,7 +12,8 @@ "bom_numbers": [ 9051, 214475, - 214476 + 214476, + 214477 ], "firmware_update_info": { diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index a996e00f72..a7e9742b40 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -10,7 +10,8 @@ "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s7_platform.obj", "bom_numbers": [ - 5078167 + 5078167, + 5078168 ], "firmware_update_info": { From e606dae5c55e5918b4ca00409d577ed4f7d8c823 Mon Sep 17 00:00:00 2001 From: bryanfoley Date: Fri, 14 Apr 2023 09:33:54 +0000 Subject: [PATCH 15/35] Applied printer-linter format --- resources/definitions/ultimaker_s3.def.json | 6 +++++- resources/definitions/ultimaker_s7.def.json | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 4ddb76c7fe..0cf31c7f66 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -9,7 +9,11 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s3_platform.obj", - "bom_numbers": [213482, 213483, 213484], + "bom_numbers": [ + 213482, + 213483, + 213484 + ], "exclude_materials": [ "generic_hips", "generic_petg", diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index a7e9742b40..580b43209b 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -9,10 +9,7 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s7_platform.obj", - "bom_numbers": [ - 5078167, - 5078168 - ], + "bom_numbers": [5078167, 5078168], "firmware_update_info": { "check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ], From f337788ba2f2bc0c6ac4626b8b3536d98f650812 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 14 Apr 2023 13:09:43 +0200 Subject: [PATCH 16/35] Update translations CURA-10371 --- resources/i18n/de_DE/cura.po | 11 ++++---- resources/i18n/es_ES/cura.po | 36 ++++++++++++------------ resources/i18n/fr_FR/cura.po | 48 ++++++++++++++++---------------- resources/i18n/it_IT/cura.po | 48 ++++++++++++++++---------------- resources/i18n/ja_JP/cura.po | 46 +++++++++++++++---------------- resources/i18n/ko_KR/cura.po | 46 +++++++++++++++---------------- resources/i18n/nl_NL/cura.po | 6 ++-- resources/i18n/pt_PT/cura.po | 53 +++++++++++++++++++----------------- resources/i18n/ru_RU/cura.po | 46 ++++++++++++++++--------------- resources/i18n/tr_TR/cura.po | 44 +++++++++++++++--------------- resources/i18n/zh_CN/cura.po | 42 ++++++++++++++-------------- 11 files changed, 216 insertions(+), 210 deletions(-) diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index d2f2ec3a3f..45a1c71369 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -3313,7 +3313,8 @@ msgstr "Drucker verwalten" #: plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:280 msgctxt "@info" msgid "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura. Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam." -msgstr "" +msgstr "Webcam-Feeds für Cloud-Drucker können nicht in Ultimaker Cura angezeigt werden. Klicken Sie auf „Drucker verwalten“, um die Ultimaker Digital Factory zu" +" besuchen und diese Webcam zu sehen." #: plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:340 msgctxt "@label:status" @@ -4627,7 +4628,7 @@ msgstr "Mehr über Druckprofile von Cura erfahren" #: resources/qml/Cura.qml:926 msgctxt "@button" msgid "Save new profile" -msgstr "" +msgstr "Neues Profil speichern" #: resources/qml/Dialogs/AboutDialog.qml:15 msgctxt "@title:window The argument is the application name." @@ -6804,12 +6805,12 @@ msgstr "Welchen Drucker möchten Sie einrichten?" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:55 msgctxt "@button" msgid "UltiMaker printer" -msgstr "" +msgstr "UltiMaker-Drucker" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:64 msgctxt "@button" msgid "Non UltiMaker printer" -msgstr "" +msgstr "Nicht-UltiMaker-Drucker" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:73 msgctxt "@button" @@ -6824,7 +6825,7 @@ msgstr "Drucker hinzufügen" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:33 msgctxt "@label" msgid "New UltiMaker printers can be connected to Digital Factory and monitored remotely." -msgstr "" +msgstr "Neue UltiMaker-Drucker können mit Digital Factory verbunden und aus der Ferne überwacht werden." #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:70 msgctxt "@label" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 511d2cf891..bc6d9e002e 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -924,7 +924,7 @@ msgstr "Grupo de impresoras" #: plugins/3MFReader/WorkspaceDialog.qml:103 msgctxt "@action:label" msgid "Open With" -msgstr "" +msgstr "Abrir con" #: plugins/3MFReader/WorkspaceDialog.qml:104 msgctxt "@info:tooltip" @@ -4602,17 +4602,17 @@ msgstr "Novedades" #: resources/qml/Cura.qml:890 msgctxt "@title:window" msgid "Save Custom Profile" -msgstr "" +msgstr "Guardar perfil personalizado" #: resources/qml/Cura.qml:891 msgctxt "@textfield:placeholder" msgid "New Custom Profile" -msgstr "" +msgstr "Nuevo perfil personalizado" #: resources/qml/Cura.qml:892 msgctxt "@info" msgid "Custom profile name:" -msgstr "" +msgstr "Nombre del perfil personalizado:" #: resources/qml/Cura.qml:909 msgctxt "@label %i will be replaced with a profile name" @@ -4627,7 +4627,7 @@ msgstr "Más información sobre los perfiles de impresión de Cura" #: resources/qml/Cura.qml:926 msgctxt "@button" msgid "Save new profile" -msgstr "" +msgstr "Guardar nuevo perfil" #: resources/qml/Dialogs/AboutDialog.qml:15 msgctxt "@title:window The argument is the application name." @@ -4916,12 +4916,12 @@ msgstr "Mantener los cambios" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:171 msgctxt "@action:button" msgid "Save as new custom profile" -msgstr "" +msgstr "Guardar como nuevo perfil personalizado" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:178 msgctxt "@action:button" msgid "Save changes" -msgstr "" +msgstr "Guardar cambios" #: resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:47 msgctxt "@text:window" @@ -6216,7 +6216,7 @@ msgstr "Se ha modificado la configuración recomendada (para %1)." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "" +msgstr "Algunas configuraciones del perfil actual se han sobrescrito." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" @@ -6241,7 +6241,7 @@ msgstr "Habilita la impresión de un borde o una balsa. Esta opción agregará u #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:102 msgctxt "@label" msgid "Recommended print settings" -msgstr "" +msgstr "Ajustes de impresión recomendados" #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:111 msgctxt "@button" @@ -6266,7 +6266,7 @@ msgstr "Los siguientes ajustes definen la resistencia de la pieza." #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:34 msgctxt "infill_sparse_density description" msgid "Infill Density" -msgstr "" +msgstr "Densidad de relleno" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:35 msgctxt "@label" @@ -6300,7 +6300,7 @@ msgstr "" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:67 msgctxt "@action:label" msgid "Shell Thickness" -msgstr "" +msgstr "Grosor del perímetro" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:68 msgctxt "@label" @@ -6320,7 +6320,7 @@ msgstr "Generar estructuras para soportar piezas del modelo que tengan voladizos #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@action:label" msgid "Support Type" -msgstr "" +msgstr "Tipo de soporte" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:41 msgctxt "@label" @@ -6789,12 +6789,12 @@ msgstr "Agregar una impresora fuera de red" #: resources/qml/WelcomePages/AddThirdPartyPrinter.qml:102 msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "" +msgstr "Añadir impresora UltiMaker a través de Digital Factory" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:29 msgctxt "@label" msgid "In order to start using Cura you will need to configure a printer." -msgstr "" +msgstr "Para empezar a utilizar Cura, deberá configurar una impresora." #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:36 msgctxt "@label" @@ -6824,7 +6824,7 @@ msgstr "Agregar impresora" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:33 msgctxt "@label" msgid "New UltiMaker printers can be connected to Digital Factory and monitored remotely." -msgstr "" +msgstr "Las nuevas impresoras UltiMaker pueden conectarse a Digital Factory y supervisarse a distancia." #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:70 msgctxt "@label" @@ -6854,17 +6854,17 @@ msgstr "Más Información" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:121 msgctxt "@button" msgid "Add local printer" -msgstr "" +msgstr "Añadir impresora local" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:129 msgctxt "@button" msgid "Sign in to Digital Factory" -msgstr "" +msgstr "Iniciar sesión en Digital Factory" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:133 msgctxt "@button" msgid "Waiting for new printers" -msgstr "" +msgstr "A la espera de nuevas impresoras" #: resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 408d73acd7..36ca7d652c 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -829,7 +829,7 @@ msgstr "Ouvrir un fichier de projet" #: plugins/3MFReader/WorkspaceDialog.qml:134 msgctxt "@button" msgid "Create new" -msgstr "" +msgstr "Créer" #: plugins/3MFReader/ThreeMFWorkspaceReader.py:681 #, python-brace-format @@ -925,7 +925,7 @@ msgstr "Groupe d'imprimantes" #: plugins/3MFReader/WorkspaceDialog.qml:103 msgctxt "@action:label" msgid "Open With" -msgstr "" +msgstr "Ouvrir avec" #: plugins/3MFReader/WorkspaceDialog.qml:104 msgctxt "@info:tooltip" @@ -2119,7 +2119,7 @@ msgstr "Gérer les packages" #: plugins/Marketplace/resources/qml/ManagedPackages.qml:16 msgctxt "@text" msgid "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly." -msgstr "" +msgstr "Gérez vos plug-ins Ultimaker Cura et vos profils matériaux ici. Assurez-vous de maintenir vos plug-ins à jour et de sauvegarder régulièrement votre configuration." #: plugins/Marketplace/resources/qml/Marketplace.qml:87 msgctxt "@title" @@ -4602,17 +4602,17 @@ msgstr "Quoi de neuf" #: resources/qml/Cura.qml:890 msgctxt "@title:window" msgid "Save Custom Profile" -msgstr "" +msgstr "Enregistrer le profil personnalisé" #: resources/qml/Cura.qml:891 msgctxt "@textfield:placeholder" msgid "New Custom Profile" -msgstr "" +msgstr "Nouveau profil personnalisé" #: resources/qml/Cura.qml:892 msgctxt "@info" msgid "Custom profile name:" -msgstr "" +msgstr "Nom du profil personnalisé :" #: resources/qml/Cura.qml:909 msgctxt "@label %i will be replaced with a profile name" @@ -4627,7 +4627,7 @@ msgstr "En savoir plus sur les profils d'impression Cura" #: resources/qml/Cura.qml:926 msgctxt "@button" msgid "Save new profile" -msgstr "" +msgstr "Enregistrer le nouveau profil" #: resources/qml/Dialogs/AboutDialog.qml:15 msgctxt "@title:window The argument is the application name." @@ -4916,12 +4916,12 @@ msgstr "Conserver les modifications" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:171 msgctxt "@action:button" msgid "Save as new custom profile" -msgstr "" +msgstr "Enregistrer comme nouveau profil personnalisé" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:178 msgctxt "@action:button" msgid "Save changes" -msgstr "" +msgstr "Conserver les modifications" #: resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:47 msgctxt "@text:window" @@ -6216,7 +6216,7 @@ msgstr "Les paramètres recommandés (pour %1) ont été modifiés." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "" +msgstr "Certains paramètres du profil actuel ont été remplacés." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" @@ -6241,7 +6241,7 @@ msgstr "Activez l'impression d'une bordure ou plaquette (Brim/Raft). Cela ajoute #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:102 msgctxt "@label" msgid "Recommended print settings" -msgstr "" +msgstr "Paramètres d'impression recommandés" #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:111 msgctxt "@button" @@ -6266,7 +6266,7 @@ msgstr "Les paramètres suivants déterminent la résistance de votre pièce." #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:34 msgctxt "infill_sparse_density description" msgid "Infill Density" -msgstr "" +msgstr "Densité du remplissage" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:35 msgctxt "@label" @@ -6300,7 +6300,7 @@ msgstr "" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:67 msgctxt "@action:label" msgid "Shell Thickness" -msgstr "" +msgstr "Épaisseur de la coque" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:68 msgctxt "@label" @@ -6320,7 +6320,7 @@ msgstr "Générer des structures pour soutenir les parties du modèle qui possè #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@action:label" msgid "Support Type" -msgstr "" +msgstr "Type de prise en charge" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:41 msgctxt "@label" @@ -6335,7 +6335,7 @@ msgstr "Choisit entre les stratégies de support disponibles. Le support « Nor #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:53 msgctxt "@action:label" msgid "Print with" -msgstr "" +msgstr "Imprimer avec" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:54 msgctxt "@label" @@ -6789,12 +6789,12 @@ msgstr "Ajouter une imprimante hors réseau" #: resources/qml/WelcomePages/AddThirdPartyPrinter.qml:102 msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "" +msgstr "Ajouter l'imprimante UltiMaker par le biais de Digital Factory" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:29 msgctxt "@label" msgid "In order to start using Cura you will need to configure a printer." -msgstr "" +msgstr "Pour pouvoir utiliser Cura, vous devez configurer une imprimante." #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:36 msgctxt "@label" @@ -6804,12 +6804,12 @@ msgstr "Quelle imprimante souhaitez-vous configurer?" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:55 msgctxt "@button" msgid "UltiMaker printer" -msgstr "" +msgstr "Imprimante UltiMaker" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:64 msgctxt "@button" msgid "Non UltiMaker printer" -msgstr "" +msgstr "Imprimante d'une autre marque" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:73 msgctxt "@button" @@ -6824,7 +6824,7 @@ msgstr "Ajouter une imprimante" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:33 msgctxt "@label" msgid "New UltiMaker printers can be connected to Digital Factory and monitored remotely." -msgstr "" +msgstr "Les nouvelles imprimantes UltiMaker peuvent être connectées à Digital Factory et contrôlées à distance." #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:70 msgctxt "@label" @@ -6834,7 +6834,7 @@ msgstr "Si vous essayez d'ajouter une nouvelle imprimante UltiMaker à Cura" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:80 msgctxt "@info" msgid "Sign in into UltiMaker Digital Factory" -msgstr "" +msgstr "Se connecter à UltiMaker Digital Factory" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:81 msgctxt "@info" @@ -6854,17 +6854,17 @@ msgstr "En savoir plus" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:121 msgctxt "@button" msgid "Add local printer" -msgstr "" +msgstr "Ajouter une imprimante locale" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:129 msgctxt "@button" msgid "Sign in to Digital Factory" -msgstr "" +msgstr "Se connecter à Digital Factory" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:133 msgctxt "@button" msgid "Waiting for new printers" -msgstr "" +msgstr "En attente de nouvelles imprimantes" #: resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 76fb949db0..7b76c83016 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -829,7 +829,7 @@ msgstr "Apri file progetto" #: plugins/3MFReader/WorkspaceDialog.qml:134 msgctxt "@button" msgid "Create new" -msgstr "" +msgstr "Crea nuovo" #: plugins/3MFReader/ThreeMFWorkspaceReader.py:681 #, python-brace-format @@ -925,7 +925,7 @@ msgstr "Gruppo stampanti" #: plugins/3MFReader/WorkspaceDialog.qml:103 msgctxt "@action:label" msgid "Open With" -msgstr "" +msgstr "Apri con" #: plugins/3MFReader/WorkspaceDialog.qml:104 msgctxt "@info:tooltip" @@ -4313,7 +4313,7 @@ msgstr "Gestione materiali..." #: resources/qml/Actions.qml:218 msgctxt "@action:inmenu Marketplace is a brand name of UltiMaker's, so don't translate." msgid "Add more materials from Marketplace" -msgstr "" +msgstr "Aggiungere altri materiali da Marketplace" #: resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:profile" @@ -4605,17 +4605,17 @@ msgstr "Scopri le novità" #: resources/qml/Cura.qml:890 msgctxt "@title:window" msgid "Save Custom Profile" -msgstr "" +msgstr "Salva profilo personalizzato" #: resources/qml/Cura.qml:891 msgctxt "@textfield:placeholder" msgid "New Custom Profile" -msgstr "" +msgstr "Nuovo profilo personalizzato" #: resources/qml/Cura.qml:892 msgctxt "@info" msgid "Custom profile name:" -msgstr "" +msgstr "Nome profilo personalizzato:" #: resources/qml/Cura.qml:909 msgctxt "@label %i will be replaced with a profile name" @@ -4630,7 +4630,7 @@ msgstr "Ulteriori informazioni sui profili di stampa di Cura" #: resources/qml/Cura.qml:926 msgctxt "@button" msgid "Save new profile" -msgstr "" +msgstr "Salva nuovo profilo" #: resources/qml/Dialogs/AboutDialog.qml:15 msgctxt "@title:window The argument is the application name." @@ -4924,7 +4924,7 @@ msgstr "" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:178 msgctxt "@action:button" msgid "Save changes" -msgstr "" +msgstr "Salva modifiche" #: resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:47 msgctxt "@text:window" @@ -6219,7 +6219,7 @@ msgstr "Le impostazioni consigliate (per %1) sono state modificate." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "" +msgstr "Alcune impostazioni del profilo corrente sono state sovrascritte." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" @@ -6244,7 +6244,7 @@ msgstr "Abilita stampa di brim o raft. Questa funzione aggiunge un’area piana #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:102 msgctxt "@label" msgid "Recommended print settings" -msgstr "" +msgstr "Impostazioni di stampa consigliate" #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:111 msgctxt "@button" @@ -6269,7 +6269,7 @@ msgstr "Le seguenti impostazioni definiscono la resistenza del tuo pezzo." #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:34 msgctxt "infill_sparse_density description" msgid "Infill Density" -msgstr "" +msgstr "Densità del riempimento" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:35 msgctxt "@label" @@ -6303,7 +6303,7 @@ msgstr "" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:67 msgctxt "@action:label" msgid "Shell Thickness" -msgstr "" +msgstr "Spessore guscio" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:68 msgctxt "@label" @@ -6323,7 +6323,7 @@ msgstr "Genera strutture per supportare le parti del modello a sbalzo. Senza que #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@action:label" msgid "Support Type" -msgstr "" +msgstr "Tipo di supporto" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:41 msgctxt "@label" @@ -6338,7 +6338,7 @@ msgstr "Scegliere tra le tecniche disponibili per generare il supporto. Il suppo #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:53 msgctxt "@action:label" msgid "Print with" -msgstr "" +msgstr "Stampa con" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:54 msgctxt "@label" @@ -6792,12 +6792,12 @@ msgstr "Aggiungi una stampante non in rete" #: resources/qml/WelcomePages/AddThirdPartyPrinter.qml:102 msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "" +msgstr "Aggiungi stampante UltiMaker tramite Digital Factory" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:29 msgctxt "@label" msgid "In order to start using Cura you will need to configure a printer." -msgstr "" +msgstr "Per utilizzare Cura, è necessario configurare una stampante." #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:36 msgctxt "@label" @@ -6807,12 +6807,12 @@ msgstr "Quale stampante si desidera configurare?" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:55 msgctxt "@button" msgid "UltiMaker printer" -msgstr "" +msgstr "Stampante UltiMaker" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:64 msgctxt "@button" msgid "Non UltiMaker printer" -msgstr "" +msgstr "Stampante non UltiMaker" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:73 msgctxt "@button" @@ -6822,12 +6822,12 @@ msgstr "Scopri di più sull'aggiunta di stampanti a Cura" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinterStack.qml:29 msgctxt "@label" msgid "Add printer" -msgstr "" +msgstr "Aggiungi stampante" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:33 msgctxt "@label" msgid "New UltiMaker printers can be connected to Digital Factory and monitored remotely." -msgstr "" +msgstr "Le nuove stampanti UltiMaker possono essere connesse a Digital Factory e monitorate da remoto." #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:70 msgctxt "@label" @@ -6852,22 +6852,22 @@ msgstr "La nuova stampante apparirà automaticamente in Cura" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:100 msgctxt "@button" msgid "Learn more" -msgstr "" +msgstr "Ulteriori informazioni" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:121 msgctxt "@button" msgid "Add local printer" -msgstr "" +msgstr "Aggiungi una stampante locale" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:129 msgctxt "@button" msgid "Sign in to Digital Factory" -msgstr "" +msgstr "Accedi a Digital Factory" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:133 msgctxt "@button" msgid "Waiting for new printers" -msgstr "" +msgstr "In attesa delle nuove stampanti" #: resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 19d852d2b7..c4dae72d79 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -829,7 +829,7 @@ msgstr "プロジェクトファイルを開く" #: plugins/3MFReader/WorkspaceDialog.qml:134 msgctxt "@button" msgid "Create new" -msgstr "" +msgstr "新しいものを作成する" #: plugins/3MFReader/ThreeMFWorkspaceReader.py:681 #, python-brace-format @@ -925,7 +925,7 @@ msgstr "プリンターグループ" #: plugins/3MFReader/WorkspaceDialog.qml:103 msgctxt "@action:label" msgid "Open With" -msgstr "" +msgstr "開く" #: plugins/3MFReader/WorkspaceDialog.qml:104 msgctxt "@info:tooltip" @@ -4593,17 +4593,17 @@ msgstr "新情報" #: resources/qml/Cura.qml:890 msgctxt "@title:window" msgid "Save Custom Profile" -msgstr "" +msgstr "カスタムプロファイルを保存" #: resources/qml/Cura.qml:891 msgctxt "@textfield:placeholder" msgid "New Custom Profile" -msgstr "" +msgstr "新しいカスタムプロファイル" #: resources/qml/Cura.qml:892 msgctxt "@info" msgid "Custom profile name:" -msgstr "" +msgstr "カスタムプロファイル名：" #: resources/qml/Cura.qml:909 msgctxt "@label %i will be replaced with a profile name" @@ -4618,7 +4618,7 @@ msgstr "Curaのプリントプロファイルについて詳しくはこちら" #: resources/qml/Cura.qml:926 msgctxt "@button" msgid "Save new profile" -msgstr "" +msgstr "新しいプロファイルを保存" #: resources/qml/Dialogs/AboutDialog.qml:15 msgctxt "@title:window The argument is the application name." @@ -4907,12 +4907,12 @@ msgstr "変更を維持" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:171 msgctxt "@action:button" msgid "Save as new custom profile" -msgstr "" +msgstr "新しいカスタムプロファイルとして保存" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:178 msgctxt "@action:button" msgid "Save changes" -msgstr "" +msgstr "変更を保存" #: resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:47 msgctxt "@text:window" @@ -6202,7 +6202,7 @@ msgstr "推奨設定(%1)が変更されました。" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "" +msgstr "現在のプロファイルの一部の設定が上書きされました。" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" @@ -6227,7 +6227,7 @@ msgstr "ブリムまたはラフトのプリントの有効化。それぞれ、 #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:102 msgctxt "@label" msgid "Recommended print settings" -msgstr "" +msgstr "推奨される印刷設定" #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:111 msgctxt "@button" @@ -6252,7 +6252,7 @@ msgstr "次の設定では、部材の強度を定義します。" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:34 msgctxt "infill_sparse_density description" msgid "Infill Density" -msgstr "" +msgstr "インフィル密度" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:35 msgctxt "@label" @@ -6286,7 +6286,7 @@ msgstr "" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:67 msgctxt "@action:label" msgid "Shell Thickness" -msgstr "" +msgstr "シェルの厚さ" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:68 msgctxt "@label" @@ -6306,7 +6306,7 @@ msgstr "オーバーハングがあるモデルにサポートを生成します #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@action:label" msgid "Support Type" -msgstr "" +msgstr "サポートタイプ" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:41 msgctxt "@label" @@ -6321,7 +6321,7 @@ msgstr "サポートを生成するために利用できる技術を選択しま #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:53 msgctxt "@action:label" msgid "Print with" -msgstr "" +msgstr "印刷する" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:54 msgctxt "@label" @@ -6771,12 +6771,12 @@ msgstr "非ネットワークプリンターの追加" #: resources/qml/WelcomePages/AddThirdPartyPrinter.qml:102 msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "" +msgstr "Digital FactoryでUltiMakerプリンターを追加する" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:29 msgctxt "@label" msgid "In order to start using Cura you will need to configure a printer." -msgstr "" +msgstr "Curaの使用を開始するには、プリンターを設定する必要があります。" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:36 msgctxt "@label" @@ -6786,12 +6786,12 @@ msgstr "どのプリンターをセットアップしますか？" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:55 msgctxt "@button" msgid "UltiMaker printer" -msgstr "" +msgstr "UltiMakerプリンター" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:64 msgctxt "@button" msgid "Non UltiMaker printer" -msgstr "" +msgstr "非UltiMakerプリンター" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:73 msgctxt "@button" @@ -6801,12 +6801,12 @@ msgstr "Curaへのプリンターの追加方法はこちら" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinterStack.qml:29 msgctxt "@label" msgid "Add printer" -msgstr "" +msgstr "プリンターの追加" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:33 msgctxt "@label" msgid "New UltiMaker printers can be connected to Digital Factory and monitored remotely." -msgstr "" +msgstr "新しいUltiMakerプリンターは、Digital Factoryに接続してリモートで監視できます。" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:70 msgctxt "@label" @@ -6836,17 +6836,17 @@ msgstr "詳しく見る" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:121 msgctxt "@button" msgid "Add local printer" -msgstr "" +msgstr "ローカルプリンターの追加" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:129 msgctxt "@button" msgid "Sign in to Digital Factory" -msgstr "" +msgstr "Digital Factoryにサインイン" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:133 msgctxt "@button" msgid "Waiting for new printers" -msgstr "" +msgstr "新しいプリンターのため待機中" #: resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 8807126e75..6b894d1f18 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -829,7 +829,7 @@ msgstr "프로젝트 파일 열기" #: plugins/3MFReader/WorkspaceDialog.qml:134 msgctxt "@button" msgid "Create new" -msgstr "" +msgstr "새로 만들기" #: plugins/3MFReader/ThreeMFWorkspaceReader.py:681 #, python-brace-format @@ -925,7 +925,7 @@ msgstr "프린터 그룹" #: plugins/3MFReader/WorkspaceDialog.qml:103 msgctxt "@action:label" msgid "Open With" -msgstr "" +msgstr "다음으로 열기" #: plugins/3MFReader/WorkspaceDialog.qml:104 msgctxt "@info:tooltip" @@ -4592,17 +4592,17 @@ msgstr "새로운 기능" #: resources/qml/Cura.qml:890 msgctxt "@title:window" msgid "Save Custom Profile" -msgstr "" +msgstr "사용자 지정 프로필 저장" #: resources/qml/Cura.qml:891 msgctxt "@textfield:placeholder" msgid "New Custom Profile" -msgstr "" +msgstr "새 사용자 지정 프로필" #: resources/qml/Cura.qml:892 msgctxt "@info" msgid "Custom profile name:" -msgstr "" +msgstr "사용자 지정 프로필 이름:" #: resources/qml/Cura.qml:909 msgctxt "@label %i will be replaced with a profile name" @@ -4617,7 +4617,7 @@ msgstr "Cura 프린트 프로필에 대해 자세히 알아보기" #: resources/qml/Cura.qml:926 msgctxt "@button" msgid "Save new profile" -msgstr "" +msgstr "새 프로필 저장" #: resources/qml/Dialogs/AboutDialog.qml:15 msgctxt "@title:window The argument is the application name." @@ -4906,12 +4906,12 @@ msgstr "변경 사항 유지" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:171 msgctxt "@action:button" msgid "Save as new custom profile" -msgstr "" +msgstr "새 사용자 지정 프로필로 저장" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:178 msgctxt "@action:button" msgid "Save changes" -msgstr "" +msgstr "변경 사항 저장" #: resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:47 msgctxt "@text:window" @@ -6202,7 +6202,7 @@ msgstr "(%1)에 대한 권장 설정이 변경되었습니다." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "" +msgstr "현재 프로파일의 일부 설정을 덮어썼습니다." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" @@ -6227,7 +6227,7 @@ msgstr "브림이나 라프트를 사용합니다. 이렇게하면 출력물 주 #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:102 msgctxt "@label" msgid "Recommended print settings" -msgstr "" +msgstr "권장 프린트 설정" #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:111 msgctxt "@button" @@ -6252,7 +6252,7 @@ msgstr "다음 설정은 부품의 강도를 정의합니다." #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:34 msgctxt "infill_sparse_density description" msgid "Infill Density" -msgstr "" +msgstr "내부채움 밀도" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:35 msgctxt "@label" @@ -6286,7 +6286,7 @@ msgstr "" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:67 msgctxt "@action:label" msgid "Shell Thickness" -msgstr "" +msgstr "셸 두께" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:68 msgctxt "@label" @@ -6306,7 +6306,7 @@ msgstr "오버행이 있는 모델 서포트를 생성합니다. 이러한 구 #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@action:label" msgid "Support Type" -msgstr "" +msgstr "지원 유형" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:41 msgctxt "@label" @@ -6321,7 +6321,7 @@ msgstr "서포트를 생성하는 데 사용할 수 있는 기술 중 하나를 #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:53 msgctxt "@action:label" msgid "Print with" -msgstr "" +msgstr "다음으로 프린트" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:54 msgctxt "@label" @@ -6774,12 +6774,12 @@ msgstr "비 네트워크 프린터 추가" #: resources/qml/WelcomePages/AddThirdPartyPrinter.qml:102 msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "" +msgstr "Digital Factory를 통해 UltiMaker 프린터 추가" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:29 msgctxt "@label" msgid "In order to start using Cura you will need to configure a printer." -msgstr "" +msgstr "Cura를 사용하려면 프린터를 구성해야 합니다." #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:36 msgctxt "@label" @@ -6789,12 +6789,12 @@ msgstr "어떤 프린터를 설정하시겠습니까?" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:55 msgctxt "@button" msgid "UltiMaker printer" -msgstr "" +msgstr "UltiMaker 프린터" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:64 msgctxt "@button" msgid "Non UltiMaker printer" -msgstr "" +msgstr "UltiMaker 프린터가 아님" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:73 msgctxt "@button" @@ -6804,12 +6804,12 @@ msgstr "Cura에 프린터를 추가하는 방법 자세히 알아보기" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinterStack.qml:29 msgctxt "@label" msgid "Add printer" -msgstr "" +msgstr "프린터 추가" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:33 msgctxt "@label" msgid "New UltiMaker printers can be connected to Digital Factory and monitored remotely." -msgstr "" +msgstr "새 UltiMaker 프린터를 Digital Factory에 연결하여 원격으로 모니터링할 수 있습니다." #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:70 msgctxt "@label" @@ -6839,17 +6839,17 @@ msgstr "자세히 알아보기" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:121 msgctxt "@button" msgid "Add local printer" -msgstr "" +msgstr "로컬 프린터 추가" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:129 msgctxt "@button" msgid "Sign in to Digital Factory" -msgstr "" +msgstr "Digital Factory에 로그인" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:133 msgctxt "@button" msgid "Waiting for new printers" -msgstr "" +msgstr "새 프린터 대기 중" #: resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index f442352940..dbc30155ba 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -6792,12 +6792,12 @@ msgstr "Een niet-netwerkprinter toevoegen" #: resources/qml/WelcomePages/AddThirdPartyPrinter.qml:102 msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "" +msgstr "Ultimaker printer toevoegen via Digital Factory" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:29 msgctxt "@label" msgid "In order to start using Cura you will need to configure a printer." -msgstr "" +msgstr "Om Cura te gebruiken moet u een printer configureren." #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:36 msgctxt "@label" @@ -6812,7 +6812,7 @@ msgstr "UltiMaker printer" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:64 msgctxt "@button" msgid "Non UltiMaker printer" -msgstr "" +msgstr "Non UltiMaker printer" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:73 msgctxt "@button" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index 7f50af81c0..aa98ad0737 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -93,7 +93,10 @@ msgid "" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" " " -msgstr "" +msgstr "

Ups, o UltiMaker Cura encontrou um possível problema.

\n

Foi encontrado um erro irrecuperável durante o arranque da" +" aplicação. Este pode ter sido causado por alguns ficheiros de configuração incorrectos. Sugerimos que faça um backup e reponha a sua configuração.

\n" +"

Os backups estão localizados na pasta de configuração.

\n

Por favor envie-nos este Relatório de Falhas" +" para podermos resolver o problema.

\n " #: cura/CrashHandler.py:122 msgctxt "@action:button" @@ -4598,17 +4601,17 @@ msgstr "Novidades" #: resources/qml/Cura.qml:890 msgctxt "@title:window" msgid "Save Custom Profile" -msgstr "" +msgstr "Guardar perfil personalizado" #: resources/qml/Cura.qml:891 msgctxt "@textfield:placeholder" msgid "New Custom Profile" -msgstr "" +msgstr "Novo perfil personalizado" #: resources/qml/Cura.qml:892 msgctxt "@info" msgid "Custom profile name:" -msgstr "" +msgstr "Nome do perfil personalizado" #: resources/qml/Cura.qml:909 msgctxt "@label %i will be replaced with a profile name" @@ -4623,7 +4626,7 @@ msgstr "Saiba mais sobre os perfis de impressão Cura" #: resources/qml/Cura.qml:926 msgctxt "@button" msgid "Save new profile" -msgstr "" +msgstr "Guardar novo perfil" #: resources/qml/Dialogs/AboutDialog.qml:15 msgctxt "@title:window The argument is the application name." @@ -4912,12 +4915,12 @@ msgstr "Manter alterações" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:171 msgctxt "@action:button" msgid "Save as new custom profile" -msgstr "" +msgstr "Guardar como novo perfil personalizado" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:178 msgctxt "@action:button" msgid "Save changes" -msgstr "" +msgstr "Guardar alterações" #: resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:47 msgctxt "@text:window" @@ -6212,7 +6215,7 @@ msgstr "As definições recomendadas (para %1) foram alteradas." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "" +msgstr "Algumas definições do perfil actual foram substituídas." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" @@ -6237,12 +6240,12 @@ msgstr "Permite a impressão de uma aba ou raft. Isto irá adicionar, respetivam #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:102 msgctxt "@label" msgid "Recommended print settings" -msgstr "" +msgstr "Definições de impressão recomendadas" #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:111 msgctxt "@button" msgid "Show Custom" -msgstr "" +msgstr "Mostrar personalizado" #: resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml:27 msgctxt "@label" @@ -6262,7 +6265,7 @@ msgstr "As seguintes definições definem a força da sua peça." #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:34 msgctxt "infill_sparse_density description" msgid "Infill Density" -msgstr "" +msgstr "Densidade do Enchimento" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:35 msgctxt "@label" @@ -6294,7 +6297,7 @@ msgstr "" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:67 msgctxt "@action:label" msgid "Shell Thickness" -msgstr "" +msgstr "Espessura da camada" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:68 msgctxt "@label" @@ -6314,7 +6317,7 @@ msgstr "Criar estruturas para suportar partes do modelo, suspensas ou com saliê #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@action:label" msgid "Support Type" -msgstr "" +msgstr "Tipo de suporte" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:41 msgctxt "@label" @@ -6332,7 +6335,7 @@ msgstr "" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:53 msgctxt "@action:label" msgid "Print with" -msgstr "" +msgstr "Imprimir com" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:54 msgctxt "@label" @@ -6786,12 +6789,12 @@ msgstr "Adicionar uma impressora sem rede" #: resources/qml/WelcomePages/AddThirdPartyPrinter.qml:102 msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "" +msgstr "Adicionar a impressora UltiMaker via Digital Factory" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:29 msgctxt "@label" msgid "In order to start using Cura you will need to configure a printer." -msgstr "" +msgstr "Para poder utilizar o Cura terá de configurar a impressora." #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:36 msgctxt "@label" @@ -6801,12 +6804,12 @@ msgstr "Qual impressora gostaria de definir?" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:55 msgctxt "@button" msgid "UltiMaker printer" -msgstr "" +msgstr "Impressora da UltiMaker" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:64 msgctxt "@button" msgid "Non UltiMaker printer" -msgstr "" +msgstr "Impressora não Ultimaker" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:73 msgctxt "@button" @@ -6816,12 +6819,12 @@ msgstr "Saiba mais sobre como adicionar impressoras ao Cura" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinterStack.qml:29 msgctxt "@label" msgid "Add printer" -msgstr "" +msgstr "Adicionar Impressora" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:33 msgctxt "@label" msgid "New UltiMaker printers can be connected to Digital Factory and monitored remotely." -msgstr "" +msgstr "As novas impressoras UltiMaker podem ser conectadas à Digital Factory e monitoradas remotamente." #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:70 msgctxt "@label" @@ -6831,7 +6834,7 @@ msgstr "Se estiver a tentar adicionar uma nova impressora UltiMaker ao Cura" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:80 msgctxt "@info" msgid "Sign in into UltiMaker Digital Factory" -msgstr "" +msgstr "Iniciar sessão na UltiMaker Digital Factory" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:81 msgctxt "@info" @@ -6846,22 +6849,22 @@ msgstr "A sua nova impressora aparecerá automaticamente no Cura" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:100 msgctxt "@button" msgid "Learn more" -msgstr "" +msgstr "Saber mais" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:121 msgctxt "@button" msgid "Add local printer" -msgstr "" +msgstr "Adicionar uma impressora local" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:129 msgctxt "@button" msgid "Sign in to Digital Factory" -msgstr "" +msgstr "Iniciar sessão na Digital Factory" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:133 msgctxt "@button" msgid "Waiting for new printers" -msgstr "" +msgstr "À espera de novas impressoras" #: resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 0f597c4741..3cc45b82af 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -93,7 +93,9 @@ msgid "" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" " " -msgstr " " +msgstr "

В ПО UltiMaker Cura обнаружена ошибка.

\n

Во время запуска обнаружена неустранимая ошибка. Возможно, она вызвана некоторыми" +" файлами конфигурации с неправильными данными. Рекомендуется создать резервную копию конфигурации и сбросить ее.

\n

Резервные" +" копии хранятся в папке конфигурации.

\n

Отправьте нам этот отчет о сбое для устранения проблемы.

\n " #: cura/CrashHandler.py:122 msgctxt "@action:button" @@ -920,7 +922,7 @@ msgstr "Группа принтеров" #: plugins/3MFReader/WorkspaceDialog.qml:103 msgctxt "@action:label" msgid "Open With" -msgstr "" +msgstr "Открыть с помощью" #: plugins/3MFReader/WorkspaceDialog.qml:104 msgctxt "@info:tooltip" @@ -4609,17 +4611,17 @@ msgstr "Что нового" #: resources/qml/Cura.qml:890 msgctxt "@title:window" msgid "Save Custom Profile" -msgstr "" +msgstr "Сохранить пользовательский профиль" #: resources/qml/Cura.qml:891 msgctxt "@textfield:placeholder" msgid "New Custom Profile" -msgstr "" +msgstr "Новый пользовательский профиль" #: resources/qml/Cura.qml:892 msgctxt "@info" msgid "Custom profile name:" -msgstr "" +msgstr "Имя пользовательского профиля:" #: resources/qml/Cura.qml:909 msgctxt "@label %i will be replaced with a profile name" @@ -4634,7 +4636,7 @@ msgstr "Подробнее о профилях печати Cura" #: resources/qml/Cura.qml:926 msgctxt "@button" msgid "Save new profile" -msgstr "" +msgstr "Сохранить новый профиль" #: resources/qml/Dialogs/AboutDialog.qml:15 msgctxt "@title:window The argument is the application name." @@ -4923,12 +4925,12 @@ msgstr "Сохранить изменения" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:171 msgctxt "@action:button" msgid "Save as new custom profile" -msgstr "" +msgstr "Сохранить как новый пользовательский профиль" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:178 msgctxt "@action:button" msgid "Save changes" -msgstr "" +msgstr "Сохранить изменения" #: resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:47 msgctxt "@text:window" @@ -6227,7 +6229,7 @@ msgstr "Рекомендуемые настройки (для %1) был #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "" +msgstr "Некоторые настройки из текущего профиля были перезаписаны." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" @@ -6252,7 +6254,7 @@ msgstr "Разрешает печать каймы или подложки. Эт #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:102 msgctxt "@label" msgid "Recommended print settings" -msgstr "" +msgstr "Рекомендуемые настройки печати" #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:111 msgctxt "@button" @@ -6277,7 +6279,7 @@ msgstr "Следующие настройки определяют прочно #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:34 msgctxt "infill_sparse_density description" msgid "Infill Density" -msgstr "" +msgstr "Плотность заполнения" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:35 msgctxt "@label" @@ -6311,7 +6313,7 @@ msgstr "" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:67 msgctxt "@action:label" msgid "Shell Thickness" -msgstr "" +msgstr "Толщина стенки" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:68 msgctxt "@label" @@ -6331,7 +6333,7 @@ msgstr "Генерация структур для поддержки навис #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@action:label" msgid "Support Type" -msgstr "" +msgstr "Тип поддержки" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:41 msgctxt "@label" @@ -6346,7 +6348,7 @@ msgstr "Выберите одну из доступных техник созд #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:53 msgctxt "@action:label" msgid "Print with" -msgstr "" +msgstr "Печать с помощью" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:54 msgctxt "@label" @@ -6801,12 +6803,12 @@ msgstr "Добавить принтер, не подключенный к сет #: resources/qml/WelcomePages/AddThirdPartyPrinter.qml:102 msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "" +msgstr "Добавить принтер UltiMaker через Digital Factory" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:29 msgctxt "@label" msgid "In order to start using Cura you will need to configure a printer." -msgstr "" +msgstr "Чтобы начать пользоваться Cura, необходимо настроить принтер." #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:36 msgctxt "@label" @@ -6816,12 +6818,12 @@ msgstr "Какой принтер вы хотите настроить?" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:55 msgctxt "@button" msgid "UltiMaker printer" -msgstr "" +msgstr "Принтер UltiMaker" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:64 msgctxt "@button" msgid "Non UltiMaker printer" -msgstr "" +msgstr "Принтер, не использующий UltiMaker" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:73 msgctxt "@button" @@ -6836,7 +6838,7 @@ msgstr "Добавление принтера" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:33 msgctxt "@label" msgid "New UltiMaker printers can be connected to Digital Factory and monitored remotely." -msgstr "" +msgstr "Новые принтеры UltiMaker можно подключить к Digital Factory и управлять ими удаленно." #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:70 msgctxt "@label" @@ -6866,17 +6868,17 @@ msgstr "Узнать больше" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:121 msgctxt "@button" msgid "Add local printer" -msgstr "" +msgstr "Добавить локальный принтер" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:129 msgctxt "@button" msgid "Sign in to Digital Factory" -msgstr "" +msgstr "Войти в Digital Factory" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:133 msgctxt "@button" msgid "Waiting for new printers" -msgstr "" +msgstr "Ожидание новых принтеров" #: resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index df5aab3bd3..e04046d18c 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -925,7 +925,7 @@ msgstr "Yazıcı Grubu" #: plugins/3MFReader/WorkspaceDialog.qml:103 msgctxt "@action:label" msgid "Open With" -msgstr "" +msgstr "Birlikte Aç" #: plugins/3MFReader/WorkspaceDialog.qml:104 msgctxt "@info:tooltip" @@ -4605,17 +4605,17 @@ msgstr "Yenilikler" #: resources/qml/Cura.qml:890 msgctxt "@title:window" msgid "Save Custom Profile" -msgstr "" +msgstr "Özel Profili Kaydet" #: resources/qml/Cura.qml:891 msgctxt "@textfield:placeholder" msgid "New Custom Profile" -msgstr "" +msgstr "Yeni Özel Profil" #: resources/qml/Cura.qml:892 msgctxt "@info" msgid "Custom profile name:" -msgstr "" +msgstr "Özel profil adı:" #: resources/qml/Cura.qml:909 msgctxt "@label %i will be replaced with a profile name" @@ -4630,7 +4630,7 @@ msgstr "Cura baskı profilleri hakkında daha fazla bilgi edinin" #: resources/qml/Cura.qml:926 msgctxt "@button" msgid "Save new profile" -msgstr "" +msgstr "Yeni profil kaydet" #: resources/qml/Dialogs/AboutDialog.qml:15 msgctxt "@title:window The argument is the application name." @@ -4919,12 +4919,12 @@ msgstr "Değişiklikleri tut" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:171 msgctxt "@action:button" msgid "Save as new custom profile" -msgstr "" +msgstr "Yeni özel profil olarak kaydet" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:178 msgctxt "@action:button" msgid "Save changes" -msgstr "" +msgstr "Değişiklikleri kaydet" #: resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:47 msgctxt "@text:window" @@ -6219,7 +6219,7 @@ msgstr "Önerilen ayarlar (%1 için) değiştirildi." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "" +msgstr "Mevcut profilin bazı ayarlarının üzerine yazılmış." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" @@ -6244,7 +6244,7 @@ msgstr "Bir kenar veya radye yazdırın. Bu nesnenizin etrafına veya altına da #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:102 msgctxt "@label" msgid "Recommended print settings" -msgstr "" +msgstr "Tavsiye edilen baskı ayarları" #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:111 msgctxt "@button" @@ -6269,7 +6269,7 @@ msgstr "Aşağıdaki ayarlar parçanızın sağlamlığını tanımlar." #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:34 msgctxt "infill_sparse_density description" msgid "Infill Density" -msgstr "" +msgstr "Dolgu Yoğunluğu" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:35 msgctxt "@label" @@ -6303,7 +6303,7 @@ msgstr "" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:67 msgctxt "@action:label" msgid "Shell Thickness" -msgstr "" +msgstr "Katman Kalınlığı" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:68 msgctxt "@label" @@ -6318,12 +6318,12 @@ msgstr "Destek" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:21 msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, these parts would collapse during printing." -msgstr "" +msgstr "Modelde çıkıntılı olan kısımlarını desteklemek için yapılar oluşturun. Bu yapılar olmadan, bu parçalar baskı sırasında çökecektir." #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@action:label" msgid "Support Type" -msgstr "" +msgstr "Destek Türü" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:41 msgctxt "@label" @@ -6338,7 +6338,7 @@ msgstr "Destek oluşturmak için kullanılabilir teknikler arasından seçim yap #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:53 msgctxt "@action:label" msgid "Print with" -msgstr "" +msgstr "Şununla yazdır:" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:54 msgctxt "@label" @@ -6792,12 +6792,12 @@ msgstr "Ağ dışı bir yazıcı ekleyin" #: resources/qml/WelcomePages/AddThirdPartyPrinter.qml:102 msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "" +msgstr "Digital Factory üzerinden UltiMaker yazıcı ekle" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:29 msgctxt "@label" msgid "In order to start using Cura you will need to configure a printer." -msgstr "" +msgstr "Cura’yı kullanmaya başlamak için bir yazıcı yapılandırmanız gerekir." #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:36 msgctxt "@label" @@ -6807,12 +6807,12 @@ msgstr "Hangi yazıcıyı kurmak istersiniz?" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:55 msgctxt "@button" msgid "UltiMaker printer" -msgstr "" +msgstr "UltiMaker yazıcı" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:64 msgctxt "@button" msgid "Non UltiMaker printer" -msgstr "" +msgstr "UltiMaker olmayan yazıcı" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:73 msgctxt "@button" @@ -6827,7 +6827,7 @@ msgstr "Yazıcı Ekle" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:33 msgctxt "@label" msgid "New UltiMaker printers can be connected to Digital Factory and monitored remotely." -msgstr "" +msgstr "Yeni Ultimaker yazıcılar Digital Factory’ye bağlanabilir ve uzaktan izlenebilir." #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:70 msgctxt "@label" @@ -6857,17 +6857,17 @@ msgstr "Daha fazla bilgi edinin" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:121 msgctxt "@button" msgid "Add local printer" -msgstr "" +msgstr "Yerel yazıcı ekleyin" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:129 msgctxt "@button" msgid "Sign in to Digital Factory" -msgstr "" +msgstr "Digital Factory’de oturum aç" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:133 msgctxt "@button" msgid "Waiting for new printers" -msgstr "" +msgstr "Yeni yazıcılar bekleniyor" #: resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 968aa3d2d7..ccf1269e02 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -925,7 +925,7 @@ msgstr "打印机组" #: plugins/3MFReader/WorkspaceDialog.qml:103 msgctxt "@action:label" msgid "Open With" -msgstr "" +msgstr "打开方式" #: plugins/3MFReader/WorkspaceDialog.qml:104 msgctxt "@info:tooltip" @@ -4594,17 +4594,17 @@ msgstr "新增功能" #: resources/qml/Cura.qml:890 msgctxt "@title:window" msgid "Save Custom Profile" -msgstr "" +msgstr "保存自定义配置文件" #: resources/qml/Cura.qml:891 msgctxt "@textfield:placeholder" msgid "New Custom Profile" -msgstr "" +msgstr "新建自定义配置文件" #: resources/qml/Cura.qml:892 msgctxt "@info" msgid "Custom profile name:" -msgstr "" +msgstr "自定义配置文件名称：" #: resources/qml/Cura.qml:909 msgctxt "@label %i will be replaced with a profile name" @@ -4619,7 +4619,7 @@ msgstr "了解有关 Cura 打印配置文件的更多信息" #: resources/qml/Cura.qml:926 msgctxt "@button" msgid "Save new profile" -msgstr "" +msgstr "保存新配置文件" #: resources/qml/Dialogs/AboutDialog.qml:15 msgctxt "@title:window The argument is the application name." @@ -4908,12 +4908,12 @@ msgstr "保留更改" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:171 msgctxt "@action:button" msgid "Save as new custom profile" -msgstr "" +msgstr "另存为新自定义配置文件" #: resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:178 msgctxt "@action:button" msgid "Save changes" -msgstr "" +msgstr "保存更改" #: resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:47 msgctxt "@text:window" @@ -6229,7 +6229,7 @@ msgstr "允许打印 Brim 或 Raft。这将在您的对象周围或下方添加 #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:102 msgctxt "@label" msgid "Recommended print settings" -msgstr "" +msgstr "建议的打印设置" #: resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml:111 msgctxt "@button" @@ -6254,7 +6254,7 @@ msgstr "以下设置定义零件的强度。" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:34 msgctxt "infill_sparse_density description" msgid "Infill Density" -msgstr "" +msgstr "填充密度" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:35 msgctxt "@label" @@ -6264,7 +6264,7 @@ msgstr "调整打印填充的密度。" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:54 msgctxt "@action:label" msgid "Infill Pattern" -msgstr "" +msgstr "填充图案" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:56 msgctxt "@label" @@ -6288,7 +6288,7 @@ msgstr "" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:67 msgctxt "@action:label" msgid "Shell Thickness" -msgstr "" +msgstr "外壳厚度" #: resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml:68 msgctxt "@label" @@ -6308,7 +6308,7 @@ msgstr "在模型的悬垂（Overhangs）部分生成支撑结构。若不这样 #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:40 msgctxt "@action:label" msgid "Support Type" -msgstr "" +msgstr "支撑类型" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:41 msgctxt "@label" @@ -6323,7 +6323,7 @@ msgstr "在可用于产生支撑的方法之间进行选择。“普通”支撑 #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:53 msgctxt "@action:label" msgid "Print with" -msgstr "" +msgstr "打印方式" #: resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:54 msgctxt "@label" @@ -6776,12 +6776,12 @@ msgstr "添加未联网打印机" #: resources/qml/WelcomePages/AddThirdPartyPrinter.qml:102 msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "" +msgstr "通过 Digital Factory 添加 UltiMaker 打印机" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:29 msgctxt "@label" msgid "In order to start using Cura you will need to configure a printer." -msgstr "" +msgstr "要开始使用 Cura，您需要配置一台打印机。" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:36 msgctxt "@label" @@ -6791,12 +6791,12 @@ msgstr "您要设置什么打印机？" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:55 msgctxt "@button" msgid "UltiMaker printer" -msgstr "" +msgstr "UltiMaker 打印机" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:64 msgctxt "@button" msgid "Non UltiMaker printer" -msgstr "" +msgstr "非 UltiMaker 打印机" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:73 msgctxt "@button" @@ -6811,7 +6811,7 @@ msgstr "添加打印机" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:33 msgctxt "@label" msgid "New UltiMaker printers can be connected to Digital Factory and monitored remotely." -msgstr "" +msgstr "新的 UltiMaker 打印机可连接到 Digital Factory，用户可对其进行远程监控。" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:70 msgctxt "@label" @@ -6841,17 +6841,17 @@ msgstr "详细了解" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:121 msgctxt "@button" msgid "Add local printer" -msgstr "" +msgstr "添加本地打印机" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:129 msgctxt "@button" msgid "Sign in to Digital Factory" -msgstr "" +msgstr "登录 Digital Factory" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:133 msgctxt "@button" msgid "Waiting for new printers" -msgstr "" +msgstr "等待新打印机" #: resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" From bed7f22a1b5763679a98fdb04a4c01b802b348e2 Mon Sep 17 00:00:00 2001 From: Bryan Foley Date: Fri, 14 Apr 2023 13:32:10 +0200 Subject: [PATCH 17/35] SEM-166 UMs7 firmware location updated With this commit we use the dedicated update url for the UMs7 firmware location instead of the UMs5 location --- resources/definitions/ultimaker_s7.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index 580b43209b..16a36eefc2 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -12,7 +12,7 @@ "bom_numbers": [5078167, 5078168], "firmware_update_info": { - "check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ], + "check_urls": [ "https://software.ultimaker.com/releases/firmware/5078167/stable/um-update.swu.version" ], "id": 5078167, "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" }, From 1b15eb4a4cca6b1e43837b41bb29dad1d2c40c8b Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Fri, 14 Apr 2023 15:38:02 +0200 Subject: [PATCH 18/35] Capitalize UltiMaker CURA-10371 --- resources/i18n/nl_NL/cura.po | 2 +- resources/i18n/pt_PT/cura.po | 2 +- resources/i18n/tr_TR/cura.po | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index dbc30155ba..1a3b03f393 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -6792,7 +6792,7 @@ msgstr "Een niet-netwerkprinter toevoegen" #: resources/qml/WelcomePages/AddThirdPartyPrinter.qml:102 msgctxt "@button" msgid "Add UltiMaker printer via Digital Factory" -msgstr "Ultimaker printer toevoegen via Digital Factory" +msgstr "UltiMaker printer toevoegen via Digital Factory" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:29 msgctxt "@label" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index aa98ad0737..00c31e34ee 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -6809,7 +6809,7 @@ msgstr "Impressora da UltiMaker" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:64 msgctxt "@button" msgid "Non UltiMaker printer" -msgstr "Impressora não Ultimaker" +msgstr "Impressora não UltiMaker" #: resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml:73 msgctxt "@button" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index e04046d18c..9978f781f1 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -6827,7 +6827,7 @@ msgstr "Yazıcı Ekle" #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:33 msgctxt "@label" msgid "New UltiMaker printers can be connected to Digital Factory and monitored remotely." -msgstr "Yeni Ultimaker yazıcılar Digital Factory’ye bağlanabilir ve uzaktan izlenebilir." +msgstr "Yeni UltiMaker yazıcılar Digital Factory’ye bağlanabilir ve uzaktan izlenebilir." #: resources/qml/WelcomePages/AddUltimakerPrinter.qml:70 msgctxt "@label" From 024876b314069f44a3b8e347e2218c95c07233b7 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 14 Apr 2023 15:23:38 +0000 Subject: [PATCH 19/35] Applied printer-linter format --- resources/definitions/longer_lk4x.def.json | 10 +++++----- resources/variants/longer/longer_lk4x_0.4.inst.cfg | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/definitions/longer_lk4x.def.json b/resources/definitions/longer_lk4x.def.json index b98dbeca06..9d3de42599 100644 --- a/resources/definitions/longer_lk4x.def.json +++ b/resources/definitions/longer_lk4x.def.json @@ -26,13 +26,13 @@ [35, 20] ] }, - "machine_start_gcode": { "default_value": "; -- LONGER BL-TOUCH Start G-code --\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\n\n; confirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm release\nG4 P100 ; Delay for BL-Touch\n\n; homing\nG28 X0 Y0 ; move X/Y to min endstops\nG28 Z0 ; move Z to min endstops\n\n; reconfirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm realease\nG4 P100 ; Delay for BL-Touch\n\n; bed leveling\nG29; Auto leveling\nM420 Z5 ; set LEVELING_FADE_HEIGHT\nM500 ; save data of G29 and M420\nM420 S1 ; enable bed leveling\n\n; prepare hot-end\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y150.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y150.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n; -- end of LONGER BL-TOUCH Start G-code --" }, "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "LONGER LK4 X" }, + "machine_start_gcode": { "default_value": "; -- LONGER BL-TOUCH Start G-code --\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\n\n; confirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm release\nG4 P100 ; Delay for BL-Touch\n\n; homing\nG28 X0 Y0 ; move X/Y to min endstops\nG28 Z0 ; move Z to min endstops\n\n; reconfirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm realease\nG4 P100 ; Delay for BL-Touch\n\n; bed leveling\nG29; Auto leveling\nM420 Z5 ; set LEVELING_FADE_HEIGHT\nM500 ; save data of G29 and M420\nM420 S1 ; enable bed leveling\n\n; prepare hot-end\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y150.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y150.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n; -- end of LONGER BL-TOUCH Start G-code --" }, "machine_width": { "default_value": 220 }, - "speed_travel": { "value": 65 }, "retraction_amount": { "value": 2.0 }, - "z_seam_type": { "value": "'shortest'" }, - "retraction_combing": { "value": "'noskin'" } + "retraction_combing": { "value": "'noskin'" }, + "speed_travel": { "value": 65 }, + "z_seam_type": { "value": "'shortest'" } } -} +} \ No newline at end of file diff --git a/resources/variants/longer/longer_lk4x_0.4.inst.cfg b/resources/variants/longer/longer_lk4x_0.4.inst.cfg index c5e7cdb230..0ecce67ff9 100644 --- a/resources/variants/longer/longer_lk4x_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk4x_0.4.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.4 + From 1924d8c1b011909e7e7b6019833d0581b934f297 Mon Sep 17 00:00:00 2001 From: Aldo Hoeben Date: Fri, 14 Apr 2023 20:34:59 +0200 Subject: [PATCH 20/35] Continue if there is no scripts folder inside a resource folder Co-authored-by: Casper Lamboo --- plugins/PostProcessingPlugin/PostProcessingPlugin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.py b/plugins/PostProcessingPlugin/PostProcessingPlugin.py index 5e37ede4c7..fbb4214021 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.py +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.py @@ -159,6 +159,8 @@ class PostProcessingPlugin(QObject, Extension): if root is None: continue path = os.path.join(root, "scripts") + if not os.path.isdir(path): + continue self.loadScripts(path) def loadScripts(self, path: str) -> None: From b5b6f8197bed78528184ee07f880db7d141d08f2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 17 Apr 2023 12:47:54 +0200 Subject: [PATCH 21/35] Fix the writeStarted emit When printing via abstract printer, this signal was not correctly emitted causing the postprocessing script to fail CURA-10524 --- .../UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py index 4ee74550a4..fdbeb051cf 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py @@ -96,6 +96,9 @@ class AbstractCloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): @pyqtSlot(str) def printerSelected(self, unique_id: str): + # The device that it defers the actual write to isn't hooked up correctly. So we should emit the write signal + # here. + self.writeStarted.emit(self) self._request_write_callback(unique_id, self._nodes) if self._on_print_dialog: self._on_print_dialog.close() From d7d32b07aefeb3fb4f52e6e02d15b10c6921eefe Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 17 Apr 2023 14:06:52 +0200 Subject: [PATCH 22/35] Bump-up settings version to 22 for longer cube 2 --- resources/variants/longer/longer_lk4x_0.4.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/variants/longer/longer_lk4x_0.4.inst.cfg b/resources/variants/longer/longer_lk4x_0.4.inst.cfg index 0ecce67ff9..839df818c4 100644 --- a/resources/variants/longer/longer_lk4x_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk4x_0.4.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] From 3f276f08b6a6c62e46da01e403bd728bfec83e07 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 17 Apr 2023 14:15:21 +0200 Subject: [PATCH 23/35] Removed wrongly translated strings The %1 location marker wasn't translated by Smartling. Contributes to CURA-10371 --- resources/i18n/de_DE/cura.po | 2 +- resources/i18n/es_ES/cura.po | 2 +- resources/i18n/fr_FR/cura.po | 2 +- resources/i18n/it_IT/cura.po | 2 +- resources/i18n/ja_JP/cura.po | 2 +- resources/i18n/ko_KR/cura.po | 2 +- resources/i18n/nl_NL/cura.po | 2 +- resources/i18n/pt_BR/cura.po | 2 +- resources/i18n/pt_PT/cura.po | 2 +- resources/i18n/ru_RU/cura.po | 2 +- resources/i18n/tr_TR/cura.po | 2 +- resources/i18n/zh_CN/cura.po | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 45a1c71369..caa02a760e 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -6217,7 +6217,7 @@ msgstr "Empfohlene Einstellungen (für %1) wurden geändert." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "Einige Einstellungen des aktuellen Profils wurden überschrieben." +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index bc6d9e002e..cdf76f8bd0 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -6216,7 +6216,7 @@ msgstr "Se ha modificado la configuración recomendada (para %1)." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "Algunas configuraciones del perfil actual se han sobrescrito." +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 36ca7d652c..245042953a 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -6216,7 +6216,7 @@ msgstr "Les paramètres recommandés (pour %1) ont été modifiés." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "Certains paramètres du profil actuel ont été remplacés." +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 7b76c83016..f3dfe080ed 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -6219,7 +6219,7 @@ msgstr "Le impostazioni consigliate (per %1) sono state modificate." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "Alcune impostazioni del profilo corrente sono state sovrascritte." +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index c4dae72d79..a4918aa720 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -6202,7 +6202,7 @@ msgstr "推奨設定(%1)が変更されました。" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "現在のプロファイルの一部の設定が上書きされました。" +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 6b894d1f18..23b79279f7 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -6202,7 +6202,7 @@ msgstr "(%1)에 대한 권장 설정이 변경되었습니다." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "현재 프로파일의 일부 설정을 덮어썼습니다." +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 1a3b03f393..bcfcced70d 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -6219,7 +6219,7 @@ msgstr "Aanbevolen instellingen (voor %1) zijn gewijzigd." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "Enkele instellingen van het huidige profiel zijn overschreven." +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 5dd4963079..272e33342f 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -6216,7 +6216,7 @@ msgstr "Ajustes recomendados (para %1) foram alterados." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "Alguns ajustes do perfil atual foram sobrescritos." +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index 00c31e34ee..adbd94319c 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -6215,7 +6215,7 @@ msgstr "As definições recomendadas (para %1) foram alteradas." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "Algumas definições do perfil actual foram substituídas." +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 3cc45b82af..34539e4479 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -6229,7 +6229,7 @@ msgstr "Рекомендуемые настройки (для %1) был #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "Некоторые настройки из текущего профиля были перезаписаны." +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 9978f781f1..81840da25b 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -6219,7 +6219,7 @@ msgstr "Önerilen ayarlar (%1 için) değiştirildi." #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "Mevcut profilin bazı ayarlarının üzerine yazılmış." +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index ccf1269e02..b409d26a98 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -6204,7 +6204,7 @@ msgstr "建议的设置（适用于 %1）已更改。" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:106 msgctxt "@info %1 is the name of a profile" msgid "Some setting-values defined in %1 were overridden." -msgstr "当前配置文件的一些设置已经重写。" +msgstr "" #: resources/qml/PrintSetupSelector/ProfileWarningReset.qml:137 msgctxt "@info" From 21de7a366735a282fb459dfff4b517a0a6df84e7 Mon Sep 17 00:00:00 2001 From: Bryan Foley Date: Tue, 18 Apr 2023 10:06:46 +0200 Subject: [PATCH 24/35] SEM-166 Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/ultimaker_s3.def.json | 2 +- resources/definitions/ultimaker_s5.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 0cf31c7f66..8892e27676 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -12,7 +12,7 @@ "bom_numbers": [ 213482, 213483, - 213484 + 213484, ], "exclude_materials": [ "generic_hips", diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 8bb086a654..26b7e864b2 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -13,7 +13,7 @@ 9051, 214475, 214476, - 214477 + 214477, ], "firmware_update_info": { From 3b538d975c70e7eda7d2a61a013cb6d2adb71f97 Mon Sep 17 00:00:00 2001 From: Bryan Foley Date: Tue, 18 Apr 2023 10:12:23 +0200 Subject: [PATCH 25/35] Revert "SEM-166 Apply suggestions from code review" This reverts commit 21de7a366735a282fb459dfff4b517a0a6df84e7. --- resources/definitions/ultimaker_s3.def.json | 2 +- resources/definitions/ultimaker_s5.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 8892e27676..0cf31c7f66 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -12,7 +12,7 @@ "bom_numbers": [ 213482, 213483, - 213484, + 213484 ], "exclude_materials": [ "generic_hips", diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 26b7e864b2..8bb086a654 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -13,7 +13,7 @@ 9051, 214475, 214476, - 214477, + 214477 ], "firmware_update_info": { From 82b0889199445274b5973441d27cb0b796cdeefd Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 18 Apr 2023 14:58:13 +0200 Subject: [PATCH 26/35] Update changelog CURA-10520 --- resources/texts/change_log.txt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 644e9d69ac..93fa078a92 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,4 +1,16 @@ -[5.3] +[5.3.1] + +Restored and updated translations for 11 languages + +* Bug fixes: +- Fixed a bug where the machine definitions could not be updated +- Fixed a bug where part of the model would not have fuzzy skin +- Fixed a bug where a project files that contain an intent profile would not load correctly +- Fixed a bug where Pause At Height was not working correctly for Griffin (UltiMaker printers) +- Fixed a bug where slicing was blocked if initial printing temperature was higher than the printing temperature +- Fixed a bug where Gcode would display NOMESH instead of NONMESH + +[5.3] This release does not yet contain the new tree support implementation by ThomasRahm. You can download a special Cura version for that here. * Interlocking Structure Generation From 860aa7ad9d5bc153bdbf0a98a171d1e4771c1c88 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 18 Apr 2023 16:03:27 +0200 Subject: [PATCH 27/35] Pin dependency versions CURA-10520 --- conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index ffe4b81034..bbad0e0a69 100644 --- a/conanfile.py +++ b/conanfile.py @@ -279,12 +279,12 @@ class CuraConan(ConanFile): def requirements(self): self.requires("pyarcus/5.2.2") - self.requires("curaengine/(latest)@ultimaker/stable") + self.requires("curaengine/5.3.1") self.requires("pysavitar/5.2.2") self.requires("pynest2d/5.2.2") - self.requires("uranium/(latest)@ultimaker/stable") - self.requires("fdm_materials/(latest)@ultimaker/stable") - self.requires("cura_binary_data/(latest)@ultimaker/stable") + self.requires("uranium/5.3.1") + self.requires("fdm_materials/5.3.0") + self.requires("cura_binary_data/5.3.0") self.requires("cpython/3.10.4") if self.options.internal: self.requires("cura_private_data/(latest)@ultimaker/testing") From d561ba5defc112d58a5f01ea2cd2daf5256be809 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 18 Apr 2023 20:53:20 +0200 Subject: [PATCH 28/35] Despite the name, 'Maximum' Fan Speed should be able to go below minimum. This is because the maximum fan speed is really just the fan speed for layers at or below a certain layer time threshold. Interpolation-logic in the backend (engine) still holds up, even if the values are 'switched' in the sense that the supposed 'max' is lower than the 'min'. Change was needed since some UM materials had a Maximum Fan Speed set to 15, even though the normal speed and the Minimum Fan Speed are set to 50 in the machine. Despite the confusing naming, from context this seems intentional. Will fix #15233 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 087cfdad01..cd4e7d930b 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4314,7 +4314,7 @@ "description": "The speed at which the fans spin on the minimum layer time. The fan speed gradually increases between the regular fan speed and maximum fan speed when the threshold is hit.", "unit": "%", "type": "float", - "minimum_value": "max(0, cool_fan_speed_min)", + "minimum_value": "0", "maximum_value": "100", "default_value": 100, "enabled": "cool_fan_enabled", From ac43ddd91ee7e373a3ae5d62fd7061f130847f7a Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 19 Apr 2023 10:05:43 +0200 Subject: [PATCH 29/35] Update changelog CURA-10520 --- resources/texts/change_log.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 93fa078a92..72dffa0b86 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -9,6 +9,7 @@ Restored and updated translations for 11 languages - Fixed a bug where Pause At Height was not working correctly for Griffin (UltiMaker printers) - Fixed a bug where slicing was blocked if initial printing temperature was higher than the printing temperature - Fixed a bug where Gcode would display NOMESH instead of NONMESH +- Fixed a bug where users were unable to slice with certain materials [5.3] This release does not yet contain the new tree support implementation by ThomasRahm. You can download a special Cura version for that here. From fa5166d42aeb9c353140d3e3b128e13c0093cf25 Mon Sep 17 00:00:00 2001 From: syntax1269 <49670361+syntax1269@users.noreply.github.com> Date: Wed, 19 Apr 2023 06:42:45 -0400 Subject: [PATCH 30/35] Adding two printers Tina2 and Tina2S (#15095) CURA-10534 --- resources/definitions/weedo_base.def.json | 326 ++++++++++++++++++ resources/definitions/weefun_tina2.def.json | 87 +++++ resources/definitions/weefun_tina2s.def.json | 81 +++++ .../extruders/weedo_base_extruder_0.def.json | 15 + 4 files changed, 509 insertions(+) create mode 100644 resources/definitions/weedo_base.def.json create mode 100644 resources/definitions/weefun_tina2.def.json create mode 100644 resources/definitions/weefun_tina2s.def.json create mode 100644 resources/extruders/weedo_base_extruder_0.def.json diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json new file mode 100644 index 0000000000..d6891ee750 --- /dev/null +++ b/resources/definitions/weedo_base.def.json @@ -0,0 +1,326 @@ +{ + "version":2, + "name":"WEEDO Base", + "inherits":"fdmprinter", + "metadata":{ + "author":"WEEDO", + "manufacturer":"WEEDO", + "visible":false, + "file_formats":"text/x-gcode", + "machine_extruder_trains":{ + "0":"weedo_base_extruder_0" + }, + "has_materials":true, + "has_variants":false, + "has_machine_quality":false, + "preferred_quality_type":"draft", + "preferred_material":"generic_pla_175", + "exclude_materials":[ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_pc_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides":{ + "material_bed_temp_wait":{ + "default_value":false + }, + "material_print_temp_wait":{ + "default_value":false + }, + "material_diameter":{ + "default_value":1.75 + }, + "machine_nozzle_size":{ + "default_value":0.4 + }, + "machine_steps_per_mm_x":{ + "default_value":94 + }, + "machine_steps_per_mm_y":{ + "default_value":94 + }, + "machine_steps_per_mm_z":{ + "default_value":400 + }, + "machine_steps_per_mm_e":{ + "default_value":96 + }, + "machine_max_feedrate_x":{ + "default_value":250 + }, + "machine_max_feedrate_y":{ + "default_value":250 + }, + "machine_max_feedrate_z":{ + "default_value":10 + }, + "machine_max_feedrate_e":{ + "default_value":45 + }, + "machine_endstop_positive_direction_x":{ + "default_value":true + }, + "machine_endstop_positive_direction_y":{ + "default_value":true + }, + "machine_endstop_positive_direction_z":{ + "default_value":false + }, + "machine_feeder_wheel_diameter":{ + "default_value":10.61 + }, + "infill_sparse_density":{ + "default_value":10 + }, + "material_flow":{ + "default_value":95 + }, + "material_standby_temperature":{ + "minimum_value":"0" + }, + "material_print_temp_prepend":{ + "default_value":false + }, + "default_material_bed_temperature":{ + "default_value":35 + }, + "speed_wall":{ + "value":"max(5,round(speed_print / 2,1))" + }, + "speed_wall_0":{ + "value":"max(5,speed_wall-5)" + }, + "speed_wall_x":{ + "value":"speed_wall" + }, + "speed_topbottom":{ + "value":"round(speed_print * 0.65,1)" + }, + "speed_support":{ + "value":"round(speed_print*0.82,1)" + }, + "speed_support_interface":{ + "value":"round(speed_support*0.689,1)" + }, + "speed_prime_tower":{ + "value":"speed_support" + }, + "speed_travel":{ + "value":105.0 + }, + "speed_layer_0":{ + "value":26.0 + }, + "speed_print_layer_0":{ + "value":26.0 + }, + "speed_travel_layer_0":{ + "value":80.0 + }, + "skirt_brim_speed":{ + "value":26.0 + }, + "retraction_amount":{ + "default_value":1.5 + }, + "retraction_speed":{ + "default_value":28 + }, + "switch_extruder_retraction_amount":{ + "value":16.5 + }, + "switch_extruder_retraction_speeds":{ + "default_value":28 + }, + "retraction_combing":{ + "value":"off" + }, + "support_angle":{ + "default_value":60 + }, + "support_interface_pattern":{ + "default_value":"lines" + }, + "adhesion_type":{ + "default_value":"raft" + }, + "raft_margin":{ + "default_value":8 + }, + "raft_airgap":{ + "default_value":0.22 + }, + "raft_surface_speed":{ + "value":40 + }, + "raft_interface_speed":{ + "value":33 + }, + "raft_base_speed":{ + "value":20 + }, + "extruder_prime_pos_y":{ + "minimum_value":"0", + "maximum_value":"machine_depth" + }, + "extruder_prime_pos_x":{ + "minimum_value":"0", + "maximum_value":"machine_width" + }, + "prime_tower_size":{ + "default_value":15 + }, + "prime_tower_min_volume":{ + "default_value":10 + }, + "raft_surface_fan_speed":{ + "value":100 + } + } +} diff --git a/resources/definitions/weefun_tina2.def.json b/resources/definitions/weefun_tina2.def.json new file mode 100644 index 0000000000..ba5a42a37a --- /dev/null +++ b/resources/definitions/weefun_tina2.def.json @@ -0,0 +1,87 @@ +{ + "name":"WEEFUN TINA2", + "version":2, + "inherits":"weedo_base", + "metadata":{ + "visible":true, + "author":"WEEFUN", + "manufacturer":"WEEFUN", + "file_formats":"text/x-gcode", + "platform_offset":[ + 0, + 0, + 0 + ] + }, + "overrides":{ + "machine_extruder_count":{ + "default_value":1 + }, + "machine_heated_bed":{ + "default_value":false + }, + "machine_center_is_zero":{ + "default_value":false + }, + "machine_height":{ + "default_value":100 + }, + "machine_depth":{ + "default_value":120 + }, + "machine_width":{ + "default_value":100 + }, + "machine_name":{ + "default_value":"WEEFUN TINA2" + }, + "machine_start_gcode":{ + "default_value":";(**** start.gcode for TINA2****)\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG1 Z10 F200\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000 \nG92 E0 ; Reset extruder position\n\nM203 Z5" + }, + "machine_end_gcode":{ + "default_value":";(**** end.gcode for TINA2****)\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG1 Z105 F300\nG28 X0 Y0\nG1 Y90 F1000\nM203 Z30" + }, + "retraction_amount":{ + "default_value":3 + }, + "retraction_speed":{ + "default_value":35 + }, + "support_xy_distance":{ + "default_value":1.0 + }, + "retraction_count_max":{ + "default_value":10 + }, + "speed_wall_0":{ + "value":20.0 + }, + "speed_wall_x":{ + "value":25.0 + }, + "speed_topbottom":{ + "value":30.0 + }, + "speed_infill":{ + "value":40.0 + }, + "speed_support_infill":{ + "value":45.0 + }, + "speed_print_layer_0":{ + "value":22.0 + }, + "speed_travel_layer_0":{ + "value":60 + }, + "speed_support_roof":{ + "value":30.0 + }, + "speed_support_bottom":{ + "dvalue":30.0 + }, + "speed_roofing":{ + "value":25.0 + } + } +} diff --git a/resources/definitions/weefun_tina2s.def.json b/resources/definitions/weefun_tina2s.def.json new file mode 100644 index 0000000000..cfc139bdfc --- /dev/null +++ b/resources/definitions/weefun_tina2s.def.json @@ -0,0 +1,81 @@ +{ + "name":"WEEFUN TINA2S", + "version":2, + "inherits":"weedo_base", + "metadata":{ + "visible":true, + "author":"WEEFUN", + "manufacturer":"WEEFUN", + "file_formats":"text/x-gcode", + "platform_offset":[ + 0, + 0, + 0 + ] + }, + "overrides":{ + "machine_extruder_count":{ + "default_value":1 + }, + "machine_heated_bed":{ + "default_value":true + }, + "machine_center_is_zero":{ + "default_value":false + }, + "machine_height":{ + "default_value":100 + }, + "machine_depth":{ + "default_value":120 + }, + "machine_width":{ + "default_value":100 + }, + "gantry_height":{ + "value":20 + }, + "machine_name":{ + "default_value":"WEEFUN TINA2S" + }, + "machine_start_gcode":{ + "default_value":";MachineType:TINA2S\n;FilamentType:{material_type}\n;Layer height:{layer_height}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n;InfillDensity:{infill_sparse_density}\n;(**** start.gcode for tina2s****)\nM203 Z5 ;Move Z axis up 5mm\nM117 Homing axes\nG28 Z; Home extruder axis Z\nG28 X Y; Home extruder axis X Y\nM117 Start Warm Up\nM140 S{material_bed_temperature} ;start heating the bed to what is set in Cura\nM104 S130 ;start heating E to 130 for preheat\nM190 S{material_bed_temperature} ;Wait for Bed Temperature\nM117 Levling the build plate\nG29\nG1 Z1.0 F3000 ;Move Z Axis up to 1mm\nG1 X0.5 Y1 ;Move hotend to starting position\nM117 Heating Hotend\nM104 S{material_initial_print_temperature} T0 ;start heating T0 to what is set in Cura\nM109 S{material_initial_print_temperature} T0 ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nM117 Purging and cleaning nozzle\nG1 X1.1 Y10 Z0.28 F1000.0 ;Move to start position\nG1 X1.1 Y90.0 Z0.28 F2000.0 E15 ;Draw the first line\nG1 X1.4 Y90.0 Z0.23 F5000.0 ;Move to side a little\nG1 X1.4 Y10 Z0.20 F2000.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X1 Y5 Z0.2 F5000.0 ;Move over to prevent blob squish\nM117 Printing..." + }, + "machine_end_gcode":{ + "default_value":";(**** end.gcode for tina2s****)\nM203 Z15 ;Move Z axis up 5mm\nM104 S0 ;Turn off extruder heating\nM140 S0 ;Turn off bed heating\nM107 ;Turn Fans off\nG92 E0 ;(Reset after prime)\nG0 E-1 F300 ;Retract Fillament 1mm\nG28 Z F300 ;Park Hotend up\nG28 X0 Y0 ;Park Hotend\nG1 Y90 F1000 ;Present finished model\nG0 E-2 F300 ;Retract Fillament 2mm\nM82 ;absolute extrusion mode\nM104 S0 ;Ensure hotend is off\nM117 Print Complete" + }, + "retraction_amount":{ + "default_value":3 + }, + "speed_wall_0":{ + "value":20.0 + }, + "speed_wall_x":{ + "value":25.0 + }, + "speed_topbottom":{ + "value":30.0 + }, + "speed_infill":{ + "value":40.0 + }, + "speed_support_infill":{ + "value":45.0 + }, + "speed_print_layer_0":{ + "value":22.0 + }, + "speed_travel_layer_0":{ + "value":60 + }, + "speed_support_roof":{ + "value":30.0 + }, + "speed_support_bottom":{ + "dvalue":30.0 + }, + "speed_roofing":{ + "value":25.0 + } + } +} diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json new file mode 100644 index 0000000000..0cb088acdd --- /dev/null +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "weedo_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From d2f0ee41921a01698b94ad0678da9d7ba8006cb8 Mon Sep 17 00:00:00 2001 From: nallath Date: Wed, 19 Apr 2023 10:43:59 +0000 Subject: [PATCH 31/35] Applied printer-linter format --- resources/definitions/weedo_base.def.json | 556 ++++++++---------- resources/definitions/weefun_tina2.def.json | 128 ++-- resources/definitions/weefun_tina2s.def.json | 120 ++-- .../extruders/weedo_base_extruder_0.def.json | 9 +- 4 files changed, 317 insertions(+), 496 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index d6891ee750..305f4f081b 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -1,326 +1,230 @@ -{ - "version":2, - "name":"WEEDO Base", - "inherits":"fdmprinter", - "metadata":{ - "author":"WEEDO", - "manufacturer":"WEEDO", - "visible":false, - "file_formats":"text/x-gcode", - "machine_extruder_trains":{ - "0":"weedo_base_extruder_0" - }, - "has_materials":true, - "has_variants":false, - "has_machine_quality":false, - "preferred_quality_type":"draft", - "preferred_material":"generic_pla_175", - "exclude_materials":[ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_pc_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] - }, - "overrides":{ - "material_bed_temp_wait":{ - "default_value":false - }, - "material_print_temp_wait":{ - "default_value":false - }, - "material_diameter":{ - "default_value":1.75 - }, - "machine_nozzle_size":{ - "default_value":0.4 - }, - "machine_steps_per_mm_x":{ - "default_value":94 - }, - "machine_steps_per_mm_y":{ - "default_value":94 - }, - "machine_steps_per_mm_z":{ - "default_value":400 - }, - "machine_steps_per_mm_e":{ - "default_value":96 - }, - "machine_max_feedrate_x":{ - "default_value":250 - }, - "machine_max_feedrate_y":{ - "default_value":250 - }, - "machine_max_feedrate_z":{ - "default_value":10 - }, - "machine_max_feedrate_e":{ - "default_value":45 - }, - "machine_endstop_positive_direction_x":{ - "default_value":true - }, - "machine_endstop_positive_direction_y":{ - "default_value":true - }, - "machine_endstop_positive_direction_z":{ - "default_value":false - }, - "machine_feeder_wheel_diameter":{ - "default_value":10.61 - }, - "infill_sparse_density":{ - "default_value":10 - }, - "material_flow":{ - "default_value":95 - }, - "material_standby_temperature":{ - "minimum_value":"0" - }, - "material_print_temp_prepend":{ - "default_value":false - }, - "default_material_bed_temperature":{ - "default_value":35 - }, - "speed_wall":{ - "value":"max(5,round(speed_print / 2,1))" - }, - "speed_wall_0":{ - "value":"max(5,speed_wall-5)" - }, - "speed_wall_x":{ - "value":"speed_wall" - }, - "speed_topbottom":{ - "value":"round(speed_print * 0.65,1)" - }, - "speed_support":{ - "value":"round(speed_print*0.82,1)" - }, - "speed_support_interface":{ - "value":"round(speed_support*0.689,1)" - }, - "speed_prime_tower":{ - "value":"speed_support" - }, - "speed_travel":{ - "value":105.0 - }, - "speed_layer_0":{ - "value":26.0 - }, - "speed_print_layer_0":{ - "value":26.0 - }, - "speed_travel_layer_0":{ - "value":80.0 - }, - "skirt_brim_speed":{ - "value":26.0 - }, - "retraction_amount":{ - "default_value":1.5 - }, - "retraction_speed":{ - "default_value":28 - }, - "switch_extruder_retraction_amount":{ - "value":16.5 - }, - "switch_extruder_retraction_speeds":{ - "default_value":28 - }, - "retraction_combing":{ - "value":"off" - }, - "support_angle":{ - "default_value":60 - }, - "support_interface_pattern":{ - "default_value":"lines" - }, - "adhesion_type":{ - "default_value":"raft" - }, - "raft_margin":{ - "default_value":8 - }, - "raft_airgap":{ - "default_value":0.22 - }, - "raft_surface_speed":{ - "value":40 - }, - "raft_interface_speed":{ - "value":33 - }, - "raft_base_speed":{ - "value":20 - }, - "extruder_prime_pos_y":{ - "minimum_value":"0", - "maximum_value":"machine_depth" - }, - "extruder_prime_pos_x":{ - "minimum_value":"0", - "maximum_value":"machine_width" - }, - "prime_tower_size":{ - "default_value":15 - }, - "prime_tower_min_volume":{ - "default_value":10 - }, - "raft_surface_fan_speed":{ - "value":100 - } - } -} +{ + "version": 2, + "name": "WEEDO Base", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_pc_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "has_machine_quality": false, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": { "0": "weedo_base_extruder_0" }, + "preferred_material": "generic_pla_175", + "preferred_quality_type": "draft" + }, + "overrides": + { + "adhesion_type": { "default_value": "raft" }, + "default_material_bed_temperature": { "default_value": 35 }, + "extruder_prime_pos_x": + { + "maximum_value": "machine_width", + "minimum_value": "0" + }, + "extruder_prime_pos_y": + { + "maximum_value": "machine_depth", + "minimum_value": "0" + }, + "infill_sparse_density": { "default_value": 10 }, + "machine_endstop_positive_direction_x": { "default_value": true }, + "machine_endstop_positive_direction_y": { "default_value": true }, + "machine_endstop_positive_direction_z": { "default_value": false }, + "machine_feeder_wheel_diameter": { "default_value": 10.61 }, + "machine_max_feedrate_e": { "default_value": 45 }, + "machine_max_feedrate_x": { "default_value": 250 }, + "machine_max_feedrate_y": { "default_value": 250 }, + "machine_max_feedrate_z": { "default_value": 10 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_steps_per_mm_e": { "default_value": 96 }, + "machine_steps_per_mm_x": { "default_value": 94 }, + "machine_steps_per_mm_y": { "default_value": 94 }, + "machine_steps_per_mm_z": { "default_value": 400 }, + "material_bed_temp_wait": { "default_value": false }, + "material_diameter": { "default_value": 1.75 }, + "material_flow": { "default_value": 95 }, + "material_print_temp_prepend": { "default_value": false }, + "material_print_temp_wait": { "default_value": false }, + "material_standby_temperature": { "minimum_value": "0" }, + "prime_tower_min_volume": { "default_value": 10 }, + "prime_tower_size": { "default_value": 15 }, + "raft_airgap": { "default_value": 0.22 }, + "raft_base_speed": { "value": 20 }, + "raft_interface_speed": { "value": 33 }, + "raft_margin": { "default_value": 8 }, + "raft_surface_fan_speed": { "value": 100 }, + "raft_surface_speed": { "value": 40 }, + "retraction_amount": { "default_value": 1.5 }, + "retraction_combing": { "value": "off" }, + "retraction_speed": { "default_value": 28 }, + "skirt_brim_speed": { "value": 26.0 }, + "speed_layer_0": { "value": 26.0 }, + "speed_prime_tower": { "value": "speed_support" }, + "speed_print_layer_0": { "value": 26.0 }, + "speed_support": { "value": "round(speed_print*0.82,1)" }, + "speed_support_interface": { "value": "round(speed_support*0.689,1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.65,1)" }, + "speed_travel": { "value": 105.0 }, + "speed_travel_layer_0": { "value": 80.0 }, + "speed_wall": { "value": "max(5,round(speed_print / 2,1))" }, + "speed_wall_0": { "value": "max(5,speed_wall-5)" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "default_value": 60 }, + "support_interface_pattern": { "default_value": "lines" }, + "switch_extruder_retraction_amount": { "value": 16.5 }, + "switch_extruder_retraction_speeds": { "default_value": 28 } + } +} \ No newline at end of file diff --git a/resources/definitions/weefun_tina2.def.json b/resources/definitions/weefun_tina2.def.json index ba5a42a37a..ebe026b163 100644 --- a/resources/definitions/weefun_tina2.def.json +++ b/resources/definitions/weefun_tina2.def.json @@ -1,87 +1,43 @@ { - "name":"WEEFUN TINA2", - "version":2, - "inherits":"weedo_base", - "metadata":{ - "visible":true, - "author":"WEEFUN", - "manufacturer":"WEEFUN", - "file_formats":"text/x-gcode", - "platform_offset":[ - 0, - 0, - 0 - ] - }, - "overrides":{ - "machine_extruder_count":{ - "default_value":1 - }, - "machine_heated_bed":{ - "default_value":false - }, - "machine_center_is_zero":{ - "default_value":false - }, - "machine_height":{ - "default_value":100 - }, - "machine_depth":{ - "default_value":120 - }, - "machine_width":{ - "default_value":100 - }, - "machine_name":{ - "default_value":"WEEFUN TINA2" - }, - "machine_start_gcode":{ - "default_value":";(**** start.gcode for TINA2****)\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG1 Z10 F200\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000 \nG92 E0 ; Reset extruder position\n\nM203 Z5" - }, - "machine_end_gcode":{ - "default_value":";(**** end.gcode for TINA2****)\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG1 Z105 F300\nG28 X0 Y0\nG1 Y90 F1000\nM203 Z30" - }, - "retraction_amount":{ - "default_value":3 - }, - "retraction_speed":{ - "default_value":35 - }, - "support_xy_distance":{ - "default_value":1.0 - }, - "retraction_count_max":{ - "default_value":10 - }, - "speed_wall_0":{ - "value":20.0 - }, - "speed_wall_x":{ - "value":25.0 - }, - "speed_topbottom":{ - "value":30.0 - }, - "speed_infill":{ - "value":40.0 - }, - "speed_support_infill":{ - "value":45.0 - }, - "speed_print_layer_0":{ - "value":22.0 - }, - "speed_travel_layer_0":{ - "value":60 - }, - "speed_support_roof":{ - "value":30.0 - }, - "speed_support_bottom":{ - "dvalue":30.0 - }, - "speed_roofing":{ - "value":25.0 - } - } -} + "version": 2, + "name": "WEEFUN TINA2", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "WEEFUN", + "manufacturer": "WEEFUN", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 120 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for TINA2****)\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG1 Z105 F300\nG28 X0 Y0\nG1 Y90 F1000\nM203 Z30" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "WEEFUN TINA2" }, + "machine_start_gcode": { "default_value": ";(**** start.gcode for TINA2****)\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG1 Z10 F200\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000 \nG92 E0 ; Reset extruder position\n\nM203 Z5" }, + "machine_width": { "default_value": 100 }, + "retraction_amount": { "default_value": 3 }, + "retraction_count_max": { "default_value": 10 }, + "retraction_speed": { "default_value": 35 }, + "speed_infill": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "dvalue": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 }, + "support_xy_distance": { "default_value": 1.0 } + } +} \ No newline at end of file diff --git a/resources/definitions/weefun_tina2s.def.json b/resources/definitions/weefun_tina2s.def.json index cfc139bdfc..d23e0c356c 100644 --- a/resources/definitions/weefun_tina2s.def.json +++ b/resources/definitions/weefun_tina2s.def.json @@ -1,81 +1,41 @@ { - "name":"WEEFUN TINA2S", - "version":2, - "inherits":"weedo_base", - "metadata":{ - "visible":true, - "author":"WEEFUN", - "manufacturer":"WEEFUN", - "file_formats":"text/x-gcode", - "platform_offset":[ - 0, - 0, - 0 - ] - }, - "overrides":{ - "machine_extruder_count":{ - "default_value":1 - }, - "machine_heated_bed":{ - "default_value":true - }, - "machine_center_is_zero":{ - "default_value":false - }, - "machine_height":{ - "default_value":100 - }, - "machine_depth":{ - "default_value":120 - }, - "machine_width":{ - "default_value":100 - }, - "gantry_height":{ - "value":20 - }, - "machine_name":{ - "default_value":"WEEFUN TINA2S" - }, - "machine_start_gcode":{ - "default_value":";MachineType:TINA2S\n;FilamentType:{material_type}\n;Layer height:{layer_height}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n;InfillDensity:{infill_sparse_density}\n;(**** start.gcode for tina2s****)\nM203 Z5 ;Move Z axis up 5mm\nM117 Homing axes\nG28 Z; Home extruder axis Z\nG28 X Y; Home extruder axis X Y\nM117 Start Warm Up\nM140 S{material_bed_temperature} ;start heating the bed to what is set in Cura\nM104 S130 ;start heating E to 130 for preheat\nM190 S{material_bed_temperature} ;Wait for Bed Temperature\nM117 Levling the build plate\nG29\nG1 Z1.0 F3000 ;Move Z Axis up to 1mm\nG1 X0.5 Y1 ;Move hotend to starting position\nM117 Heating Hotend\nM104 S{material_initial_print_temperature} T0 ;start heating T0 to what is set in Cura\nM109 S{material_initial_print_temperature} T0 ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nM117 Purging and cleaning nozzle\nG1 X1.1 Y10 Z0.28 F1000.0 ;Move to start position\nG1 X1.1 Y90.0 Z0.28 F2000.0 E15 ;Draw the first line\nG1 X1.4 Y90.0 Z0.23 F5000.0 ;Move to side a little\nG1 X1.4 Y10 Z0.20 F2000.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X1 Y5 Z0.2 F5000.0 ;Move over to prevent blob squish\nM117 Printing..." - }, - "machine_end_gcode":{ - "default_value":";(**** end.gcode for tina2s****)\nM203 Z15 ;Move Z axis up 5mm\nM104 S0 ;Turn off extruder heating\nM140 S0 ;Turn off bed heating\nM107 ;Turn Fans off\nG92 E0 ;(Reset after prime)\nG0 E-1 F300 ;Retract Fillament 1mm\nG28 Z F300 ;Park Hotend up\nG28 X0 Y0 ;Park Hotend\nG1 Y90 F1000 ;Present finished model\nG0 E-2 F300 ;Retract Fillament 2mm\nM82 ;absolute extrusion mode\nM104 S0 ;Ensure hotend is off\nM117 Print Complete" - }, - "retraction_amount":{ - "default_value":3 - }, - "speed_wall_0":{ - "value":20.0 - }, - "speed_wall_x":{ - "value":25.0 - }, - "speed_topbottom":{ - "value":30.0 - }, - "speed_infill":{ - "value":40.0 - }, - "speed_support_infill":{ - "value":45.0 - }, - "speed_print_layer_0":{ - "value":22.0 - }, - "speed_travel_layer_0":{ - "value":60 - }, - "speed_support_roof":{ - "value":30.0 - }, - "speed_support_bottom":{ - "dvalue":30.0 - }, - "speed_roofing":{ - "value":25.0 - } - } -} + "version": 2, + "name": "WEEFUN TINA2S", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "WEEFUN", + "manufacturer": "WEEFUN", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": + { + "gantry_height": { "value": 20 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 120 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2s****)\nM203 Z15 ;Move Z axis up 5mm\nM104 S0 ;Turn off extruder heating\nM140 S0 ;Turn off bed heating\nM107 ;Turn Fans off\nG92 E0 ;(Reset after prime)\nG0 E-1 F300 ;Retract Fillament 1mm\nG28 Z F300 ;Park Hotend up\nG28 X0 Y0 ;Park Hotend\nG1 Y90 F1000 ;Present finished model\nG0 E-2 F300 ;Retract Fillament 2mm\nM82 ;absolute extrusion mode\nM104 S0 ;Ensure hotend is off\nM117 Print Complete" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "WEEFUN TINA2S" }, + "machine_start_gcode": { "default_value": ";MachineType:TINA2S\n;FilamentType:{material_type}\n;Layer height:{layer_height}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n;InfillDensity:{infill_sparse_density}\n;(**** start.gcode for tina2s****)\nM203 Z5 ;Move Z axis up 5mm\nM117 Homing axes\nG28 Z; Home extruder axis Z\nG28 X Y; Home extruder axis X Y\nM117 Start Warm Up\nM140 S{material_bed_temperature} ;start heating the bed to what is set in Cura\nM104 S130 ;start heating E to 130 for preheat\nM190 S{material_bed_temperature} ;Wait for Bed Temperature\nM117 Levling the build plate\nG29\nG1 Z1.0 F3000 ;Move Z Axis up to 1mm\nG1 X0.5 Y1 ;Move hotend to starting position\nM117 Heating Hotend\nM104 S{material_initial_print_temperature} T0 ;start heating T0 to what is set in Cura\nM109 S{material_initial_print_temperature} T0 ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nM117 Purging and cleaning nozzle\nG1 X1.1 Y10 Z0.28 F1000.0 ;Move to start position\nG1 X1.1 Y90.0 Z0.28 F2000.0 E15 ;Draw the first line\nG1 X1.4 Y90.0 Z0.23 F5000.0 ;Move to side a little\nG1 X1.4 Y10 Z0.20 F2000.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X1 Y5 Z0.2 F5000.0 ;Move over to prevent blob squish\nM117 Printing..." }, + "machine_width": { "default_value": 100 }, + "retraction_amount": { "default_value": 3 }, + "speed_infill": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "dvalue": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 } + } +} \ No newline at end of file diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json index 0cb088acdd..82cf9d9541 100644 --- a/resources/extruders/weedo_base_extruder_0.def.json +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "weedo_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From ac2adfd6ba7e9e85fcb8385c539e3c54a387faaf Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 20 Apr 2023 12:32:32 +0200 Subject: [PATCH 32/35] Add proper credentials in changelog --- resources/texts/change_log.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 72dffa0b86..548add9b7e 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -8,7 +8,7 @@ Restored and updated translations for 11 languages - Fixed a bug where a project files that contain an intent profile would not load correctly - Fixed a bug where Pause At Height was not working correctly for Griffin (UltiMaker printers) - Fixed a bug where slicing was blocked if initial printing temperature was higher than the printing temperature -- Fixed a bug where Gcode would display NOMESH instead of NONMESH +- Fixed a bug where Gcode would display NOMESH instead of NONMESH, contributed by ckvsoft - Fixed a bug where users were unable to slice with certain materials [5.3] From 68087b15519ba0743f30102d5e67ca4cebe909a4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 20 Apr 2023 23:11:42 +0200 Subject: [PATCH 33/35] Resolve failed printer definition linting. CURA-10332 | PP-249 --- resources/definitions/elegoo_base.def.json | 1 - resources/definitions/mixware_hyper_s.def.json | 1 - 2 files changed, 2 deletions(-) diff --git a/resources/definitions/elegoo_base.def.json b/resources/definitions/elegoo_base.def.json index ed0c6d1c9d..c18ecc5874 100644 --- a/resources/definitions/elegoo_base.def.json +++ b/resources/definitions/elegoo_base.def.json @@ -116,7 +116,6 @@ "support_brim_enable": { "value": "support_structure == 'normal' or support_structure == 'tree'" }, "support_brim_width": { - "default_value": 3, "value": "6 if support_structure == 'tree' else line_width * initial_layer_line_width_factor * 0.02 " }, "support_infill_angles": { "default_value": "[65]" }, diff --git a/resources/definitions/mixware_hyper_s.def.json b/resources/definitions/mixware_hyper_s.def.json index 2fbf273a78..95ee6f48e0 100644 --- a/resources/definitions/mixware_hyper_s.def.json +++ b/resources/definitions/mixware_hyper_s.def.json @@ -125,7 +125,6 @@ "speed_z_hop": { "default_value": 5 }, "support_angle": { "default_value": 60 }, "support_brim_enable": { "value": false }, - "support_brim_width": { "default_value": 4 }, "support_enable": { "default_value": true }, "support_infill_rate": { "value": 15 }, "support_interface_density": { "default_value": 33.333 }, From 29380a5ed79118ce9ab780c9cafd22266e05c33a Mon Sep 17 00:00:00 2001 From: rburema Date: Thu, 20 Apr 2023 21:33:03 +0000 Subject: [PATCH 34/35] Applied printer-linter format --- resources/definitions/elegoo_base.def.json | 5 +---- resources/definitions/mixware_hyper_s.def.json | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/resources/definitions/elegoo_base.def.json b/resources/definitions/elegoo_base.def.json index e6c9e5b5cd..2de07271fe 100644 --- a/resources/definitions/elegoo_base.def.json +++ b/resources/definitions/elegoo_base.def.json @@ -114,10 +114,7 @@ "support_angle": { "value": "45 if speed_print > 99.9 else 50" }, "support_bottom_offset": { "value": "-0.4" }, "support_brim_enable": { "value": "support_structure == 'normal' or support_structure == 'tree'" }, - "support_brim_width": - { - "value": "6 if support_structure == 'tree' else line_width * initial_layer_line_width_factor * 0.02 " - }, + "support_brim_width": { "value": "6 if support_structure == 'tree' else line_width * initial_layer_line_width_factor * 0.02 " }, "support_infill_angles": { "default_value": "[65]" }, "support_interface_density": { "default_value": 33.333 }, "support_interface_pattern": { "default_value": "lines" }, diff --git a/resources/definitions/mixware_hyper_s.def.json b/resources/definitions/mixware_hyper_s.def.json index 79917304c7..e59ee4f5a7 100644 --- a/resources/definitions/mixware_hyper_s.def.json +++ b/resources/definitions/mixware_hyper_s.def.json @@ -117,8 +117,8 @@ "speed_wall_x": { "value": "speed_wall" }, "speed_z_hop": { "default_value": 5 }, "support_angle": { "default_value": 60 }, - "support_brim_enable": { "value": false }, "support_bottom_stair_step_height": { "value": 0.2 }, + "support_brim_enable": { "value": false }, "support_brim_width": { "default_value": 4 }, "support_enable": { "default_value": true }, "support_interface_density": { "default_value": 80 }, From 6a704f48020deb5168e194b127dde83b0fd70579 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 21 Apr 2023 00:15:20 +0200 Subject: [PATCH 35/35] Fix printer definition linter problem (default brim width). --- resources/definitions/mixware_hyper_s.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/mixware_hyper_s.def.json b/resources/definitions/mixware_hyper_s.def.json index e59ee4f5a7..9268b99808 100644 --- a/resources/definitions/mixware_hyper_s.def.json +++ b/resources/definitions/mixware_hyper_s.def.json @@ -119,7 +119,6 @@ "support_angle": { "default_value": 60 }, "support_bottom_stair_step_height": { "value": 0.2 }, "support_brim_enable": { "value": false }, - "support_brim_width": { "default_value": 4 }, "support_enable": { "default_value": true }, "support_interface_density": { "default_value": 80 }, "support_interface_enable": { "default_value": true },