14766 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Brecht Nuyttens	dadd6ffa67	Merge remote-tracking branch 'refs/remotes/Ultimaker/master'	2017-11-29 08:46:45 +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
Ghostkeeper	c63ef6fed6	Remove unused variables ... The machine_name variable is later redefined. Contributes to issue CURA-4243.	2017-11-28 16:58:04 +01:00
Dinow	21c1272e45	Update cura.po for 3.1	2017-11-28 23:50:38 +08:00
Ghostkeeper	381d9bf3f1	Log which file caused it to go wrong ... Contributes to issue CURA-4243.	2017-11-28 16:15:20 +01:00
ChrisTerBeke	ce88b9ee67	Merge pull request #2692 from Ultimaker/reload_qml ... Added reload qml action	2017-11-28 15:50:47 +01:00
ChrisTerBeke	263230f9d2	Merge branch '3.1'	2017-11-28 15:45:57 +01:00
Ghostkeeper	56d6664c8c	Guard against materials not having a definition ... The empty container has no definition. Contributes to issue CURA-4243.	2017-11-28 15:33:21 +01:00
ChrisTerBeke	f41759e1dc	Fix binding extruder manager in machine actions view - CURA-4568	2017-11-28 15:20:05 +01:00
ChrisTerBeke	b961c37ead	Fix generating view for machine action - CURA-4568	2017-11-28 15:18:05 +01:00
ChrisTerBeke	eeeefcc47a	Update UM3 discovery dialog creation to new method - CURA-4568	2017-11-28 15:06:53 +01:00
ChrisTerBeke	9a7fa67da7	Cleanup plugin browser dialog creation - CURA-4568	2017-11-28 15:02:17 +01:00
ChrisTerBeke	bd5e4f9a51	Cleanup cluster output device component creation - CURA-4568	2017-11-28 14:59:55 +01:00
ChrisTerBeke	b40ba0cfc7	Update network cluster output device print view component creation - CURA-4568	2017-11-28 14:58:53 +01:00
ChrisTerBeke	11f50f1cd3	Update machine action and image reader dialogs with new component creation method - CURA-4568	2017-11-28 14:55:35 +01:00
Lipu Fei	fa1d1ee3ad	Fix layer height slider auto switching ... CURA-4617	2017-11-28 14:35:44 +01:00
ChrisTerBeke	1d68bcc218	Cleanup usb printer output device manager qml component creation - CURA-4568	2017-11-28 14:31:21 +01:00
ChrisTerBeke	055e4792b0	Cleanup for change log dialog - CURA-4568	2017-11-28 14:27:51 +01:00
ChrisTerBeke	dd43bcee77	Small cleanups for new component creation method - CURA-4568	2017-11-28 14:27:05 +01:00
Ghostkeeper	eb3981b4e0	Let _fetchInstanceContainers return containers split by loaded or not ... It must now return two dictionaries: One for the profiles that have been completely loaded and one for the profiles that are only metadata. We could probably improve on these a little bit, since all of these (except the material model) will now load all available quality profiles. I'll see if it is necessary to optimise that. Contributes to issue CURA-4243.	2017-11-28 14:26:14 +01:00
ChrisTerBeke	e3f1144d97	Update creating QML component in plugin browser - CURA-4568	2017-11-28 14:25:09 +01:00
ChrisTerBeke	74eb4958af	Fixes for printer output device views - CURA-4568	2017-11-28 14:21:47 +01:00
ChrisTerBeke	cfbb553182	Use new QML element creator for output device view - CURA-4568	2017-11-28 14:16:58 +01:00
ChrisTerBeke	e6b3773d8e	Merge pull request #2797 from Ultimaker/feature_firmware_retract_setting ... Add setting to determine whether to use firmware retraction	2017-11-28 13:45:38 +01:00
ChrisTerBeke	0f944c094d	Merge pull request #2869 from Ultimaker/gcode_flavors ... Gcode flavors	2017-11-28 13:30:23 +01:00
Aleksei S	6e171be0b9	After changing the settings refresh simulation max path number ... CURA-4632	2017-11-28 13:08:25 +01:00
Jaime van Kessel	e841896090	PrintJobs are now assigned if they are not queued ... It used to just do it if it was printing, but jobs can also be in other states such as paused, pre_print, etc CL-541	2017-11-28 13:04:58 +01:00
Jaime van Kessel	9084dfd6bd	It's now possible to send print jobs to cluster again ... CL-541	2017-11-28 12:59:54 +01:00
ChrisTerBeke	f5332ac9ba	Merge pull request #2753 from nickthetait/master ... Cleanup/merge old changelog file	2017-11-28 12:51:19 +01:00
Jaime van Kessel	cfc6a3ad48	Added some convenience functions to NetworkedPrinterOutputdevice ... This also moves the getUser from legacy to networked printer CL-541	2017-11-28 12:43:49 +01:00
Diego Prado Gesto	8054bc3d7d	CURA-4552 Change names as indicated in the review and making Marlin the ... default flavor. Also fix the case in which the read flavor was not in the dict.	2017-11-28 11:47:34 +01:00
ChrisTerBeke	cf187215dd	Add experimental settings for adaptive layer heights - CURA-4524	2017-11-28 11:44:20 +01:00
Lipu Fei	7d01e3388f	Merge remote-tracking branch 'upstream/3.1'	2017-11-28 11:36:03 +01:00
Lipu Fei	6db06ea713	Fix project loading for single-extrusion machines ... CURA-4617	2017-11-28 11:17:17 +01:00
ChrisTerBeke	9db8bff924	Merge pull request #2838 from fieldOfView/fix_crashhandler_crash ... Fix error when CrashHandler is opened before opengl is initialised	2017-11-28 10:38:23 +01:00
ChrisTerBeke	68cd9df65f	Merge branch '3.1'	2017-11-28 10:36:11 +01:00
ChrisTerBeke	7b30e9a6fc	Merge pull request #2856 from Ultimaker/simulation_view_gradient_changes ... Adapt gradient in Simulation view for better visualization of feedrates	2017-11-28 10:34:10 +01:00
ChrisTerBeke	ec281dc1d5	Merge pull request #2861 from Builder3D/master ... Removed the "Not supported" materials Builder Premium	2017-11-28 09:55:46 +01:00
Diego Prado Gesto	49537b64f7	CURA-4482 Fix error in SolidView when the support angle stack doesn't ... exist. This error was sent twice through the CrashHandler and it is in Metabase.	2017-11-28 09:39:57 +01:00
Buco	af0b949a6f	Changed Setting version ... Setting version to 4	2017-11-28 09:28:25 +01:00
Buco	6caa434dc2	Add Quality Profiles ... Added extra Quality profiles for BVOH, PET, Innoflex60 and PVA	2017-11-28 09:07:34 +01:00
Buco	228c373133	Merge pull request #1 from Ultimaker/master ... Update from original	2017-11-28 08:32:39 +01:00
Thomas Karl Pietrowski	0e95063f8f	desktop.in: Ultimaker Cura everywhere!	2017-11-28 00:45:01 +01:00
Ruben D	0c4db90b7b	Add button to disable sending info directly ... Convenient and easy.	2017-11-28 00:20:43 +01:00