32 Commits

Author SHA1 Message Date
Jaime van Kessel
ad85e29c0a
Fix stupid identation issue 2019-11-04 13:11:46 +01:00
Jaime van Kessel
aa5b788b59
Fix issue with profiles getting added to non creality printers in upgrade 2019-11-04 11:30:48 +01:00
Nino van Hooff
c62ff262ed Change SDK version to 7.0.0
CURA-6858
2019-10-21 14:51:34 +02:00
Lipu Fei
bbde75491d Fix version number in upgrade from 4.1 to 4.2 2019-09-13 10:52:41 +02:00
Jaime van Kessel
e9862fb348
Move version upgrade for intents from 4.1-4.2 to 4.3-4.4
CURA-6599
2019-09-10 10:57:25 +02:00
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
Ghostkeeper
e5ebbdd62f
Remove debugging statements
Contributes to issue CURA-6696.
2019-07-31 14:34:07 +02:00
Ghostkeeper
65b28f228b
Fix missing comma
Otherwise it would concatenate the two strings, leading to both of them effectively missing from the set.
2019-07-31 14:22:23 +02:00
Ghostkeeper
5cf4cd03cf
Fix importing profiles for CR10s
It was somehow missing from this list. An oversight.

Fixes #6083.
2019-07-31 14:18:44 +02:00
Jaime van Kessel
ee05dc7b47 Minor codestyle fixes 2019-07-19 10:55:22 +02:00
Jaime van Kessel
b8d27b9ce3 Fix definition_changes not being updated properly
CURA-6667
2019-07-19 10:53:11 +02:00
Jaime van Kessel
7d446722a9 Remove the max-z-speed-override
CURA-6625
2019-07-03 16:13:21 +02:00
Lipu Fei
7f824b06bb Fix typing 2019-07-03 09:09:23 +02:00
Ghostkeeper
bb6e9da526
Fix upgrading custom quality profiles for Creality printers
Quite a lot of logic necessary... Oh well.

Contributes to issue CURA-6554.
2019-07-02 16:39:56 +02:00
Ghostkeeper
d5da6e34be
Add version upgrade for Creality printers and CreawsomeMod
This should work for both.

Contributes to issue CURA-6554.
2019-07-02 16:00:06 +02:00
Ghostkeeper
aea5e50401
Stacks are upgraded to a higher version number
So indicate to the plug-in metadata that they are.
2019-06-19 13:14:02 +02:00
Ghostkeeper
91767cf81f
Fix merge conflict 2019-06-19 13:12:42 +02:00
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
728d8c3141 Add test for VersionUpgrade41to42 2019-06-03 16:22:54 +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