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

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)",

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" },

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

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)