Ghostkeeper 02b925388a Merge branch 'updateTiZYX' of https://github.com/TiZYX/Cura into TiZYX-updateTiZYX ... 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		2019-07-02 17:35:07 +02:00
..
bundled_packages	Fix merge issue	2019-04-26 11:53:50 +02:00
definitions	Merge branch 'updateTiZYX' of https://github.com/TiZYX/Cura into TiZYX-updateTiZYX	2019-07-02 17:35:07 +02:00
extruders	Merge pull request #5578 from curso007/master	2019-06-24 13:27:03 +02:00
i18n	Improve Japanese translation that missed one sentence	2019-05-31 11:24:58 +02:00
images	add START and STE320 profiles	2019-04-25 15:42:59 +04:00
meshes	Add files via upload	2019-05-02 12:12:31 -04:00
qml	Fix the updating of material diameter.	2019-07-02 15:16:41 +02:00
quality	Merge branch 'updateTiZYX' of https://github.com/TiZYX/Cura into TiZYX-updateTiZYX	2019-07-02 17:35:07 +02:00
setting_visibility	Merge branch 'feat_line_spacings' of https://github.com/BagelOrb/Cura	2019-07-01 17:19:26 +02:00
shaders	Make stripes closer togheter in striped shader.	2019-07-02 16:49:27 +02:00
texts	Some minor fixes to change log	2019-05-28 09:42:07 +02:00
themes	Merge branch 'master' of github.com:Ultimaker/Cura	2019-06-11 09:54:14 +02:00
variants	Merge branch 'updateTiZYX' of https://github.com/TiZYX/Cura into TiZYX-updateTiZYX	2019-07-02 17:35:07 +02:00