Merge branch 'master' of github.com:Ultimaker/Cura

2025-08-12 22:29:01 +08:00 · 2017-05-10 11:57:17 +02:00 · 2017-05-10 11:57:17 +02:00 · 740346e0d8
commit 740346e0d8
parent 2375c832be 2e3059600e
35 changed files with 6 additions and 29 deletions
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@ -4216,7 +4216,7 @@
                    "type": "float",
                    "unit": "mm",
                    "enabled": "resolveOrValue('prime_tower_enable')",
-                    "default_value": 15,
+                    "default_value": 20,
                    "resolve": "max(extruderValues('prime_tower_size'))",
                    "minimum_value": "0",
                    "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)",
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@ -113,7 +113,7 @@
        "material_bed_temperature_layer_0": { "maximum_value": "115" },
        "material_standby_temperature": { "value": "100" },
        "multiple_mesh_overlap": { "value": "0" },
-        "prime_tower_enable": { "value": "True" },
+        "prime_tower_enable": { "default_value": true },
        "raft_airgap": { "value": "0" },
        "raft_base_thickness": { "value": "0.3" },
        "raft_interface_line_spacing": { "value": "0.5" },
--- a/resources/meshes/FT-5_build_plate.stl
+++ b/resources/meshes/FT-5_build_plate.stl
--- a/resources/meshes/kossel_pro_build_platform.stl
+++ b/resources/meshes/kossel_pro_build_platform.stl
--- a/resources/meshes/makeR_prusa_tairona_i3_platform.stl
+++ b/resources/meshes/makeR_prusa_tairona_i3_platform.stl
--- a/resources/meshes/mendel90_platform.stl
+++ b/resources/meshes/mendel90_platform.stl
--- a/resources/meshes/printrbot_simple_metal_upgrade.stl
+++ b/resources/meshes/printrbot_simple_metal_upgrade.stl
--- a/resources/meshes/prusai3_xl_platform.stl
+++ b/resources/meshes/prusai3_xl_platform.stl
--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg
@ -15,7 +15,7 @@ machine_nozzle_heat_up_speed = 1.5
 material_print_temperature = =default_material_print_temperature + 10
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
-prime_tower_size = 16
+prime_tower_enable = False
 skin_overlap = 20
 speed_print = 60
 speed_layer_0 = 20
--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg
@ -17,7 +17,7 @@ material_print_temperature = =default_material_print_temperature + 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
-prime_tower_size = 16
+prime_tower_enable = False
 speed_print = 60
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg
@ -17,7 +17,7 @@ material_standby_temperature = 100
 material_print_temperature = =default_material_print_temperature - 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
-prime_tower_size = 16
+prime_tower_enable = False
 speed_print = 50
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg
@ -15,7 +15,7 @@ machine_nozzle_heat_up_speed = 1.5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
-prime_tower_size = 16
+prime_tower_enable = False
 speed_print = 55
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
@ -29,7 +29,6 @@ material_print_temperature_layer_0 = =material_print_temperature
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
-prime_tower_size = 17
 prime_tower_wipe_enabled = True
 retraction_combing = off
 retraction_extrusion_window = 1
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
@ -29,7 +29,6 @@ material_print_temperature_layer_0 = =material_print_temperature
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
-prime_tower_size = 17
 prime_tower_wipe_enabled = True
 retraction_combing = off
 retraction_extrusion_window = 1
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
@ -31,7 +31,6 @@ material_print_temperature_layer_0 = =material_print_temperature
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
-prime_tower_size = 17
 prime_tower_wipe_enabled = True
 retraction_combing = off
 retraction_extrusion_window = 1
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
@ -30,7 +30,6 @@ material_print_temperature_layer_0 = =material_print_temperature
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
-prime_tower_size = 17
 prime_tower_wipe_enabled = True
 retraction_combing = off
 retraction_extrusion_window = 1
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
@ -14,7 +14,6 @@ material_print_temperature = =default_material_print_temperature + 10
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
-prime_tower_size = 17
 skin_overlap = 20
 speed_print = 60
 speed_layer_0 = 20
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg
@ -15,7 +15,6 @@ material_print_temperature = =default_material_print_temperature + 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
-prime_tower_size = 17
 speed_print = 60
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg
@ -17,7 +17,6 @@ material_print_temperature = =default_material_print_temperature - 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
-prime_tower_size = 17
 speed_print = 50
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg
@ -15,7 +15,6 @@ machine_nozzle_heat_up_speed = 1.5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
-prime_tower_size = 17
 speed_print = 55
 speed_layer_0 = 20
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
@ -36,7 +36,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 ooze_shield_angle = 40
 prime_tower_enable = True
-prime_tower_size = 16
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 retraction_count_max = 80
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
@ -35,7 +35,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 ooze_shield_angle = 40
 prime_tower_enable = True
-prime_tower_size = 16
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 retraction_count_max = 80
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
@ -36,7 +36,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 ooze_shield_angle = 40
 prime_tower_enable = True
-prime_tower_size = 16
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 retraction_count_max = 80
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
@ -33,7 +33,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 ooze_shield_angle = 40
 prime_tower_enable = True
-prime_tower_size = 16
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 retraction_count_max = 80
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
@ -38,7 +38,6 @@ material_print_temperature_layer_0 = =default_material_print_temperature + 2
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
-prime_tower_size = 16
 prime_tower_wipe_enabled = True
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
@ -38,7 +38,6 @@ material_print_temperature_layer_0 = =default_material_print_temperature + 2
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
-prime_tower_size = 16
 prime_tower_wipe_enabled = True
 retraction_amount = 7
 retraction_count_max = 12
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
@ -36,7 +36,6 @@ material_print_temperature_layer_0 = =default_material_print_temperature
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
-prime_tower_size = 16
 prime_tower_wipe_enabled = True
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
@ -19,7 +19,6 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 material_standby_temperature = 100
 ooze_shield_angle = 40
-prime_tower_size = 15
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
@ -20,7 +20,6 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 material_standby_temperature = 100
 ooze_shield_angle = 40
-prime_tower_size = 15
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
@ -20,7 +20,6 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 material_standby_temperature = 100
 ooze_shield_angle = 40
-prime_tower_size = 15
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
@ -25,7 +25,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
-prime_tower_size = 15
 support_angle = 70
 support_line_width = =line_width * 0.75
 support_pattern = ='triangles'
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
@ -26,7 +26,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
 material_print_temperature = =default_material_print_temperature + 15
 material_standby_temperature = 100
-prime_tower_size = 15
 raft_margin = 10
 support_angle = 70
 support_line_width = =line_width * 0.75
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
@ -26,7 +26,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
-prime_tower_size = 15
 support_angle = 70
 support_line_width = =line_width * 0.75
 support_pattern = ='triangles'
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@ -37,7 +37,6 @@ material_initial_print_temperature = =material_print_temperature - 5
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = False
-prime_tower_size = 16
 prime_tower_wipe_enabled = True
 retract_at_layer_change = True
 retraction_amount = 6.5
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@ -37,7 +37,6 @@ material_initial_print_temperature = =material_print_temperature - 5
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = False
-prime_tower_size = 16
 prime_tower_wipe_enabled = True
 retract_at_layer_change = True
 retraction_amount = 6.5