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

This commit is contained in:
Ghostkeeper 2019-05-13 15:17:23 +02:00
commit da74ef83ac
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276

View file

@ -50,11 +50,6 @@
"machine_gcode_flavor": {"default_value": "RepRap (RepRap)" },
"material_print_temp_wait": {"default_value": true},
"material_bed_temp_wait": {"default_value": true },
"prime_tower_enable": {"default_value": false },
"prime_tower_size": {"value": 20.6 },
"prime_tower_position_x": {"value": 125 },
"prime_tower_position_y": {"value": 70 },
"prime_blob_enable": {"default_value": false },
"machine_max_feedrate_z": {"default_value": 1200 },
"machine_start_gcode": {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file. \nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\n\nG1 X-71 F9000;go to wipe point\nG1 Y-100 F9000\nG1 Z0 F900\n\nG1 Z0.2 F900\n\nG1 Y-65 F12000\nG1 X50 Y0 F9000\nM117 HMS434 Printing ...\n\n" },
"machine_end_gcode": {"default_value": "" },
@ -141,7 +136,12 @@
"skirt_gap": {"value": 1},
"skirt_brim_minimal_length": {"value": 50},
"prime_tower_enable": {"value": false},
"prime_tower_enable": {"value": false },
"prime_tower_wall_thickness": {"resolve": 0.7 },
"prime_tower_size": {"value": 20.6 },
"prime_tower_position_x": {"value": 125 },
"prime_tower_position_y": {"value": 70 },
"prime_blob_enable": {"default_value": false },
"coasting_enable": {"value": true},
"coasting_volume": {"value": 0.1},