Merge branch 'main' into CURA-7647-play-simulation-time-dependent

This commit is contained in:
Saumya Jain 2023-12-08 11:48:53 +01:00 committed by GitHub
commit 031370acf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions

View File

@ -329,6 +329,7 @@
"machine_name": { "default_value": "UltiMaker Method" }, "machine_name": { "default_value": "UltiMaker Method" },
"machine_nozzle_cool_down_speed": { "value": 0.8 }, "machine_nozzle_cool_down_speed": { "value": 0.8 },
"machine_nozzle_heat_up_speed": { "value": 3.5 }, "machine_nozzle_heat_up_speed": { "value": 3.5 },
"machine_scale_fan_speed_zero_to_one": { "value": true },
"machine_start_gcode": { "default_value": "" }, "machine_start_gcode": { "default_value": "" },
"material_bed_temperature": { "enabled": "machine_heated_bed" }, "material_bed_temperature": { "enabled": "machine_heated_bed" },
"material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" },

View File

@ -45,6 +45,16 @@ UM.Dialog
anchors.centerIn: parent anchors.centerIn: parent
} }
Image
{
id: enterpriseLogo
visible: CuraApplication.isEnterprise
source: UM.Theme.getImage("enterprise")
fillMode: Image.PreserveAspectFit
anchors.bottom: parent.bottom
}
UM.Label UM.Label
{ {
id: version id: version

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB