Merge branch 'develop'

# Conflicts:
#	src/settings/printer.yml
This commit is contained in:
casperlamboo 2017-10-17 12:07:52 +02:00
commit 3f3408747c

View File

@ -154,6 +154,13 @@ ultimaker2:
x: 223 x: 223
y: 223 y: 223
z: 205 z: 205
ultimaker2_plus:
title: Ultimaker 2+
heatedBed: true
dimensions:
x: 223
y: 223
z: 305
ultimaker2go: ultimaker2go:
title: Ultimaker 2 Go title: Ultimaker 2 Go
dimensions: dimensions:
@ -173,3 +180,7 @@ wanhao_duplicator4:
x: 210 x: 210
y: 140 y: 140
z: 140 z: 140
wanhao_duplicator_i3_plus:
title: Wanhao Duplicator i3 Plus
filamentThickness: 1.75
heatedBed: false