21759 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jaime van Kessel	e8350547b7	Merge pull request #5999 from Ultimaker/CURA-6659_fix_import_quality ... CURA-6659 Use VersionUpgradeManager to update the imported quality	2019-07-16 14:33:26 +02:00
Jaime van Kessel	2ca39c8e7f	Don't reparse entire file when checking for already extracted version ... CURA-6659	2019-07-16 14:31:38 +02:00
Diego Prado Gesto	0eec9138c1	Merge branch 'DragonJe-master'	2019-07-16 12:09:22 +02:00
Diego Prado Gesto	3460ce5b8b	Remove deprecated setting from the quality profiles ... The setting should not exist anymore in the new setting_version 8. Contributes to CURA-6642.	2019-07-16 12:07:37 +02:00
Ghostkeeper	569765adfc	Merge branch '4.2'	2019-07-16 11:51:39 +02:00
Diego Prado Gesto	0e9379e658	Merge branch 'master' of https://github.com/DragonJe/Cura into DragonJe-master	2019-07-16 11:47:00 +02:00
Lipu Fei	1e7c682382	Use default variant if empty in project loading ... CURA-6654	2019-07-16 11:24:19 +02:00
Jaime van Kessel	f402235406	Fix shadowed use of builtin type ... CURA-6651	2019-07-16 10:27:50 +02:00
Diego Prado Gesto	9590262f18	Change the name of the original depriming settings ... Change to align with the name in the XML material files. Contributes to CURA-6662.	2019-07-16 09:55:50 +02:00
DragonJe	4216c2bfc4	Rename resources/quality/nwa3d_a31_normal.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg	2019-07-15 15:02:19 -05:00
DragonJe	12bdcacefc	Rename resources/quality/nwa3d_a31_fast.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg	2019-07-15 15:00:58 -05:00
DragonJe	b53794ca74	Rename resources/quality/nwa3d_a31_e.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg	2019-07-15 15:00:35 -05:00
DragonJe	85c7386990	Rename resources/quality/nwa3d_a31_nwa3d_a31_best.inst.cfg to resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg	2019-07-15 15:00:01 -05:00
DragonJe	c690f52878	Rename nwa3d_a31_best.inst.cfg to nwa3d_a31_nwa3d_a31_best.inst.cfg	2019-07-15 14:59:43 -05:00
Ghostkeeper	fed275024a	Add slot to store peripherals ... You can get the list of names of peripherals this way. Contributes to issue CURA-6651.	2019-07-15 17:29:30 +02:00
Ghostkeeper	7927169da1	Add peripheral class ... It has a non-human-readable type for the plug-ins to use and a human-readable name which can be requested with the peripherals() property. Contributes to issue CURA-6651.	2019-07-15 17:27:23 +02:00
Lipu Fei	9da6044a72	Simplify camera_view data collection	2019-07-15 17:00:56 +02:00
Ghostkeeper	bf34550488	Merge branch 'eMotion-Tech-master'	2019-07-15 15:01:02 +02:00
Ghostkeeper	505742e63f	Merge branch 'master' of https://github.com/eMotion-Tech/Cura into eMotion-Tech-master	2019-07-15 14:49:36 +02:00
Jaime van Kessel	9fd7ceeae1	Fix trailing ,	2019-07-15 14:01:26 +02:00
Ghostkeeper	20c55c09cd	Add description for smart hiding to Corner Seam Pref description	2019-07-15 11:34:04 +02:00
Jaime van Kessel	8ca68ebb15	Move Skin overlap to shell category from the infill category	2019-07-15 10:45:56 +02:00
Lipu Fei	64b23758c5	Add camera_view as stats	2019-07-12 14:35:06 +02:00
Ian Paschal	b166853256	Merge pull request #6002 from Ultimaker/CS-191_fix_resume_local_network ... Send the correct action name when using local network	2019-07-12 12:03:06 +02:00
ChrisTerBeke	25130b63e2	Fix logic	2019-07-12 09:19:30 +02:00
ChrisTerBeke	6210135b92	Send the correct action name when using local network	2019-07-12 08:14:28 +02:00
Lipu Fei	6bb3e33c9e	Use VersionUpgradeManager to update the imported quality ... CURA-6659	2019-07-11 14:27:49 +02:00
Ghostkeeper	17c0797818	Merge branch '4.2'	2019-07-11 09:59:02 +02:00
Ghostkeeper	483e343b38	Specify both Ultimaker B.V. and Custom as preferred categories ... This requires commit 91c6abfc56162aedc887098744533dfcd8f1cdd5 on Ultimaker/Cura. Contributes to issue CURA-6640.	2019-07-11 09:58:40 +02:00
Ghostkeeper	79f948a826	Merge branch '4.2'	2019-07-10 15:59:17 +02:00
Ghostkeeper	40169809bc	Set the default build plate temperature to 0 ... All third-party materials that didn't fill in a value for this build volume temperature will then default to 0 which causes the printer to go into a safe mode that doesn't melt the plastic or anything. Contributes to issue CURA-6652.	2019-07-10 15:59:05 +02:00
Ghostkeeper	037f1967c8	Remove override for version number in CuraContainerStack ... Otherwise plug-ins can't register ContainerStacks any more. As discussed in the CCB.	2019-07-10 14:57:26 +02:00
Ghostkeeper	8cdafc5c1a	Merge branch '4.2'	2019-07-10 14:42:48 +02:00
Ghostkeeper	bb49acbb7f	Use correct font for material estimates ... Otherwise it uses the system defaults.	2019-07-10 14:42:26 +02:00
Ian Paschal	5ac167d61a	Merge pull request #5997 from Ultimaker/CS-134_fix_ordering_and_move_to_top ... CS-134: fix ordering and move to top	2019-07-10 14:05:36 +02:00
Ghostkeeper	99fbb3e5f1	Merge branch '4.2'	2019-07-10 13:02:26 +02:00
Ghostkeeper	83a24ed0cc	Rename machines with too long names ... The names of these two printers were so long that the file names would be too long by default for some file systems. Cura was preventing the user from adding the printers then unless they changed their names.	2019-07-10 13:02:14 +02:00
Ghostkeeper	446f87ec59	Merge branch '4.2'	2019-07-10 12:58:52 +02:00
Ghostkeeper	be86576ff9	Improve wording and name of 'Ignore Small Z Gaps' ... Hopefully it'll be a bit more clear what this setting does, now.	2019-07-10 12:58:35 +02:00
ChrisTerBeke	99e2939801	Add defense for when active printer is None	2019-07-10 12:55:12 +02:00
ChrisTerBeke	f1df7b93c4	Fix printer and print job ordering, add back 'move to top'	2019-07-10 12:42:01 +02:00
Lipu Fei	9c3d65a6c7	Merge pull request #5993 from Ultimaker/feature_intent_model_per_category ... Create an intent model per intent category	2019-07-09 13:12:02 +02:00
Simon Edwards	146f78e658	Merge pull request #5992 from Ultimaker/CS-134_hide_move_to_top ... Hide 'move to top' option from actions	2019-07-09 13:03:42 +02:00
Lipu Fei	4e0b9d7b78	Fix typing ... CURA-6597	2019-07-09 13:02:01 +02:00
Lipu Fei	8863516aa4	Rename function name and fix tests ... CURA-6597	2019-07-09 12:53:44 +02:00
Lipu Fei	f086c1eb11	Minor cleanup changes ... CURA-6597	2019-07-09 11:57:46 +02:00
Lipu Fei	659a276f65	Rename signal ... CURA-6597	2019-07-09 11:29:27 +02:00
Lipu Fei	ec82d8f58d	Fix merge conflicts ... CURA-6597	2019-07-09 11:01:51 +02:00
Ghostkeeper	e2fd90506a	Include intent profiles from the default intents ... If we have the default intent category, list all quality types available. Contributes to issue CURA-6597.	2019-07-09 10:56:21 +02:00
Ghostkeeper	86750c0446	Don't continue after returning empty list ... Oops. Shouldn't have pushed... Contributes to issue CURA-6597.	2019-07-09 10:54:47 +02:00