mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Conflicts: resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_coarse.inst.cfg -> Deleted in branch, but modified for setting version resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_draft.inst.cfg -> Deleted in branch, but modified for settings version resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_coarse.inst.cfg -> Deleted in branch, but modified for settings version resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version resources/variants/tizyx_evy_dual_direct_drive.inst.cfg -> Modified in branch for new settings, in master for settings version |
||
|---|---|---|
| .. | ||
| cartesio_0.4.inst.cfg | ||
| cartesio_0.8.inst.cfg | ||
| cartesio_0.25.inst.cfg | ||
| deltacomb_025_e3d.inst.cfg | ||
| deltacomb_040_e3d.inst.cfg | ||
| deltacomb_080_e3d.inst.cfg | ||
| fabtotum_hyb35.inst.cfg | ||
| fabtotum_lite04.inst.cfg | ||
| fabtotum_lite06.inst.cfg | ||
| fabtotum_pro02.inst.cfg | ||
| fabtotum_pro04.inst.cfg | ||
| fabtotum_pro06.inst.cfg | ||
| fabtotum_pro08.inst.cfg | ||
| felixtec4_0.25.inst.cfg | ||
| felixtec4_0.35.inst.cfg | ||
| felixtec4_0.50.inst.cfg | ||
| felixtec4_0.70.inst.cfg | ||
| gmax15plus_04_e3d.inst.cfg | ||
| gmax15plus_05_e3d.inst.cfg | ||
| gmax15plus_05_jhead.inst.cfg | ||
| gmax15plus_06_e3d.inst.cfg | ||
| gmax15plus_08_e3d.inst.cfg | ||
| gmax15plus_10_jhead.inst.cfg | ||
| gmax15plus_12_e3d.inst.cfg | ||
| gmax15plus_025_e3d.inst.cfg | ||
| gmax15plus_dual_04_e3d.inst.cfg | ||
| gmax15plus_dual_05_e3d.inst.cfg | ||
| gmax15plus_dual_05_jhead.inst.cfg | ||
| gmax15plus_dual_06_e3d.inst.cfg | ||
| gmax15plus_dual_08_e3d.inst.cfg | ||
| gmax15plus_dual_10_jhead.inst.cfg | ||
| gmax15plus_dual_025_e3d.inst.cfg | ||
| hms434_0.4tpnozzle.inst.cfg | ||
| hms434_0.6tpnozzle.inst.cfg | ||
| hms434_0.8tpnozzle.inst.cfg | ||
| hms434_0.25tpnozzle.inst.cfg | ||
| hms434_1.2tpnozzle.inst.cfg | ||
| hms434_1.5tpnozzle.inst.cfg | ||
| imade3d_jellybox_0.4.inst.cfg | ||
| imade3d_jellybox_0.4_2-fans.inst.cfg | ||
| Mark2_for_Ultimaker2_0.4.inst.cfg | ||
| Mark2_for_Ultimaker2_0.6.inst.cfg | ||
| Mark2_for_Ultimaker2_0.8.inst.cfg | ||
| Mark2_for_Ultimaker2_0.25.inst.cfg | ||
| structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg | ||
| structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg | ||
| structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg | ||
| structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg | ||
| structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg | ||
| structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg | ||
| structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg | ||
| tizyx_evy_0.2.inst.cfg | ||
| tizyx_evy_0.3.inst.cfg | ||
| tizyx_evy_0.4.inst.cfg | ||
| tizyx_evy_0.5.inst.cfg | ||
| tizyx_evy_0.6.inst.cfg | ||
| tizyx_evy_0.8.inst.cfg | ||
| tizyx_evy_1.0.inst.cfg | ||
| tizyx_evy_dual_classic.inst.cfg | ||
| tizyx_evy_dual_direct_drive.inst.cfg | ||
| tizyx_k25_0.2.inst.cfg | ||
| tizyx_k25_0.3.inst.cfg | ||
| tizyx_k25_0.4.inst.cfg | ||
| tizyx_k25_0.5.inst.cfg | ||
| tizyx_k25_0.6.inst.cfg | ||
| tizyx_k25_0.8.inst.cfg | ||
| tizyx_k25_1.0.inst.cfg | ||
| ultimaker2_0.4.inst.cfg | ||
| ultimaker2_0.6.inst.cfg | ||
| ultimaker2_0.8.inst.cfg | ||
| ultimaker2_0.25.inst.cfg | ||
| ultimaker2_extended_0.4.inst.cfg | ||
| ultimaker2_extended_0.6.inst.cfg | ||
| ultimaker2_extended_0.8.inst.cfg | ||
| ultimaker2_extended_0.25.inst.cfg | ||
| ultimaker2_extended_plus_0.4.inst.cfg | ||
| ultimaker2_extended_plus_0.6.inst.cfg | ||
| ultimaker2_extended_plus_0.8.inst.cfg | ||
| ultimaker2_extended_plus_0.25.inst.cfg | ||
| ultimaker2_plus_0.4.inst.cfg | ||
| ultimaker2_plus_0.6.inst.cfg | ||
| ultimaker2_plus_0.8.inst.cfg | ||
| ultimaker2_plus_0.25.inst.cfg | ||
| ultimaker3_aa0.8.inst.cfg | ||
| ultimaker3_aa0.25.inst.cfg | ||
| ultimaker3_aa04.inst.cfg | ||
| ultimaker3_bb0.8.inst.cfg | ||
| ultimaker3_bb04.inst.cfg | ||
| ultimaker3_extended_aa0.8.inst.cfg | ||
| ultimaker3_extended_aa0.25.inst.cfg | ||
| ultimaker3_extended_aa04.inst.cfg | ||
| ultimaker3_extended_bb0.8.inst.cfg | ||
| ultimaker3_extended_bb04.inst.cfg | ||
| ultimaker_s5_aa0.8.inst.cfg | ||
| ultimaker_s5_aa0.25.inst.cfg | ||
| ultimaker_s5_aa04.inst.cfg | ||
| ultimaker_s5_aluminum.inst.cfg | ||
| ultimaker_s5_bb0.8.inst.cfg | ||
| ultimaker_s5_bb04.inst.cfg | ||
| ultimaker_s5_cc06.inst.cfg | ||
| ultimaker_s5_glass.inst.cfg | ||