3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix merge conflicts with master

Browse source
This commit is contained in:
Lipu Fei 2019-09-24 14:26:43 +02:00
commit 94e89ad4ac
89 changed files with 1283 additions and 928 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/TestMachineManager.py
View file

@ -139,7 +139,7 @@ def test_resetSettingForAllExtruders(machine_manager):
extruder_2 = createMockedExtruder("extruder_2")
extruder_1.userChanges = createMockedInstanceContainer("settings_1")
extruder_2.userChanges = createMockedInstanceContainer("settings_2")
global_stack.extruders = {"1": extruder_1, "2": extruder_2}
global_stack.extruderList = [extruder_1, extruder_2]
machine_manager.resetSettingForAllExtruders("whatever")