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

This commit is contained in:
Ghostkeeper 2018-05-16 10:46:42 +02:00
commit 1174f0fa3b
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
2 changed files with 5 additions and 7 deletions

View file

@ -8,7 +8,8 @@
"manufacturer": "101Hero",
"file_formats": "text/x-gcode",
"platform": "101hero-platform.stl",
"supports_usb_connection": true
"supports_usb_connection": true,
"preferred_quality_type": "draft"
},
"overrides": {
@ -19,7 +20,6 @@
"machine_depth": { "default_value": 149.86 },
"machine_height": { "default_value": 99.822 },
"machine_center_is_zero": { "default_value": true },
"layer_height": { "default_value": 0.2 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_head_with_fans_polygon": {

View file

@ -8,7 +8,8 @@
"manufacturer": "3DMaker",
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj",
"icon": "icon_ultimaker2.png",
"platform": "makerstarter_platform.stl"
"platform": "makerstarter_platform.stl",
"preferred_quality_type": "draft"
},
"overrides": {
@ -49,9 +50,6 @@
"machine_nozzle_expansion_angle": {
"default_value": 45
},
"layer_height": {
"default_value": 0.2
},
"layer_height_0": {
"default_value": 0.2
},
@ -167,4 +165,4 @@
"default_value": 2
}
}
}
}