19244 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Робокинетика	f95bac436e	Update erzay3d.def.json	2019-06-16 19:33:30 +03:00
Робокинетика	d5bf2a73f4	The correct author is specified	2019-04-12 12:43:59 +03:00
Робокинетика	724661b600	Fixed some flaws	2019-04-11 21:17:15 +03:00
Робокинетика	ba1459d575	Fixed some flaws	2019-04-11 21:15:12 +03:00
Alexander	37d8ee3f73	Added Erzay3D machine definitions	2019-04-07 00:12:42 +03:00
Jaime van Kessel	fe14024620	Move existNetworkInstances into discover action	2019-04-05 17:49:29 +02:00
Jaime van Kessel	5b818d203a	Move a bunch of network only functions out of machine manager ... Machine manager is way to big as is, so we need to move more code out of it to locations where the code is actually used.	2019-04-05 17:45:19 +02:00
Jaime van Kessel	ed503cb6ec	Removed platform check that always had the same result ... The UM.Application.platform property has been removed by someone for quite some time. I don't know why the check was in there, but it doesn't seem needed at all as the property was always undefined	2019-04-05 17:07:12 +02:00
Jaime van Kessel	ac0a5bb156	Merge branch 'master' of github.com:Ultimaker/Cura	2019-04-05 16:41:38 +02:00
Jaime van Kessel	495b24b87b	Factor out the scene proxy	2019-04-05 16:41:22 +02:00
Lipu Fei	6892307be3	Fix typo	2019-04-05 10:49:36 +02:00
Lipu Fei	f2234cffa4	Fix extruder enable/disable problem in color scheme	2019-04-05 10:43:09 +02:00
Lipu Fei	5074cf69dd	Fix typing ... CURA-6435	2019-04-05 09:57:58 +02:00
Jaime van Kessel	2dd4a30586	Prevent machines without an extruder from showing "undefined" in the workspace dialog ... This fixes #5572	2019-04-04 20:07:27 +02:00
Jaime van Kessel	13c56d40e7	Merge branch 'master' of github.com:Ultimaker/Cura	2019-04-04 20:07:16 +02:00
Ghostkeeper	93ef8f6c98	Merge branch 'master' into CURA-6440_exclude_support_blocks_in_used_extruders	2019-04-04 16:41:00 +02:00
Ghostkeeper	8c5f871185	Also omit support meshes from used extruders list ... Their own extruder doesn't get used necessarily, because these meshes are then printed using the support extruder. Contributes to issue CURA-6440.	2019-04-04 16:35:48 +02:00
Ghostkeeper	4e2d7a6ea9	Fix combing setting ... This is a Python expression so it needs to be in quotes to become a string.	2019-04-04 16:22:03 +02:00
Jaime van Kessel	8ae87d3904	Merge pull request #5570 from Ultimaker/remove_compatibility_chart_link ... Remove the link to the compatibility chart	2019-04-04 15:32:22 +02:00
Jaime van Kessel	7dd54aefcd	Merge branch 'remove_compatibility_chart_link' of github.com:Ultimaker/Cura	2019-04-04 15:05:43 +02:00
Diego Prado Gesto	9594545f2c	Remove the link to show the compatibility chart ... Actually it only made sense for ultimaker materials. Now that we can include instruction link in every materials, a specific link for every material can be used instead. Contributes to CURA-6423.	2019-04-04 14:46:20 +02:00
Ghostkeeper	bd1712cb10	Spelling fix: Overriden -> Overridden ... I think some of us got the spelling of this word wrong in their heads.	2019-04-04 14:39:01 +02:00
Jaime van Kessel	932a5c8fc9	Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura	2019-04-04 14:38:18 +02:00
Jaime van Kessel	8acafe09f6	No longer prevent old versions from being restored in backup ... CURA-5983	2019-04-04 14:28:29 +02:00
Lipu Fei	06f427ef46	Make GCode TextField scrollable ... CURA-6057	2019-04-04 14:18:54 +02:00
Jaime van Kessel	29a55c2953	Added missing rendertype	2019-04-04 14:11:07 +02:00
Jaime van Kessel	2e50c19949	Added missing rendertype	2019-04-04 09:51:53 +02:00
Lipu Fei	53c38e0a80	Fix quality_changes container handling in project loading ... CURA-6441 Containers are created but not added...	2019-04-04 09:21:22 +02:00
Lipu Fei	992040d4e6	Merge pull request #5497 from TinkerGnome/Mark2_definition ... add Mark2 definition files	2019-04-04 08:08:46 +02:00
TinkerGnome	ebfd33ba10	remove machine_extruder positions from the definition file	2019-04-03 21:01:36 +02:00
Simon Edwards	f933f2f271	Merge pull request #5478 from Ultimaker/CL-1267_selective_cloud_flow_metadata ... CL-1267 Don't hide Cloud flow message for wrong printer	2019-04-03 17:09:57 +02:00
Jaime van Kessel	75386c0b7e	Change the font of the customMachineSettings window ... CURA-6057	2019-04-03 17:08:07 +02:00
Jaime van Kessel	cf68fb9cae	Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding	2019-04-03 17:04:16 +02:00
Jaime van Kessel	362036e064	Fix small display issue where a line was drawn between the tabs ... CURA-6057	2019-04-03 17:03:39 +02:00
Ghostkeeper	b9efeb47ed	Don't open add printer wizard on first launch ... Oops. Contributes to issue CURA-6057.	2019-04-03 15:56:54 +02:00
Ghostkeeper	2ccc30b824	Only show add machine dialogue if your stack got corrupt, not whole onboarding ... We don't need to accept the EULA again or whatever. Just add the printer that got lost. Contributes to issue CURA-6057.	2019-04-03 15:52:07 +02:00
Lipu Fei	1207533046	Fix local printer selection update ... CURA-6057	2019-04-03 15:14:06 +02:00
Jaime van Kessel	cf04ee98ef	Fix being able to add a local machine that is not the first in the list ... CURA-6057	2019-04-03 15:04:59 +02:00
Remco Burema	6242433d8e	Merge pull request #5356 from DesktopMetal/feature_wipe_script ... Feature: "Wipe Script"	2019-04-03 14:42:18 +02:00
Vlad Gribinchuk	a56e088ee0	Put all of wiping settings to expert.cfg file to allow also browsing them	2019-04-03 13:46:37 +03:00
Vlad Gribinchuk	6e955f780b	Change description of clean_between_layers to make the relation this setting to retract_at_layer_change more clear for user	2019-04-03 13:45:19 +03:00
Lipu Fei	ffce5b8d58	FixassociateActiveMachineWithPrinterDevice() ... CURA-6057	2019-04-03 12:10:09 +02:00
Ghostkeeper	ae9395aebb	Merge branch 'master' into WIP_onboarding	2019-04-03 11:53:40 +02:00
Ghostkeeper	df32f3e263	Move Cura.ProgressBar to Uranium ... It is not specific to 3D printing. Contributes to issue CURA-6057.	2019-04-03 11:51:57 +02:00
Ghostkeeper	745d9e6116	Also catch middle mouse button in overlay ... Just catch all buttons. There's an entry for that in QML. Contributes to issue CURA-6057.	2019-04-03 11:03:55 +02:00
Ghostkeeper	453a785bee	Fix typo ... Contributes to issue CURA-6057.	2019-04-03 10:42:07 +02:00
Lipu Fei	8da1f8fa7d	Exclude support blockers in used extruders ... CURA-6440	2019-04-02 14:16:57 +02:00
Jaime van Kessel	5e66564c00	Ensure that configurationTypes doesn't crash if a None is in the list ... Fixes #5551	2019-04-02 12:05:08 +02:00
Jaime van Kessel	8a62cd7610	Merge branch 'master' of github.com:Ultimaker/Cura	2019-04-02 11:46:54 +02:00
Jaime van Kessel	efe8f19109	Return the value for default extruder if the requested one could not be found ... This fixes #5535	2019-04-02 11:46:12 +02:00