Merge branch '3.1' of https://github.com/Ultimaker/cura into 3.1

This commit is contained in:
Aleksei Sasin 2017-11-29 14:09:02 +01:00
commit 2f1181743f
2 changed files with 1 additions and 4 deletions

View File

@ -15,8 +15,7 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_print_temperature = =230
material_standby_temperature = 100
material_print_temperature = =default_material_print_temperature + 5
# prime_tower_enable: see CURA-4248
prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
skin_overlap = 20

View File

@ -11,12 +11,10 @@ weight = -1
setting_version = 4
[values]
default_material_print_temperature = 225
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_standby_temperature = 100
# prime_tower_enable: see CURA-4248
prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
speed_print = 80