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

This commit is contained in:
Jaime van Kessel 2017-03-16 11:27:54 +01:00
commit 134425db90
127 changed files with 147 additions and 126 deletions

View File

@ -41,4 +41,5 @@ def getMetaData():
} }
def register(app): def register(app):
return {}
return { "version_upgrade": upgrade } return { "version_upgrade": upgrade }

View File

@ -2556,6 +2556,17 @@
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },
"start_layers_at_same_position":
{
"label": "Start Layers with the Same Part",
"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",
"default_value": false,
"enabled": false,
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": true
},
"layer_start_x": "layer_start_x":
{ {
"label": "Layer Start X", "label": "Layer Start X",

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_pri3 definition = abax_pri3

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = abax_pri3 definition = abax_pri3

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_pri3 definition = abax_pri3

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_pri5 definition = abax_pri5

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = abax_pri5 definition = abax_pri5

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_pri5 definition = abax_pri5

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_titan definition = abax_titan

View File

@ -1,8 +1,8 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = abax_titan definition = abax_titan
[metadata] [metadata]
type = quality type = quality
material = generic_pla material = generic_pla

View File

@ -1,5 +1,6 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = abax_titan definition = abax_titan

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = fdmprinter definition = fdmprinter

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Low Quality name = Low Quality
definition = fdmprinter definition = fdmprinter

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = fdmprinter definition = fdmprinter

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker2_plus definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Not Supported name = Not Supported
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Superdraft Print name = Superdraft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Verydraft Print name = Verydraft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Superdraft Print name = Superdraft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Verydraft Print name = Verydraft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Not Supported name = Not Supported
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Not Supported name = Not Supported
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Not Supported name = Not Supported
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Not Supported name = Not Supported
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Fast Print name = Fast Print
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = High Quality name = High Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Normal Quality name = Normal Quality
definition = ultimaker3 definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general] [general]
version = 3 version = 2
name = Draft Print name = Draft Print
definition = ultimaker3 definition = ultimaker3

Some files were not shown because too many files have changed in this diff Show More