3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix merge conflict

Browse source
This commit is contained in:
ChrisTerBeke 2018-12-06 16:39:58 +01:00
commit ec03b012a7
73 changed files with 3047 additions and 1216 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/PrinterSelector/MachineSelectorList.qml
View file

@ -13,7 +13,7 @@ Column
Label
{
text: catalog.i18nc("@label", "Network connected printers")
text: catalog.i18nc("@label", "Connected printers")
visible: networkedPrintersModel.items.length > 0
leftPadding: UM.Theme.getSize("default_margin").width
height: visible ? contentHeight + 2 * UM.Theme.getSize("default_margin").height : 0