Jack Ha c9dc429b2b CURA-5045 solve merge conflicts

2018-03-29 09:22:19 +02:00

..

Models

CURA-5045 solve merge conflicts

2018-03-29 09:22:19 +02:00

__init__.py

WIP: Create VariantManager

2018-02-16 14:20:02 +01:00

ContainerNode.py

Show configuration error when failing to find container in ContainerNode

2018-03-27 09:54:47 +02:00

MachineErrorChecker.py

Simplify task queue for machine error check

2018-03-13 16:08:46 +01:00

MaterialGroup.py

Merge branch 'master' into feature_sync_button

2018-03-13 13:54:22 +01:00

MaterialManager.py

Don't crash when finding duplicated materials

2018-03-27 13:57:52 +02:00

MaterialNode.py

Split MaterialGroup and MaterialNode

2018-02-28 11:12:44 +01:00

QualityChangesGroup.py

Check before adding quality changes node

2018-03-27 14:15:29 +02:00

QualityGroup.py

Store extruder position of quality groups as int

2018-03-12 17:08:13 +01:00

QualityManager.py

Only show error when quality is global with material/nozzle

2018-03-27 14:19:36 +02:00

QualityNode.py

Separate quality manager related classes into separate files

2018-03-01 16:37:01 +01:00

VariantManager.py

Remove check for if variant container is a variant container

2018-03-27 14:26:05 +02:00