casperlamboo 3f3408747c Merge branch 'develop' ... # Conflicts: # src/settings/printer.yml		2017-10-17 12:07:52 +02:00
..
default.yml	update combing	2017-08-17 16:13:21 +02:00
material.yml	replace default settings in json with split yml files	2017-07-10 16:07:38 +02:00
printer.yml	Merge branch 'develop'	2017-10-17 12:07:52 +02:00
quality.yml	fixed typo 'high' and added fill.gridSize:0.15	2017-07-13 17:56:57 +02:00