6226 Commits

Author	SHA1	Message	Date
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
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
Jaime van Kessel	63316fa4e9	Fix manual output devices not being added on boot	2019-05-28 11:59:17 +02:00
Cherubim	cdafdc8d5c	Break up translation in two pieces ... As a rule of thumb, translated text should not contain any layout. This particular text has gone wrong in the translations because the translators didn't translate the second part (or their application messed it up). I'm breaking it up into two pieces as to force them to translate both. Contributes to issue CURA-6547.	2019-05-28 11:23:42 +02:00
Lipu Fei	8a18e0c65c	Merge branch 'master' of github.com:Ultimaker/Cura	2019-05-24 10:51:19 +02:00
Lipu Fei	7c6c00df84	Merge remote-tracking branch 'origin/4.1'	2019-05-24 10:50:43 +02:00
Lipu Fei	27d6b9b53b	Calculate bounding box for helper meshes	2019-05-24 10:49:35 +02:00
Ghostkeeper	4e361a068c	Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting" ... This reverts commit bec7b6546d3f7de457418a2e15f08c1e6dfa3148, reversing changes made to 7094b222b10076af3a13f11b03dd3416eae12156. The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this. Conflicts: plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.	2019-05-23 13:40:11 +02:00
Lipu Fei	5b7b262d61	Merge remote-tracking branch 'origin/4.1'	2019-05-23 10:53:24 +02:00
Lipu Fei	50e4519298	Fix upgrade 40 to 41	2019-05-23 10:46:14 +02:00
Lipu Fei	3ca272ff72	Merge remote-tracking branch 'origin/4.1'	2019-05-22 07:44:26 +02:00
Remco Burema	083564a184	Merge pull request #5763 from Ultimaker/CL-1329_fix_monitor_progress_bar_bug ... CL-1329 fix monitor progress bar bug	2019-05-21 17:27:53 +02:00
Ian Paschal	5a8b70ad0c	Simplify can_override conditional ... Contributes to CL-1259	2019-05-20 15:48:57 +02:00
Ian Paschal	0dc49a66f1	Merge pull request #5762 from Ultimaker/CL-1259_hide_useless_override_button ... CL-1259 hide useless override button	2019-05-20 15:47:26 +02:00
Ian Paschal	0c9f3a1842	Update MonitorConfigOverrideDialog.qml ... Contributes to CL-1259	2019-05-20 15:47:19 +02:00
Ian Paschal	7be3863d51	Put override logic in Python instead of QML ... Contributes to CL-1259	2019-05-20 15:46:07 +02:00
Ian Paschal	2a80a8d0db	Simplify can_override conditional ... Contributes to CL-1259	2019-05-20 15:12:08 +02:00
Ghostkeeper	19cc267726	Merge branch '4.1'	2019-05-20 13:42:38 +02:00
Jaime van Kessel	fbc4c5fb1e	Merge pull request #5719 from Ultimaker/CURA-6497_fix_empty_material_name ... CURA-6497 Add validation for empty strings in SettingDefinition	2019-05-20 13:40:39 +02:00
Jaime van Kessel	5ae103964a	Merge branch 'CURA-6497_fix_empty_material_name' of github.com:Ultimaker/Cura into 4.1	2019-05-20 13:38:37 +02:00
Ian Paschal	3b7b554f1a	Update MonitorPrintJobProgressBar.qml ... Contributes to CL-1329	2019-05-20 12:18:55 +02:00
Ian Paschal	c9588d173f	Add monitor column to theme ... Contributes to CL-1329	2019-05-20 12:18:38 +02:00