13 Commits

Author	SHA1	Message	Date
Simon Edwards	d4619da358	Merge branch 'master' into python_type_hinting	2016-12-13 14:39:35 +01:00
Simon Edwards	74e5798509	Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py. ... CURA-2917	2016-12-12 16:05:35 +01:00
Jaime van Kessel	9f13338c17	Codestyle	2016-12-06 14:28:25 +01:00
fieldOfView	21bcb0e434	Create a definition_changes container instead of a second variant	2016-11-23 22:53:03 +01:00
fieldOfView	497b6f99a4	Fix finding existing variant by id ... ContainerStack.findContainer cannot find a container by id directly.	2016-11-23 22:04:19 +01:00
fieldOfView	78475d68b3	Fix creating variants	2016-11-23 22:04:18 +01:00
fieldOfView	c8cedb301a	Use insertContainer instead of adding a parameter to addContainer	2016-11-23 22:04:18 +01:00
fieldOfView	b6689870f5	Make Machine Settings compatible with machines that use variants (UM2+) ... For machines that use variants, a second variant container is added between the machine definition and the variant.	2016-11-23 22:04:16 +01:00
fieldOfView	1325c31882	Remove hardcoded container index	2016-11-23 22:04:16 +01:00
Simon Edwards	14afd9eab7	Heaps to changes to get the Cura code through the type checker (with minimal checking). ... CURA-2917	2016-11-21 21:36:08 +01:00
fieldOfView	8b0587e75a	Add logging with reason why printers don't have MachineSettings action	2016-08-16 21:10:58 +02:00
fieldOfView	9b048efe22	Fixed copyrights	2016-08-16 18:19:25 +02:00
fieldOfView	9e7e469df8	Move plugin files into main repo location	2016-08-15 16:06:34 +02:00