20907 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ChrisTerBeke	b2719af0e3	Merge branch 'master' into CS-234_network_plugin_code_quality	2019-08-02 15:30:04 +02:00
ChrisTerBeke	e7fdd02b6f	First round of CI codestyle fixes	2019-08-02 15:26:24 +02:00
Jaime van Kessel	5f692f3028	Added missing typing	2019-08-02 15:16:29 +02:00
ChrisTerBeke	1fa5628cb2	Rename output device to prevent inheritance naming confusion	2019-08-02 15:16:08 +02:00
ChrisTerBeke	baa7b485ef	Fix dangling close bracket	2019-08-02 15:12:16 +02:00
ChrisTerBeke	11439644c3	Fix dangling close bracket	2019-08-02 15:11:43 +02:00
ChrisTerBeke	2628af1790	Remove commented import	2019-08-02 15:10:34 +02:00
ChrisTerBeke	0ba8bf13e1	Fix copyright year to 2019	2019-08-02 15:09:37 +02:00
Jaime van Kessel	c35c8e0f50	Move comments to be above the right bit of code	2019-08-02 14:40:59 +02:00
Jaime van Kessel	b0385ecd68	Merge branch 'master' of github.com:Ultimaker/Cura	2019-08-02 14:38:56 +02:00
Jaime van Kessel	1103df0cc9	Add test for _getIOPlugins	2019-08-02 14:38:39 +02:00
Diego Prado Gesto	69f92ff311	Update when a setting is removed from the list ... Add a connection to check when a setting was or not removed from the list of the added settings in the PerObjectSettings panel.	2019-08-02 14:34:14 +02:00
Jaime van Kessel	c7ab1a9f5d	Add tests for _isMetadataValid	2019-08-02 14:30:37 +02:00
ChrisTerBeke	92d07ddb71	Merge branch 'master' into CS-234_network_plugin_code_quality	2019-08-02 12:44:56 +02:00
Lipu Fei	c841382bbd	Add more info in exceptions	2019-08-02 11:12:16 +02:00
Mark Burton	0aae887166	Add entry for prime tower type to _isInfillOrSkinTypeMap.	2019-08-01 20:34:39 +01:00
Jaime van Kessel	3f8a65d926	Fix the settings menu not reacting to onTriggered signals	2019-08-01 11:51:58 +02:00
Ghostkeeper	8179e1ee90	Add typing	2019-08-01 11:06:22 +02:00
Vlad Gribinchuk	6f3eea3c2c	Adjust VersionUpgrade to update support_infill_angle	2019-08-01 11:41:50 +03:00
trouch	0ddeb0afd8	Creality machines - lower Z-hop speed to 5	2019-07-31 18:45:33 +02:00
PM	b517a031c0	Added FelixPro2 printer definition files	2019-07-31 16:12:29 +02:00
Ghostkeeper	52f5a1f8bc	Merge branch '4.2'	2019-07-31 14:34:25 +02:00
Ghostkeeper	e5ebbdd62f	Remove debugging statements ... Contributes to issue CURA-6696. 4.2.1	2019-07-31 14:34:07 +02:00
Ghostkeeper	ce8fdca938	Merge branch '4.2'	2019-07-31 14:23:23 +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
ChrisTerBeke	7147c788ef	Fix a bug that would pair a local and cloud printer when they were not the same	2019-07-31 12:27:33 +02:00
Vlad Gribinchuk	1a4d491dd9	Fix tabulations	2019-07-31 12:47:50 +03:00
Vlad Gribinchuk	f805a9df10	Merge branch 'master' into feature_support_line_directions ... # Conflicts: # resources/definitions/fdmprinter.def.json	2019-07-31 12:45:56 +03:00
Ghostkeeper	b3912fb930	Merge branch '4.2'	2019-07-31 10:43:17 +02:00
Jaime van Kessel	4b956953a6	Fix incorect error checking ... We don't need to check the global stack for errors, as the correct values are already checked by looking at the extruder stacks	2019-07-31 10:24:31 +02:00
Ghostkeeper	bcbedb990c	Merge branch '4.2'	2019-07-31 10:23:13 +02:00
Ghostkeeper	1d7f2e645e	Increase maximum Z speed to 10 ... The default for the Z hop speed is 10, so otherwise it wouldn't slice if Z hops are applied. Contributes to issue CURA-6679.	2019-07-31 10:22:51 +02:00
ChrisTerBeke	60d47fcbad	Only remove output device if it actually existed	2019-07-31 09:20:33 +02:00
ChrisTerBeke	dc826ab456	Fix typing	2019-07-30 22:52:29 +02:00
ChrisTerBeke	52a5a43fe2	Show cloud connection flow message when adding local network device	2019-07-30 22:44:45 +02:00
ChrisTerBeke	d280252437	Cleanup	2019-07-30 22:21:36 +02:00
ChrisTerBeke	72ac8b5f4c	Simplify output device cleanup code	2019-07-30 19:29:35 +02:00
ChrisTerBeke	c1b5cce064	Fix string formatting	2019-07-30 18:04:16 +02:00
ChrisTerBeke	b7dfa11e69	Enable network key pairing again	2019-07-30 17:41:03 +02:00
Ghostkeeper	846cbe79a3	Rename Orthogonal to Orthographic everywhere	2019-07-30 17:35:40 +02:00
ChrisTerBeke	c0933ddb2d	Simplify return	2019-07-30 17:00:30 +02:00
ChrisTerBeke	aa6105f1be	cleanup imports	2019-07-30 16:56:58 +02:00
ChrisTerBeke	69102643b7	Bring back print job preview images	2019-07-30 16:55:35 +02:00
ChrisTerBeke	cf1dff3fdc	Fix camera stream	2019-07-30 15:51:56 +02:00
ChrisTerBeke	64c7b2e737	Remove some TODOs	2019-07-30 15:32:34 +02:00
ChrisTerBeke	7398f08b27	Fix job name	2019-07-30 15:30:34 +02:00
ChrisTerBeke	1ec2ac4118	some cleanup	2019-07-30 15:20:59 +02:00
Lipu Fei	2ce567ccfe	Fix material current item reset ... CURA-6679	2019-07-30 15:16:50 +02:00
Lipu Fei	0c66fd82d4	Merge remote-tracking branch 'origin/4.2'	2019-07-30 15:16:18 +02:00