GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-19 18:29:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4

Browse Source
This commit is contained in:
Jaime van Kessel 2016-12-16 11:35:51 +01:00
commit 4431241a51
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/definitions/fdmprinter.def.json
View File

@ -3755,7 +3755,7 @@
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 2, "default_value": 2,
"value": "max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(resolveOrValue('prime_tower_size') ** 2 - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height'))))", "value": "max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(resolveOrValue('prime_tower_size') ** 2 - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height')) if (resolveOrValue('prime_tower_size') ** 2 > max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height')) else 0))",
"resolve": "max(extruderValues('prime_tower_wall_thickness'))", "resolve": "max(extruderValues('prime_tower_wall_thickness'))",
"minimum_value": "0.001", "minimum_value": "0.001",
"minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width'))", "minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width'))",

2
resources/qml/Menus/MaterialMenu.qml
View File

@ -23,7 +23,7 @@ Menu
if(printerConnected && Cura.MachineManager.printerOutputDevices[0].materialNames.length > extruderIndex) if(printerConnected && Cura.MachineManager.printerOutputDevices[0].materialNames.length > extruderIndex)
{ {
var materialName = Cura.MachineManager.printerOutputDevices[0].materialNames[extruderIndex]; var materialName = Cura.MachineManager.printerOutputDevices[0].materialNames[extruderIndex];
return catalog.i18nc("@title:menuitem %1 is the value from the printer", "Automatic: %1").arg(materialName); return catalog.i18nc("@title:menuitem %1 is the automatically selected material", "Automatic: %1").arg(materialName);
} }
return ""; return "";
} }

1
resources/qml/Preferences/MaterialsPage.qml
View File

@ -278,6 +278,7 @@ UM.ManagementPage
{ {
messageDialog.icon = StandardIcon.Information messageDialog.icon = StandardIcon.Information
messageDialog.text = catalog.i18nc("@info:status", "Successfully imported material <filename>%1</filename>").arg(fileUrl) messageDialog.text = catalog.i18nc("@info:status", "Successfully imported material <filename>%1</filename>").arg(fileUrl)
currentItem = base.model.getItem(base.objectList.currentIndex)
} }
else if(result.status == "duplicate") else if(result.status == "duplicate")
{ {