diff options
| author | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-03-06 20:31:47 +0300 |
|---|---|---|
| committer | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-03-06 20:31:47 +0300 |
| commit | c8fe3761b1e28770e0895733c409c581830e1112 (patch) | |
| tree | 09558b06503e5a9ed2c298f4427b439f0a2f15bb /resources/quickprint | |
| parent | 81831e568dc116305da0ebc06b6f81e7e5abd070 (diff) | |
| parent | 27fe37595c12315e930fe52f683b19d35ec31844 (diff) | |
Merge tag '15.01-RC7' into upstream
Conflicts:
Cura/gui/firmwareInstall.py
Cura/gui/mainWindow.py
Cura/gui/sceneView.py
Cura/util/profile.py
Diffstat (limited to 'resources/quickprint')
| -rw-r--r-- | resources/quickprint/materials/2_abs.ini | 2 | ||||
| -rw-r--r-- | resources/quickprint/materials/3_pet.ini | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/resources/quickprint/materials/2_abs.ini b/resources/quickprint/materials/2_abs.ini index ccf5e9b00d..7b91fd24e1 100644 --- a/resources/quickprint/materials/2_abs.ini +++ b/resources/quickprint/materials/2_abs.ini @@ -6,3 +6,5 @@ print_bed_temperature = 100 platform_adhesion = Brim filament_flow = 107 print_temperature = 250 +fan_speed = 50 +fan_speed_max = 50 diff --git a/resources/quickprint/materials/3_pet.ini b/resources/quickprint/materials/3_pet.ini new file mode 100644 index 0000000000..9b906eef10 --- /dev/null +++ b/resources/quickprint/materials/3_pet.ini @@ -0,0 +1,9 @@ +[info] +name = U-PET + +[profile] +print_bed_temperature = 60 +platform_adhesion = Brim +print_temperature = 250 +fan_speed = 50 +fan_speed_max = 50 |