Lipu Fei 834fd055b6 Fix conflict resolve strategies in project loading ...

CURA-4053

When loading a project file:

- Only check if the global stack exists to detect conflicts instead
  of checking the global stack and the extruder stacks. It can happen
  that the global stack exists while the extruder stacks not or the
  other way around.

- Always assign a resolve strategy to container(s). There can be
  "None" strategies and those were not handled correctly.

2017-07-19 14:48:11 +02:00

..

__init__.py

Moved certain meta data entries to seperate file

2017-06-21 11:22:35 +02:00

plugin.json

Set author to Ultimaker B.V. instead of Ultimaker

2017-06-28 13:50:37 +02:00

ThreeMFReader.py

Only 3mf nodes with mesh data are getting the sliceable object decorator. CURA-3559

2017-03-20 14:43:46 +01:00

ThreeMFWorkspaceReader.py

Fix conflict resolve strategies in project loading

2017-07-19 14:48:11 +02:00

WorkspaceDialog.py

Fix WorkspaceDialog to include resolve for definition_changes

2017-05-10 13:07:45 +02:00

WorkspaceDialog.qml

fixed too big dialogs and hidden checkboxes

2017-05-31 12:46:07 +02:00