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

This commit is contained in:
Ghostkeeper 2019-09-25 11:53:44 +02:00
commit 23cc73a78f
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276

View File

@ -19,7 +19,7 @@
"fiberlogy_hd_pla",
"filo3d_pla", "filo3d_pla_green", "filo3d_pla_red",
"generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pva_175", "generic_tpu_175",
"imade3d_generic_petg_175", "imade3d_generic_pla_175",
"imade3d_petg_175", "imade3d_pla_175",
"innofill_innoflex60_175",
"octofiber_pla",
"polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla",
@ -67,7 +67,8 @@
"machine_gcode_flavor": {"default_value": "RepRap (RepRap)" },
"material_print_temp_wait": {"default_value": false },
"material_bed_temp_wait": {"default_value": false },
"machine_max_feedrate_z": {"default_value": 1200 },
"machine_max_feedrate_z": {"default_value": 10 },
"machine_acceleration": {"default_value": 1000 },
"machine_start_gcode": {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X-44 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nM117 HMS434 Printing ...\n\n" },
"machine_end_gcode": {"default_value": "" },
@ -130,11 +131,12 @@
"speed_travel": {"value": "150"},
"speed_travel_layer_0": {"value": "speed_travel"},
"speed_support_interface": {"value": "speed_topbottom"},
"speed_z_hop": {"value": 10},
"speed_slowdown_layers": {"value": 1},
"acceleration_print": {"value": 200},
"acceleration_travel": {"value": 200},
"jerk_print": {"value": 5},
"jerk_travel": {"value": 5},
"acceleration_print": {"value": 1000},
"acceleration_travel": {"value": 1000},
"jerk_print": {"value": 10},
"jerk_travel": {"value": 10},
"retraction_hop_enabled": {"value": false},
"retraction_hop": {"value": 1},