7330 commits

Author	SHA1	Message	Date
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
Mathias Lyngklip Kjeldgaard	4067f5216e	Create DisplayRemainingTimeOnLCD.py ... Added a post-processing script that prints out the estimated time remaining generated by Cura.	2019-07-31 13:34:28 +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
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
ChrisTerBeke	bfca117bff	Fixes	2019-07-30 13:09:29 +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	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
ChrisTerBeke	4b71b45aa3	Fix for initial connection	2019-07-29 21:27:28 +02:00
ChrisTerBeke	8360b5b448	Simply manual device checking	2019-07-29 19:48:57 +02:00
ChrisTerBeke	5b206496d0	Formatting new line	2019-07-29 17:41:27 +02:00
ChrisTerBeke	67045b34b5	Add some more explanation	2019-07-29 17:39:27 +02:00
ChrisTerBeke	6d9b6668e2	Add TODO	2019-07-29 17:38:07 +02:00
ChrisTerBeke	14808c5de1	Don't cache application instance	2019-07-29 17:34:31 +02:00
ChrisTerBeke	93146610f7	Fix local pause, resume and abort	2019-07-29 17:31:05 +02:00
ChrisTerBeke	1aa70748af	Consistent naming, some bug fixes	2019-07-29 17:24:10 +02:00
ChrisTerBeke	ddd282eef3	Remove absolute plugin imports, some fixes	2019-07-29 16:11:01 +02:00
ChrisTerBeke	7d69b1727d	Simplify code	2019-07-29 14:56:21 +02:00
ChrisTerBeke	4b212d6c05	Merge more stuff, re-use models for local networking as well	2019-07-29 14:53:50 +02:00
ChrisTerBeke	8f37c83b9c	Merge branch 'master' into CS-234_network_plugin_code_quality	2019-07-29 08:47:13 +02:00
Ghostkeeper	7883cf1807	Remove start_layers_at_same_position from user profiles ... There shouldn't be any since the setting was invisible, but just to be sure.	2019-07-26 17:28:44 +02:00
ChrisTerBeke	4268c011a7	Start inheriting both output devices from a base device	2019-07-26 17:05:39 +02:00
ChrisTerBeke	bd4f0c4e25	Extract API calls to separate class	2019-07-26 15:34:37 +02:00
ChrisTerBeke	fb434ec81a	Remove unneeded import	2019-07-26 15:08:49 +02:00
ChrisTerBeke	3c1b377308	Restructure codebase - part 1	2019-07-26 15:07:52 +02:00
Jaime van Kessel	e0c2611a0a	Merge branch '4.2' of github.com:Ultimaker/Cura	2019-07-26 12:47:13 +02:00
ChrisTerBeke	87517a77c2	Merge pull request #6057 from Ultimaker/network-plugin-remove-hardcoded-references ... Get rid of any hard-coded references to machines	2019-07-25 16:02:29 +02:00
ChrisTerBeke	96cf235d8c	Get rid of any hardcoded references to machines	2019-07-25 14:56:46 +02:00
Lipu Fei	9f18ceda51	Merge remote-tracking branch 'origin/master' into add_42_43_version_upgrader	2019-07-25 14:56:27 +02:00
Jaime van Kessel	8311a39f08	Fix case where an error in the stack would not prevent slicing ... CURA-6680	2019-07-25 09:42:00 +02:00