Merge branch '2.6'

This commit is contained in:
Ghostkeeper 2017-06-02 10:27:51 +02:00
commit afb5dd7582
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
2 changed files with 14 additions and 12 deletions

View file

@ -70,7 +70,7 @@
"machine_start_gcode": { "default_value": "" },
"machine_end_gcode": { "default_value": "" },
"prime_tower_position_x": { "default_value": 175 },
"prime_tower_position_y": { "default_value": 178 },
"prime_tower_position_y": { "default_value": 177 },
"prime_tower_wipe_enabled": { "default_value": false },
"prime_blob_enable": { "enabled": true },