14 Commits

Author	SHA1	Message	Date
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
Lipu Fei	d1e7648f0e	Fix merge conflicts	2019-06-18 09:45:06 +02:00
Lipu Fei	927135e0da	Fix typing ... CURA-6460	2019-06-17 13:44:08 +02:00
Lipu Fei	42b1e4f8f6	Fix typing ... CURA-6311	2019-06-17 08:48:15 +02:00
Ghostkeeper	a55cc6fade	Also remove removed keys from visible settings ... It's listed among the setting keys that you explicitly made visible. Contributes to issue CURA-6460.	2019-06-12 13:36:40 +02:00
Ghostkeeper	056afdde5f	Merge branch 'rename_minimum_diameter' into CURA-6460_remove_square_tower ... Conflicts: plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> Change there that needed to be merged here, but we had changed lines around it.	2019-06-12 13:34:59 +02:00
Ghostkeeper	2fb722b287	Apply changed visible settings to preferences file ... Otherwise the change will not be made to the actual file, just in memory. Contributes to issue CURA-6311.	2019-06-12 13:32:43 +02:00
Ghostkeeper	a82e4bbb0b	Remove setting from 'values' category ... Oops. Contributes to issue CURA-6311.	2019-06-12 13:31:30 +02:00
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
Ghostkeeper	5fcb59d9fc	Also rename setting in list of visible settings ... Yeah, that's why the preferences file had a setting version number... Contributes to issue CURA-6311.	2019-06-12 12:55:33 +02:00
Ghostkeeper	4f954f18bd	Remove unnecessary updating of main version number ... Contributes to issue CURA-6311.	2019-06-11 17:45:08 +02:00
Ghostkeeper	489b9c4c53	Add version upgrade for version 4.1 to 4.2 ... This is necessary for the renamed setting. Contributes to issue CURA-6311.	2019-06-11 17:44:04 +02:00
Lipu Fei	9911f98deb	Add version upgrade 4.1 to 4.2 ... CURA-6460	2019-06-06 13:11:56 +02:00
Jaime van Kessel	7cc4ac741c	Add version upgrade that adds empty intent profile to the stacks ... CURA-6534	2019-06-03 11:49:03 +02:00