3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-11 07:47:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Merge branch '2.1'

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

16
resources/machines/innovo-inventor.json
View file

@ -27,15 +27,13 @@
"machine_end_gcode": {"default": "M104 S0\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors"},
"machine_platform_offset": {"default": [-180, -0.25, 160]}
},
"overrides": {
"layer_height": { "default": 0.15 },
"shell_thickness": { "default": 0.8},
"wall_thickness": { "default": 0.8 },
"top_bottom_thickness": { "default": 0.3, "visible": true },
"material_print_temperature": { "default": 215, "visible": true },
"material_bed_temperature": { "default": 60, "visible": true },
"material_diameter": { "default": 1.75, "visible": true },
"overrides": {
"layer_height": { "default": 0.15},
"wall_thickness": { "default": 0.8},
"top_bottom_thickness": { "default": 0.3, "visible": true},
"material_print_temperature": { "default": 215, "visible": true},
"material_bed_temperature": { "default": 60, "visible": true},
"material_diameter": { "default": 1.75, "visible": true},
"retraction_enable": { "default": true, "always_visible": true},
"retraction_speed": { "default": 50.0, "visible": false },
"retraction_amount": { "default": 2.5, "visible": false },