Ghostkeeper 309d3fc56f Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master ... Conflicts: resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit. resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit. resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit. resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.		2020-04-07 23:40:10 +02:00
..
bundled_packages	Add Versionupgrader to bundled plugin list	2020-04-06 11:20:44 +02:00
definitions	Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master	2020-04-07 23:40:10 +02:00
extruders	Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master	2020-04-07 23:40:10 +02:00
i18n	Update translation file headers for Cura 4.6	2020-04-06 17:19:59 +02:00
images	Merge pull request #7101 from yyh1002/master	2020-03-18 16:12:50 +01:00
intent	Increment setting version to 13	2020-04-01 15:14:01 +02:00
meshes	New Deltacomb Models and updates	2020-03-26 00:28:31 +01:00
qml	Merge branch '4.6'	2020-04-02 17:21:03 +02:00
quality	Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master	2020-04-07 23:40:10 +02:00
setting_visibility	Merge pull request #7010 from smartavionics/mb-hole-offset	2020-02-13 09:05:18 +01:00
shaders	Older drivers can lie w.r.t. GLSL-version if it's forced lower.	2019-09-21 14:58:59 +02:00
texts	Updated "What's New?"change log for 4.6	2020-04-03 16:02:00 +02:00
themes	Add placeholder header pattern	2020-03-20 14:05:42 +01:00
variants	Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master	2020-04-07 23:40:10 +02:00
public_key.pem	Move the package signature pem file to the Resources folder	2020-03-19 15:14:21 +01:00