20821 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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 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
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
Jaime van Kessel	608ca3e92a	Convert some functions to static	2019-09-06 15:18:50 +02:00
Jaime van Kessel	a6c27787b9	Merge branch 'master' of github.com:Ultimaker/Cura	2019-09-06 15:13:57 +02:00
Jaime van Kessel	f540abbd73	Expand the createUniqueName test	2019-09-06 15:13:25 +02:00
Ghostkeeper	c3f9d65de1	Ignore SettingsGuide plug-in	2019-09-06 14:35:30 +02:00
Ghostkeeper	f5aa2921ff	Add space before comments ... Some pause commands on some printers (looking at you, Repetier) seem to require a space after it, which is not obvious to the user. So we'll put a space there for them. Fixes #6295.	2019-09-06 14:35:29 +02:00