12129 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Diego Prado Gesto	e7ac2e37b4	Fix an error when closing USB connection. This error raised several ... times in the crash reports in the stats.	2017-12-01 13:17:36 +01:00
Lipu Fei	7b4cb11240	Fix legacy profile upgrade ... CURA-4075 Only for single-extrusion machines just like before.	2017-12-01 11:20:52 +01:00
Lipu Fei	7de43e71e0	Fix legacy profile upgrade ... CURA-4075 Only for single-extrusion machines just like before.	2017-12-01 11:06:14 +01:00
Ghostkeeper	c0e7446f2a	Correct label of Save Project menu item ... Capital P. Ellipses to indicate that a modal window is coming. Ampersand to enable the hotkey.	2017-12-01 10:44:56 +01:00
Ghostkeeper	f045b85db3	Merge branch '3.1'	2017-12-01 10:19:36 +01:00
Ghostkeeper	ea7ff05a3d	Merge branch '3.1' of github.com:Ultimaker/Cura into 3.1	2017-12-01 10:19:23 +01:00
Ghostkeeper	81533c888e	Merge branch 'anraf1001-3.1' into 3.1	2017-12-01 10:19:07 +01:00
Lipu Fei	14c84d835a	Make quality switching clear ... CURA-4650	2017-12-01 09:55:38 +01:00
Ghostkeeper	0336af3b4a	Merge branch '3.1' of github.com:Anraf1001/Cura into anraf1001-3.1	2017-12-01 09:52:17 +01:00
Diego Prado Gesto	972f4c5b05	Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1	2017-11-30 17:38:47 +01:00
Diego Prado Gesto	7e4ed8a257	CURA-4646 Fix save containers also for the extruders	2017-11-30 17:37:16 +01:00
Ghostkeeper	96c38bce2b	Merge branch '3.1'	2017-11-30 16:57:01 +01:00
Ghostkeeper	93159c8986	Corrections to translations ... Made by Vandrasc. Contributes to issue CURA-4601.	2017-11-30 16:32:52 +01:00
Ghostkeeper	31104bcdc4	Corrections to Dutch translation ... Not all too bad this time. Contributes to issue CURA-4601.	2017-11-30 16:32:52 +01:00
ChrisTerBeke	47c1c1a8bf	Merge pull request #2883 from fieldOfView/fix_machinesettings_gcode_flavor_materials ... [regression] Fix material container for extruder when changing gcode flavor	2017-11-30 16:30:13 +01:00
ChrisTerBeke	d76081ae1d	Only restore global profile based on extruders that are actually in use when loading legacy project file	2017-11-30 16:24:46 +01:00
fieldOfView	9564bb645f	Remove test code	2017-11-30 15:54:24 +01:00
ChrisTerBeke	f5a35408e8	Merge pull request #2884 from fieldOfView/fix_gcode_snippets_encoding ... [CRITICAL] Prevent start & end gcode snippets being double encoded	2017-11-30 15:33:22 +01:00
ChrisTerBeke	96d5d376fb	Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1	2017-11-30 15:25:03 +01:00
ChrisTerBeke	3abf067d25	Fix loading .curaproject files with stack setups from earlier versions - CURA-4646	2017-11-30 15:24:51 +01:00
fieldOfView	4b0ff6e5f4	Prevent start & end gcode snippets being double encoded	2017-11-30 15:16:09 +01:00
Ghostkeeper	0fdb21fc91	Update translations for 3.1 ... The rest of the ones from Bothof. Contributes to issue CURA-4601.	2017-11-30 15:12:44 +01:00
Ghostkeeper	3bb45488c3	Update translations for 3.1 ... From Bothof. Contributes to issue CURA-4601.	2017-11-30 14:54:34 +01:00
fieldOfView	e8a7237391	Fix updating material container for extruder when changing gcode flavor ... Since single extrusion printers have a single extruder stack now, material container needs to be set on the extruder stack instead of the global stack	2017-11-30 11:46:06 +01:00
fieldOfView	4303278602	Tweak layout and alignment of print time and (material) cost estimation... ... improving readability * table takes the full width and values are right-aligned * time estimates are shortened * values are right aligned * feature/time/percentage are on a single line again * handle long feature & material names gracefully Fixes #2712 * totals are only shown when there are multiple extruders	2017-11-30 10:35:31 +01:00
Diego Prado Gesto	b425672ad0	CURA-4643 Allow using the ESC/ENTER keys for reject or accept the ... user agreement	2017-11-30 09:31:07 +01:00
Ruben D	d29d73413f	Remove unused function ... Contributes to issue CURA-4243.	2017-11-30 01:11:10 +01:00
Ruben D	f9c59c7e1e	Don't update model if extruders haven't all been loaded yet ... This model is created while the extruder stacks have not yet been filled in. You can't connect yet. When the extruder is ready, _extrudersChanged will be called again and then the new extruder will also get connected. Contributes to issue CURA-4243.	2017-11-30 00:33:10 +01:00
Ruben D	c1ba64fd9e	Correct variants after all metadata is loaded ... As explained in the block of documentation, we can't find the variants because there is no guarantee that the variants have been loaded by the time that the metadata of materials is deserialised and we don't know their IDs either (so no lazy loading). This registers a function to be called upon completely loading the metadata, which runs a query on the metadata to find the variant by its definition and name. A bit hacky but I see no better solution. Contributes to issue CURA-4243.	2017-11-30 00:10:02 +01:00
fieldOfView	d5d75aca19	Hide material diameter when the machine has no materials ... eg Ultimaker 2 when using UltiGcode	2017-11-29 22:46:17 +01:00
Ghostkeeper	c34de83e3f	Use isLoaded to check if a material is already loaded ... This prevents us from having to make an expensive findContainers call if it's not necessary, and also prevents us from unnecessarily loading the subcontainers in a loop during loading. Contributes to issue CURA-4243.	2017-11-29 18:04:07 +01:00
Ghostkeeper	cacc4b8586	Properly set the definition to the currently processed machine ... Otherwise all of them stay at fdmprinter. Contributes to issue CURA-4243.	2017-11-29 16:41:20 +01:00
Lipu Fei	320330b788	Take DebugMode flag from CuraVersion ... CURA-4539	2017-11-29 14:36:00 +01:00
Lipu Fei	e1167ee68f	Fix disableKeyButtons in UserAgreement dialog ... CURA-4643	2017-11-29 14:33:19 +01:00
Ghostkeeper	838e49f3da	Pass just metadata through quality manager instead of full containers ... Where we only need metadata, we should pass metadata instead of full containers. Also add some type hinting. Contributes to issue CURA-4243.	2017-11-29 14:33:04 +01:00
Lipu Fei	4586e3dd55	Merge pull request #2375 from Ghostkeeper/optimise_sending_slice_job ... Optimise sending slice job	2017-11-29 14:13:37 +01:00
Aleksei Sasin	2f1181743f	Merge branch '3.1' of https://github.com/Ultimaker/cura into 3.1	2017-11-29 14:09:02 +01:00
Aleksei Sasin	0b9f7c85c8	Skip keyboard clicks for authentication dialog ... CURA-4643 Please enter the commit message for your changes. Lines starting	2017-11-29 14:07:23 +01:00
Lipu Fei	b7fed81fc1	Pass "is_debug_mode" flag to Application ... CURA-4539	2017-11-29 14:01:19 +01:00
Ghostkeeper	99cd139ba4	Remove setting definition double ... Contributes to issue CURA-4243.	2017-11-29 13:39:24 +01:00
Diego Prado Gesto	14e99cef17	CURA-4634 Remove standby temperature from quality profiles	2017-11-29 13:33:40 +01:00
ChrisTerBeke	0668f80792	Merge pull request #2758 from fieldOfView/feature_mesh_types ... Improved mesh type UX (Per Model Settings)	2017-11-29 13:24:38 +01:00
Aleksei Sasin	1dba27339e	Typo in association ... CURA-4555	2017-11-29 13:10:45 +01:00
Ghostkeeper	dad99f5292	Merge branch 'master' into feature_local_container_server ... Contributes to issue CURA-4243.	2017-11-29 13:06:08 +01:00
Aleksei Sasin	6274f70949	Added .stl extension association for windows	2017-11-29 12:01:03 +01:00
Diego Prado Gesto	e5ac33a929	CURA-4641 Minor changes	2017-11-29 11:19:11 +01:00
ChrisTerBeke	75e4c34a6a	Merge branch 'master' of https://github.com/Ultimaker/Cura	2017-11-29 10:47:58 +01:00
ChrisTerBeke	16e07fc461	Update color indicators for extruders when changing material color - CURA-4641	2017-11-29 10:47:39 +01:00
alekseisasin	d4dfca3ef5	Merge pull request #2868 from Ultimaker/feature_adaptive_layer_heights ... Add experimental settings for adaptive layer heights - CURA-4524	2017-11-29 09:48:33 +01:00
Ghostkeeper	8707396ad7	Remove isReadOnly functionality ... Everyone should now ask it from the container registry. Contributes to issue CURA-4243.	2017-11-28 17:30:00 +01:00