Ghostkeeper 5ab1881a21 Merge branch 'master' into feature_intent ... Conflicts: plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3. plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py		2019-06-19 13:10:36 +02:00
..
bundled_packages	Add version upgrade that adds empty intent profile to the stacks	2019-06-03 11:49:03 +02:00
definitions	Merge pull request #5888 from Ultimaker/rename_minimum_diameter	2019-06-17 15:39:44 +02:00
extruders	Merge branch 'master' of https://github.com/Robokinetics/Cura into Robokinetics-master	2019-06-17 09:38:12 +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
intent	Expose intent model to QML	2019-06-05 09:57:42 +02:00
meshes	Add files via upload	2019-05-02 12:12:31 -04:00
qml	Merge branch 'master' into feature_intent	2019-06-19 13:10:36 +02:00
quality	Merge branch 'rename_minimum_diameter' into CURA-6460_remove_square_tower	2019-06-12 13:03:05 +02:00
setting_visibility	Merge branch 'rename_minimum_diameter' into CURA-6460_remove_square_tower	2019-06-12 13:03:05 +02:00
shaders	Move multiplication from Python to shaders. (Needs the same-named Uranium branch.)	2019-04-19 16:58:38 +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	Increment setting_version to 8	2019-06-12 09:09:41 +02:00