13254 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jaime van Kessel	f36e34a7c5	Merge branch 'master' of github.com:Ultimaker/Cura	2018-03-12 16:33:53 +01:00
Jaime van Kessel	522e297711	Add some more states to check if print_job is active	2018-03-12 16:33:32 +01:00
Ghostkeeper	f08407cf97	Document Available role ... Contributes to issue CURA-4606.	2018-03-12 16:32:10 +01:00
Ghostkeeper	5afcf2beac	Don't update brand and generic materials models upon switching active extruder ... Because the list of materials can't change by that action. Contributes to issue CURA-4606.	2018-03-12 16:28:41 +01:00
Ghostkeeper	0078340175	Only update NozzleModel when machine changes ... The available nozzles only change upon changing machines. Contributes to issue CURA-4606.	2018-03-12 16:19:47 +01:00
Lipu Fei	1f08accbec	Fix profile importing for version upgrade ... CURA-4946	2018-03-12 16:15:16 +01:00
Ghostkeeper	05c034558d	Set default layer height via preferred quality type ... So the layer heights are correct for each quality type but the default is still 0.2mm. Contributes to issue CURA-4981.	2018-03-12 16:03:42 +01:00
Ghostkeeper	1512a8096b	Require MaterialGroup to always have a base material ... The material group is loaded lazily whenever the base material is not yet in the dictionary. Contributes to issue CURA-4606.	2018-03-12 15:43:42 +01:00
Lipu Fei	c54679ba2d	Gix buildplate handling in Material profile ... CURA-4606	2018-03-12 15:25:29 +01:00
Lipu Fei	220e4a64c6	Fix VariantManager.getVariant() and simplify NozzleModel ... CURA-4606	2018-03-12 15:25:29 +01:00
Diego Prado Gesto	55c3f06e73	Merge branch 'master' of github.com:Ultimaker/Cura	2018-03-12 15:10:43 +01:00
Diego Prado Gesto	809db6a4d9	CURA-5078 Remove material warning if the mismatch was the buildplate.	2018-03-12 15:09:56 +01:00
Ghostkeeper	bb7fccbd48	Add logging for every setting model update ... You can clearly see that some models are updated 4 times or so now. Contributes to issue CURA-4606.	2018-03-12 14:48:56 +01:00
Lipu Fei	2c5cc17b49	Fix build plate compatibility check ... CURA-5078	2018-03-12 10:34:18 +01:00
Ghostkeeper	d98cab48ac	Get scripts from either Resources or Preferences ... We must retain the old directory for legacy. People might still have scripts there.	2018-03-12 09:48:03 +01:00
Ghostkeeper	a3efbc70fb	Merge branch 'fix_postprocessing_script_path' of https://github.com/fieldOfView/Cura into fieldOfView-fix_postprocessing_script_path	2018-03-12 09:42:21 +01:00
Ghostkeeper	15212d4426	Align for readability	2018-03-12 09:38:20 +01:00
Ghostkeeper	aae8a31f00	Don't display extruder count if you can't use it ... If your printer can only handle one extruder, don't display this drop-down. Don't let users get confused.	2018-03-12 09:23:25 +01:00
Lipu Fei	7312ed8e3c	Fix project loading for version upgrade ... CURA-5054	2018-03-09 19:35:23 +01:00
Lipu Fei	e09325bf82	Fix project loading for version upgrade ... CURA-5054	2018-03-09 17:16:27 +01:00
Lipu Fei	a81981a27a	Better info on no profiles to import for gcode ... CIRA-4946 If a gcode is sliced with default profiles, there won't be any custom profiles to import from that gcode. In that case, we show a info message telling the user about this instead of showing an error message.	2018-03-09 16:40:57 +01:00
Lipu Fei	c41af83b41	Fix create quality changes for extruders ... CURA-5054	2018-03-09 16:29:49 +01:00
Ghostkeeper	2f1657f848	Update version numbers in variants ... These didn't match on my initial search-and-replace so I missed them. Contributes to issue CURA-5054.	2018-03-09 16:23:38 +01:00
Ghostkeeper	cf21e7c74b	Also upgrade definition_changes and user ... Because these files share their version numbers with quality changes. Contributes to issue CURA-5054.	2018-03-09 16:21:42 +01:00
Ghostkeeper	d8a066c1e7	Increment instance container version number instead of just quality_changes ... Otherwise when we load that quality_changes file we'll deny it because the instance container version number is wrong. Contributes to issue CURA-5054.	2018-03-09 16:14:24 +01:00
Ghostkeeper	3a832d66a9	Safer check for extruder vs. global ... Because it might be an empty string. Contributes to issue CURA-5054.	2018-03-09 16:07:54 +01:00
Ghostkeeper	b797ac1a15	Read only position from metadata ... We now determine whether this is a global or an extruder profile based on whether the position metadata field is present, instead of whether the extruder metadata field is present. Contributes to issue CURA-5054.	2018-03-09 16:07:06 +01:00
Ghostkeeper	5d2e98cdd4	Translate to American English ... The spelling in AmE is with a Z.	2018-03-09 15:55:27 +01:00
Ghostkeeper	e18b1cde55	Store extruder position under 'position' instead of 'extruder' ... Otherwise it thinks it is still an extruder ID. Contributes to issue CURA-5054.	2018-03-09 15:37:30 +01:00
Ghostkeeper	71afbba789	Merge branch '3.2'	2018-03-09 15:36:51 +01:00
Ghostkeeper	c54ea00111	Merge branch 'master' of github.com:Ultimaker/Cura	2018-03-09 15:22:13 +01:00
Ghostkeeper	5caa92cf7a	Update current version for quality changes ... We now need to upgrade up to version 3000004. Contributes to issue CURA-5054.	2018-03-09 15:21:45 +01:00
Ghostkeeper	2962e0e282	Upgrade to quality_changes rather than quality ... Oops. Contributes to issue CURA-5054.	2018-03-09 15:20:20 +01:00
Lipu Fei	206d20c440	Fix empty definition_changes check in MachineSettingsAction ... CURA-5060 Should check for both "empty" and "empty_definition_changes".	2018-03-09 15:04:57 +01:00
Ghostkeeper	65591e7c26	Merge branch 'master' of github.com:Ultimaker/Cura	2018-03-09 15:00:25 +01:00
Lipu Fei	c9905449eb	Clean up MachineSettingsAction imports ... CURA-5060	2018-03-09 14:54:13 +01:00
Ghostkeeper	fb814b6519	Implement upgrade for quality changes extruder metadata ... The metadata used to be the ID of the extruder. Now it's the position of the extruder stack. Contributes to issue CURA-5054.	2018-03-09 14:54:08 +01:00
Lipu Fei	8c7e413038	Remove unnecessary setGlobalContainerStack() in project loading ... CURA-5073	2018-03-09 14:37:43 +01:00
Lipu Fei	48dae7b6c7	Remove commented code ... CURA-5060	2018-03-09 14:35:43 +01:00
Lipu Fei	de72dd3455	Fix material update upon gcode flavour change ... CURA-5060	2018-03-09 14:26:53 +01:00
Andreea Scorojitu	a40be0c64a	Add default_build_plate to expert view, CURA-5032 ... The default build plate settings is now added in Expert view in SettingsVisibility	2018-03-09 14:25:35 +01:00
Ghostkeeper	e30d15ab66	Implement getCfgVersion ... Mostly copied from the implementation in the 3.0 to 3.1 upgrade. Contributes to issue CURA-5054.	2018-03-09 14:02:15 +01:00
Mark	af89209cde	Changed rounding of prettyTime by accident	2018-03-09 14:02:04 +01:00
Ghostkeeper	60de2aff65	Basic upgrade module from 3.2 to 3.3 implementation ... 'Basic' meaning no implementation at all. Contributes to issue CURA-5054.	2018-03-09 13:59:31 +01:00
Ghostkeeper	970f1da810	Add missing getVersion and location for quality ... It worked out because older plug-ins still defined this, but let's properly put it in here too. Contributes to issue CURA-5054.	2018-03-09 13:47:19 +01:00
Ghostkeeper	d8853b8a98	Sort profile models case-insensitively ... Cast every sorting key to uppercase before doing this. Don't cast to lowercase or there will be problems with characters that don't have lowercase and with Turkish dotted i vs. undotted i. Fixes #3460.	2018-03-09 11:40:33 +01:00
Lipu Fei	3550ef80e0	Fix quality management page QML ... CURA-5063	2018-03-09 11:00:39 +01:00
Ian Paschal	6bee5bf1b0	CURA-4972 Tweak per review comments	2018-03-09 10:36:34 +01:00
Ian Paschal	c278942cec	CURA-67 Don't enable by default ... `value` is set to !support and !tree support, both of which are typically disabled by default, making this setting's default value effectively `true` even though the line above says the default should be `false`.	2018-03-09 10:26:48 +01:00
Lipu Fei	15f017b404	Set dirty for containers created in project loading ... CURA-5056	2018-03-09 10:18:51 +01:00