Ghostkeeper 542a0cb2d1 Merge branch 'gMax-1.5+-Cura-3.5.1' of https://github.com/gordo3di/Cura into gordo3di-gMax-1.5+-Cura-3.5.1 ... Conflicts: resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg -> Profile weight vs. new global property resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg -> Profile weight vs. new global property resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg -> Profile weight vs. new global property resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg -> Profile weight vs. new global property		2018-12-27 16:20:37 +01:00
..
abax_pri3	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
abax_pri5	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
abax_titan	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
anycubic_4max	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
anycubic_i3_mega	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
builder_premium	Update setting_version to 5 and add 34 -> 40 upgrade	2018-06-12 10:17:35 +02:00
cartesio	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
dagoma	Also rename dagoma_neva_magis profiles to dagoma_magis	2018-09-17 11:38:51 +02:00
deltacomb	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
fabtotum	Improve generic profiles for fabtotum and zyyx	2018-11-13 11:48:02 +01:00
gmax15plus	Merge branch 'gMax-1.5+-Cura-3.5.1' of https://github.com/gordo3di/Cura into gordo3di-gMax-1.5+-Cura-3.5.1	2018-12-27 16:20:37 +01:00
imade3d_jellybox	Merge pull request #3920 from Ultimaker/CURA-5450_remove_concentric_3d	2018-06-13 16:55:44 +02:00
kemiq_q2	Merge pull request #3920 from Ultimaker/CURA-5450_remove_concentric_3d	2018-06-13 16:55:44 +02:00
malyan_m200	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
monoprice_select_mini_v2	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
peopoly_moai	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
tevo_blackwidow	Remove support_roof_enable to True in Tevo Black Widow quality profiles,	2018-10-17 10:51:28 +02:00
tizyx_k25	add variants to Tizyx K25	2018-09-30 23:10:29 +02:00
ultimaker2	Merge branch '3.4'	2018-06-28 14:43:39 +02:00
ultimaker2_plus	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
ultimaker3	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
ultimaker_original	Merge branch '3.4'	2018-06-28 14:43:39 +02:00
ultimaker_s5	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
vertex_delta_k8800	Update setting_version to 5 and add 34 -> 40 upgrade	2018-06-12 10:17:35 +02:00
zyyx	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
coarse.inst.cfg	Merge pull request #3920 from Ultimaker/CURA-5450_remove_concentric_3d	2018-06-13 16:55:44 +02:00
draft.inst.cfg	Merge pull request #3920 from Ultimaker/CURA-5450_remove_concentric_3d	2018-06-13 16:55:44 +02:00
extra_coarse.inst.cfg	Merge pull request #3920 from Ultimaker/CURA-5450_remove_concentric_3d	2018-06-13 16:55:44 +02:00
extra_fast.inst.cfg	Add extra fast base global profile	2018-06-19 11:24:24 +02:00
fast.inst.cfg	Merge pull request #3920 from Ultimaker/CURA-5450_remove_concentric_3d	2018-06-13 16:55:44 +02:00
high.inst.cfg	Merge pull request #3920 from Ultimaker/CURA-5450_remove_concentric_3d	2018-06-13 16:55:44 +02:00
normal.inst.cfg	Update setting_version to 5 and add 34 -> 40 upgrade	2018-06-12 10:17:35 +02:00