5 Commits

Author	SHA1	Message	Date
Diego Prado Gesto	2bf6d071d1	Merge branch 'master' into feature_sync_button	2018-03-13 13:54:22 +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
Diego Prado Gesto	f625fa8a90	CURA-4870 Add function to set the configuration from the printer back to ... Cura. Change the hash function to compare by GUID instead of type. Show the material name instead of type in the list.	2018-03-06 16:08:50 +01:00
Lipu Fei	31d1a3b5db	Code style fix	2018-03-01 16:31:00 +01:00
Lipu Fei	c5d443109b	Split MaterialGroup and MaterialNode	2018-02-28 11:12:44 +01:00