6246 Commits

Author	SHA1	Message	Date
Lipu Fei	9da6044a72	Simplify camera_view data collection	2019-07-15 17:00:56 +02:00
Lipu Fei	64b23758c5	Add camera_view as stats	2019-07-12 14:35:06 +02:00
ChrisTerBeke	99e2939801	Add defense for when active printer is None	2019-07-10 12:55:12 +02:00
ChrisTerBeke	f1df7b93c4	Fix printer and print job ordering, add back 'move to top'	2019-07-10 12:42:01 +02:00
ChrisTerBeke	9ad89017d0	Add text about cloud connection when no printer can be reached on monitor	2019-07-09 09:09:08 +02:00
ChrisTerBeke	b6a00b9f7f	Hide 'move to top' opion from actions	2019-07-09 08:26:44 +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
Lipu Fei	67f10d8bc3	Merge pull request #5885 from Ultimaker/CURA-6329_add_crystallinity_setting ... Add deprime settings	2019-06-27 16:09:36 +02:00
Ghostkeeper	faf256b2f0	Rename deprime settings with the new name ... These have been renamed for greater clarity. We also have to rename them on this side now. Contributes to issue CURA-6329.	2019-06-26 16:41:51 +02:00
Ian Paschal	48a69afbcf	Merge pull request #5912 from Ultimaker/cloud-print-job-actions ... CS-134: Print job actions via cloud	2019-06-25 15:52:10 +02:00
ChrisTerBeke	1d09cb5b9c	Fix typing for optional data argument ... Co-Authored-By: Jaime van Kessel <nallath@gmail.com>	2019-06-24 13:18:27 +02:00
Jaime van Kessel	9e4f2a441b	Revert "Also upgrade profiles if only the setting version is incorrect" ... This reverts commit 77d396b9bdbfe52f70548b26adcc18038ff6115d. The upgrade only needs to be run if it still uses "profile" as type (eg 2.1 profiles). So for a regular setting version upgrade, this does not need to be run (and breaks importing profiles). Fixes CURA-6592	2019-06-24 11:59:13 +02:00
Jaime van Kessel	0a0b4821ef	Added logging for cases where the upgrade of the profile failed ... CURA-6592	2019-06-24 11:32:43 +02:00
ChrisTerBeke	1ab109ade0	Fix 'resume' action	2019-06-20 13:46:20 +02:00
ChrisTerBeke	baf9dc041c	Fix typing of Any	2019-06-20 12:56:45 +02:00
ChrisTerBeke	0513322f86	Fix expected controller options in test	2019-06-20 12:36:56 +02:00
ChrisTerBeke	93351ec9b9	Show context menu on printers with firmware 5.3 or later	2019-06-20 12:36:15 +02:00
ChrisTerBeke	eb8d353e11	Add basic support for print job actions via Cloud output device	2019-06-19 13:58:11 +02:00
Ghostkeeper	23abcd6fd6	Merge branch 'master' into CURA-6329_add_crystallinity_setting	2019-06-19 10:49:20 +02:00
Remco Burema	c65fefce67	Merge pull request #5909 from Ultimaker/CURA-6590_fix_value_update_material ... CURA-6590 Fix value update in material profile	2019-06-18 16:56:45 +02:00
Ghostkeeper	adc6f79c9c	Merge branch 'master' into CURA-6329_add_crystallinity_setting	2019-06-18 15:50:48 +02:00
Ghostkeeper	77d396b9bd	Also upgrade profiles if only the setting version is incorrect ... We need to check both version numbers.	2019-06-18 12:00:23 +02:00
Ghostkeeper	0498d43834	Run upgrader on imported profiles from >2.1 ... Oops... It should upgrade the old profiles so that they have the correct version and setting version.	2019-06-18 12:00:23 +02:00
Ghostkeeper	7fbdccffdb	Add typing	2019-06-18 12:00:22 +02:00
Lipu Fei	51dc7b1b8e	Fix value update in material profile ... CURA-6590	2019-06-18 11:23:28 +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	fdea83cbd6	Merge branch 'master' of github.com:Ultimaker/Cura	2019-06-06 09:51:16 +02:00
Ghostkeeper	3ea68e6c7f	Fix width of labels in machine settings ... - Elide the titles in the columns. - Give the width of a ratio so that it doesn't matter if the font renders differently or if we resize the window. Fixes #5742.	2019-06-06 09:44:42 +02:00
Jaime van Kessel	d0cf7f04bf	Don't show "Your rating" for generic materials	2019-06-05 16:45:34 +02:00
Ghostkeeper	36a206b418	Also remove translation for break preparation temperature ... This setting is no longer used. If I don't remove it, it'll complain when syncing materials with the printer because it tries to serialise the material profiles then. Contributes to issue CURA-6329.	2019-06-04 17:23:20 +02:00
Ghostkeeper	a0c3738a49	Add translations for deprime settings ... These need to be read for the deprime experiments in the PPA. Contributes to issue CURA-6329.	2019-06-04 17:07:59 +02:00
Ghostkeeper	24b1930b14	Don't erase G92 commands ... They should only be read in order to detect travel moves properly. They don't need to be modified in any way. Fixes #4878.	2019-06-03 11:17:04 +02:00
Ghostkeeper	2f92479db2	Don't use caps for log entry of firmware update ... Also it might be useful to show what the newly discovered version is.	2019-06-03 09:17:35 +02:00
Cherubim	f6627daa49	Allow negative values for nozzle offsets and print head shape ... That's half of the point of these settings, anyway. Fixes #5784.	2019-05-28 17:10:32 +02:00
Cherubim	e1bb783bcd	Better bounds checking in layer numbers	2019-05-28 14:38:19 +02:00
Jaime van Kessel	14f96bd9b6	Merge branch '4.1' of github.com:Ultimaker/Cura	2019-05-28 12:41:33 +02:00