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

This commit is contained in:
Jaime van Kessel 2016-11-24 17:57:00 +01:00
commit 1e54fcda82
4 changed files with 6 additions and 6 deletions

View File

@ -2327,8 +2327,8 @@
}, },
"start_layers_at_same_position": "start_layers_at_same_position":
{ {
"label": "Start Layers Near Same Point", "label": "Start Layers With The Same Part",
"description": "Start printing the objects in each layer near the same point, so that we don't start a new layer with printing the piece which the previous layer ended with. This makes for better overhangs and small parts, but increases printing time.", "description": "In each layer start with printing the object near the same point, so that we don't start a new layer with printing the piece which the previous layer ended with. This makes for better overhangs and small parts, but increases printing time.",
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"settable_per_mesh": false, "settable_per_mesh": false,
@ -2338,7 +2338,7 @@
"layer_start_x": "layer_start_x":
{ {
"label": "Layer Start X", "label": "Layer Start X",
"description": "The X coordinate of the position near where to start printing objects each layer.", "description": "The X coordinate of the position near where to find the part to start printing each layer.",
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 0.0, "default_value": 0.0,
@ -2351,7 +2351,7 @@
"layer_start_y": "layer_start_y":
{ {
"label": "Layer Start Y", "label": "Layer Start Y",
"description": "The Y coordinate of the position near where to start printing objects each layer.", "description": "The Y coordinate of the position near where to find the part to start printing each layer.",
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 0.0, "default_value": 0.0,

View File

@ -128,7 +128,7 @@
"retraction_min_travel": { "value": "5" }, "retraction_min_travel": { "value": "5" },
"retraction_prime_speed": { "value": "15" }, "retraction_prime_speed": { "value": "15" },
"skin_overlap": { "value": "10" }, "skin_overlap": { "value": "10" },
"speed_layer_0": { "value": "20" }, "speed_layer_0": { "value": "speed_print * 30 / 70" },
"speed_prime_tower": { "value": "speed_topbottom" }, "speed_prime_tower": { "value": "speed_topbottom" },
"speed_print": { "value": "35" }, "speed_print": { "value": "35" },
"speed_support": { "value": "speed_wall_0" }, "speed_support": { "value": "speed_wall_0" },

View File

@ -28,7 +28,6 @@ retraction_min_travel = =line_width * 2
retraction_prime_speed = =retraction_speed retraction_prime_speed = =retraction_speed
skin_overlap = 15 skin_overlap = 15
speed_print = 70 speed_print = 70
speed_layer_0 = =speed_print * 30 / 70
speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_topbottom = =math.ceil(speed_print * 30 / 70)
speed_wall = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70)
support_angle = 60 support_angle = 60

View File

@ -12,6 +12,7 @@ cool_fan_speed_max = =cool_fan_speed
machine_nozzle_heat_up_speed = 1.5 machine_nozzle_heat_up_speed = 1.5
material_print_temperature = 215 material_print_temperature = 215
retraction_extrusion_window = =retraction_amount retraction_extrusion_window = =retraction_amount
speed_layer_0 = 20
speed_wall_0 = =math.ceil(speed_wall * 25 / 30) speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
support_bottom_height = =layer_height * 2 support_bottom_height = =layer_height * 2
support_bottom_stair_step_height = =layer_height support_bottom_stair_step_height = =layer_height