2832 commits

Author	SHA1	Message	Date
Lipu Fei	49cac860a8	Fix project loading ... CURA-4617	2017-11-27 14:17:13 +01:00
Ghostkeeper	17a25f98a4	Merge branch '3.1'	2017-11-27 13:58:52 +01:00
Ghostkeeper	99780c3b44	Fix casing of getMetadataEntry ... This is done a bit inconsistently because it's unclear whether metadata should be considered as one word or two. I'd say it is one word, not 'meta data', but people seem to disagree. Contributes to issue CURA-4243.	2017-11-27 13:31:29 +01:00
Jaime van Kessel	0613b1e4b7	Creating components is now done with the prefab function ... CURA-4568	2017-11-27 13:00:49 +01:00
Lipu Fei	1866c4ee66	Split user settings for single extrusion machines ... CURA-4617	2017-11-27 12:56:53 +01:00
Ghostkeeper	4189f8dfa3	Use new findDirtyContainers function ... This prevents all instance containers from being loaded every time we auto-save. Contributes to issue CURA-4243.	2017-11-27 11:59:37 +01:00
ChrisTerBeke	8082c092e5	Fix setting extruder definition in user changes container	2017-11-27 09:54:10 +01:00
Ghostkeeper	9938678347	Fix setting IDs of empty containers ... The _id hasn't been used for a very long time. Contributes to issue CURA-4243.	2017-11-27 09:16:27 +01:00
Ruben D	ffef26097d	Merge branch '3.1'	2017-11-26 18:48:42 +01:00
Aleksei S	bb2be70dac	Finds candidate quality profile for fdmextruder ... CURA-4620	2017-11-25 02:25:36 +01:00
fieldOfView	77d134a3b7	Fix python error when CrashHandler is opened before opengl is initialised ... Contributes to #2837	2017-11-24 16:55:18 +01:00
Ghostkeeper	ebe766a7c8	Set definition by their ID ... The new function for setting the definition just adds the ID to the metadata. Contributes to issue CURA-4243.	2017-11-24 16:45:09 +01:00
Ghostkeeper	4a8dacbe06	Make crash handler easier to translate ... All that formatting doesn't need to be translated along. It's only confusing, especially because of those variable names. They always need to be in that position anyway. Contributes to issue CURA-4601.	2017-11-24 13:16:14 +01:00
Aleksei S	6cea9c59e8	Prevent crash handler exception	2017-11-24 11:59:09 +01:00
Lipu Fei	c7667b56e2	Multiple fixes for stacks ... CURA-4617	2017-11-24 09:45:59 +01:00
Ghostkeeper	37935a8a90	Load only metadata on start-up ... Contributes to issue CURA-4243.	2017-11-23 16:47:55 +01:00
Lipu Fei	2397b68cd7	Optimize MaterialsModel update ... CURA-4546	2017-11-23 14:07:40 +01:00
Lipu Fei	17f09ec21e	Fix variant/material/quality handling in stacks ... CURA-4613	2017-11-23 12:46:33 +01:00
Lipu Fei	18c7a5acf3	Pass optional file_name for deserialization ... CURA-4613 Some upgrades depend on the file_name, so the file_name is needed in this case.	2017-11-23 11:28:16 +01:00
Ghostkeeper	105d7a5615	Return newly added single extruder ... The workspace reader needs to use it to get the correct material. Contributes to issue CURA-4604.	2017-11-22 17:12:53 +01:00
ChrisTerBeke	6c3eaca0fd	fix loading user changes container for single extruder machine	2017-11-22 16:22:23 +01:00
Jack Ha	3b5ed70113	CURA-4602 Fixed active custom profile selected check	2017-11-22 16:15:06 +01:00
Lipu Fei	a7a3ba9500	Always update the job name when a project file is loaded ... CURA-4553	2017-11-22 13:10:09 +01:00
ChrisTerBeke	532cfd8404	Fix showing correct quality changes in dropdown list after upgrading - CURA-4482	2017-11-22 10:48:21 +01:00
Lipu Fei	f8fe6cd455	Treat project files the same way as model files for job name ... CURA-4553	2017-11-22 10:17:53 +01:00
Lipu Fei	aeb478bb4b	Should only show Keep/Discard dialog when it's needed ... CURA-4599	2017-11-22 09:32:17 +01:00
Lipu Fei	31c859b3d7	Show Keep/Discard dialog after the containers have been changed ... CURA-4599 Or the default values will reflect those before the switch.	2017-11-22 09:18:20 +01:00
ChrisTerBeke	0625d22e04	Fix update script for single extrusion quality changes - CURA-4482	2017-11-21 16:43:05 +01:00
ChrisTerBeke	7c28f6f149	Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1	2017-11-21 15:32:08 +01:00
ChrisTerBeke	62d70b46d6	Fix filtering custom profiles per extruder - CURA-4482	2017-11-21 15:31:59 +01:00
Lipu Fei	8782e2e529	Rename parameters ... CURA-4581	2017-11-21 15:12:56 +01:00
Lipu Fei	f18cb951fc	Use workspaceLoaded signal instead of projectFileLoaded ... CURA-4581	2017-11-21 13:49:25 +01:00
Diego Prado Gesto	b6e997c88d	CURA-4526 Delete LayerView plugin because it will be replaced with the ... SimulationView. This commit also adapts the code in order to accept the messages coming from the engine, with information about feedrates and line thicknesses. Add also some changes in the GCodeReader that reads feedrates and line thickness from the gcode file.	2017-11-21 10:47:29 +01:00
jack	f197508694	Merge pull request #2814 from Ultimaker/feature_maximum_resolution ... Maximum mesh resolution	2017-11-20 18:09:11 +01:00
Aleksei S	10b5a19043	Fix merge conflict	2017-11-20 17:56:54 +01:00
ChrisTerBeke	657a91c525	Merge pull request #2685 from Ultimaker/container_stack_improvements ... Container stack improvements	2017-11-20 17:42:26 +01:00
fieldOfView	1924946b59	Merge branch 'master' into feature_mesh_types ... # Conflicts: # plugins/SolidView/SolidView.py	2017-11-18 11:28:15 +01:00
Aleksei S	f484467f86	Clean project name in PrintInformation after removing the last model ... CURA-4581	2017-11-17 18:11:22 +01:00
Aleksei S	93de006271	Remove suffix .curaproject for case "import models"	2017-11-17 15:22:29 +01:00
ChrisTerBeke	f48539cc93	Merge pull request #2685 from Ultimaker/container_stack_improvements ... Container stack improvements	2017-11-17 13:09:54 +01:00
Lipu Fei	2c39612bc8	Fix UM2 upgrade regarding the variant ... CURA-4482 UM2 by default doesn't have variants, but if the user enables Olsson Block, the variant option will become available. This commit fixes the following cases: - Make sure that the variant is set on the extruder stack but not the global stack - Extruder stacks don't contain information such as has_variant. Such info should be retrieved from the global stack and not just from the definition container because they can be overriden by other containers.	2017-11-17 12:47:30 +01:00
Lipu Fei	e246784df2	Use parseBool() for metadata bool values ... CURA-4482	2017-11-17 12:43:30 +01:00
Lipu Fei	cd37f91a0a	Remove unnecessary code in BuildVolume ... CURA-4482	2017-11-17 11:02:41 +01:00
Jack Ha	e2a663992c	CURA-4525 Added an option to turn on the UI elements of multi build plate	2017-11-15 17:00:19 +01:00
Jack Ha	864f417723	CURA-4525 Fix load and save projects. Not storing build plates or object names yet.	2017-11-15 16:03:32 +01:00
Jack Ha	be6561b575	CURA-4525 fixed material info per build plate, bugfix arrange on load	2017-11-15 10:28:34 +01:00
Thomas Karl Pietrowski	b2da4894b1	CuraApplication: Rename file --> file_name ... 'file' is a built-in function!	2017-11-15 01:21:08 +01:00
Jack Ha	4a893c048e	CURA-4525 made PrintInformation multi buildplate-aware	2017-11-14 16:35:37 +01:00
Jack Ha	f6c7ffac11	CURA-4525 some cleanup and comments	2017-11-14 14:48:51 +01:00
Jack Ha	bd8aa8d989	CURA-4525 automatic build plate menu items using BuildPlateModel	2017-11-14 14:27:46 +01:00