From 9cd7d9a038c8e1eb5b744e16054ef10e2dd3f6a2 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 13 Apr 2017 13:52:11 +0200 Subject: [PATCH 1/3] Use the correct i18n catalog name for translations in the right-click menu CURA-3660 --- resources/qml/Settings/SettingView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 7138d4acd3..19792e3e0e 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -312,7 +312,7 @@ Item } } - UM.I18nCatalog { id: catalog; name: "uranium"; } + UM.I18nCatalog { id: catalog; name: "cura"; } add: Transition { SequentialAnimation { From 72c0295c816acade0e53faa152f7bcf859c47446 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 14 Apr 2017 14:00:53 +0200 Subject: [PATCH 2/3] Set nozzle tip diameter for 0.8mm cores They have a outer diameter of 2mm. Contributes to issue CURA-3650. --- resources/variants/ultimaker3_aa0.8.inst.cfg | 1 + resources/variants/ultimaker3_bb0.8.inst.cfg | 1 + resources/variants/ultimaker3_extended_aa0.8.inst.cfg | 1 + resources/variants/ultimaker3_extended_bb0.8.inst.cfg | 1 + 4 files changed, 4 insertions(+) diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index 98859a64a1..e7e1654c6e 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -31,6 +31,7 @@ machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 2.0 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_standby_temperature = 100 diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 104b4d09d1..d0c2c9c661 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -25,6 +25,7 @@ layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 2.0 material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 multiple_mesh_overlap = 0 diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index 4ce6689f67..b89ce4406b 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -31,6 +31,7 @@ machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 2.0 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_standby_temperature = 100 diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index e8096c2cd6..e4fb152ee0 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -25,6 +25,7 @@ layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 2.0 material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 multiple_mesh_overlap = 0 From 541e28a3879140926fb66d36f0f1f1378deaa26c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 14 Apr 2017 14:11:55 +0200 Subject: [PATCH 3/3] Allow exactly 2 line widths for prime tower We give a warning when it's 2 or fewer lines in the prime tower, but 2 should be allowable. It works quite well. Contributes to issue CURA-3650. --- 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 17add697a5..147f966a94 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3898,7 +3898,7 @@ "value": "round(max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(max(0, resolveOrValue('prime_tower_size') ** 2 - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height'))))), 3)", "resolve": "max(extruderValues('prime_tower_wall_thickness'))", "minimum_value": "0.001", - "minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width'))", + "minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width')) - 0.0001", "maximum_value_warning": "resolveOrValue('prime_tower_size') / 2", "enabled": "resolveOrValue('prime_tower_enable')", "settable_per_mesh": false,