From 3606ac8bd61f145756ab296942274fe7a79f0d5c Mon Sep 17 00:00:00 2001 From: F-Fischer Date: Mon, 16 Sep 2019 16:23:35 -0300 Subject: [PATCH 01/28] Hellbot printers definitions added --- resources/definitions/hellbot_adonis.def.json | 33 +++++++++ .../definitions/hellbot_magna_I.def.json | 33 +++++++++ .../definitions/hellbot_magna_dual.def.json | 34 +++++++++ .../hellbot_adonis_extruder.def.json | 16 ++++ .../hellbot_magna_dual_extruder_1.def.json | 16 ++++ .../hellbot_magna_dual_extruder_2.def.json | 16 ++++ .../hellbot_magna_i_extruder.def.json | 16 ++++ resources/images/hellbot.png | Bin 0 -> 38425 bytes resources/meshes/hellbot_adonis.obj | 70 ++++++++++++++++++ resources/meshes/hellbot_magna.obj | 70 ++++++++++++++++++ 10 files changed, 304 insertions(+) create mode 100644 resources/definitions/hellbot_adonis.def.json create mode 100644 resources/definitions/hellbot_magna_I.def.json create mode 100644 resources/definitions/hellbot_magna_dual.def.json create mode 100644 resources/extruders/hellbot_adonis_extruder.def.json create mode 100644 resources/extruders/hellbot_magna_dual_extruder_1.def.json create mode 100644 resources/extruders/hellbot_magna_dual_extruder_2.def.json create mode 100644 resources/extruders/hellbot_magna_i_extruder.def.json create mode 100644 resources/images/hellbot.png create mode 100644 resources/meshes/hellbot_adonis.obj create mode 100644 resources/meshes/hellbot_magna.obj diff --git a/resources/definitions/hellbot_adonis.def.json b/resources/definitions/hellbot_adonis.def.json new file mode 100644 index 0000000000..25c120eb8e --- /dev/null +++ b/resources/definitions/hellbot_adonis.def.json @@ -0,0 +1,33 @@ + { + "version": 2, + "name": "Hellbot Adonis", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "MUX team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_adonis.obj", + "platform_texture": "hellbot.png", + "platform_offset": [0, -1, 0], + "has_materials": true, + "machine_extruder_trains": { + "0": "hellbot_adonis_extruder" + } + }, + "overrides": { + "machine_name": { + "default_value": "Hellbot Adonis" + }, + "machine_width": { + "default_value": 160 + }, + "machine_depth": { + "default_value": 160 + }, + "machine_height": { + "default_value": 160 + } + + } + } diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json new file mode 100644 index 0000000000..cf9762f134 --- /dev/null +++ b/resources/definitions/hellbot_magna_I.def.json @@ -0,0 +1,33 @@ + { + "version": 2, + "name": "Hellbot Magna I", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "MUX team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_magna.obj", + "platform_texture": "hellbot.png", + "platform_offset": [0, -1, 0], + "has_materials": true, + "machine_extruder_trains": { + "0": "hellbot_magna_i_extruder" + } + }, + "overrides": { + "machine_name": { + "default_value": "Hellbot Magna I" + }, + "machine_width": { + "default_value": 230 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 260 + } + + } + } diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json new file mode 100644 index 0000000000..5fa59e5a19 --- /dev/null +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -0,0 +1,34 @@ + { + "version": 2, + "name": "Hellbot Magna dual", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "MUX team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_magna.obj", + "platform_texture": "hellbot.png", + "platform_offset": [0, -1, 0], + "has_materials": true, + "machine_extruder_trains": { + "0": "hellbot_magna_dual_extruder_1", + "1": "hellbot_magna_dual_extruder_2" + } + }, + "overrides": { + "machine_name": { + "default_value": "Hellbot Magna I" + }, + "machine_width": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 260 + } + + } + } diff --git a/resources/extruders/hellbot_adonis_extruder.def.json b/resources/extruders/hellbot_adonis_extruder.def.json new file mode 100644 index 0000000000..3da0e95ef3 --- /dev/null +++ b/resources/extruders/hellbot_adonis_extruder.def.json @@ -0,0 +1,16 @@ + { + "id": "hellbot_adonis_extruder", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_adonis", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hellbot_magna_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_dual_extruder_1.def.json new file mode 100644 index 0000000000..f46290b503 --- /dev/null +++ b/resources/extruders/hellbot_magna_dual_extruder_1.def.json @@ -0,0 +1,16 @@ + { + "id": "hellbot_magna_dual_extruder_1", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_magna_dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hellbot_magna_dual_extruder_2.def.json b/resources/extruders/hellbot_magna_dual_extruder_2.def.json new file mode 100644 index 0000000000..5894970b78 --- /dev/null +++ b/resources/extruders/hellbot_magna_dual_extruder_2.def.json @@ -0,0 +1,16 @@ + { + "id": "hellbot_magna_dual_extruder_2", + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_magna_dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 1 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hellbot_magna_i_extruder.def.json b/resources/extruders/hellbot_magna_i_extruder.def.json new file mode 100644 index 0000000000..bb0822407c --- /dev/null +++ b/resources/extruders/hellbot_magna_i_extruder.def.json @@ -0,0 +1,16 @@ + { + "id": "hellbot_magna_i_extruder", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_magna_i", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/images/hellbot.png b/resources/images/hellbot.png new file mode 100644 index 0000000000000000000000000000000000000000..e39ac419dcabc0e09128ae7cc4561ca743c28c1d GIT binary patch literal 38425 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 Date: Wed, 25 Sep 2019 10:23:20 +0200 Subject: [PATCH 02/28] HMS434 update and material exclusion --- resources/definitions/hms434.def.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index e54b518a89..1901f87824 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -19,7 +19,7 @@ "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pva_175", "generic_tpu_175", - "imade3d_generic_petg_175", "imade3d_generic_pla_175", + "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", @@ -67,7 +67,8 @@ "machine_gcode_flavor": {"default_value": "RepRap (RepRap)" }, "material_print_temp_wait": {"default_value": false }, "material_bed_temp_wait": {"default_value": false }, - "machine_max_feedrate_z": {"default_value": 1200 }, + "machine_max_feedrate_z": {"default_value": 10 }, + "machine_acceleration": {"default_value": 1000 }, "machine_start_gcode": {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X-44 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nM117 HMS434 Printing ...\n\n" }, "machine_end_gcode": {"default_value": "" }, @@ -130,11 +131,12 @@ "speed_travel": {"value": "150"}, "speed_travel_layer_0": {"value": "speed_travel"}, "speed_support_interface": {"value": "speed_topbottom"}, + "speed_z_hop": {"value": 10}, "speed_slowdown_layers": {"value": 1}, - "acceleration_print": {"value": 200}, - "acceleration_travel": {"value": 200}, - "jerk_print": {"value": 5}, - "jerk_travel": {"value": 5}, + "acceleration_print": {"value": 1000}, + "acceleration_travel": {"value": 1000}, + "jerk_print": {"value": 10}, + "jerk_travel": {"value": 10}, "retraction_hop_enabled": {"value": false}, "retraction_hop": {"value": 1}, From 9f1b434a7ee2e7307ee12eaab105da9a429fff5f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 25 Sep 2019 11:15:21 +0200 Subject: [PATCH 03/28] Don't show support brim width if support brim is disabled --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 503f04e1c5..4f8a496b24 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4302,7 +4302,7 @@ "default_value": 8.0, "minimum_value": "0.0", "maximum_value_warning": "50.0", - "enabled": "support_enable or support_tree_enable", + "enabled": "(support_enable or support_tree_enable) and support_brim_enable", "settable_per_mesh": false, "settable_per_extruder": true, "limit_to_extruder": "support_infill_extruder_nr", @@ -4317,7 +4317,7 @@ "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))", - "enabled": "support_enable or support_tree_enable", + "enabled": "(support_enable or support_tree_enable) and support_brim_enable", "settable_per_mesh": false, "settable_per_extruder": true, "limit_to_extruder": "support_infill_extruder_nr" From 0c873d1757e2032e0039f193eb2ff125175fc25c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 25 Sep 2019 11:42:34 +0200 Subject: [PATCH 04/28] Fix inheritance of support interface line direction settings Fixes #6412. --- resources/definitions/fdmprinter.def.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4f8a496b24..4234ec9e5a 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4860,6 +4860,7 @@ "description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees).", "type": "[int]", "default_value": "[ ]", + "value": "support_interface_angles", "limit_to_extruder": "support_roof_extruder_nr", "enabled": "support_roof_enable and support_roof_pattern != 'concentric'", "settable_per_mesh": false, @@ -4871,6 +4872,7 @@ "description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees).", "type": "[int]", "default_value": "[ ]", + "value": "support_interface_angles", "limit_to_extruder": "support_bottom_extruder_nr", "enabled": "support_bottom_enable and support_bottom_pattern != 'concentric'", "settable_per_mesh": false, From 8b321bc39813765ea26fb5280713501e26dc9019 Mon Sep 17 00:00:00 2001 From: F-Fischer Date: Wed, 25 Sep 2019 13:52:42 -0300 Subject: [PATCH 05/28] Pull Request Requested changes --- resources/definitions/hellbot_magna_I.def.json | 6 +++--- resources/definitions/hellbot_magna_dual.def.json | 4 ++-- resources/extruders/hellbot_magna_dual_extruder_2.def.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json index cf9762f134..fd7aa32684 100644 --- a/resources/definitions/hellbot_magna_I.def.json +++ b/resources/definitions/hellbot_magna_I.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Hellbot Magna I", + "name": "Hellbot Magna 1", "inherits": "fdmprinter", "metadata": { "visible": true, @@ -17,10 +17,10 @@ }, "overrides": { "machine_name": { - "default_value": "Hellbot Magna I" + "default_value": "Hellbot Magna 1" }, "machine_width": { - "default_value": 230 + "default_value": 220 }, "machine_depth": { "default_value": 220 diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json index 5fa59e5a19..e258638a51 100644 --- a/resources/definitions/hellbot_magna_dual.def.json +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Hellbot Magna dual", + "name": "Hellbot Magna DUAL", "inherits": "fdmprinter", "metadata": { "visible": true, @@ -18,7 +18,7 @@ }, "overrides": { "machine_name": { - "default_value": "Hellbot Magna I" + "default_value": "Hellbot Magna DUAL" }, "machine_width": { "default_value": 220 diff --git a/resources/extruders/hellbot_magna_dual_extruder_2.def.json b/resources/extruders/hellbot_magna_dual_extruder_2.def.json index 5894970b78..ffa0831bd7 100644 --- a/resources/extruders/hellbot_magna_dual_extruder_2.def.json +++ b/resources/extruders/hellbot_magna_dual_extruder_2.def.json @@ -5,7 +5,7 @@ "inherits": "fdmextruder", "metadata": { "machine": "hellbot_magna_dual", - "position": "0" + "position": "1" }, "overrides": { From dbbeeef9a59004fabf0c9d301daadba862e8b45e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 26 Sep 2019 09:11:54 +0200 Subject: [PATCH 06/28] Don't render buildvolume if it's set to invisible --- cura/BuildVolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 42bf1b693a..e1dac12eba 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -202,7 +202,7 @@ class BuildVolume(SceneNode): self._disallowed_areas = areas def render(self, renderer): - if not self.getMeshData(): + if not self.getMeshData() or self.isVisible(): return True if not self._shader: From 5464a2075d0dda30045510bcbbe5eeda77b72fa1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 26 Sep 2019 09:44:56 +0200 Subject: [PATCH 07/28] Upgrade TiZYX quality profiles to most recent version Otherwise they don't get loaded. These profiles didn't use any of the settings that were renamed or removed, so they can be upgraded with just their setting version. Contributes to issue CURA-6774. --- .../tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg | 2 +- .../tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg | 2 +- .../tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg | 2 +- .../flex/tizyx_evy_dual_classic_flex_flex.inst.cfg | 2 +- .../flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg | 2 +- .../flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg | 2 +- .../flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg | 2 +- .../tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg | 2 +- .../pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg | 2 +- .../pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg | 2 +- .../pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg | 2 +- .../pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg | 2 +- .../pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg | 2 +- .../pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg | 2 +- .../tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg | 2 +- .../tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg | 2 +- .../pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg | 2 +- .../tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg | 2 +- resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg index b9dc375d5c..1d866e53d9 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg index 1d6b876e7c..95f8d69f97 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg index b43df0dd6d..7b8e48c20f 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg index 91b3fd4af8..923f3c6bc5 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg index a2163b4b9c..85823d9276 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg index 5d20e723f5..8fa9f08d41 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg index 0bce28b960..778be27b1c 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg index 7df01e2780..8e964d532b 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg index 23373fe772..fa4a7ce2fe 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg index 33b77ad3a5..a893ddc6d0 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg index b3729e0768..e276ddfd80 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg index 78777e60b8..2a1fb70852 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg index d8f8581f2c..6d2f668fef 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg index 653bcc6025..a61c7b7265 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg index 4070bebb23..9c66a0ad10 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg index 9dc8af8161..2cfba4db4a 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg index 6cd279dae0..89b0b8430c 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg index 35525ef307..f692c83267 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg index ac2d2fe4f1..fc6fd386d1 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg index dd66277727..480c98afd2 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg index 791bbed462..6e17c6a6b5 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg index e9986eb2fd..0e17655de0 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg index 198f2403a3..60b14a5f7a 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg index bc07b48393..c75f2cca4d 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg index 5c1fe91ca3..d47fbef04b 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg index 6152b0377e..abfc316453 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg index cadd4eb584..d3c7ad84d1 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg index 3ba5b74e13..34d66ff7de 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg index a9433d33c0..585205b8bb 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg index b9002fa1b3..1828fb55f8 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg index 298f94deb9..128aeef211 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 7 +setting_version = 10 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg b/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg index b307e33586..ef31e9482e 100644 --- a/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_k25 [metadata] quality_type = draft -setting_version = 7 +setting_version = 10 type = quality global_quality = True From 241ca56e6ebd7456237c36ecc944043126c1531d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 26 Sep 2019 09:46:02 +0200 Subject: [PATCH 08/28] Fix stupid derp issue I really need coffee before coding --- cura/BuildVolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index e1dac12eba..a640760471 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -202,7 +202,7 @@ class BuildVolume(SceneNode): self._disallowed_areas = areas def render(self, renderer): - if not self.getMeshData() or self.isVisible(): + if not self.getMeshData() or not self.isVisible(): return True if not self._shader: From 541bd3811ed0ff2e63b88f55a428ffeb3116ad8c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 26 Sep 2019 10:33:44 +0200 Subject: [PATCH 09/28] Fix whitespace Contributes to issue CURA-6813. --- resources/definitions/hellbot_adonis.def.json | 65 +++++++++--------- .../definitions/hellbot_magna_I.def.json | 65 +++++++++--------- .../definitions/hellbot_magna_dual.def.json | 67 +++++++++---------- .../hellbot_adonis_extruder.def.json | 3 +- .../hellbot_magna_dual_extruder_1.def.json | 3 +- .../hellbot_magna_dual_extruder_2.def.json | 3 +- .../hellbot_magna_i_extruder.def.json | 3 +- 7 files changed, 101 insertions(+), 108 deletions(-) diff --git a/resources/definitions/hellbot_adonis.def.json b/resources/definitions/hellbot_adonis.def.json index 25c120eb8e..a73c66a611 100644 --- a/resources/definitions/hellbot_adonis.def.json +++ b/resources/definitions/hellbot_adonis.def.json @@ -1,33 +1,32 @@ - { - "version": 2, - "name": "Hellbot Adonis", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "MUX team", - "manufacturer": "Hellbot", - "file_formats": "text/x-gcode", - "platform": "hellbot_adonis.obj", - "platform_texture": "hellbot.png", - "platform_offset": [0, -1, 0], - "has_materials": true, - "machine_extruder_trains": { - "0": "hellbot_adonis_extruder" - } - }, - "overrides": { - "machine_name": { - "default_value": "Hellbot Adonis" - }, - "machine_width": { - "default_value": 160 - }, - "machine_depth": { - "default_value": 160 - }, - "machine_height": { - "default_value": 160 - } - - } - } +{ + "version": 2, + "name": "Hellbot Adonis", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "MUX team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_adonis.obj", + "platform_texture": "hellbot.png", + "platform_offset": [0, -1, 0], + "has_materials": true, + "machine_extruder_trains": { + "0": "hellbot_adonis_extruder" + } + }, + "overrides": { + "machine_name": { + "default_value": "Hellbot Adonis" + }, + "machine_width": { + "default_value": 160 + }, + "machine_depth": { + "default_value": 160 + }, + "machine_height": { + "default_value": 160 + } + } +} diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json index fd7aa32684..453dcef718 100644 --- a/resources/definitions/hellbot_magna_I.def.json +++ b/resources/definitions/hellbot_magna_I.def.json @@ -1,33 +1,32 @@ - { - "version": 2, - "name": "Hellbot Magna 1", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "MUX team", - "manufacturer": "Hellbot", - "file_formats": "text/x-gcode", - "platform": "hellbot_magna.obj", - "platform_texture": "hellbot.png", - "platform_offset": [0, -1, 0], - "has_materials": true, - "machine_extruder_trains": { - "0": "hellbot_magna_i_extruder" - } - }, - "overrides": { - "machine_name": { - "default_value": "Hellbot Magna 1" - }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 260 - } - - } - } +{ + "version": 2, + "name": "Hellbot Magna 1", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "MUX team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_magna.obj", + "platform_texture": "hellbot.png", + "platform_offset": [0, -1, 0], + "has_materials": true, + "machine_extruder_trains": { + "0": "hellbot_magna_i_extruder" + } + }, + "overrides": { + "machine_name": { + "default_value": "Hellbot Magna 1" + }, + "machine_width": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 260 + } + } +} diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json index e258638a51..2870c2e800 100644 --- a/resources/definitions/hellbot_magna_dual.def.json +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -1,34 +1,33 @@ - { - "version": 2, - "name": "Hellbot Magna DUAL", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "MUX team", - "manufacturer": "Hellbot", - "file_formats": "text/x-gcode", - "platform": "hellbot_magna.obj", - "platform_texture": "hellbot.png", - "platform_offset": [0, -1, 0], - "has_materials": true, - "machine_extruder_trains": { - "0": "hellbot_magna_dual_extruder_1", - "1": "hellbot_magna_dual_extruder_2" - } - }, - "overrides": { - "machine_name": { - "default_value": "Hellbot Magna DUAL" - }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 260 - } - - } - } +{ + "version": 2, + "name": "Hellbot Magna DUAL", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "MUX team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_magna.obj", + "platform_texture": "hellbot.png", + "platform_offset": [0, -1, 0], + "has_materials": true, + "machine_extruder_trains": { + "0": "hellbot_magna_dual_extruder_1", + "1": "hellbot_magna_dual_extruder_2" + } + }, + "overrides": { + "machine_name": { + "default_value": "Hellbot Magna DUAL" + }, + "machine_width": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 260 + } + } +} diff --git a/resources/extruders/hellbot_adonis_extruder.def.json b/resources/extruders/hellbot_adonis_extruder.def.json index 3da0e95ef3..4201f6b393 100644 --- a/resources/extruders/hellbot_adonis_extruder.def.json +++ b/resources/extruders/hellbot_adonis_extruder.def.json @@ -1,5 +1,4 @@ - { - "id": "hellbot_adonis_extruder", +{ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/hellbot_magna_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_dual_extruder_1.def.json index f46290b503..a31a3fdd70 100644 --- a/resources/extruders/hellbot_magna_dual_extruder_1.def.json +++ b/resources/extruders/hellbot_magna_dual_extruder_1.def.json @@ -1,5 +1,4 @@ - { - "id": "hellbot_magna_dual_extruder_1", +{ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/hellbot_magna_dual_extruder_2.def.json b/resources/extruders/hellbot_magna_dual_extruder_2.def.json index ffa0831bd7..651c39d53b 100644 --- a/resources/extruders/hellbot_magna_dual_extruder_2.def.json +++ b/resources/extruders/hellbot_magna_dual_extruder_2.def.json @@ -1,5 +1,4 @@ - { - "id": "hellbot_magna_dual_extruder_2", +{ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", diff --git a/resources/extruders/hellbot_magna_i_extruder.def.json b/resources/extruders/hellbot_magna_i_extruder.def.json index bb0822407c..dc63081bd2 100644 --- a/resources/extruders/hellbot_magna_i_extruder.def.json +++ b/resources/extruders/hellbot_magna_i_extruder.def.json @@ -1,5 +1,4 @@ - { - "id": "hellbot_magna_i_extruder", +{ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", From 0161a1eca5e177fe876fb879111b8ad14aacf89d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 26 Sep 2019 11:14:01 +0200 Subject: [PATCH 10/28] Fix dual extrusion for Magna Dual Contributes to issue CURA-6813. --- resources/definitions/hellbot_magna_dual.def.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json index 2870c2e800..5ee36e0749 100644 --- a/resources/definitions/hellbot_magna_dual.def.json +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -28,6 +28,9 @@ }, "machine_height": { "default_value": 260 + }, + "machine_extruder_count": { + "default_value": 2 } } } From 53a535a077305716f2a389b8379e39874637e8e2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 26 Sep 2019 17:05:05 +0200 Subject: [PATCH 11/28] Warn when difference between X/Y distance and minimum X/Y distance is too big This could cause a large overhang. Contributes to issue CURA-6106. --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4234ec9e5a..cedcc3b036 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4403,6 +4403,7 @@ "unit": "mm", "type": "float", "minimum_value": "0", + "minimum_value_warning": "support_xy_distance - support_line_width * 2", "maximum_value_warning": "support_xy_distance", "default_value": 0.2, "value": "machine_nozzle_size / 2", From 827f84bd6a34de7d052bbbccaa18391e750a3bcd Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Thu, 26 Sep 2019 19:26:10 -0600 Subject: [PATCH 12/28] Set BIBO print speed to 40mm/s BIBO and members from the BIBO group on Facebook say this printer should be run at 40-45mm/s and not the FDMprinter default of 60mm/s. BIBO provided test gcode files also show that they are setting 40mm/s in the slicer to create their test files. This change sets the print speed override so the printer profile does not start at the FDMPrinter print speed default of 60mm/s but at the reccommended value of 40mm/s --- resources/definitions/bibo2_dual.def.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/definitions/bibo2_dual.def.json b/resources/definitions/bibo2_dual.def.json index e86c979260..dbfb03a0c9 100644 --- a/resources/definitions/bibo2_dual.def.json +++ b/resources/definitions/bibo2_dual.def.json @@ -78,6 +78,9 @@ "machine_end_gcode": { "default_value": ";End GCode\nM104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91\nG1 Z1 F100 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-2 X-20 Y-20 F300 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, + "speed_print": { + "default_value": 40 + }, "machine_extruder_count": { "default_value": 2 }, From 45cc1e87632638cc75a00aeb94c38337439c2db0 Mon Sep 17 00:00:00 2001 From: MatthewCroughan Date: Fri, 27 Sep 2019 02:50:20 +0100 Subject: [PATCH 13/28] Add StartupWMClass=cura.real in order to group windows properly in Gnome and more. This has been infuriating me for the past few weeks. The result of this change is that when you use Cura as built from source or via thopiekar's PPA the Gnome shortcut will act only as a launcher for potentially infinite instances of Cura. That is, if you keep clicking it, it will open up more and more instances of Cura. This is because the class cura.real is not present or specified in the desktop file. See this askubuntu thread on the topic; https://askubuntu.com/questions/367396/what-does-the-startupwmclass-field-of-a-desktop-file-represent/367851#367851 Simply adding "StartupWMClass=cura.real" allows Cura to behave like a normal application in all desktop environments that implement .desktop. Cura can now spawn children and in gnome in particular has options for spawning a New Window, rather than a runaway "Spawn more instances" as you click the launcher. This has been particularly annoying for me, as in a makerspace I attend where I have set up a dedicated Cura machine people have been opening several instances of Cura because of this flaw. --- cura.desktop.in | 1 + 1 file changed, 1 insertion(+) diff --git a/cura.desktop.in b/cura.desktop.in index 2502327203..1e17e30f4e 100644 --- a/cura.desktop.in +++ b/cura.desktop.in @@ -16,3 +16,4 @@ Type=Application MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;text/x-gcode;application/x-amf;application/x-ply;application/x-ctm;model/vnd.collada+xml;model/gltf-binary;model/gltf+json;model/vnd.collada+xml+zip; Categories=Graphics; Keywords=3D;Printing;Slicer; +StartupWMClass=cura.real From 93c1c88793d2c1bb961e03cc53bd4f9106e8c3fe Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 27 Sep 2019 13:38:13 +0200 Subject: [PATCH 14/28] Only show cloud flow message when signed in and not cloud connected yet, fix machine configuration when using legacy network selection flow --- .../LocalClusterOutputDeviceManager.py | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py index b725224d81..922d926f02 100644 --- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py @@ -92,10 +92,7 @@ class LocalClusterOutputDeviceManager: ## Connect the active machine to a given device. def associateActiveMachineWithPrinterDevice(self, device: LocalClusterOutputDevice) -> None: - active_machine = CuraApplication.getInstance().getGlobalContainerStack() - if not active_machine: - return - self._connectToOutputDevice(device, active_machine) + self._createMachineFromDiscoveredDevice(device.getId()) ## Callback for when the active machine was changed by the user or a new remote cluster was found. def _connectToActiveMachine(self) -> None: @@ -111,7 +108,7 @@ class LocalClusterOutputDeviceManager: self._connectToOutputDevice(device, active_machine) elif device.key in output_device_manager.getOutputDeviceIds(): # Remove device if it is not meant for the active machine. - CuraApplication.getInstance().getOutputDeviceManager().removeOutputDevice(device.key) + output_device_manager.removeOutputDevice(device.key) ## Callback for when a manual device check request was responded to. def _onCheckManualDeviceResponse(self, address: str, status: PrinterSystemStatus, @@ -201,7 +198,7 @@ class LocalClusterOutputDeviceManager: if not active_machine: return self._connectToOutputDevice(device, active_machine) - CloudFlowMessage(device.ipAddress).show() # Nudge the user to start using Ultimaker Cloud. + self._showCloudFlowMessage(device) ## Add an address to the stored preferences. def _storeManualAddress(self, address: str) -> None: @@ -248,3 +245,14 @@ class LocalClusterOutputDeviceManager: output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() if device.key not in output_device_manager.getOutputDeviceIds(): output_device_manager.addOutputDevice(device) + + ## Nudge the user to start using Ultimaker Cloud. + @staticmethod + def _showCloudFlowMessage(device: LocalClusterOutputDevice) -> None: + if CuraApplication.getInstance().getMachineManager().activeMachineIsUsingCloudConnection: + # This printer is already cloud connected, so we do not bother the user anymore. + return + if not CuraApplication.getInstance().getCuraAPI().account.isLoggedIn: + # Do not show the message if the user is not signed in. + return + CloudFlowMessage(device.ipAddress).show() From abfd7e9266a60a0a6defe3fad92c05b74f2daae2 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 27 Sep 2019 16:37:19 +0200 Subject: [PATCH 15/28] Do not show the "load project or models" dialog when opening a file from a command line argument --- cura/CuraApplication.py | 6 +++--- cura/SingleInstance.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 2c225f31e8..b2970aeeaa 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -805,7 +805,7 @@ class CuraApplication(QtApplication): def _onPostStart(self): for file_name in self._files_to_open: - self.callLater(self._openFile, file_name) + self.callLater(self._openFile, file_name, True) for file_name in self._open_file_queue: # Open all the files that were queued up while plug-ins were loading. self.callLater(self._openFile, file_name) @@ -1549,8 +1549,8 @@ class CuraApplication(QtApplication): return job._node.setMeshData(mesh_data) - def _openFile(self, filename): - self.readLocalFile(QUrl.fromLocalFile(filename)) + def _openFile(self, filename, skip_project_file_check = False): + self.readLocalFile(QUrl.fromLocalFile(filename), skip_project_file_check) def _addProfileReader(self, profile_reader): # TODO: Add the profile reader to the list of plug-ins that can be used when importing profiles. diff --git a/cura/SingleInstance.py b/cura/SingleInstance.py index cf07b143c6..e6e48ea1df 100644 --- a/cura/SingleInstance.py +++ b/cura/SingleInstance.py @@ -87,9 +87,9 @@ class SingleInstance: if command == "clear-all": self._application.callLater(lambda: self._application.deleteAll()) - # Command: Load a model file + # Command: Load a model or project file elif command == "open": - self._application.callLater(lambda f = payload["filePath"]: self._application._openFile(f)) + self._application.callLater(lambda f, skip_check = payload["filePath"]: self._application._openFile(f, skip_check)) # Command: Activate the window and bring it to the top. elif command == "focus": From 2c12d713e39ad3327eb31cf322cd0ded43ce7c23 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Fri, 27 Sep 2019 16:50:28 +0200 Subject: [PATCH 16/28] Revert "Do not show the "load project or models" dialog when opening a file from a command line argument" This reverts commit abfd7e92, because the desired behavior has still tbd --- cura/CuraApplication.py | 6 +++--- cura/SingleInstance.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index b2970aeeaa..2c225f31e8 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -805,7 +805,7 @@ class CuraApplication(QtApplication): def _onPostStart(self): for file_name in self._files_to_open: - self.callLater(self._openFile, file_name, True) + self.callLater(self._openFile, file_name) for file_name in self._open_file_queue: # Open all the files that were queued up while plug-ins were loading. self.callLater(self._openFile, file_name) @@ -1549,8 +1549,8 @@ class CuraApplication(QtApplication): return job._node.setMeshData(mesh_data) - def _openFile(self, filename, skip_project_file_check = False): - self.readLocalFile(QUrl.fromLocalFile(filename), skip_project_file_check) + def _openFile(self, filename): + self.readLocalFile(QUrl.fromLocalFile(filename)) def _addProfileReader(self, profile_reader): # TODO: Add the profile reader to the list of plug-ins that can be used when importing profiles. diff --git a/cura/SingleInstance.py b/cura/SingleInstance.py index e6e48ea1df..cf07b143c6 100644 --- a/cura/SingleInstance.py +++ b/cura/SingleInstance.py @@ -87,9 +87,9 @@ class SingleInstance: if command == "clear-all": self._application.callLater(lambda: self._application.deleteAll()) - # Command: Load a model or project file + # Command: Load a model file elif command == "open": - self._application.callLater(lambda f, skip_check = payload["filePath"]: self._application._openFile(f, skip_check)) + self._application.callLater(lambda f = payload["filePath"]: self._application._openFile(f)) # Command: Activate the window and bring it to the top. elif command == "focus": From 01e665a0d72cbf0552d34d6199f5826cf205a6fa Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 27 Sep 2019 19:25:23 +0200 Subject: [PATCH 17/28] Partial revert of #6432, actually fix refreshing configurations --- .../src/Network/LocalClusterOutputDeviceManager.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py index 922d926f02..d972832751 100644 --- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py @@ -92,7 +92,11 @@ class LocalClusterOutputDeviceManager: ## Connect the active machine to a given device. def associateActiveMachineWithPrinterDevice(self, device: LocalClusterOutputDevice) -> None: - self._createMachineFromDiscoveredDevice(device.getId()) + active_machine = CuraApplication.getInstance().getGlobalContainerStack() + if not active_machine: + return + self._connectToOutputDevice(device, active_machine) + self._connectToActiveMachine() ## Callback for when the active machine was changed by the user or a new remote cluster was found. def _connectToActiveMachine(self) -> None: From b18f9469bfde7c1c95d6e1a44fd1c4c807abf612 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 27 Sep 2019 20:39:57 +0200 Subject: [PATCH 18/28] Select correct machine type connecting to output device --- .../src/Network/LocalClusterOutputDeviceManager.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py index d972832751..ab23fd56c9 100644 --- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py @@ -250,6 +250,13 @@ class LocalClusterOutputDeviceManager: if device.key not in output_device_manager.getOutputDeviceIds(): output_device_manager.addOutputDevice(device) + # Pre-select the correct machine type of the group host. + # We first need to find the correct definition because the machine manager only takes name as input, not ID. + definitions = CuraApplication.getInstance().getContainerRegistry().findContainers(id=device.printerType) + if not definitions: + return + CuraApplication.getInstance().getMachineManager().switchPrinterType(definitions[0].getName()) + ## Nudge the user to start using Ultimaker Cloud. @staticmethod def _showCloudFlowMessage(device: LocalClusterOutputDevice) -> None: From 9e54cc33cee8ae1e4e383bf28b72a942c2af56cd Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 27 Sep 2019 20:50:46 +0200 Subject: [PATCH 19/28] Move code --- .../src/Network/LocalClusterOutputDeviceManager.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py index ab23fd56c9..557de4ec80 100644 --- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py @@ -98,6 +98,13 @@ class LocalClusterOutputDeviceManager: self._connectToOutputDevice(device, active_machine) self._connectToActiveMachine() + # Pre-select the correct machine type of the group host. + # We first need to find the correct definition because the machine manager only takes name as input, not ID. + definitions = CuraApplication.getInstance().getContainerRegistry().findContainers(id = device.printerType) + if not definitions: + return + CuraApplication.getInstance().getMachineManager().switchPrinterType(definitions[0].getName()) + ## Callback for when the active machine was changed by the user or a new remote cluster was found. def _connectToActiveMachine(self) -> None: active_machine = CuraApplication.getInstance().getGlobalContainerStack() @@ -250,13 +257,6 @@ class LocalClusterOutputDeviceManager: if device.key not in output_device_manager.getOutputDeviceIds(): output_device_manager.addOutputDevice(device) - # Pre-select the correct machine type of the group host. - # We first need to find the correct definition because the machine manager only takes name as input, not ID. - definitions = CuraApplication.getInstance().getContainerRegistry().findContainers(id=device.printerType) - if not definitions: - return - CuraApplication.getInstance().getMachineManager().switchPrinterType(definitions[0].getName()) - ## Nudge the user to start using Ultimaker Cloud. @staticmethod def _showCloudFlowMessage(device: LocalClusterOutputDevice) -> None: From 99832c3a68403c0f67a6bb3465fbef8ea877c2ef Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 27 Sep 2019 21:09:53 +0200 Subject: [PATCH 20/28] Use printer type name instead of id --- .../resources/qml/DiscoverUM3Action.qml | 5 +---- .../src/UltimakerNetworkedPrinterOutputDevice.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml index b27416e199..a604bac20c 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml @@ -212,10 +212,7 @@ Cura.MachineAction text: { if (base.selectedDevice) { - // It would be great to use a more readable machine type here, - // but the new discoveredPrintersModel is not used yet in the UM networking actions. - // TODO: remove actions or replace 'connect via network' button with new flow? - return base.selectedDevice.printerType + return base.selectedDevice.printerTypeName } return "" } diff --git a/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py index 02ce91800d..73b5b456f9 100644 --- a/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py @@ -60,9 +60,13 @@ class UltimakerNetworkedPrinterOutputDevice(NetworkedPrinterOutputDevice): self._time_of_last_response = time() self._time_of_last_request = time() - # Set the display name from the properties + # Set the display name from the properties. self.setName(self.getProperty("name")) + # Set the display name of the printer type. + definitions = CuraApplication.getInstance().getContainerRegistry().findContainers(id = self.printerType) + self._printer_type_name = definitions[0].getName() if definitions else "" + # Keeps track of all printers in the cluster. self._printers = [] # type: List[PrinterOutputModel] self._has_received_printers = False @@ -87,6 +91,11 @@ class UltimakerNetworkedPrinterOutputDevice(NetworkedPrinterOutputDevice): def address(self) -> str: return self._address + ## The display name of the printer. + @pyqtProperty(str, constant=True) + def printerTypeName(self) -> str: + return self._printer_type_name + # Get all print jobs for this cluster. @pyqtProperty("QVariantList", notify=printJobsChanged) def printJobs(self) -> List[UM3PrintJobOutputModel]: From cfc296de377b97c32ffb0436fe5d3d6de8265fd8 Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Sat, 28 Sep 2019 10:36:05 +0200 Subject: [PATCH 21/28] Update ActionPanelWidget.qml Find this whitespace strange. Shouldn't this normally give an error? Or is this allowed due to the syntax? --- resources/qml/ActionPanel/ActionPanelWidget.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/ActionPanel/ActionPanelWidget.qml b/resources/qml/ActionPanel/ActionPanelWidget.qml index 4d61380c99..6efa77518b 100644 --- a/resources/qml/ActionPanel/ActionPanelWidget.qml +++ b/resources/qml/ActionPanel/ActionPanelWidget.qml @@ -27,7 +27,7 @@ Item width: UM.Theme.getSize("action_panel_widget").width height: childrenRect.height + 2 * UM.Theme.getSize("thick_margin").height - anchors. right: parent.right + anchors.right: parent.right color: UM.Theme.getColor("main_background") border.width: UM.Theme.getSize("default_lining").width border.color: UM.Theme.getColor("lining") @@ -103,4 +103,4 @@ Item CuraApplication.additionalComponents["saveButton"][component].parent = additionalComponentsRow } } -} \ No newline at end of file +} From 3c17af61920880cd9b2e8384c54cb08e85d242b4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Sun, 29 Sep 2019 18:25:11 +0200 Subject: [PATCH 22/28] Clarify description of support interface area settings They'll be generated and then tossed away. I'm specifying that there will be normal support in its place, unlike the minimum support area setting that replaces the support with air. It won't be air here, but normal support. --- resources/definitions/fdmprinter.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4234ec9e5a..6e729f2111 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4757,7 +4757,7 @@ "minimum_interface_area": { "label": "Minimum Support Interface Area", - "description": "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will not be generated.", + "description": "Minimum area size for support interface polygons. Polygons which have an area smaller than this value will be printed as normal support.", "unit": "mm²", "type": "float", "default_value": 1.0, @@ -4771,7 +4771,7 @@ "minimum_roof_area": { "label": "Minimum Support Roof Area", - "description": "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will not be generated.", + "description": "Minimum area size for the roofs of the support. Polygons which have an area smaller than this value will be printed as normal support.", "unit": "mm²", "type": "float", "default_value": 1.0, @@ -4785,7 +4785,7 @@ "minimum_bottom_area": { "label": "Minimum Support Floor Area", - "description": "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will not be generated.", + "description": "Minimum area size for the floors of the support. Polygons which have an area smaller than this value will be printed as normal support.", "unit": "mm²", "type": "float", "default_value": 1.0, From f57528ef1ae7e4e7fb5189c4d025f03e8c4ca190 Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Sun, 29 Sep 2019 21:20:11 +0200 Subject: [PATCH 23/28] CuraApplication: Some formatting around messageBox functions Just preventing some long lines. --- cura/CuraApplication.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 2c225f31e8..c8faae3704 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -632,9 +632,17 @@ class CuraApplication(QtApplication): ## A reusable dialogbox # - showMessageBox = pyqtSignal(str, str, str, str, int, int, arguments = ["title", "text", "informativeText", "detailedText", "buttons", "icon"]) + showMessageBox = pyqtSignal(str,str, str, str, int, int, + arguments = ["title", "text", "informativeText", "detailedText","buttons", "icon"]) - def messageBox(self, title, text, informativeText = "", detailedText = "", buttons = QMessageBox.Ok, icon = QMessageBox.NoIcon, callback = None, callback_arguments = []): + def messageBox(self, title, text, + informativeText = "", + detailedText = "", + buttons = QMessageBox.Ok, + icon = QMessageBox.NoIcon, + callback = None, + callback_arguments = [] + ): self._message_box_callback = callback self._message_box_callback_arguments = callback_arguments self.showMessageBox.emit(title, text, informativeText, detailedText, buttons, icon) From 6228b30d622c2b60c5968bae94005b91628dd078 Mon Sep 17 00:00:00 2001 From: oorail Date: Sun, 29 Sep 2019 18:52:40 -0400 Subject: [PATCH 24/28] Changed the JG Aurora z603s definition to send the print head to the rear of the printer. The z603S is a COREXY style printer, unlike the other JG Aurora printers where moving the Y-axis shifts the bed to the front for easy print removal. On the z603s, it shoves the print head into the frame of the printer, the X-axis bar and the print head are then in the way, making it difficult to remove the print. The z603S should have the print head homed on X and Y axis to tuck it out of the way in the rear right of the printer --- resources/definitions/jgaurora_z_603s.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/jgaurora_z_603s.def.json b/resources/definitions/jgaurora_z_603s.def.json index cf92f2fc71..0076a050fc 100644 --- a/resources/definitions/jgaurora_z_603s.def.json +++ b/resources/definitions/jgaurora_z_603s.def.json @@ -21,7 +21,7 @@ "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" }, "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" + "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG28 Y0 ;move to the Y-axis origin (Home) for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" }, "machine_width": { "default_value": 280 From 5c2c4118c611ce793bd07f11b4a2f07781d708d3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 30 Sep 2019 12:58:36 +0200 Subject: [PATCH 25/28] Add clarification about that supported overhang doesn't fall into this category Fixes #6436. --- 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 6e729f2111..86d918675c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7084,7 +7084,7 @@ "wall_overhang_angle": { "label": "Overhanging Wall Angle", - "description": "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging.", + "description": "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either.", "unit": "°", "type": "float", "minimum_value": "0", From eb1d0248c2f1d3e5ed1d49f42fec3efc79814a02 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 30 Sep 2019 15:47:24 +0200 Subject: [PATCH 26/28] Update translations for Cura 4.3 These are the new translations for Cura 4.3 for Polish. These are too late, but in the future we may work on these. --- resources/i18n/pl_PL/cura.po | 124 +++++++------- resources/i18n/pl_PL/fdmprinter.def.json.po | 176 ++++++++++---------- 2 files changed, 152 insertions(+), 148 deletions(-) diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index 9f1aabd914..79ec7b48af 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-09-10 16:55+0200\n" -"PO-Revision-Date: 2019-05-27 13:29+0200\n" +"PO-Revision-Date: 2019-09-24 17:00+0200\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" "Language: pl_PL\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 2.2.3\n" "X-Poedit-SourceCharset: UTF-8\n" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28 @@ -89,7 +89,7 @@ msgstr "Profil został spłaszczony i aktywowany." #: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "AMF File" -msgstr "" +msgstr "Plik AMF" #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 msgctxt "@item:inmenu" @@ -119,12 +119,12 @@ msgstr "Trwa drukowanie przez USB, zamknięcie Cura spowoduje jego zatrzymanie. #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:127 msgctxt "@message" msgid "A print is still in progress. Cura cannot start another print via USB until the previous print has completed." -msgstr "" +msgstr "Nadal trwa drukowanie. Cura nie może rozpocząć kolejnego wydruku przez USB, dopóki poprzedni wydruk nie zostanie zakończony." #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:127 msgctxt "@message" msgid "Print in Progress" -msgstr "" +msgstr "Drukowanie w toku" #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" @@ -295,28 +295,28 @@ msgstr "Połączone przez sieć" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadBlockedMessage.py:15 msgctxt "@info:status" msgid "Please wait until the current job has been sent." -msgstr "" +msgstr "Poczekaj, aż bieżące zadanie zostanie wysłane." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadBlockedMessage.py:16 msgctxt "@info:title" msgid "Print error" -msgstr "" +msgstr "Błąd druku" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format msgctxt "@info:status" msgid "You are attempting to connect to {0} but it is not the host of a group. You can visit the web page to configure it as a group host." -msgstr "" +msgstr "Próbujesz połączyć się z {0}, ale nie jest to gospodarz grupy. Możesz odwiedzić stronę internetową, aby skonfigurować jako gospodarza." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:30 msgctxt "@info:title" msgid "Not a group host" -msgstr "" +msgstr "Nie jest gospodarzem grupy" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:35 msgctxt "@action" msgid "Configure group" -msgstr "" +msgstr "Konfiguruj grupę" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py:27 msgctxt "@info:status" @@ -326,7 +326,7 @@ msgstr "Wyślij i nadzoruj zadania druku z każdego miejsca, używając konta Ul #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py:33 msgctxt "@info:status Ultimaker Cloud should not be translated." msgid "Connect to Ultimaker Cloud" -msgstr "" +msgstr "Połacz z Ultimaker Cloud" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py:36 msgctxt "@action" @@ -341,7 +341,7 @@ msgstr "Wysyłanie zadania druku" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadProgressMessage.py:15 msgctxt "@info:status" msgid "Uploading print job to printer." -msgstr "" +msgstr "Przesyłanie zadania do drukarki." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py:15 msgctxt "@info:status" @@ -356,23 +356,23 @@ msgstr "Dane Wysłane" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:18 msgctxt "@info:status" msgid "You are attempting to connect to a printer that is not running Ultimaker Connect. Please update the printer to the latest firmware." -msgstr "" +msgstr "Próbujesz połączyć się z drukarką, na której nie działa Ultimaker Connect. Zaktualizuj drukarkę do najnowszej wersji firmware." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py:21 msgctxt "@info:title" msgid "Update your printer" -msgstr "" +msgstr "Zaktualizuj swoją drukarkę" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/MaterialSyncMessage.py:24 #, python-brace-format msgctxt "@info:status" msgid "Cura has detected material profiles that were not yet installed on the host printer of group {0}." -msgstr "" +msgstr "Cura wykryła profile materiałów, które nie zostały jeszcze zainstalowane na gospodarzu grupy {0}." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/MaterialSyncMessage.py:26 msgctxt "@info:title" msgid "Sending materials to printer" -msgstr "" +msgstr "Wysyłanie materiałów do drukarki" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadErrorMessage.py:15 msgctxt "@info:text" @@ -382,7 +382,7 @@ msgstr "Nie można wgrać danych do drukarki." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadErrorMessage.py:16 msgctxt "@info:title" msgid "Network error" -msgstr "" +msgstr "Błąd sieci" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Utils.py:27 msgctxt "@info:status" @@ -504,32 +504,32 @@ msgstr "Obraz GIF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:15 msgctxt "@item:inlistbox" msgid "Open Compressed Triangle Mesh" -msgstr "" +msgstr "Otwórz skompresowaną siatkę trójkątów" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:19 msgctxt "@item:inlistbox" msgid "COLLADA Digital Asset Exchange" -msgstr "" +msgstr "Cyfrowa wymiana zasobów COLLADA" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:23 msgctxt "@item:inlistbox" msgid "glTF Binary" -msgstr "" +msgstr "Biblioteka glTF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:27 msgctxt "@item:inlistbox" msgid "glTF Embedded JSON" -msgstr "" +msgstr "Załączony JSON glTF" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:36 msgctxt "@item:inlistbox" msgid "Stanford Triangle Format" -msgstr "" +msgstr "Format trójkątów Stanforda" #: /home/ruben/Projects/Cura/plugins/TrimeshReader/__init__.py:40 msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" -msgstr "" +msgstr "Skompresowana cyfrowa wymiana zasobów COLLADA" #: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:331 msgctxt "@info:status" @@ -776,7 +776,7 @@ msgstr "Nieprawidłowy adres URL pliku:" #: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" -msgstr "" +msgstr "Ustawienia zostały zmienione w celu dopasowania do bieżącej dostępności ekstruderów:" #: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 msgctxt "@info:title" @@ -846,7 +846,7 @@ msgstr "Profil {0} zawiera błędne dane, nie można go imp #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to import profile from {0}:" -msgstr "" +msgstr "Błąd importu profilu z {0}:" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:320 #, python-brace-format @@ -1253,7 +1253,7 @@ msgstr "Logi" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" msgid "User description (Note: Developers may not speak your language, please use English if possible)" -msgstr "" +msgstr "Opis użytkownika (Uwaga: programiści mogą nie mówić w Twoim języku, w miarę możliwości używaj angielskiego)" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" @@ -1352,7 +1352,7 @@ msgstr "Podgrzewany stół" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "Heated build volume" -msgstr "" +msgstr "Grzany obszar roboczy" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:163 msgctxt "@label" @@ -1671,27 +1671,27 @@ msgstr "Zgodność" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:124 msgctxt "@label:table_header" msgid "Machine" -msgstr "" +msgstr "Drukarka" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:131 msgctxt "@label:table_header" msgid "Print Core" -msgstr "" +msgstr "Rdzeń drukujący" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:137 msgctxt "@label:table_header" msgid "Build Plate" -msgstr "" +msgstr "Stół roboczy" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:143 msgctxt "@label:table_header" msgid "Support" -msgstr "" +msgstr "Podpory" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:149 msgctxt "@label:table_header" msgid "Quality" -msgstr "" +msgstr "Jakość" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml:170 msgctxt "@action:label" @@ -1811,7 +1811,7 @@ msgstr "Aktualizacja oprogramowania nie powiodła się z powodu utraconego oprog #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:155 msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" -msgstr "" +msgstr "Zarządzaj drukarkami" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:192 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:183 @@ -1825,7 +1825,7 @@ msgstr "Szkło" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:248 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." -msgstr "" +msgstr "Zaktualizuj oprogramowanie drukarki, aby zdalnie zarządzać kolejką." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:289 msgctxt "@info" @@ -1890,12 +1890,12 @@ msgstr "W kolejce" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" msgid "Manage in browser" -msgstr "" +msgstr "Zarządzaj w przeglądarce" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 msgctxt "@label" msgid "There are no print jobs in the queue. Slice and send a job to add one." -msgstr "" +msgstr "W kolejce nie ma zadań drukowania. Potnij i wyślij zadanie, aby dodać." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:115 msgctxt "@label" @@ -1920,12 +1920,12 @@ msgstr "Połącz się z drukarką sieciową" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:57 msgctxt "@label" msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." -msgstr "" +msgstr "Aby drukować bezpośrednio na drukarce przez sieć, upewnij się, że drukarka jest podłączona do sieci za pomocą kabla sieciowego lub do sieci WIFI. Jeśli nie podłączysz Cury do drukarki, możesz nadal używać napędu USB do przesyłania plików G-Code do drukarki." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:57 msgctxt "@label" msgid "Select your printer from the list below:" -msgstr "" +msgstr "Wybierz swoją drukarkę z poniższej listy:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:77 msgctxt "@action:button" @@ -2008,7 +2008,7 @@ msgstr "Adres drukarki" #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." -msgstr "" +msgstr "Wprowadź adres IP drukarki." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:364 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:138 @@ -2214,6 +2214,10 @@ msgid "" "- Check if the printer is connected to the network.\n" "- Check if you are signed in to discover cloud-connected printers." msgstr "" +"Upewnij się, że drukarka ma połączenie:\n" +"- Sprawdź, czy drukarka jest włączona.\n" +"- Sprawdź, czy drukarka jest podłączona do sieci.\n" +"- Sprawdź, czy jesteś zalogowany, aby znaleźć drukarki podłączone do chmury." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -3131,7 +3135,7 @@ msgstr "Czy przybliżanie powinno poruszać się w kierunku myszy?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." -msgstr "" +msgstr "Powiększanie w kierunku myszy nie jest obsługiwane w danej perspektywie." #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" @@ -3181,20 +3185,20 @@ msgstr "Wymuszenie widoku warstw w trybie zgodności (wymaga ponownego uruchomie #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" -msgstr "" +msgstr "Jakiego rodzaju kamery należy użyć do renderowania?" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 msgctxt "@window:text" msgid "Camera rendering: " -msgstr "" +msgstr "Renderowanie z kamery: " #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 msgid "Perspective" -msgstr "" +msgstr "Perspektywiczny" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 msgid "Orthographic" -msgstr "" +msgstr "Rzut ortograficzny" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" @@ -3875,17 +3879,17 @@ msgstr "&Pozycja kamery" #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 msgctxt "@action:inmenu menubar:view" msgid "Camera view" -msgstr "" +msgstr "Widok z kamery" #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 msgctxt "@action:inmenu menubar:view" msgid "Perspective" -msgstr "" +msgstr "Perspektywiczny" #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" -msgstr "" +msgstr "Rzut ortograficzny" #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" @@ -4034,7 +4038,7 @@ msgstr "Typ widoku" #: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 msgctxt "@label" msgid "Object list" -msgstr "" +msgstr "Lista obiektów" #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." @@ -4105,7 +4109,7 @@ msgstr "Nie można pociąć" #: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Processing" -msgstr "" +msgstr "Przetwarzanie" #: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" @@ -4175,7 +4179,7 @@ msgstr "Przełącz tryb pełnoekranowy" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu" msgid "Exit Full Screen" -msgstr "" +msgstr "Wyłącz tryb pełnoekranowy" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" @@ -5023,12 +5027,12 @@ msgstr "Spłaszcz profil" #: AMFReader/plugin.json msgctxt "description" msgid "Provides support for reading AMF files." -msgstr "" +msgstr "Zapewnia wsparcie dla czytania plików AMF." #: AMFReader/plugin.json msgctxt "name" msgid "AMF Reader" -msgstr "" +msgstr "Czytnik AMF" #: USBPrinting/plugin.json msgctxt "description" @@ -5083,12 +5087,12 @@ msgstr "Wtyczka Urządzenia Wyjścia Dysku Zewnętrznego" #: UM3NetworkPrinting/plugin.json msgctxt "description" msgid "Manages network connections to Ultimaker networked printers." -msgstr "" +msgstr "Zarządza połączeniami z sieciowymi drukarkami Ultimaker." #: UM3NetworkPrinting/plugin.json msgctxt "name" msgid "Ultimaker Network Connection" -msgstr "" +msgstr "Połączenie sieciowe Ultimaker" #: MonitorStage/plugin.json msgctxt "description" @@ -5283,12 +5287,12 @@ msgstr "Ulepszenie Wersji 3.0 do 3.1" #: VersionUpgrade/VersionUpgrade41to42/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." -msgstr "" +msgstr "Uaktualnia konfiguracje z Cura 4.1 to Cura 4.2." #: VersionUpgrade/VersionUpgrade41to42/plugin.json msgctxt "name" msgid "Version Upgrade 4.1 to 4.2" -msgstr "" +msgstr "Uaktualnij wersję 4.1 do 4.2" #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" @@ -5323,12 +5327,12 @@ msgstr "Ulepszenie Wersji z 2.2 do 2.4" #: VersionUpgrade/VersionUpgrade42to43/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.2 to Cura 4.3." -msgstr "" +msgstr "Uaktualnia konfiguracje z Cura 4.2 to Cura 4.3." #: VersionUpgrade/VersionUpgrade42to43/plugin.json msgctxt "name" msgid "Version Upgrade 4.2 to 4.3" -msgstr "" +msgstr "Uaktualnij wersję 4.2 do 4.3" #: ImageReader/plugin.json msgctxt "description" @@ -5343,12 +5347,12 @@ msgstr "Czytnik Obrazu" #: TrimeshReader/plugin.json msgctxt "description" msgid "Provides support for reading model files." -msgstr "" +msgstr "Zapewnia wsparcie dla czytania plików modeli." #: TrimeshReader/plugin.json msgctxt "name" msgid "Trimesh Reader" -msgstr "" +msgstr "Czytnik siatki trójkątów" #: CuraEngineBackend/plugin.json msgctxt "description" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index 44e3b49fa6..aefdf33ce2 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: Cura 4.3\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2019-09-10 16:55+0000\n" -"PO-Revision-Date: 2019-05-27 22:32+0200\n" +"PO-Revision-Date: 2019-09-30 15:45+0200\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" "Language: pl_PL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 2.2.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -218,12 +218,12 @@ msgstr "Określa czy maszyna posiada podgrzewany stół." #: fdmprinter.def.json msgctxt "machine_heated_build_volume label" msgid "Has Build Volume Temperature Stabilization" -msgstr "" +msgstr "Posiada komorę stabilizacji temperatury" #: fdmprinter.def.json msgctxt "machine_heated_build_volume description" msgid "Whether the machine is able to stabilize the build volume temperature." -msgstr "" +msgstr "Określa czy drukarka posiada zamkniętą komorę stabilizującą temperaturę." #: fdmprinter.def.json msgctxt "machine_center_is_zero label" @@ -348,7 +348,7 @@ msgstr "Minimalny czas, w jakim ekstruder musi być nieużywany, aby schłodzić #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" msgid "G-code Flavor" -msgstr "" +msgstr "Smak G-code" #: fdmprinter.def.json msgctxt "machine_gcode_flavor description" @@ -1283,52 +1283,52 @@ msgstr "Najostrzejszy róg" #: fdmprinter.def.json msgctxt "z_seam_position label" msgid "Z Seam Position" -msgstr "" +msgstr "Pozycja szwu osi Z" #: fdmprinter.def.json msgctxt "z_seam_position description" msgid "The position near where to start printing each part in a layer." -msgstr "" +msgstr "Najbliższa pozycja startu druku każdej warstwy." #: fdmprinter.def.json msgctxt "z_seam_position option backleft" msgid "Back Left" -msgstr "" +msgstr "Lewy tył" #: fdmprinter.def.json msgctxt "z_seam_position option back" msgid "Back" -msgstr "" +msgstr "Tył" #: fdmprinter.def.json msgctxt "z_seam_position option backright" msgid "Back Right" -msgstr "" +msgstr "Prawy tył" #: fdmprinter.def.json msgctxt "z_seam_position option right" msgid "Right" -msgstr "" +msgstr "Prawa" #: fdmprinter.def.json msgctxt "z_seam_position option frontright" msgid "Front Right" -msgstr "" +msgstr "Prawy przód" #: fdmprinter.def.json msgctxt "z_seam_position option front" msgid "Front" -msgstr "" +msgstr "Przód" #: fdmprinter.def.json msgctxt "z_seam_position option frontleft" msgid "Front Left" -msgstr "" +msgstr "Lewy przód" #: fdmprinter.def.json msgctxt "z_seam_position option left" msgid "Left" -msgstr "" +msgstr "Lewa" #: fdmprinter.def.json msgctxt "z_seam_x label" @@ -1358,7 +1358,7 @@ msgstr "Wybór Rogu Szwu" #: fdmprinter.def.json msgctxt "z_seam_corner description" msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." -msgstr "" +msgstr "Kontroluj, czy narożniki obrysu wpływają na położenie szwu. Brak oznacza, że rogi nie mają wpływu na tę pozycję. Ukryj szew zwiększa prawdopodobieństwo pojawienia się szwu w wewnętrznym rogu. Ujawnij szew zwiększa prawdopodobieństwo pojawienia się szwu w narożniku zewnętrznym. Ukryj lub odsłoń szew zwiększa prawdopodobieństwo, że szew pojawi się w rogu wewnętrznym lub zewnętrznym. Inteligentne ukrywanie odsłania zarówno narożniki wewnętrzne, jak i zewnętrzne, ale w miarę potrzeby wybiera wewnętrzne narożniki." #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1383,7 +1383,7 @@ msgstr "Ukryj lub Pokaż Szew" #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_weighted" msgid "Smart Hiding" -msgstr "" +msgstr "Inteligentne ukrywanie" #: fdmprinter.def.json msgctxt "z_seam_relative label" @@ -1398,12 +1398,12 @@ msgstr "Kiedy włączone, współrzędne szwu są względne do każdego środka #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" -msgstr "" +msgstr "Brak wypełnienia w lukach osi Z" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." -msgstr "" +msgstr "Gdy model ma małe pionowe szczeliny składające się z kilku warstw, powinna pojawić się powierzchnia zewnętrzna wokół tych warstw w wąskiej przestrzeni. Włącz, aby nie generować powierzchni zewnętrznej, jeśli odstęp pionowy jest bardzo mały. Poprawia to czas drukowania i czas cięcia, ale technicznie pozostawia wypełnienie bez wykończenia." #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1423,7 +1423,7 @@ msgstr "Włącz Prasowanie" #: fdmprinter.def.json msgctxt "ironing_enabled description" msgid "Go over the top surface one additional time, but this time extruding very little material. This is meant to melt the plastic on top further, creating a smoother surface. The pressure in the nozzle chamber is kept high so that the creases in the surface are filled with material." -msgstr "" +msgstr "Ponowne przejście po górnej powierzchni, tym razem wytłaczając bardzo mało materiału. Ma to na celu lepsze stopienie tworzywa na wierzchu, tworząc gładsze wykończenie. Ciśnienie w dyszy jest utrzymywane na wysokim poziomie, aby szczeliny na powierzchni były wypełnione materiałem." #: fdmprinter.def.json msgctxt "ironing_only_highest_layer label" @@ -1703,12 +1703,12 @@ msgstr "Wzór wypełnienia jest przesunięty o tę odległość wzdłuż osi Y." #: fdmprinter.def.json msgctxt "infill_randomize_start_location label" msgid "Randomize Infill Start" -msgstr "" +msgstr "Losowy punkt startu wypełnienia" #: fdmprinter.def.json msgctxt "infill_randomize_start_location description" msgid "Randomize which infill line is printed first. This prevents one segment becoming the strongest, but it does so at the cost of an additional travel move." -msgstr "" +msgstr "Losuje, która linia wypełnienia jest drukowana jako pierwsza. Dzięki temu nie ma zjawiska, kiedy jeden segment jest mocniejszy. Kosztem jest dodatkowy ruchu jałowy." #: fdmprinter.def.json msgctxt "infill_multiplier label" @@ -1952,7 +1952,7 @@ msgstr "Temperatura obszaru roboczego" #: fdmprinter.def.json msgctxt "build_volume_temperature description" msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." -msgstr "" +msgstr "Temperatura otoczenia druku. Jeśli ustawione jest 0, temperatura komory nie będzie ustawiana." #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -2067,82 +2067,82 @@ msgstr "Współczynnik skurczu w procentach." #: fdmprinter.def.json msgctxt "material_crystallinity label" msgid "Crystalline Material" -msgstr "" +msgstr "Materiał krystaliczny" #: fdmprinter.def.json msgctxt "material_crystallinity description" msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" -msgstr "" +msgstr "Czy ten rodzaj materiału odłamuje się łatwo po podgrzaniu (krystaliczny), czy też jest to tworzywo, które wytwarza długie splecione łańcuchy polimerowe (niekrystaliczne)?" #: fdmprinter.def.json msgctxt "material_anti_ooze_retracted_position label" msgid "Anti-ooze Retracted Position" -msgstr "" +msgstr "Odległość retrakcji anty-wyciekom" #: fdmprinter.def.json msgctxt "material_anti_ooze_retracted_position description" msgid "How far the material needs to be retracted before it stops oozing." -msgstr "" +msgstr "Jak daleko materiał musi zostać wycofany, aby przestał wyciekać." #: fdmprinter.def.json msgctxt "material_anti_ooze_retraction_speed label" msgid "Anti-ooze Retraction Speed" -msgstr "" +msgstr "Szybkość retrakcji anty-wyciekom" #: fdmprinter.def.json msgctxt "material_anti_ooze_retraction_speed description" msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." -msgstr "" +msgstr "Jak szybko materiał musi zostać wycofany podczas zmiany filamentu, aby przestał wyciekać." #: fdmprinter.def.json msgctxt "material_break_preparation_retracted_position label" msgid "Break Preparation Retracted Position" -msgstr "" +msgstr "Odległość pęknięcia przy retrakcji" #: fdmprinter.def.json msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." -msgstr "" +msgstr "Jak bardzo filament może być rozciągnięty, zanim pęknie, podczas ogrzewania." #: fdmprinter.def.json msgctxt "material_break_preparation_speed label" msgid "Break Preparation Retraction Speed" -msgstr "" +msgstr "Szybkość pękania przy retrakcji" #: fdmprinter.def.json msgctxt "material_break_preparation_speed description" msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." -msgstr "" +msgstr "Jak szybko filament musi zostać wycofany, aby pękł podczas cofania." #: fdmprinter.def.json msgctxt "material_break_retracted_position label" msgid "Break Retracted Position" -msgstr "" +msgstr "Odległość łamania retrakcji" #: fdmprinter.def.json msgctxt "material_break_retracted_position description" msgid "How far to retract the filament in order to break it cleanly." -msgstr "" +msgstr "Jak daleko wycofać filament, aby go złamać na czysto." #: fdmprinter.def.json msgctxt "material_break_speed label" msgid "Break Retraction Speed" -msgstr "" +msgstr "Szybkość łamania retrakcji" #: fdmprinter.def.json msgctxt "material_break_speed description" msgid "The speed at which to retract the filament in order to break it cleanly." -msgstr "" +msgstr "Jak szybko wycofać filament, aby go złamać na czysto." #: fdmprinter.def.json msgctxt "material_break_temperature label" msgid "Break Temperature" -msgstr "" +msgstr "Temperatura pękania" #: fdmprinter.def.json msgctxt "material_break_temperature description" msgid "The temperature at which the filament is broken for a clean break." -msgstr "" +msgstr "Temperatura, w której filament można złamać na czysto." #: fdmprinter.def.json msgctxt "material_flow label" @@ -2157,112 +2157,112 @@ msgstr "Kompensacja przepływu: ilość ekstrudowanego materiału jest mnożona #: fdmprinter.def.json msgctxt "wall_material_flow label" msgid "Wall Flow" -msgstr "" +msgstr "Przepływ ścianek" #: fdmprinter.def.json msgctxt "wall_material_flow description" msgid "Flow compensation on wall lines." -msgstr "" +msgstr "Ustawienie przepływu na liniach ścianek." #: fdmprinter.def.json msgctxt "wall_0_material_flow label" msgid "Outer Wall Flow" -msgstr "" +msgstr "Przepływu ścianek zewnętrznych" #: fdmprinter.def.json msgctxt "wall_0_material_flow description" msgid "Flow compensation on the outermost wall line." -msgstr "" +msgstr "Ustawienie przepływu na liniach ścianek zewnętrznych." #: fdmprinter.def.json msgctxt "wall_x_material_flow label" msgid "Inner Wall(s) Flow" -msgstr "" +msgstr "Przepływu ścianek wewnętrznych" #: fdmprinter.def.json msgctxt "wall_x_material_flow description" msgid "Flow compensation on wall lines for all wall lines except the outermost one." -msgstr "" +msgstr "Ustawienie przepływu na liniach ścianek wewnętrznych." #: fdmprinter.def.json msgctxt "skin_material_flow label" msgid "Top/Bottom Flow" -msgstr "" +msgstr "Przepływ warstwy górnej i dolnej" #: fdmprinter.def.json msgctxt "skin_material_flow description" msgid "Flow compensation on top/bottom lines." -msgstr "" +msgstr "Ustawienie przepływu na warstwie górnej i dolnej." #: fdmprinter.def.json msgctxt "roofing_material_flow label" msgid "Top Surface Skin Flow" -msgstr "" +msgstr "Przepływ ostatniej warstwy górnej" #: fdmprinter.def.json msgctxt "roofing_material_flow description" msgid "Flow compensation on lines of the areas at the top of the print." -msgstr "" +msgstr "Ustawienie przepływu na ostatniej warstwie górnej." #: fdmprinter.def.json msgctxt "infill_material_flow label" msgid "Infill Flow" -msgstr "" +msgstr "Przepływ wypełnienia" #: fdmprinter.def.json msgctxt "infill_material_flow description" msgid "Flow compensation on infill lines." -msgstr "" +msgstr "Ustawienie przepływu wypełnienia." #: fdmprinter.def.json msgctxt "skirt_brim_material_flow label" msgid "Skirt/Brim Flow" -msgstr "" +msgstr "Przepływ warstwy adhezyjnej" #: fdmprinter.def.json msgctxt "skirt_brim_material_flow description" msgid "Flow compensation on skirt or brim lines." -msgstr "" +msgstr "Ustawienie przepływu warstwy adhezyjnej." #: fdmprinter.def.json msgctxt "support_material_flow label" msgid "Support Flow" -msgstr "" +msgstr "Przepływ podpór" #: fdmprinter.def.json msgctxt "support_material_flow description" msgid "Flow compensation on support structure lines." -msgstr "" +msgstr "Ustawienie przepływu podpór." #: fdmprinter.def.json msgctxt "support_interface_material_flow label" msgid "Support Interface Flow" -msgstr "" +msgstr "Przepływ podłoża podpór" #: fdmprinter.def.json msgctxt "support_interface_material_flow description" msgid "Flow compensation on lines of support roof or floor." -msgstr "" +msgstr "Ustawienie przepływu podłoża podpór." #: fdmprinter.def.json msgctxt "support_roof_material_flow label" msgid "Support Roof Flow" -msgstr "" +msgstr "Przepływ dachów podpór" #: fdmprinter.def.json msgctxt "support_roof_material_flow description" msgid "Flow compensation on support roof lines." -msgstr "" +msgstr "Ustawienie przepływu podłoża ostatniej warstwy podpór." #: fdmprinter.def.json msgctxt "support_bottom_material_flow label" msgid "Support Floor Flow" -msgstr "" +msgstr "Przepływ podstawy podpór" #: fdmprinter.def.json msgctxt "support_bottom_material_flow description" msgid "Flow compensation on support floor lines." -msgstr "" +msgstr "Ustawienie przepływu pierwszej warstwy podpór." #: fdmprinter.def.json msgctxt "prime_tower_flow label" @@ -2272,7 +2272,7 @@ msgstr "Przepływ Wieży Czyszczącej" #: fdmprinter.def.json msgctxt "prime_tower_flow description" msgid "Flow compensation on prime tower lines." -msgstr "" +msgstr "Przepływ linii wieży podporowej." #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" @@ -2392,7 +2392,7 @@ msgstr "Ogranicz Retrakcje Pomiędzy Podporami" #: fdmprinter.def.json msgctxt "limit_support_retractions description" msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." -msgstr "" +msgstr "Pomiń retrakcję, przechodząc od podpory do podpory w linii prostej. Włączenie tego ustawienia oszczędza czas drukowania, ale może prowadzić do nadmiernego ciągnięcia filamentu w strukturze nośnej." #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2447,12 +2447,12 @@ msgstr "Prędkość, z jaką filament jest cofany podczas retrakcji po zmianie d #: fdmprinter.def.json msgctxt "switch_extruder_extra_prime_amount label" msgid "Nozzle Switch Extra Prime Amount" -msgstr "" +msgstr "Dodatkowa ekstruzja po zmianie dyszy" #: fdmprinter.def.json msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." -msgstr "" +msgstr "Ilość dodatkowego materiału do podania po zmianie dyszy." #: fdmprinter.def.json msgctxt "speed label" @@ -2647,12 +2647,12 @@ msgstr "Prędkość, z jaką jest drukowana obwódka i obrys. Zwykle jest to wyk #: fdmprinter.def.json msgctxt "speed_z_hop label" msgid "Z Hop Speed" -msgstr "" +msgstr "Prędkość skoku Z" #: fdmprinter.def.json msgctxt "speed_z_hop description" msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." -msgstr "" +msgstr "Szybkość, z jaką wykonuje się pionowy ruch skoku Z. Jest to zwykle mniej niż prędkość drukowania, ponieważ trudniej się porusza stołem drukarki." #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3567,7 +3567,7 @@ msgstr "Kierunek Linii Wypełnienia Podpory" #: fdmprinter.def.json msgctxt "support_infill_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees." -msgstr "" +msgstr "Lista kierunków linii całkowitych do użycia. Elementy z listy są używane sekwencyjnie w miarę postępu warstw, a po osiągnięciu końca listy zaczyna się od początku. Elementy listy są oddzielone przecinkami, a cała lista jest zawarta w nawiasach kwadratowych. Domyślnie lista jest pusta, co oznacza użycie domyślnego kąta 0 stopni." #: fdmprinter.def.json msgctxt "support_brim_enable label" @@ -3697,7 +3697,7 @@ msgstr "Odległość Łączenia Podpór" #: fdmprinter.def.json msgctxt "support_join_distance description" msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." -msgstr "" +msgstr "Maksymalna odległość między konstrukcjami wspornymi w kierunkach X/Y. Kiedy oddzielne struktury są bliżej siebie niż ta wartość, struktury łączą się w jedną." #: fdmprinter.def.json msgctxt "support_offset label" @@ -4037,32 +4037,32 @@ msgstr "Wartość przesunięcia zastosowana do obszaru podłoża podpór." #: fdmprinter.def.json msgctxt "support_interface_angles label" msgid "Support Interface Line Directions" -msgstr "" +msgstr "Kierunek linii podłoża podpór" #: fdmprinter.def.json msgctxt "support_interface_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "" +msgstr "Lista kierunków linii całkowitych do użycia. Elementy z listy są używane sekwencyjnie w miarę postępu warstw, a po osiągnięciu końca listy zaczyna się od początku. Elementy listy są oddzielone przecinkami, a cała lista jest zawarta w nawiasach kwadratowych. Domyślnie lista jest pusta, co oznacza użycie domyślnych kątów (na przemian między 45 a 135 stopni, jeśli interfejsy są dość grube lub 90 stopni)." #: fdmprinter.def.json msgctxt "support_roof_angles label" msgid "Support Roof Line Directions" -msgstr "" +msgstr "Kierunek linii dachu podpór" #: fdmprinter.def.json msgctxt "support_roof_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "" +msgstr "Lista kierunków linii całkowitych do użycia. Elementy z listy są używane sekwencyjnie w miarę postępu warstw, a po osiągnięciu końca listy zaczyna się od początku od nowa. Elementy listy są oddzielone przecinkami, a cała lista jest zawarta w nawiasach kwadratowych. Domyślnie lista jest pusta, co oznacza użycie domyślnych kątów (na przemian między 45 a 135 stopni, jeśli interfejsy są dość grube lub 90 stopni)." #: fdmprinter.def.json msgctxt "support_bottom_angles label" msgid "Support Floor Line Directions" -msgstr "" +msgstr "Kierunek linii podstawy podpór" #: fdmprinter.def.json msgctxt "support_bottom_angles description" msgid "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees)." -msgstr "" +msgstr "Lista kierunków linii całkowitych do użycia. Elementy z listy są używane sekwencyjnie w miarę postępu warstw, a po osiągnięciu końca listy zaczyna się od początku od nowa. Elementy listy są oddzielone przecinkami, a cała lista jest zawarta w nawiasach kwadratowych. Domyślnie lista jest pusta, co oznacza użycie domyślnych kątów (na przemian między 45 a 135 stopni, jeśli interfejsy są dość grube lub 90 stopni)." #: fdmprinter.def.json msgctxt "support_fan_enable label" @@ -4107,12 +4107,12 @@ msgstr "Średnica wieży specjalnej." #: fdmprinter.def.json msgctxt "support_tower_maximum_supported_diameter label" msgid "Maximum Tower-Supported Diameter" -msgstr "" +msgstr "Maksymalna średnica obsługiwana przez wieżę podporową" #: fdmprinter.def.json msgctxt "support_tower_maximum_supported_diameter description" msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "" +msgstr "Maksymalna średnica w kierunkach X/Y obszaru, który ma być podtrzymywana przez specjalistyczną wieżę podporową." #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -4951,7 +4951,7 @@ msgstr "Wygładź Spiralne Kontury" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "" +msgstr "Wygładź spiralne kontury, aby zmniejszyć widoczność szwu Z (szew Z powinien być ledwo widoczny na wydruku, ale nadal będzie widoczny w widoku warstwy). Pamiętaj, że wygładzanie będzie powodować rozmycie drobnych szczegółów powierzchni." #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5191,7 +5191,7 @@ msgstr "Maksymalne odchylenie" #: fdmprinter.def.json msgctxt "meshfix_maximum_deviation description" msgid "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true." -msgstr "" +msgstr "Maksymalne odchylenie dozwolone przy zmniejszaniu rozdzielczości dla ustawienia maksymalnej rozdzielczości. Jeśli to zwiększysz, wydruk będzie mniej dokładny, ale g-code będzie mniejszy. Maksymalne odchylenie jest limitem dla maksymalnej rozdzielczości, więc wystąpi konflikt, maksymalne odchylenie zawsze będzie używane." #: fdmprinter.def.json msgctxt "support_skip_some_zags label" @@ -5451,7 +5451,7 @@ msgstr "Włącz Podpory Stożkowe" #: fdmprinter.def.json msgctxt "support_conical_enabled description" msgid "Make support areas smaller at the bottom than at the overhang." -msgstr "" +msgstr "Zmniejsz obszary podparcia na podłożu pod zwisem." #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -6195,42 +6195,42 @@ msgstr "Odległość, którą głowica musi pokonać w tę i z powrotem po szczo #: fdmprinter.def.json msgctxt "small_hole_max_size label" msgid "Small Hole Max Size" -msgstr "" +msgstr "Maksymalny rozmiar małych otworów" #: fdmprinter.def.json msgctxt "small_hole_max_size description" msgid "Holes and part outlines with a diameter smaller than this will be printed using Small Feature Speed." -msgstr "" +msgstr "Otwory i kontury części o średnicy mniejszej niż podana zostaną wydrukowane przy małej szybkości operacji." #: fdmprinter.def.json msgctxt "small_feature_max_length label" msgid "Small Feature Max Length" -msgstr "" +msgstr "Maksymalna długość małych elementów" #: fdmprinter.def.json msgctxt "small_feature_max_length description" msgid "Feature outlines that are shorter than this length will be printed using Small Feature Speed." -msgstr "" +msgstr "Kontury obiektów, które są krótsze niż podana długość, zostaną wydrukowane przy użyciu funkcji małej prędkości." #: fdmprinter.def.json msgctxt "small_feature_speed_factor label" msgid "Small Feature Speed" -msgstr "" +msgstr "Prędkość małych elementów" #: fdmprinter.def.json msgctxt "small_feature_speed_factor description" msgid "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "" +msgstr "Małe obiekty zostaną wydrukowane z podanym procentem ich normalnej prędkości drukowania. Wolniejsze drukowanie może pomóc w zachowaniu dokładności." #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 label" msgid "First Layer Speed" -msgstr "" +msgstr "Prędkość pierwszej warstwy" #: fdmprinter.def.json msgctxt "small_feature_speed_factor_0 description" msgid "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy." -msgstr "" +msgstr "Małe elementy na pierwszej warstwie zostaną wydrukowane z podanym procentem ich normalnej prędkości drukowania. Wolniejsze drukowanie może pomóc w zachowaniu dokładności i dokładności." #: fdmprinter.def.json msgctxt "command_line_settings label" From d47ff60bf8d760e1947561dad8d6a2415c09d9e2 Mon Sep 17 00:00:00 2001 From: oorail Date: Mon, 30 Sep 2019 09:51:44 -0400 Subject: [PATCH 27/28] Optimized machine end gcode to move at F600 and in one command vs two --- resources/definitions/jgaurora_z_603s.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/jgaurora_z_603s.def.json b/resources/definitions/jgaurora_z_603s.def.json index 0076a050fc..842a81d84f 100644 --- a/resources/definitions/jgaurora_z_603s.def.json +++ b/resources/definitions/jgaurora_z_603s.def.json @@ -21,7 +21,7 @@ "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" }, "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG28 Y0 ;move to the Y-axis origin (Home) for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" + "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 Y0 F600 ;move to the X/Y-axis origin (Home)\nM84 ;turn off stepper motors\n; -- end of END GCODE --" }, "machine_width": { "default_value": 280 From ed9ec1d724e6ae06b83261ee92051328eeb02463 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 30 Sep 2019 17:30:12 +0200 Subject: [PATCH 28/28] Align comment with the rest Looks nicer. --- resources/definitions/jgaurora_z_603s.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/jgaurora_z_603s.def.json b/resources/definitions/jgaurora_z_603s.def.json index 842a81d84f..ceade3243a 100644 --- a/resources/definitions/jgaurora_z_603s.def.json +++ b/resources/definitions/jgaurora_z_603s.def.json @@ -21,7 +21,7 @@ "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" }, "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 Y0 F600 ;move to the X/Y-axis origin (Home)\nM84 ;turn off stepper motors\n; -- end of END GCODE --" + "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 Y0 F600 ;move to the X/Y-axis origin (Home)\nM84 ;turn off stepper motors\n; -- end of END GCODE --" }, "machine_width": { "default_value": 280