Merge branch '2.1'

Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
This commit is contained in:
Ghostkeeper 2016-04-04 18:49:09 +02:00
commit 0684cee681
86 changed files with 2336 additions and 3490 deletions

View file

@ -5,5 +5,6 @@ weight = -3
[settings]
layer_height = 0.06
infill_sparse_density = 12
speed_topbottom = 15
speed_infill = 80

View file

@ -9,7 +9,9 @@ shell_thickness = 0.8
infill_sparse_density = 8
speed_print = 60
speed_wall_0 = 40
speed_wall_x = 50
speed_wall_x = 80
speed_infill = 100
wall_thickness = 1
speed_topbottom = 30
speed_travel = 150
speed_layer_0 = 30

View file

@ -4,3 +4,5 @@ name = Normal Quality
weight = -2
[settings]
speed_topbottom = 15
speed_infill = 80

View file

@ -5,6 +5,5 @@ weight = -4
[settings]
layer_height = 0.04
shell_thickness = 1.6
top_bottom_thickness = 0.8
infill_sparse_density = 14
speed_topbottom = 15
speed_infill = 80