23379 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	f6089ed627	Don't use material manager to get list of materials to send ... The material manager is no longer populated so it wouldn't send any materials any more. This is probably faster anyway since it doesn't need to go back to the container registry for every file. Contributes to issue CURA-6600.	2019-09-11 15:43:35 +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
Ghostkeeper	f8d72b2ea7	Fix crash when adding first quality changes profile ... This dictionary is keyed by position integers, not position strings. Contributes to issue CURA-6600.	2019-09-10 15:33:32 +02:00
Ghostkeeper	a313255bc7	Use integer positions to get quality changes per extruder from group ... It's all a mix right now... Contributes to issue CURA-6600.	2019-09-10 15:10:42 +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	0b92c3f3df	Use .container property rather than deprecated getContainer() function ... Contributes to issue CURA-6600.	2019-09-10 14:56:16 +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
Ghostkeeper	ef8b9e98d1	Remove calls to quality manager's private functions ... It should never have been called that way. Contributes to issue CURA-6600.	2019-09-10 14:47:36 +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 4.3-beta	2019-09-10 14:05:41 +02:00
Ghostkeeper	9b05624b8d	Merge branch '4.3'	2019-09-10 14:04:09 +02:00
Nino van Hooff	42a3e1227a	Use explicit types for mesh_type qml properties ... CURA-6683	2019-09-10 13:37:05 +02:00
Nino van Hooff	0ba1bfbe4f	Enable Per Object Settings when extruder is in Recommended mode	2019-09-10 13:37:05 +02:00
Nino van Hooff	80569c2f51	Update Per Object Settings Overhangs icon	2019-09-10 13:37:05 +02:00
Nino van Hooff	6101afa68b	Remove redundant namespace usages	2019-09-10 13:37:05 +02:00
Nino van Hooff	812eeab07a	Show infill checkbox only for overhang mesh types	2019-09-10 13:37:05 +02:00
Nino van Hooff	760234f69b	Per Object Settings qml for icon buttons	2019-09-10 13:37:05 +02:00
Nino van Hooff	3052438177	Add Per Object Settings icons	2019-09-10 13:37:05 +02:00
Nino van Hooff	a457265c07	Update the Support Eraser icon size	2019-09-10 13:37:05 +02:00
Nino van Hooff	789ebc4df8	Update the Support Eraser (support blocker) icon	2019-09-10 13:37:05 +02:00
Nino van Hooff	87c81055e3	Update the per-object-settings icon	2019-09-10 13:37:05 +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
maukcc	c5224a5b91	HMS434 update ... getting rid of materials setting quality as material based added build volume changed travel speeds	2019-09-10 12:43:51 +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
MaukCC	62c0633bcc	Merge pull request #11 from Ultimaker/master ... update	2019-09-10 12:15:40 +02:00
Jaime van Kessel	7d8911b74d	Fix version upgrade for stacks ... CURA-6599	2019-09-10 11:41:42 +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
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
Lipu Fei	3f3aac7ce5	Merge pull request #6289 from Ultimaker/feature_intent_interface ... Feature intent interface	2019-09-09 16:53:37 +02:00
Ghostkeeper	5debdd4cf6	Fix getting extruder list everywhere ... Didn't test this beyond my own automated test, it seems. Contributes to issue CURA-6600.	2019-09-09 16:47:29 +02:00
Lipu Fei	dba3b77f61	Fix tests ... CURA-6598	2019-09-09 16:45:39 +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