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

This commit is contained in:
Jaime van Kessel 2016-11-04 14:33:14 +01:00
commit 642a415262
3 changed files with 45 additions and 7 deletions

View File

@ -1,14 +1,14 @@
[2.3.1]
*Layer Height in Profile Selection
The layer height of each profile is now shown in the profile selection menu.
Added the layer height to the profile selection menu.
*Bug fixes
Editing material settings has actual effect on the prints again
Upgrading from version 2.1 on OSX works again
You can import g-code from related machines as profile
Fixed inheritance taking from the wrong extruder
The i-symbol is updated properly
Fixed a freeze that could sometimes occur while printing via Wi-Fi
Fixed the option to import g-code from related machines as a profile
Fixed a bug where editing material settings has no effect on 3D prints
Fixed an issue with automatic profile importing on Cura 2.1 on Mac OSX
Fixed an inheritance issue for dual extrusion
Fixed an issue with "i" symbol updates
Fixed a freeze that can occur while printing via Wi-Fi
[2.3.0]
*Multi Extrusion Support

View File

@ -2217,6 +2217,42 @@
"settable_per_mesh": false,
"settable_per_extruder": true
},
"start_layers_at_same_position":
{
"label": "Start Layers Near Same Point",
"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.",
"type": "bool",
"default_value": false,
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": true
},
"layer_start_x":
{
"label": "Layer Start X",
"description": "The X coordinate of the position near where to start printing objects each layer.",
"unit": "mm",
"type": "float",
"default_value": 0.0,
"minimum_value": "0",
"enabled": "start_layers_at_same_position",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": true
},
"layer_start_y":
{
"label": "Layer Start Y",
"description": "The Y coordinate of the position near where to start printing objects each layer.",
"unit": "mm",
"type": "float",
"default_value": 0.0,
"minimum_value": "0",
"enabled": "start_layers_at_same_position",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": true
},
"retraction_hop_enabled": {
"label": "Z Hop when Retracted",
"description": "Whenever a retraction is done, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate.",

View File

@ -106,6 +106,8 @@
"jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
"jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
"layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
"layer_start_x": { "value": "sum(extruderValues('extruder_prime_pos_x')) / len(extruderValues('extruder_prime_pos_x'))" },
"layer_start_y": { "value": "sum(extruderValues('extruder_prime_pos_y')) / len(extruderValues('extruder_prime_pos_y'))" },
"line_width": { "value": "machine_nozzle_size * 0.875" },
"machine_min_cool_heat_time_window": { "value": "15" },
"material_print_temperature": { "value": "200" },