13325 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jack Ha	961b868424	CURA-4400 fix updating quality slider	2018-03-08 09:47:22 +01:00
Jack Ha	3b8d470323	Merge branch 'master' into feature_enable_disable_extruder	2018-03-08 09:35:49 +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
Jack Ha	16cebe35ef	CURA-4400 added docs to new functions	2018-03-07 16:41:03 +01: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
Jack Ha	859ac88357	Merge branch 'master' into feature_enable_disable_extruder	2018-03-07 12:59:40 +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
Jack Ha	ff1c378c08	CURA-4400 fix start slicing when disabled extruder is incompatible	2018-03-07 11:38:35 +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
Jack Ha	4568fab531	CURA-4400 fix quality profiles model to not use disabled extruder and update Not Supported or select a valid quality when enabling/disabling extruder	2018-03-07 11:27:23 +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
Jack Ha	bab46d7048	CURA-4400 only reevaluate non printing mesh if the setting actually matters	2018-03-06 17:19:31 +01:00
Lipu Fei	75d9297c7d	Optimize 3MF writer and XML material serialization ... CURA-5049	2018-03-06 17:05:58 +01:00
Jack Ha	32ce458516	CURA-4400 solved merge conflict	2018-03-06 17:05:39 +01:00
Jack Ha	ab49bd9016	Merge branch 'feature_enable_disable_extruder' of github.com:Ultimaker/Cura into feature_enable_disable_extruder	2018-03-06 17:02:07 +01:00
Jack Ha	095d9fbdf6	CURA-4400 Bugfix do not handle layer scene nodes in solidview	2018-03-06 17:01:30 +01:00
Jack Ha	92e80fa26a	CURA-4400 Bugfix do not handle layer scene nodes in solidview	2018-03-06 16:28:40 +01:00
Jack Ha	63e679e4a0	CURA-4400 updated UM3 machine_head_with_fans_polygon	2018-03-06 16:28:00 +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
Lipu Fei	eb84e6aa3e	Disable not supported custom profiles ... CURA-5051	2018-03-06 15:47:49 +01:00
Aleksei S	6bb42da056	Removed related commits to Settins per Object validation and ... added short validation in StartScliceJob CURA-4972	2018-03-06 15:40:26 +01:00
Lipu Fei	fb798ab7e5	Small refactor in MachineManager and add more loggings ... CURA-4606 - Added more info loggings - Changed some variant names - Use some shortcut variables instead of getInstance()s	2018-03-06 15:30:39 +01:00
Lipu Fei	cb7677347d	Fix material model update upon variant change ... CURA-5052	2018-03-06 15:27:05 +01:00
Lipu Fei	31b7374689	Fix material settings saving upon dialog close ... CURA-4606 Force to trigger a lose focus on all editing fields so their onEditingFinished callback will get triggered.	2018-03-06 13:40:32 +01:00
Tim Kuipers	5950d147ac	Update ISSUE_TEMPLATE.md ... More focus on printer and attaching project file	2018-03-06 13:20:15 +01:00
Tim Kuipers	f8c129f4c7	Update ISSUE_TEMPLATE.md ... Allow for uploading curaproject files in github directly	2018-03-06 12:46:48 +01:00
Aleksei S	42ac725705	Merge branch 'master' of github.com:Ultimaker/cura	2018-03-06 12:40:55 +01:00
Aleksei S	1f883f3312	Remove reply hanlder to prevent crash after canceling a printing job ... CURA-4960	2018-03-06 12:39:54 +01:00
Lipu Fei	ff0d694e72	Select the activated material when material management page shows up ... CURA-4606	2018-03-06 11:55:24 +01:00
Jack Ha	8ebd778224	CURA-4400 force update all settings if something changed with the extruder	2018-03-06 11:48:22 +01:00
Mark Burton	1ed5a00198	Added skin densities and layer 3 settings + tweaked various defaults.	2018-03-06 10:47:28 +00:00
Lipu Fei	27b3a71a98	Sort branded materials for dropdown menu ... CURA-4606	2018-03-06 11:26:16 +01:00
ChrisTerBeke	96b40433a9	Merge branch 'master' into docker	2018-03-06 11:19:30 +01:00
Ian Paschal	8d5a643c9b	Removed print() statement	2018-03-06 10:51:39 +01:00
Jack Ha	00a173b1bf	CURA-4400 when enabling / disabling extruder, remove user changes that are no longer enabled	2018-03-06 09:55:43 +01:00
Ghostkeeper	3e8f29d380	Allow floating point values for moving print head ... The X, Y, Z coordinates and speed don't necessarily have to be full millimetres or millimetres per minute. Fixes #3271.	2018-03-06 09:37:47 +01:00
ChrisTerBeke	5a8f2040d3	Add method to machine manager to get a machine stack by definition id	2018-03-05 17:53:40 +01:00
Jack Ha	7fd0a9b98b	CURA-4400 fixed multiply	2018-03-05 17:01:53 +01:00
Jack Ha	bad637eb14	CURA-4400 fixed merge conflicts	2018-03-05 16:47:40 +01:00
Aleksei S	9901780dbc	Merge branch 'master' of github.com:Ultimaker/cura	2018-03-05 16:45:42 +01:00
Aleksei S	a35d4ae400	Fix: After clicking "cancel" button while sending a print job ... the connection is disconnected CURA-4960	2018-03-05 16:43:58 +01:00
Jack Ha	01f4e7c0e3	CURA-4400 on load mesh, set the extruder to the default extruder	2018-03-05 16:31:49 +01:00