Ghostkeeper 20201c65e6 Merge branch 'master' into feature_intent ... Conflicts: resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously tests/TestMachineManager.py -> Due to changes in conftest.py tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties		2019-08-13 14:43:28 +02:00
..
bundled_packages	Merge branch 'master' of github.com:Ultimaker/Cura into add_42_43_version_upgrader	2019-07-23 11:33:52 +02:00
definitions	Expand documentation of Maximum Deviation	2019-08-13 13:41:05 +02:00
extruders	Added FelixPro2 printer definition files	2019-07-31 16:12:29 +02:00
i18n	Change support_infill_angle to support_infill_angles	2019-08-12 13:57:29 +02:00
images	Remove Felix' platform texture	2019-08-05 10:35:55 +02:00
intent	Give special values to the intents	2019-07-05 14:20:36 +02:00
meshes	Added FelixPro2 printer definition files	2019-07-31 16:12:29 +02:00
qml	Merge branch 'master' into feature_intent	2019-08-13 14:43:28 +02:00
quality	Change support_infill_angle to support_infill_angles	2019-08-12 13:57:29 +02:00
setting_visibility	Add random infill start setting to expert-visibility.	2019-08-09 14:38:57 +02:00
shaders	Make stripes closer togheter in striped shader.	2019-07-02 16:49:27 +02:00
texts	Updated change_log.txt with one letter typo	2019-07-29 13:34:53 +02:00
themes	Simplified the dark & light theme for colorblindness	2019-07-23 14:19:21 +02:00
variants	Upgrade to setting_version 9	2019-08-05 10:29:00 +02:00