Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

This commit is contained in:
fieldOfView 2016-03-03 16:44:49 +01:00
commit 6d1a848e40
17 changed files with 21545 additions and 29 deletions

View file

@ -1,5 +1,5 @@
{
"id": "rigidbotbig",
"id": "rigidbot",
"version": 1,
"name": "RigidBot",
"manufacturer": "Other",
@ -51,7 +51,7 @@
"speed_infill": { "default": 100.0, "visible": true },
"speed_topbottom": { "default": 15.0, "visible": true },
"speed_travel": { "default": 150.0, "visible": true },
"speed_layer_0": { "min_value": 0.1, "default": 15.0, "visible": true },
"speed_layer_0": { "min_value": "0.1", "default": 15.0, "visible": true },
"infill_overlap": { "default": 10.0 },
"cool_fan_enabled": { "default": false, "visible": true },
"cool_fan_speed": { "default": 0.0, "visible": true },

View file

@ -49,7 +49,7 @@
"speed_infill": { "default": 100.0, "visible": true },
"speed_topbottom": { "default": 15.0, "visible": true },
"speed_travel": { "default": 150.0, "visible": true },
"speed_layer_0": { "min_value": 0.1, "default": 15.0, "visible": true },
"speed_layer_0": { "min_value": "0.1", "default": 15.0, "visible": true },
"infill_overlap": { "default": 10.0 },
"cool_fan_enabled": { "default": false, "visible": true},
"cool_fan_speed": { "default": 0.0, "visible": true },