Merge branch 'CURA-5672_fix_s5_extruder_start_end_locations' of github.com:Ultimaker/Cura into 3.5

This commit is contained in:
Jaime van Kessel 2018-09-12 14:17:45 +02:00
commit ecc66fe05b
2 changed files with 4 additions and 4 deletions

View File

@ -17,10 +17,10 @@
"machine_nozzle_offset_y": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 },
"machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_abs": { "default_value": true },
"machine_extruder_start_pos_x": { "default_value": 310 }, "machine_extruder_start_pos_x": { "default_value": 330 },
"machine_extruder_start_pos_y": { "default_value": 237 }, "machine_extruder_start_pos_y": { "default_value": 237 },
"machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_abs": { "default_value": true },
"machine_extruder_end_pos_x": { "default_value": 310 }, "machine_extruder_end_pos_x": { "default_value": 330 },
"machine_extruder_end_pos_y": { "default_value": 237 }, "machine_extruder_end_pos_y": { "default_value": 237 },
"machine_nozzle_head_distance": { "default_value": 2.7 }, "machine_nozzle_head_distance": { "default_value": 2.7 },
"extruder_prime_pos_x": { "default_value": -3 }, "extruder_prime_pos_x": { "default_value": -3 },

View File

@ -17,10 +17,10 @@
"machine_nozzle_offset_y": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 },
"machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_abs": { "default_value": true },
"machine_extruder_start_pos_x": { "default_value": 310 }, "machine_extruder_start_pos_x": { "default_value": 330 },
"machine_extruder_start_pos_y": { "default_value": 219 }, "machine_extruder_start_pos_y": { "default_value": 219 },
"machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_abs": { "default_value": true },
"machine_extruder_end_pos_x": { "default_value": 310 }, "machine_extruder_end_pos_x": { "default_value": 330 },
"machine_extruder_end_pos_y": { "default_value": 219 }, "machine_extruder_end_pos_y": { "default_value": 219 },
"machine_nozzle_head_distance": { "default_value": 4.2 }, "machine_nozzle_head_distance": { "default_value": 4.2 },
"extruder_prime_pos_x": { "default_value": 333 }, "extruder_prime_pos_x": { "default_value": 333 },