156 commits

Author	SHA1	Message	Date
Ian Paschal	93645e6bfe	Reduce component sizes ... Contributes to CURA-5378	2018-08-24 10:46:23 +02:00
Ian Paschal	f6b43bd9ab	Merge branch 'master' into feature_favorite_materials ... Contributes to CURA-5162, CURA-5378	2018-08-23 17:24:39 +02:00
Ian Paschal	56a5f59964	Cleaner code ... I was hoping to completely nix the generic materials model (since it's basically just a brand "Generic", but then in the QML it has to be have the same in terms of sub-menus or fold-outs and that looked stupid (Generic -> ABS -> ABS)). So we keep that one for now. It is cleaner though. Contributes to CURA-5162, CURA-5378	2018-08-23 16:39:40 +02:00
Ian Paschal	8da7773600	Remove unused code ... Contributes to CURA-5162, CURA-5378	2018-08-23 16:04:51 +02:00
Ian Paschal	6225fff1f8	Re-added material detail view ... Contributes to CURA-5378	2018-08-22 15:58:58 +02:00
Ian Paschal	00eb8e6788	Organize material preferences ... Contributes to CURA-5378	2018-08-22 12:34:38 +02:00