9222 Commits

Author	SHA1	Message	Date
Jaime van Kessel	08ffafa475	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-09-23 11:19:19 +02:00
Jaime van Kessel	a4ed51342c	Fix favorite not being checked properly in MaterialMenu ... CURA-6804	2019-09-23 11:18:47 +02:00
Lipu Fei	18d93d0b7b	Fix UM2 extended variants ... CURA-6775	2019-09-23 10:43:58 +02:00
Ghostkeeper	4a68e7ec95	Fix favorite materials without material manager ... We just track it via the preference value itself rather than duplicating that in any other data structure. It's simple enough. Contributes to issue CURA-6776.	2019-09-20 09:57:36 +02:00
Jaime van Kessel	71a22bf194	Fix few profiles that didn't have global_quality set	2019-09-19 17:31:18 +02:00
Remco Burema	37aca7d361	Menu items should be removed by index, not by object. ... part of CURA-6791	2019-09-19 17:00:16 +02:00
Jaime van Kessel	7016e791c8	Fix containertree for machines without materials but with specific qualities ... CURA-6775	2019-09-19 15:33:19 +02:00
Lipu Fei	823f7e5921	Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade	2019-09-19 14:14:29 +02:00
Jaime van Kessel	84e5114566	Fix minor review comments ... CURA-6598	2019-09-18 14:17:26 +02:00
Jaime van Kessel	fade8d3644	No longer make border width hardcoded ... CURA-6598	2019-09-18 14:10:52 +02:00
Ghostkeeper	8d21f75c40	Merge branch 'feature_intent_container_tree' into feature_intent_upgrade	2019-09-16 15:20:41 +02:00
Ghostkeeper	9b341cf604	Remove UM2 upgrade selection machine action ... Instead of choosing the Olsson block with this wizard, choose it by choosing the correct definition to start with. Contributes to issue CURA-6775.	2019-09-16 15:19:47 +02:00
Ghostkeeper	bda7a6ce0a	Shorten name of UM2E with Olsson ... This is necessary because on some file systems (e.g. encryptfs) the length of these file names is limited and that would crash Cura. Contributes to issue CURA-6775.	2019-09-16 15:15:17 +02:00
Ghostkeeper	3b5716a64a	Add definition for Ultimaker 2 Extended with Olsson Block ... Only the name is now too long by default. I have to shorten it. Contributes to issue CURA-6775.	2019-09-16 15:07:04 +02:00
Ghostkeeper	c6a57a0ab7	Give Ultimaker 2 with Olsson the quality definition of the Ultimaker 2 ... This way, the user's profiles should remain intact after the upgrade. Contributes to issue CURA-6775.	2019-09-16 15:00:05 +02:00
Ghostkeeper	3c9d191a6e	Add separate definition for Ultimaker 2 with Olsson block ... This is necessary because our ContainerTree class can only create one tree per definition. This tree is not created separately for every added printer and as such the tree can't be different for every added printer. However the Ultimaker 2 Olsson block upgrade allows selecting extra variants for the UM2. This changes the available variants in the container tree, so this would be impossible. By making it a separate definition, it now gets a separate tree. However this does mean that we need to do a version upgrade for this as well. Contributes to issue CURA-6775.	2019-09-16 14:57:45 +02:00
Lipu Fei	5631e94a48	Fix creality variant versions	2019-09-13 10:53:10 +02:00
Lipu Fei	fa8213c601	Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade	2019-09-13 10:31:11 +02:00
Diego Prado Gesto	bca68c6db0	Merge branch 'feature_intent' into feature_intent_container_tree	2019-09-13 09:02:51 +02:00
Diego Prado Gesto	d38e60ce06	Merge branch 'master' into feature_intent	2019-09-13 09:02:30 +02:00
Ghostkeeper	2d0a122c2d	Display list of custom quality profiles ... If you activate any of them from here though, it'll crash. Contributes to issue CURA-6598.	2019-09-12 15:13:02 +02:00
Jaime van Kessel	a6a106b526	Merge branch 'feature/creality-machines' of https://github.com/trouch/Cura	2019-09-12 14:09:46 +02:00
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
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
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
Jaime van Kessel	626cd7e85b	Update version numbers of quality files	2019-09-10 15:08:59 +02:00
Jaime van Kessel	d6d06fb85b	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade	2019-09-10 15:07:57 +02:00
Ghostkeeper	47e1dbe38d	Remove usage of Quality Manager ... This class is deprecated. Constructing it here means that the class gets constructed on the Qt thread and makes it inaccessible for the rest. Contributes to issue CURA-6600.	2019-09-10 14:55:32 +02:00
Ghostkeeper	0d68381e61	Code style: brackets on new line ... Contributes to issue CURA-6600.	2019-09-10 14:52:51 +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
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
Diego Prado Gesto	b18565d9cf	Merge branch 'master' into feature_intent_container_tree	2019-09-10 11:08:21 +02:00
Jaime van Kessel	e9862fb348	Move version upgrade for intents from 4.1-4.2 to 4.3-4.4 ... CURA-6599	2019-09-10 10:57:25 +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
Lipu Fei	3f3aac7ce5	Merge pull request #6289 from Ultimaker/feature_intent_interface ... Feature intent interface	2019-09-09 16:53:37 +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	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
Ian Paschal	dfc23d994f	Add bom_numbers field to definitions ... CS-171	2019-09-06 16:03:26 +02:00