Merge branch '2.5'

This commit is contained in:
Ghostkeeper 2017-04-18 10:30:01 +02:00
commit e33d4693f0
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75

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": 179 },
"prime_tower_position_y": { "default_value": 178 },
"prime_tower_wipe_enabled": { "default_value": false },
"acceleration_enabled": { "value": "True" },