Ghostkeeper cf9f97e897 Merge branch 'rename_minimum_diameter' into CURA-6460_remove_square_tower ... Conflicts: plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> Both had a version upgrade implementation. plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py -> Both had a version upgrade implementation.		2019-06-12 13:03:05 +02:00
..
bundled_packages	Fix merge issue	2019-04-26 11:53:50 +02:00
definitions	Merge branch 'rename_minimum_diameter' into CURA-6460_remove_square_tower	2019-06-12 13:03:05 +02:00
extruders	Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master	2019-05-28 12:56:18 +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 hiding settings that were not visible by default	2019-06-05 16:36:30 +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 remote-tracking branch 'origin/4.1'	2019-05-22 07:44:26 +02:00
variants	Increment setting_version to 8	2019-06-12 09:09:41 +02:00