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

Merge branch '4.10'

Browse source
This commit is contained in:
Ghostkeeper 2021-06-10 17:37:35 +02:00
commit f815d15b10
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
11 changed files with 4844 additions and 4683 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/definitions/ultimaker2_plus_connect.def.json
View file

@ -22,7 +22,8 @@
"0": "ultimaker2_plus_connect_extruder_0"
},
"supports_usb_connection": false,
"supports_network_connection": true
"supports_network_connection": true,
"supports_material_export": true
},
"overrides": {

1
resources/definitions/ultimaker_s3.def.json
View file

@ -27,6 +27,7 @@
"first_start_actions": [ "DiscoverUM3Action" ],
"supported_actions": [ "DiscoverUM3Action" ],
"supports_usb_connection": false,
"supports_material_export": true,
"weight": -1,
"firmware_update_info": {
"id": 213482,

1
resources/definitions/ultimaker_s5.def.json
View file

@ -28,6 +28,7 @@
"supported_actions": [ "DiscoverUM3Action" ],
"supports_usb_connection": false,
"supports_network_connection": true,
"supports_material_export": true,
"weight": -2,
"firmware_update_info": {
"id": 9051,

9412
resources/i18n/cura.pot
View file

File diff suppressed because it is too large Load diff

2
resources/i18n/fdmextruder.def.json.pot
View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
"POT-Creation-Date: 2021-04-02 16:09+0000\n"
"POT-Creation-Date: 2021-06-10 17:35+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"

7
resources/i18n/fdmprinter.def.json.pot
View file

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
"POT-Creation-Date: 2021-04-02 16:09+0000\n"
"POT-Creation-Date: 2021-06-10 17:35+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
@ -3656,8 +3656,9 @@ msgstr ""
#: fdmprinter.def.json
msgctxt "retraction_combing_max_distance description"
msgid ""
"When non-zero, combing travel moves that are longer than this distance will "
"use retraction."
"When greater than zero, combing travel moves that are longer than this "
"distance will use retraction. If set to zero, there is no maximum and "
"combing moves will not use retraction."
msgstr ""
#: fdmprinter.def.json

32
resources/qml/Preferences/Materials/MaterialsPage.qml
View file

@ -1,5 +1,5 @@
// Copyright (c) 2018 Ultimaker B.V.
// Uranium is released under the terms of the LGPLv3 or higher.
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 1.4
@ -191,6 +191,20 @@ Item
}
enabled: base.hasCurrentItem
}
//Sync button.
Button
{
id: syncMaterialsButton
text: catalog.i18nc("@action:button Sending materials to printers", "Sync with Printers")
iconName: "sync-synchronizing"
onClicked:
{
forceActiveFocus();
exportAllMaterialsDialog.open();
}
visible: Cura.MachineManager.activeMachine.supportsMaterialExport
}
}
Item {
@ -368,6 +382,20 @@ Item
}
}
FileDialog
{
id: exportAllMaterialsDialog
title: catalog.i18nc("@title:window", "Export All Materials")
selectExisting: false
nameFilters: ["Material archives (*.umm)", "All files (*)"]
folder: base.materialManagementModel.preferredExportAllPath
onAccepted:
{
base.materialManagementModel.exportAll(fileUrl);
CuraApplication.setDefaultPath("dialog_material_path", folder);
}
}
MessageDialog
{
id: messageDialog

2
resources/qml/WelcomePages/WhatsNewContent.qml
View file

@ -100,7 +100,7 @@ Item
top: subpageImage.bottom
topMargin: UM.Theme.getSize("default_margin").height
bottom: parent.bottom
bottomMargin: UM.Theme.getSize("thick_margin").height
bottomMargin: UM.Theme.getSize("thin_margin").height
left: subpageImage.left
right: subpageImage.right
}