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

action-required-icon.svg

CL-470 Update the icon SVGs

2017-10-02 13:53:09 +02:00

blocked-icon.svg

Update the icon used to show that a printer is blocked.

2017-10-12 14:02:19 +02:00

camera-icon.svg

CL-474 Fix the image used for the camera icon

2017-10-01 12:01:08 +02:00

checkmark-icon.svg

CL-470 Update the icon SVGs

2017-10-02 13:53:09 +02:00

ClusterControlItem.qml

Found some more margins that wouldnt be fixed numbers and made the code more consistent

2017-10-27 14:12:35 +02:00

ClusterMonitorItem.qml

Fix info message when cluster has 0 machines

2017-10-10 12:58:43 +02:00

DiscoverUM3Action.py

Update UM3 discovery dialog creation to new method - CURA-4568

2017-11-28 15:06:53 +01:00

DiscoverUM3Action.qml

Clarify translations of 'unknown'

2017-11-24 13:16:14 +01:00

MonitorItem.qml

Found some more margins that wouldnt be fixed numbers and made the code more consistent

2017-10-27 14:12:35 +02:00

NetworkClusterPrinterOutputDevice.py

Solved merge conflicts. CURA-4525

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

NetworkPrinterOutputDevice.py

Solved merge conflicts. CURA-4525

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

NetworkPrinterOutputDevicePlugin.py

CURA-4649 Blocking printers that have localhost IP address.

2017-12-12 13:45:35 +01:00

OpenPanelButton.qml

Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""

2017-10-05 10:58:49 +02:00

plugin.json

Set author to Ultimaker B.V. instead of Ultimaker

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

PrintCoreConfiguration.qml

Found some more margins that wouldnt be fixed numbers and made the code more consistent

2017-10-27 14:12:35 +02:00

PrinterInfoBlock.qml

Clarify translations of 'unknown'

2017-11-24 13:16:14 +01:00

PrinterTile.qml

Apply screenScaleFactor to Cura Connect UI

2017-09-28 17:36:35 +02:00

PrinterVideoStream.qml

Found some more margins that wouldnt be fixed numbers and made the code more consistent

2017-10-27 14:12:35 +02:00

PrintWindow.qml

Apply screenScaleFactor to Cura Connect UI

2017-09-28 17:36:35 +02:00

UM3InfoComponents.qml

Fix qml error when there is no connected printer

2017-10-25 11:52:43 +02:00