Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

This commit is contained in:
Jaime van Kessel 2016-03-23 15:12:26 +01:00
commit 5ec774f796
15 changed files with 15 additions and 93 deletions

View file

@ -603,6 +603,7 @@
"unit": "mm",
"type": "float",
"default": 0.04,
"inherit_function": "wall_line_width_0 / 4 if wall_line_count == 1 else wall_line_width_x / 4",
"min_value_warning": "0",
"max_value_warning": "machine_nozzle_size",
"visible": false
@ -779,6 +780,7 @@
"unit": "mm",
"type": "float",
"default": 1.5,
"inherit_function": "line_width * 2",
"min_value": "0",
"max_value_warning": "10",
"visible": false,
@ -788,7 +790,7 @@
"retraction_count_max": {
"label": "Maximum Retraction Count",
"description": "This setting limits the number of retractions occurring within the Minimum Extrusion Distance Window. Further retractions within this window will be ignored. This avoids retracting repeatedly on the same piece of filament, as that can flatten the filament and cause grinding issues.",
"default": 8,
"default": 45,
"min_value": "0",
"max_value_warning": "100",
"type": "int",
@ -847,7 +849,7 @@
"visible": false
},
"speed_wall": {
"label": "Shell Speed",
"label": "Wall Speed",
"description": "The speed at which the shell is printed. Printing the outer shell at a lower speed improves the final skin quality.",
"unit": "mm/s",
"type": "float",
@ -858,7 +860,7 @@
"inherit_function": "parent_value / 60 * 30",
"children": {
"speed_wall_0": {
"label": "Outer Shell Speed",
"label": "Outer Wall Speed",
"description": "The speed at which the outer shell is printed. Printing the outer shell at a lower speed improves the final skin quality. However, having a large difference between the inner shell speed and the outer shell speed will effect quality in a negative way.",
"unit": "mm/s",
"type": "float",
@ -868,7 +870,7 @@
"visible": false
},
"speed_wall_x": {
"label": "Inner Shell Speed",
"label": "Inner Wall Speed",
"description": "The speed at which all inner shells are printed. Printing the inner shell faster than the outer shell will reduce printing time. It works well to set this in between the outer shell speed and the infill speed.",
"unit": "mm/s",
"type": "float",
@ -971,7 +973,7 @@
"label": "Number of Slower Layers",
"description": "The first few layers are printed slower than the rest of the object, this to get better adhesion to the printer bed and improve the overall success rate of prints. The speed is gradually increased over these layers. 4 layers of speed-up is generally right for most materials and printers.",
"type": "int",
"default": 4,
"default": 2,
"min_value": "0",
"max_value_warning": "300",
"visible": false,
@ -1007,6 +1009,7 @@
"unit": "mm",
"type": "float",
"default": 1.5,
"inherit_function": "machine_nozzle_tip_outer_diameter * 1.25",
"min_value": "0",
"max_value_warning": "machine_nozzle_tip_outer_diameter * 5",
"visible": false,
@ -1119,6 +1122,7 @@
"unit": "mm",
"type": "float",
"default": 0.5,
"inherit_function": "layer_height_0",
"min_value": "0",
"max_value_warning": "10.0",
"visible": false,
@ -1128,7 +1132,7 @@
"label": "Fan Full on at Layer",
"description": "The layer number at which the fan is turned on completely. For the layers below this the fan speed is scaled linearly with the fan off for the first layer.",
"type": "int",
"default": 4,
"default": 1,
"min_value": "0",
"max_value_warning": "100",
"visible": false,
@ -1966,9 +1970,10 @@
"type": "float",
"unit": "1/mm",
"default": 1.25,
"min_value": "0",
"min_value_warning": "0.1",
"max_value_warning": "10",
"max_value": "10000",
"max_value": "2 / magic_fuzzy_skin_thickness",
"visible": false,
"enabled": "magic_fuzzy_skin_enabled",
"children": {
@ -1978,9 +1983,10 @@
"type": "float",
"unit": "mm",
"default": 0.8,
"min_value_warning": "0.0001",
"min_value": "magic_fuzzy_skin_thickness / 2",
"min_value_warning": "0.1",
"max_value_warning": "10",
"inherit_function": "1/parent_value",
"inherit_function": "10000 if parent_value == 0 else 1 / parent_value",
"visible": false,
"enabled": "magic_fuzzy_skin_enabled"
}

View file

@ -13,16 +13,10 @@ layer_height_0 = 0.15
shell_thickness = 0.88
top_bottom_thickness = 0.72
infill_sparse_density = 22
infill_wipe_dist = 0.1
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
speed_infill = 30
speed_wall_0 = 20
speed_wall_x = 25
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15

View file

@ -13,15 +13,9 @@ layer_height_0 = 0.26
shell_thickness = 0.7
top_bottom_thickness = 0.6
infill_sparse_density = 18
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
speed_wall_0 = 40
speed_wall_x = 50
speed_travel = 150
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15

View file

@ -13,15 +13,9 @@ layer_height_0 = 0.26
shell_thickness = 1.05
top_bottom_thickness = 0.84
infill_sparse_density = 22
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
speed_infill = 50
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15

View file

@ -12,15 +12,9 @@ layer_height = 0.1
layer_height_0 = 0.26
shell_thickness = 1.05
top_bottom_thickness = 0.8
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
speed_infill = 50
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15

View file

@ -13,16 +13,10 @@ layer_height_0 = 0.26
shell_thickness = 1.4
top_bottom_thickness = 1.12
infill_sparse_density = 25
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 50
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15

View file

@ -12,16 +12,10 @@ layer_height = 0.15
layer_height_0 = 0.4
shell_thickness = 1.59
top_bottom_thickness = 1.2
infill_wipe_dist = 0.3
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
speed_infill = 55
speed_wall_0 = 25
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1.2
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 20

View file

@ -12,16 +12,10 @@ layer_height = 0.2
layer_height_0 = 0.5
shell_thickness = 2.1
top_bottom_thickness = 1.6
infill_wipe_dist = 0.4
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
speed_infill = 40
speed_wall_0 = 20
speed_wall_x = 30
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1.6
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 25

View file

@ -13,17 +13,11 @@ shell_thickness = 0.88
top_bottom_thickness = 0.72
infill_sparse_density = 22
infill_overlap = 0.022
infill_wipe_dist = 0.1
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 30
speed_wall_0 = 20
speed_wall_x = 25
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15

View file

@ -13,16 +13,10 @@ shell_thickness = 0.7
top_bottom_thickness = 0.6
infill_sparse_density = 18
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_wall_0 = 40
speed_wall_x = 50
speed_travel = 150
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15

View file

@ -13,16 +13,10 @@ shell_thickness = 1.05
top_bottom_thickness = 0.84
infill_sparse_density = 22
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 50
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15

View file

@ -12,16 +12,10 @@ layer_height_0 = 0.26
shell_thickness = 1.05
top_bottom_thickness = 0.8
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 50
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15

View file

@ -13,16 +13,10 @@ shell_thickness = 1.4
top_bottom_thickness = 1.12
infill_sparse_density = 25
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 50
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 15

View file

@ -12,17 +12,11 @@ layer_height_0 = 0.4
shell_thickness = 1.59
top_bottom_thickness = 1.2
infill_overlap = 0.053
infill_wipe_dist = 0.3
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 55
speed_wall_0 = 25
speed_wall_x = 40
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1.2
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 20

View file

@ -13,17 +13,11 @@ shell_thickness = 2.1
top_bottom_thickness = 1.6
infill_sparse_density = 20
infill_overlap = 0.07
infill_wipe_dist = 0.4
retraction_amount = 6
retraction_min_travel = 0.5
retraction_count_max = 30
retraction_extrusion_window = 6
speed_infill = 40
speed_wall_0 = 20
speed_wall_x = 30
speed_topbottom = 20
speed_layer_0 = 25
speed_slowdown_layers = 2
travel_avoid_distance = 1.6
cool_fan_full_layer = 2
cool_min_layer_time_fan_speed_max = 25