Merge branch '2.5'

This commit is contained in:
Ghostkeeper 2017-04-14 11:56:57 +02:00
commit ac46c4358b
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
4 changed files with 4 additions and 4 deletions

View File

@ -3555,7 +3555,7 @@
"value": "resolveOrValue('layer_height') * 1.5",
"minimum_value": "0.001",
"minimum_value_warning": "0.04",
"maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'raft_interface_line_width')",
"maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'machine_nozzle_size')",
"enabled": "resolveOrValue('adhesion_type') == 'raft'",
"settable_per_mesh": false,
"settable_per_extruder": true,

View File

@ -10,7 +10,7 @@ material = generic_nylon_ultimaker3_AA_0.8
weight = -2
[values]
brim_width = 3
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
infill_before_walls = True

View File

@ -10,7 +10,7 @@ material = generic_nylon_ultimaker3_AA_0.8
weight = -4
[values]
brim_width = 3
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
infill_before_walls = True

View File

@ -10,7 +10,7 @@ material = generic_nylon_ultimaker3_AA_0.8
weight = -3
[values]
brim_width = 3
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
infill_before_walls = True