3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-02-18 02:12:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'main' into CURA-12678_MSS_profile_update
Some checks failed
conan-package-resources / conan-package (push) Has been cancelled
Details
conan-package / conan-package (push) Has been cancelled
Details
printer-linter-format / Printer linter auto format (push) Has been cancelled
Details
unit-test / Run unit tests (push) Has been cancelled
Details
conan-package-resources / signal-curator (push) Has been cancelled
Details

Browse source
This commit is contained in:
HellAholic 2025-09-11 13:18:59 +02:00 • committed by GitHub
commit cf655a7367
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/definitions/ultimaker_factor4.def.json
View file

@ -74,8 +74,8 @@
{
"maximum_value": "max(35, min((material_bed_temperature + 20) / 2, 70))",
"maximum_value_warning": "max(30, min((material_bed_temperature + 10) / 2, 70))",
"minimum_value": "max((material_bed_temperature - 30) / 2, 30)",
"minimum_value_warning": "max((material_bed_temperature - 20) / 2, 30)"
"minimum_value": "max((material_bed_temperature - 40) / 1.5, 30)",
"minimum_value_warning": "max((material_bed_temperature - 35) / 1.5, 30)"
},
"cool_min_layer_time": { "value": 3 },
"cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 12" },

8
resources/definitions/zyyx_plus.def.json
View file

@ -75,10 +75,6 @@
"Extrudr_GreenTECPro_Silver_175",
"Extrudr_GreenTECPro_White_175",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
@ -186,9 +182,7 @@
"machine_extruder_trains": { "0": "zyyx_plus_extruder_0" },
"machine_x3g_variant": "z",
"preferred_material": "generic_pla",
"preferred_quality_type": "normal",
"quality_definition": "zyyx_plus",
"setting_version": 3
"preferred_quality_type": "normal"
},
"overrides":
{

6
resources/definitions/zyyx_pro.def.json
View file

@ -73,10 +73,6 @@
"Extrudr_GreenTECPro_Silver_175",
"Extrudr_GreenTECPro_White_175",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
@ -185,8 +181,6 @@
"machine_x3g_variant": "z",
"preferred_material": "generic_pla",
"preferred_variant_name": "Carbon0.6",
"quality_definition": "zyyx_pro",
"setting_version": 3,
"variants_name": "SwiftTool"
},
"overrides":

1
resources/qml/WelcomePages/AddUltimakerPrinter.qml
View file

@ -129,7 +129,6 @@ Control
text: catalog.i18nc("@button", "Sign in to Digital Factory")
onClicked: function()
{
Qt.openUrlExternally("https://digitalfactory.ultimaker.com/app/printers?add_printer=true&utm_source=cura&utm_medium=software&utm_campaign=onboarding-add-printer")
text = catalog.i18nc("@button", "Waiting for new printers")
busy = true;
enabled = false;

8
resources/qml/WelcomePages/CloudContent.qml
View file

@ -210,7 +210,13 @@ Item
anchors.bottom: parent.bottom
text: catalog.i18nc("@button", "Sign in")
onClicked: Cura.API.account.login()
onClicked: function()
{
text = catalog.i18nc("@button", "Waiting for new printers")
busy = true;
enabled = false;
Cura.API.account.isLoggedIn? Cura.API.account.sync():Cura.API.account.login();
}
// Content Item is used in order to align the text inside the button. Without it, when resizing the
// button, the text will be aligned on the left
contentItem: Text {