20538 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Ghostkeeper	5b30b5bfae	Small improvement for Italian ... Thanks to Andre(e)a. Contributes to issue CURA-6663. 4.2.0	2019-07-30 13:14:21 +02:00
ChrisTerBeke	56f58c741a	Merge branch 'master' into CS-234_network_plugin_code_quality	2019-07-30 13:10:19 +02:00
ChrisTerBeke	bfca117bff	Fixes	2019-07-30 13:09:29 +02:00
Lipu Fei	78364e0c57	Fix pytest command	2019-07-30 12:57:01 +02:00
Lipu Fei	bcd18003e9	Use group runner	2019-07-30 12:53:59 +02:00
Ghostkeeper	ec9a5fce09	Disable Polish language from the UI ... The translation files have not been updated this release, so they are incomplete. Contributes to issue CURA-6663.	2019-07-30 12:06:00 +02:00
Jaime van Kessel	67dbb97958	Fix incorrect cast import	2019-07-30 11:45:27 +02:00
Jaime van Kessel	fe2412f3a7	Merge branch '4.2' of github.com:Ultimaker/Cura	2019-07-30 11:41:51 +02:00
Jaime van Kessel	914d2e98e9	Fix the disabling of the material setting fields. ... This was caused by using 2 different modelsItems.	2019-07-30 11:29:49 +02:00
Lipu Fei	2a7b887eb2	Use group gitlab runners	2019-07-30 07:51:13 +02:00
ChrisTerBeke	9e4c71cce3	Fixes for print job upload	2019-07-29 23:51:20 +02:00
ChrisTerBeke	8087fa421d	Make params named so we know what we're doing	2019-07-29 23:25:08 +02:00
ChrisTerBeke	bd6056dd33	Merge branch 'master' into CS-234_network_plugin_code_quality	2019-07-29 23:13:23 +02:00
ChrisTerBeke	b90e5b3262	re-implement requestWrite	2019-07-29 23:12:55 +02:00
ChrisTerBeke	529b483f36	Remove ABC	2019-07-29 22:00:48 +02:00
ChrisTerBeke	fa5b083b74	Small code improvements	2019-07-29 21:58:29 +02:00
ChrisTerBeke	f34fc7e6f9	Remove tests that are no longer relevant	2019-07-29 21:53:26 +02:00
ChrisTerBeke	11bd520c98	Rename some stuff to make it clear	2019-07-29 21:49:52 +02:00
ChrisTerBeke	25fde1e0c4	Extract zeroconf into separate class	2019-07-29 21:42:52 +02:00