20723 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
HUNIBEST	67aa37b13d	Add Cubicon plus A15 and A30 ... Add Cubicon devices profile - Style Plus-A15 - Dual Pro-A30 CURA-6771	2019-09-12 14:05:13 +02:00
Ghostkeeper	ba0ebf044a	Merge branch '4.3'	2019-09-12 13:54:55 +02:00
Nino van Hooff	0cd664975e	Remove face selection for a PreviewPass ... Fixes issue where the selected face for the lay-flat feature showed up in the model thumbail of print jobs. CURA-6754	2019-09-12 13:42:19 +02:00
ChrisTerBeke	558698add7	Merge branch '4.3'	2019-09-12 12:04:01 +02:00
Chris ter Beke	08e088e607	Merge pull request #6340 from Ultimaker/CS-59_new_printers_found_popup ... CS-59: Message when new cloud printers were added to your account	2019-09-12 11:59:44 +02:00
Jaime van Kessel	a279ee5f22	Fix sync issues when printer was added by cloud ... CURA-6769	2019-09-12 11:21:09 +02:00
ChrisTerBeke	07672fd569	Show message when new cloud printers were added to your account but not in Cura yet	2019-09-12 11:04:05 +02:00
Jaime van Kessel	5e4f673ec2	Merge branch '4.3' of github.com:Ultimaker/Cura	2019-09-11 16:10:12 +02:00
Jaime van Kessel	112c2266f8	Merge branch '4.3' of github.com:Ultimaker/Cura into 4.3	2019-09-11 15:15:48 +02:00
Jaime van Kessel	ab910c2a37	Disable retraction min travel ... It's broken right now, so we should enable it again once it's fixed CURA-6675	2019-09-11 15:12:49 +02:00
Simon Edwards	4ab84c0568	Merge pull request #6335 from Ultimaker/CS-158_fix_monitor_progress_bar ... CS-158 Fix monitor tab print status (4.3 cherry pick)	2019-09-11 15:05:13 +02:00
Ian Paschal	72ba6153c2	Boyscout some stuff ... CS-158	2019-09-11 14:50:54 +02:00
Ian Paschal	3b5cf115f1	Reduce progress bar length ... CS-158	2019-09-11 14:50:42 +02:00
Ian Paschal	07a5213ea6	Reduce text size to 12pt from 14pt ... CS-158	2019-09-11 14:50:15 +02:00
Ian Paschal	d370a69073	Add some theme values ... CS-158	2019-09-11 14:49:36 +02:00
Ghostkeeper	61cedb8385	Merge branch '4.3'	2019-09-10 17:33:47 +02:00
Ghostkeeper	8126cdc051	Update translation headers for Cura 4.3 ... Contributes to issue CURA-6768.	2019-09-10 17:33:30 +02:00
Ghostkeeper	6643bf5083	Update translation files per language for Cura 4.3 ... The translators can now fill these in with their translations. Contributes to issue CURA-6768.	2019-09-10 17:33:29 +02:00
Ghostkeeper	b877717fde	Update translation template files for Cura 4.3 ... These are the new strings in Cura 4.3. Contributes to issue CURA-6768.	2019-09-10 17:33:29 +02:00
Diego Prado Gesto	c6f5f4fb33	Merge pull request #6308 from smartavionics/mb-fix-legacy-glsl-issue ... Remove gl_PrimitiveID from shader when it's not available.	2019-09-10 17:33:02 +02:00
Diego Prado Gesto	190984462b	Merge branch '4.3'	2019-09-10 14:17:31 +02:00
Lipu Fei	cfeefe365d	Merge pull request #6328 from Ultimaker/fix_select_face ... CURA-6754 / CURA-6761 Fix Select Face	2019-09-10 14:05:41 +02:00
Ghostkeeper	9b05624b8d	Merge branch '4.3'	2019-09-10 14:04:09 +02:00
Ellecross	8e37255242	Add Z Seam Position in Expert View ... As discussed in CCB, we will add the Z Seam Position setting in expert view so that it's shown together with Z Seam X and Z Seam Y settings.	2019-09-10 13:36:10 +02:00
Remco Burema	e5a690e605	Wrap up 'lay flat by face' feature for 4.3-BETA. ... Icon thanks to Yi-An Lai. part of CURA-6754	2019-09-10 12:37:59 +02:00
Lipu Fei	87285f6b86	Fix version upgrade 42 to 43	2019-09-10 12:22:16 +02:00
Remco Burema	c7bae1e8fc	Move 'lay flat by face' operation to Uranium.	2019-09-09 23:25:16 +02:00
Ghostkeeper	f561218346	Merge branch '4.3'	2019-09-09 17:37:12 +02:00
Ghostkeeper	8c817e041e	Reduce size of print head without fans for one-at-a-time mode ... This allows you to place models more compactly. According to the discussion at #5590, this was tested to work well. Fixes #5590.	2019-09-09 17:37:01 +02:00
Ghostkeeper	a43de19113	Reduce size of print head without fans for one-at-a-time mode ... This allows you to place models more compactly. According to the discussion at #5590, this was tested to work well. Fixes #5590.	2019-09-09 17:36:14 +02:00
Diego Prado Gesto	ddcd8e40cc	Merge pull request #6292 from samirabaza/patch-7 ... Update printrbot_simple.def.json	2019-09-09 16:26:51 +02:00
Ghostkeeper	eb401defdf	Add deprecated marker on extruders: Use extruderList ... Extruders is dangerous because it's a dict of which the values are randomly ordered. The keys are often cast to int so you can't use anything else than integer numbers. And then they are often cast back so if you're not properly counting from 0 you're also in trouble. So please, only use the list. Eventually we can switch the data structure around.	2019-09-09 14:21:57 +02:00
Jaime van Kessel	8c893caf9f	Merge pull request #6315 from Ultimaker/CURA-6755_add_retract_continue_script ... Add retract-continue script	2019-09-09 13:05:33 +02:00
Lipu Fei	ea8b7ebd02	Fix remove all nodes for loaded gcode ... Fixes the problem caused in UM commit 69057b48a1fc3df7c5c6f3e754a3beb285a94678	2019-09-09 11:49:25 +02:00
ChrisTerBeke	669fb39f40	Catch type errors when trying to populate models from API response	2019-09-09 10:44:17 +02:00
Jaime van Kessel	6f8c6b4af7	Merge branch 'master' of github.com:Ultimaker/Cura	2019-09-09 09:10:08 +02:00
Jaime van Kessel	5463f7600b	Add processEvent calls so progress bar moves while loading ... CURA-6572	2019-09-09 09:08:52 +02:00
Ghostkeeper	354729b621	Only show support flow if support is enabled	2019-09-07 23:19:59 +02:00
Ghostkeeper	5e302c6a67	Fix display of Z Hop After Extruder Switch Height on single extruder ... If the setting is enabled on a single extruder printer, it'll show the Z Hop Height setting anyway even though it has no effect.	2019-09-07 23:18:02 +02:00
Jaime van Kessel	7d3a2c60d4	Added some missing typing	2019-09-06 17:38:22 +02:00
Jaime van Kessel	5e41443bef	Merge branch 'master' of github.com:Ultimaker/Cura	2019-09-06 17:26:42 +02:00
Jaime van Kessel	6f92537305	Add unhappy test for serializing nonbase material	2019-09-06 17:26:28 +02:00
Jaime van Kessel	09025edffa	Convert some class functions to static ... Since they didn't access any class attributes, there is no need for them to be classMethods	2019-09-06 17:22:40 +02:00
Jaime van Kessel	94b6f7864f	Add some tests for XMLMaterialProfile	2019-09-06 17:19:23 +02:00
Ghostkeeper	47fab6e16f	Merge branch '4.3'	2019-09-06 16:04:26 +02:00
Ian Paschal	f517beba76	Fix typo ... CS-171	2019-09-06 16:04:03 +02:00
Ian Paschal	e0194d8721	Extend found_machine_type_identifiers to include R2 ... CS-171	2019-09-06 16:03:48 +02:00
Ian Paschal	dfc23d994f	Add bom_numbers field to definitions ... CS-171	2019-09-06 16:03:26 +02:00
Ghostkeeper	b24ea11cfc	Merge branch '4.3'	2019-09-06 16:02:21 +02:00
Ghostkeeper	82aa0492ea	Revert "CS-171 Add R2 support"	2019-09-06 14:00:04 +00:00