3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-29 22:01:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '5.2'

Browse source 
# Conflicts:
#	conanfile.py
This commit is contained in:
Jelle Spijker 2022-10-10 10:23:01 +02:00
commit 48ea4cee9f
18 changed files with 681 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,6 +59,7 @@ Rectangle
Item
{
Layout.preferredWidth: extruderInformation.width
height: childrenRect.height
Cura.ExtruderIcon
@ -84,6 +85,7 @@ Rectangle
{
id: singleMaterialText
anchors.left: extruderCore.right
anchors.right: parent.right
anchors.verticalCenter: extruderCore.verticalCenter
anchors.leftMargin: UM.Theme.getSize("default_margin").width
text: modelData.materials.length == 1 ? `${modelData.materials[0].brand} ${modelData.materials[0].name}` : ""