13230 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ghostkeeper	cf21e7c74b	Also upgrade definition_changes and user ... Because these files share their version numbers with quality changes. Contributes to issue CURA-5054.	2018-03-09 16:21:42 +01:00
Ghostkeeper	d8a066c1e7	Increment instance container version number instead of just quality_changes ... Otherwise when we load that quality_changes file we'll deny it because the instance container version number is wrong. Contributes to issue CURA-5054.	2018-03-09 16:14:24 +01:00
Ghostkeeper	3a832d66a9	Safer check for extruder vs. global ... Because it might be an empty string. Contributes to issue CURA-5054.	2018-03-09 16:07:54 +01:00
Ghostkeeper	b797ac1a15	Read only position from metadata ... We now determine whether this is a global or an extruder profile based on whether the position metadata field is present, instead of whether the extruder metadata field is present. Contributes to issue CURA-5054.	2018-03-09 16:07:06 +01:00
Ghostkeeper	5d2e98cdd4	Translate to American English ... The spelling in AmE is with a Z.	2018-03-09 15:55:27 +01:00
Ghostkeeper	e18b1cde55	Store extruder position under 'position' instead of 'extruder' ... Otherwise it thinks it is still an extruder ID. Contributes to issue CURA-5054.	2018-03-09 15:37:30 +01:00
Ghostkeeper	71afbba789	Merge branch '3.2'	2018-03-09 15:36:51 +01:00
Ghostkeeper	c54ea00111	Merge branch 'master' of github.com:Ultimaker/Cura	2018-03-09 15:22:13 +01:00
Ghostkeeper	5caa92cf7a	Update current version for quality changes ... We now need to upgrade up to version 3000004. Contributes to issue CURA-5054.	2018-03-09 15:21:45 +01:00
Ghostkeeper	2962e0e282	Upgrade to quality_changes rather than quality ... Oops. Contributes to issue CURA-5054.	2018-03-09 15:20:20 +01:00
Lipu Fei	206d20c440	Fix empty definition_changes check in MachineSettingsAction ... CURA-5060 Should check for both "empty" and "empty_definition_changes".	2018-03-09 15:04:57 +01:00
Ghostkeeper	65591e7c26	Merge branch 'master' of github.com:Ultimaker/Cura	2018-03-09 15:00:25 +01:00
Lipu Fei	c9905449eb	Clean up MachineSettingsAction imports ... CURA-5060	2018-03-09 14:54:13 +01:00
Ghostkeeper	fb814b6519	Implement upgrade for quality changes extruder metadata ... The metadata used to be the ID of the extruder. Now it's the position of the extruder stack. Contributes to issue CURA-5054.	2018-03-09 14:54:08 +01:00
Lipu Fei	8c7e413038	Remove unnecessary setGlobalContainerStack() in project loading ... CURA-5073	2018-03-09 14:37:43 +01:00
Lipu Fei	48dae7b6c7	Remove commented code ... CURA-5060	2018-03-09 14:35:43 +01:00
Lipu Fei	de72dd3455	Fix material update upon gcode flavour change ... CURA-5060	2018-03-09 14:26:53 +01:00
Andreea Scorojitu	a40be0c64a	Add default_build_plate to expert view, CURA-5032 ... The default build plate settings is now added in Expert view in SettingsVisibility	2018-03-09 14:25:35 +01:00
Ghostkeeper	e30d15ab66	Implement getCfgVersion ... Mostly copied from the implementation in the 3.0 to 3.1 upgrade. Contributes to issue CURA-5054.	2018-03-09 14:02:15 +01:00
Mark	af89209cde	Changed rounding of prettyTime by accident	2018-03-09 14:02:04 +01:00
Ghostkeeper	60de2aff65	Basic upgrade module from 3.2 to 3.3 implementation ... 'Basic' meaning no implementation at all. Contributes to issue CURA-5054.	2018-03-09 13:59:31 +01:00
Ghostkeeper	970f1da810	Add missing getVersion and location for quality ... It worked out because older plug-ins still defined this, but let's properly put it in here too. Contributes to issue CURA-5054.	2018-03-09 13:47:19 +01:00
Ghostkeeper	d8853b8a98	Sort profile models case-insensitively ... Cast every sorting key to uppercase before doing this. Don't cast to lowercase or there will be problems with characters that don't have lowercase and with Turkish dotted i vs. undotted i. Fixes #3460.	2018-03-09 11:40:33 +01:00
Lipu Fei	3550ef80e0	Fix quality management page QML ... CURA-5063	2018-03-09 11:00:39 +01:00
Ian Paschal	6bee5bf1b0	CURA-4972 Tweak per review comments	2018-03-09 10:36:34 +01:00
Ian Paschal	c278942cec	CURA-67 Don't enable by default ... `value` is set to !support and !tree support, both of which are typically disabled by default, making this setting's default value effectively `true` even though the line above says the default should be `false`.	2018-03-09 10:26:48 +01:00
Lipu Fei	15f017b404	Set dirty for containers created in project loading ... CURA-5056	2018-03-09 10:18:51 +01:00
Ghostkeeper	a4f9c91d95	Add acceleration/jerk data for TEVO Tarantula ... Thanks to @SuperBoppy in ticket #3323.	2018-03-09 09:30:32 +01:00
Lipu Fei	ef8cd304dc	No keep/discard setting dialog in project loading ... CURA-4966	2018-03-08 20:00:21 +01:00
Lipu Fei	b8d3cbfe16	Refactor project loading ... CURA-4966	2018-03-08 19:50:45 +01:00
Lipu Fei	6aefb2215d	Fix _setQualityChangesGroup() ... CURA-4966	2018-03-08 19:50:45 +01:00
Lipu Fei	d1beae4603	Better logging for checkIsValidProjectFile() ... CURA-4966	2018-03-08 19:50:22 +01:00
Ghostkeeper	b4cf25cb7f	Call moveHead and moveBed on the printer model ... Instead of on the output device. This function was moved, which caused Cura to crash when the bed levelling procedure was called. Contributes to issue CURA-5061.	2018-03-08 15:29:48 +01:00
Ghostkeeper	676f9b8474	Switch if-statement around for fail checking ... This reduces indent and makes the control flow a bit easier to read in my opinion. Contributes to issue CURA-5061.	2018-03-08 15:23:08 +01:00
Ghostkeeper	375770818b	Add typing for _getPrinterOutputDevices ... Then my IDE will give hints on where a printer of the wrong type is being added. Contributes to issue CURA-5061.	2018-03-08 14:23:14 +01:00
Lipu Fei	2a10c9a2d7	Move assertion in _performMerge() ... CURA-5070	2018-03-08 09:10:45 +01:00
ChrisTerBeke	3d42849f90	Merge pull request #3418 from Ultimaker/docker ... Docker support	2018-03-07 11:08:42 -08:00
Lipu Fei	618bcebd82	Fix create new for conflicting materials in project loading ... CURA-5056	2018-03-07 16:38:24 +01:00
Lipu Fei	77e3be68b3	Add removeMaterialByRootId() in MaterialManager ... CURA-5056	2018-03-07 16:38:24 +01:00
Lipu Fei	29792bbdd8	Reschedule update upon incomplete data in MaterialManager ... CURA-5056	2018-03-07 16:38:24 +01:00
Ian Paschal	a704f59034	Merge pull request #3175 from smartavionics/mb-add-bridge-settings ... Add bridge settings to experimental category.	2018-03-07 16:30:08 +01:00
Lipu Fei	27cce56467	Add error message for possible bugs in MaterialManager ... CURA-5056	2018-03-07 11:45:49 +01:00
Lipu Fei	c0d55ac2a8	Postpone signals in project loading to avoid incomplete data update ... CURA-5056	2018-03-07 11:45:49 +01:00
Aleksei S	23653d7357	Fix: Pressing 'cancel' button during compressing the print job should show "Prepare" page ... CURA-4960	2018-03-07 11:34:10 +01:00
Ghostkeeper	507de9c22c	Catch timeout exceptions when printing via USB ... If the firmware froze or something...	2018-03-07 11:30:36 +01:00
Ghostkeeper	ecfb62b69e	Rename ColorChange to FilamentChange ... I think this is more clear to the users what this should actually do.	2018-03-07 11:01:00 +01:00
Lipu Fei	6cae5c2e35	Remove unnecessary signal connection in MaterialsModel ... CURA-5052	2018-03-07 10:39:23 +01:00
Lipu Fei	75d9297c7d	Optimize 3MF writer and XML material serialization ... CURA-5049	2018-03-06 17:05:58 +01:00
Ghostkeeper	3b0a9bf16c	Fix checking whether to render objects in X-ray pass ... Otherwise nothing gets drawn there. Contributes to issue CURA-5040.	2018-03-06 15:53:34 +01:00
Ghostkeeper	b179edf60e	Document which layer is which pass ... Contributes to issue CURA-5040.	2018-03-06 15:53:34 +01:00