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

Merge branch 'main' into CURA-12811_settings-with-errors-can-be-ignored-when-slicing
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:
Erwan MATHIEU 2025-10-24 14:19:43 +02:00 • committed by GitHub
commit d67793bddf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/PaintTool/PaintTool.qml
View file

@ -327,7 +327,7 @@ Item
UM.Label
{
anchors.fill: parent
text: catalog.i18nc("@label", "Select a single model to start painting")
text: catalog.i18nc("@label", "Select a single ungrouped model to start painting")
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
}

2
resources/definitions/anycubic_i3_mega_s.def.json
View file

@ -39,7 +39,7 @@
"machine_acceleration": { "value": 3000 },
"machine_center_is_zero": { "default_value": false },
"machine_depth": { "default_value": 210 },
"machine_end_gcode": { "default_value": "M104 S0 ; Extruder off \nM140 S0 ; Heatbed off \nM107 ; Fan off \nG91 ; relative positioning \nG1 E-5 F300 ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0 ; homing \nG1 Y180 F2000 ; reset feedrate \nM84 ; disable stepper motors \nG90 ; absolute positioning \nM300 S440 P200 ; Make Print Completed Tones \nM300 S660 P250 ; beep \nM300 S880 P300 ; beep" },
"machine_end_gcode": { "default_value": "M104 S0 ; Extruder off \nM140 S0 ; Heatbed off \nM107 ; Fan off \nG91 ; relative positioning \nG1 E-5 F300 ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{speed_travel} ; lift print head \nG28 X0 Y0 ; homing \nG1 Y180 F2000 ; reset feedrate \nM84 ; disable stepper motors \nG90 ; absolute positioning \nM300 S440 P200 ; Make Print Completed Tones \nM300 S660 P250 ; beep \nM300 S880 P300 ; beep" },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 205 },

6
tests/conftest.py
View file

@ -21,6 +21,12 @@ from UM.Settings.ContainerRegistry import ContainerRegistry
@pytest.fixture()
def application() -> CuraApplication:
app = MagicMock()
app.getInstance = MagicMock(return_value=app)
machine_manager = MagicMock()
extruder_changed_signal = MagicMock()
extruder_changed_signal.connect = MagicMock()
machine_manager.extruderChanged = extruder_changed_signal
app.getMachineManager = MagicMock(return_value=machine_manager)
return app
@pytest.fixture()