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

This commit is contained in:
Tim Kuipers 2016-07-07 15:18:57 +02:00
commit 7fc37e7a74
19 changed files with 205 additions and 108 deletions

View file

@ -455,7 +455,7 @@
},
"skin_line_width":
{
"label": "Top/bottom Line Width",
"label": "Top/Bottom Line Width",
"description": "Width of a single top/bottom line.",
"unit": "mm",
"minimum_value": "0.0001",

View file

@ -16,7 +16,7 @@
"overrides": {
"machine_height": {
"default_value": 315
"default_value": 305
}
}
}

View file

@ -15,7 +15,7 @@
"overrides": {
"machine_height": {
"default_value": 313
"default_value": 305
},
"machine_show_variants": {
"default_value": true