Jack Ha 5152b2ae65 Solved merge conflicts. CURA-4525

2017-12-21 10:52:51 +01:00

..

__init__.py

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ConfigUI.qml

Fix an error that makes Cura crash when introducing commas in the

2017-12-01 14:26:53 +01:00

ImageReader.py

CURA-4525 first multi slice + multi layer data, added filter on build plate, added option arrange on load, visuals like convex hull are now correct

2017-11-09 17:03:20 +01:00

ImageReaderUI.py

Merge branch '3.1'

2017-12-01 14:41:41 +01:00

plugin.json

Set author to Ultimaker B.V. instead of Ultimaker

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