diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2020-05-11 15:03:54 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2020-05-11 15:03:54 +0300 |
| commit | 98a5321b2b7e2cbda3f03e271231477cf9ee0dcd (patch) | |
| tree | f395545dd3ecbb137c200a32552c8e06d18558d8 /resources/definitions/hms434.def.json | |
| parent | 40056c9a047b100bcbd9cd6f4f4999088cce7586 (diff) | |
| parent | 157c2d562edf42458b913a53d0e2594424b26db5 (diff) | |
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.
Diffstat (limited to 'resources/definitions/hms434.def.json')
| -rw-r--r-- | resources/definitions/hms434.def.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 4266a9b924..931bd8d94f 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -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", |