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

resources/definitions/ultimaker_method_base.def.json

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

resources/qml/Dialogs/AboutDialog.qml

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