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

Conflicts:
	resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg -> Setting version was updated at the same time.
	resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg -> Deleted while we updated setting version.
This commit is contained in:
Ghostkeeper 2020-05-11 14:03:54 +02:00
commit 98a5321b2b
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
7 changed files with 7 additions and 120 deletions

View File

@ -17,12 +17,13 @@
"fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu",
"fiberlogy_hd_pla",
"filo3d_pla", "filo3d_pla_green", "filo3d_pla_red",
"generic_abs", "generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pla_175", "generic_pva_175", "generic_tpu_175",
"generic_abs", "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_petg_175", "imade3d_pla_175",
"innofill_innoflex60_175",
"leapfrog_abs_natural", "leapfrog_epla_natural","leapfrog_pva_natural",
"octofiber_pla",
"polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla",
"redd_abs", "redd_asa", "redd_hips", "redd_nylon", "redd_petg", "redd_pla", "redd_tpe",
"verbatim_bvoh_175",
"Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_PLA_Glitter", "Vertex_Delta_PLA_Mat", "Vertex_Delta_PLA_Satin", "Vertex_Delta_PLA_Wood", "Vertex_Delta_TPU",
"tizyx_abs", "tizyx_flex", "tizyx_petg", "tizyx_pla", "tizyx_pla_bois", "tizyx_pva",

View File

@ -19,7 +19,7 @@
"default_value": "\n;changing to tool1\nM83\nM109 T0 S{material_print_temperature}\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n"
},
"machine_extruder_end_code": {
"default_value": "\nG1 X10 Y120 F12000\nG1 X-25 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool1\n\n"
"default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool1\n\n"
}
}
}

View File

@ -19,7 +19,7 @@
"default_value": "\n;changing to tool2\nM83\nM109 T1 S{material_print_temperature}\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n"
},
"machine_extruder_end_code": {
"default_value": "\nG1 X10 Y120 F12000\nG1 X-25 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool2\n\n"
"default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool2\n\n"
}
}
}

View File

@ -14,16 +14,14 @@ variant = 0.4mm TP extruder
[values]
wall_0_wipe_dist = 0.0
ironing_enabled = true
infill_overlap_mm = -0.1
infill_wipe_dist = 0
default_material_print_temperature = 190
material_standby_temperature = 160
default_material_bed_temperature = 45
build_volume_temperature = 43
material_bed_temperature_layer_0 = =material_bed_temperature + 10
material_flow = 100
retraction_amount = 1
retraction_amount = 1.5
retraction_speed = 40
retraction_prime_speed = 8
retraction_extra_prime_amount = 0

View File

@ -1,36 +0,0 @@
[general]
version = 4
name = Normal
definition = hms434
[metadata]
setting_version = 15
type = quality
quality_type = normal
weight = 0
material = generic_pla
variant = 0.4mm TP extruder
[values]
wall_0_wipe_dist = 0.0
infill_overlap_mm = -0.1
infill_wipe_dist = 0
default_material_print_temperature = 190
material_standby_temperature = 160
default_material_bed_temperature = 45
build_volume_temperature = 43
material_flow = 100
retraction_amount = 1
retraction_speed = 40
retraction_prime_speed = 8
retraction_extra_prime_amount = 0
switch_extruder_retraction_amount = 2
speed_print = 50
coasting_volume = 0.05
coasting_min_volume = 0.17
coasting_speed = 100

View File

@ -1,36 +0,0 @@
[general]
version = 4
name = Coarse
definition = hms434
[metadata]
setting_version = 15
type = quality
quality_type = coarse
weight = -1
material = generic_pla
variant = 0.8mm TP extruder
[values]
wall_0_wipe_dist = 0.0
infill_overlap_mm = -0.1
infill_wipe_dist = 0
default_material_print_temperature = 190
material_standby_temperature = 160
default_material_bed_temperature = 45
build_volume_temperature = 43
material_flow = 100
retraction_amount = 1
retraction_speed = 40
retraction_prime_speed = 8
retraction_extra_prime_amount = 0
switch_extruder_retraction_amount = 2
speed_print = 50
coasting_volume = 0.05
coasting_min_volume = 0.17
coasting_speed = 100

View File

@ -1,40 +0,0 @@
[general]
version = 4
name = Normal
definition = hms434
[metadata]
setting_version = 15
type = quality
quality_type = normal
weight = 0
material = generic_pla
variant = 0.8mm TP extruder
[values]
wall_0_wipe_dist = 0.0
infill_overlap_mm = -0.1
infill_sparse_thickness = =0.4 if infill_sparse_density < 90 else 0.2
infill_wipe_dist = 0
default_material_print_temperature = 190
material_standby_temperature = 160
default_material_bed_temperature = 45
build_volume_temperature = 43
material_flow = 100
retraction_amount = 1
retraction_speed = 40
retraction_prime_speed = 8
retraction_extra_prime_amount = 0
switch_extruder_retraction_amount = 2
speed_print = 50
speed_infill = 42
support_infill_sparse_thickness = 0.4
coasting_volume = 0.05
coasting_min_volume = 0.17
coasting_speed = 100