Merge remote-tracking branch 'origin/1.5.0'

This commit is contained in:
Lars Brubaker 2016-01-29 15:25:23 -08:00
commit 5cab6649d9
6 changed files with 17 additions and 4 deletions

View file

@ -31,6 +31,7 @@
"SeeMeCNC",
"Solidoodle",
"Type A Machines",
"Ultimaker",
"Wanhao",
"Velleman",
],
@ -41,6 +42,8 @@
}
],
"PreloadedLibraryFiles": [
"MatterControl - Coin.stl",
"MatterControl - Stand.stl",
"Calibration - Box.stl"
]
}

Binary file not shown.

View file

@ -1,2 +1,7 @@
temperature = 222
bed_temperature = 50
bed_temperature = 50
disable_fan_first_layers = 2
fan_always_on = 1
first_layer_bed_temperature = 55
first_layer_temperature = 210
retract_length = 3
temperature = 210

View file

@ -1,2 +1,7 @@
temperature = 210
bed_temperature = 50
bed_temperature = 50
disable_fan_first_layers = 2
fan_always_on = 1
first_layer_bed_temperature = 55
first_layer_temperature = 210
retract_length = 3
temperature = 210