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

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jack Ha 2016-12-08 17:24:36 +01:00
commit 10375a57f2
12 changed files with 52 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -351,7 +351,7 @@ Item {
{
if(text != "")
{
listview.model.filter = {"settable_per_mesh": true, "label": "*" + text}
listview.model.filter = {"settable_per_mesh": true, "i18n_label": "*" + text}
}
else
{

4
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View file

@ -1018,9 +1018,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
def materialHotendChangedMessage(self, callback):
Application.getInstance().messageBox(i18n_catalog.i18nc("@window:title", "Changes on the Printer"),
i18n_catalog.i18nc("@label",
"Would you like to update your current printer configuration into Cura?"),
"Would you like to use your current printer configuration in Cura?"),
i18n_catalog.i18nc("@label",
"The PrintCores and/or materials on your printer were changed. For the best result, always slice for the PrintCores and materials that are inserted in your printer."),
"The PrintCores and/or materials on your printer differ from those within your current project. For the best result, always slice for the PrintCores and materials that are inserted in your printer."),
buttons=QMessageBox.Yes + QMessageBox.No,
icon=QMessageBox.Question,
callback=callback

1
plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py
View file

@ -2,6 +2,7 @@
# Cura is released under the terms of the AGPLv3 or higher.
import configparser #To get version numbers from config files.
import os
import os.path
import io