Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master

This commit is contained in:
Ghostkeeper 2020-02-25 14:34:36 +01:00
commit dba35dc664
No known key found for this signature in database
GPG Key ID: 37E2020986774393
3 changed files with 4 additions and 3 deletions

View File

@ -164,7 +164,8 @@
"support_interface_pattern": {"value": "'lines'"}, "support_interface_pattern": {"value": "'lines'"},
"support_roof_pattern": {"value": "'concentric'"}, "support_roof_pattern": {"value": "'concentric'"},
"support_interface_enable": {"value": true}, "support_interface_enable": {"value": true},
"support_interface_height": {"value": 0.5}, "support_interface_height": {"value": "layer_height * 3"},
"support_bottom_height": {"value": "layer_height"},
"adhesion_type": {"value": "'skirt'"}, "adhesion_type": {"value": "'skirt'"},
"skirt_gap": {"value": 1}, "skirt_gap": {"value": 1},

View File

@ -16,7 +16,7 @@
"machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 },
"material_diameter": { "default_value": 1.75 }, "material_diameter": { "default_value": 1.75 },
"machine_extruder_start_code": { "machine_extruder_start_code": {
"default_value": "\n;changing to tool1\nM83\nM109 T0 S{material_print_temperature}\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 Y120 F3000\nG1 X10 F12000\nG1 E-{switch_extruder_retraction_amount} F2400\n\n" "default_value": "\n;changing to tool1\nM83\nM109 T0 S{material_print_temperature}\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 Y120 F3000\nG1 X10 F12000\nG1 E-{switch_extruder_retraction_amount} F2400\n\n"
}, },
"machine_extruder_end_code": { "machine_extruder_end_code": {
"default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool1\n\n" "default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool1\n\n"

View File

@ -16,7 +16,7 @@
"machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 },
"material_diameter": { "default_value": 1.75 }, "material_diameter": { "default_value": 1.75 },
"machine_extruder_start_code": { "machine_extruder_start_code": {
"default_value": "\n;changing to tool2\nM83\nM109 T1 S{material_print_temperature}\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 Y120 F3000\nG1 X10 F12000\nG1 E-{switch_extruder_retraction_amount} F2400\n\n" "default_value": "\n;changing to tool2\nM83\nM109 T1 S{material_print_temperature}\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 E{switch_extruder_extra_prime_amount} F360\nG1 Y120 F3000\nG1 X10 F12000\nG1 E-{switch_extruder_retraction_amount} F2400\n\n"
}, },
"machine_extruder_end_code": { "machine_extruder_end_code": {
"default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool2\n\n" "default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool2\n\n"