Jack Ha 0bf037a160 Solved merge conflict

2016-07-19 10:27:59 +02:00

..

3MFReader

Filename is now correctly set for 3mf

2016-07-08 15:58:33 +02:00

AutoSave

Update AutoSave plugin to work with the new settings API

2016-05-30 15:29:10 +02:00

ChangeLogPlugin

Another stray conflict marker

2016-07-13 14:33:42 +02:00

CuraEngineBackend

Solved merge conflict

2016-07-19 10:27:59 +02:00

CuraProfileReader

Store the Quality profile for the 'global' and extruders in the gcode. Read in all of the quality profile during import.

2016-07-12 12:41:49 +02:00

CuraProfileWriter

Move ProfileReader and ProfileWriter over to Cura itself.

2016-06-09 14:14:49 +02:00

GCodeProfileReader

Store the Quality profile for the 'global' and extruders in the gcode. Read in all of the quality profile during import.

2016-07-12 12:41:49 +02:00

GCodeWriter

Machine_id instead of definition_id is now used to link extruders

2016-07-13 11:17:44 +02:00

ImageReader

Merge branch 'master' into simple_convex_hull

2016-06-21 14:47:10 +02:00

LayerView

Unbreak LayerView.

2016-07-11 10:29:21 +02:00

LegacyProfileReader

Merge branch 'settings_rework'

2016-05-25 15:12:25 +02:00

PerObjectSettingsTool

Remove the extruder id from settingoverride decorator if the machine does not have multi extrusion

2016-07-12 10:34:58 +02:00

RemovableDriveOutputDevice

Bump API version of plugins that do not need extra porting

2016-05-30 15:29:10 +02:00

SliceInfoPlugin

Both material weights & lengths are now exposed

2016-07-15 15:49:25 +02:00

SolidView

Fix up plugins that use ExtruderManager

2016-07-04 13:16:04 +02:00

UltimakerMachineActions

Removed fixed height for checkup buttons again.

2016-07-19 09:25:36 +02:00

USBPrinting

Restarting machine check properly re-enables endstop check

2016-07-07 13:43:45 +02:00

VersionUpgrade/VersionUpgrade21to22

Properly translate default profiles

2016-07-18 16:02:41 +02:00

XmlMaterialProfile

Update material container's name when its "material" metadata key changes

2016-07-11 14:57:28 +02:00

XRayView

Increment XRayView API number

2016-05-20 16:22:10 +02:00