3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 01:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
24910 commits 302 branches 270 tags 770 MiB
Commit graph

24910 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kostas Karmas
d0534c0476 Update _remote_clusters dict when cloud printer is removed from Cura 
CURA-7457
 2020-06-02 15:23:35 +02:00
Jaime van Kessel
73026a0744
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-02 14:20:35 +02:00
Jaime van Kessel
fbbd2f7484
Fix small copy paste error 
CURA-7477
 2020-06-02 14:19:13 +02:00
Jaime van Kessel
0885d1a8e2
Merge branch 'feature_single_instance_preference' of https://github.com/fieldOfView/Cura 2020-06-02 14:16:18 +02:00
Nino van Hooff
ba705176fe Remove extraneous logging 2020-06-02 14:13:04 +02:00
Ghostkeeper
93c84d5bc0
Mock the limit_to_extruder property with an actual value 
This is necessary because our code now converts this to an integer. Mocks can't be converted to an integer, so the sub-magic-mock here can't be used. We need to provide something that can be cast to an integer.
 2020-06-02 14:01:09 +02:00
Ghostkeeper
825a34d418
Mock the extruderList 
Otherwise the list of extruders becomes a MagicMock. Adding a list to a MagicMock is again a MagicMock, and when iterating over that it doesn't result in any iterations. As a result, the for loop that clears all user containers didn't clear anything and the test failed.
 2020-06-02 13:46:17 +02:00
Ghostkeeper
be814535e9
Avoid hitting the prime blob when Z hop is enabled 
If Z hop is enabled, it would move to the height of the Z hop at the start of the print, in order to hop for the initial travel move. Cura sort of assumes that this hop is going up and so it's safe to do, but in reality this hop is going down due to the starting process in the firmware. As a hotfix, we'll just move away from that blob so that we don't hit it even if you enable Z hops.
 2020-06-02 11:54:10 +02:00
Ghostkeeper
19f500834b
Remove use of deprecated extruders property 
Still had this one uncommitted from last Friday. I tested it and it works the same way.
 2020-06-02 11:54:10 +02:00
Nino van Hooff
eb48fcf05e Merge remote-tracking branch 'origin/master' 2020-06-02 11:32:20 +02:00
Jaime van Kessel
f1d3c2272e
Merge branch 'CURA-7458_Add_offline_cloud_printers_in_Cura' of github.com:Ultimaker/Cura 2020-06-02 10:55:21 +02:00
Victor
63e7e2b382
Added 76800 baud rate 2020-06-02 00:03:12 -03:00
Victor
accd205185
Added 76800 baud rate 2020-06-02 00:02:24 -03:00
fieldOfView
aa2ed1aa4b Remove now defunct variable 2020-05-29 21:34:00 +02:00
Ghostkeeper
e68ebb198e
Don't use deprecated extruders property 
Done during Turbo Testing and Tooling.
 2020-05-29 18:14:21 +02:00
Ghostkeeper
0e4830e6ef
Don't use deprecated extruders property 
Done during Turbo Testing and Tooling.
 2020-05-29 18:10:59 +02:00
Ghostkeeper
e98c26a33c
Don't use deprecated extruders property 
Done during Turbo Testing and Tooling.
 2020-05-29 18:07:08 +02:00
Ghostkeeper
b68c3b7301
Remove usage of deprecated extruders property 
Initially PyCharm didn't find this because it's not typed.

Done during Turbo Testing and Tooling.
 2020-05-29 18:06:02 +02:00
Ghostkeeper
fc6867a4a0
Use extruderList rather than deprecated extruders property 
Done during Turbo Testing and Tooling.
 2020-05-29 17:56:56 +02:00
Ghostkeeper
458acb356f
Use extruderList rather than deprecated extruders property 
Once more into the fray.

Done during Turbo Testing and Tooling.
 2020-05-29 17:55:12 +02:00
Ghostkeeper
0d9053881c
Remove use of deprecated extruders property 
Removes lots of warnings from the test log, since there the logger doesn't prevent creating multiple of those.

Done during Turbo Testing and Tooling.
 2020-05-29 17:47:56 +02:00
Ghostkeeper
1bb4458dca
Remove use of deprecated extruders property 
This also removes the need to sort them, since the list is already sorted by position.

Done during Turbo Testing and Tooling.
 2020-05-29 17:45:41 +02:00
Ghostkeeper
1fb78d23a5
Remove usage of deprecated extruders property 
Use extruderList instead.

Done during Turbo Testing and Tooling.
 2020-05-29 17:42:18 +02:00
Ghostkeeper
da61096efe
Remove uses of deprecated extruders property 
It's been replaced by extruderList now.

Done during Turbo Testing and Tooling.
 2020-05-29 17:38:34 +02:00
Ghostkeeper
e098f98a7d
Remove unused mock of extruders property 
The extruders property is no longer being used by the code under test, so this mock is unnecessary. It's also a deprecated property.

Done during Turbo Testing and Tooling.
 2020-05-29 17:35:42 +02:00
Ghostkeeper
9c78178561
Fix running automated tests from source with different SIP version 
This prevents the PyCapsule_GetPointer error when running the tests for this plug-in.

Done during Turbo Testing and Tooling.
 2020-05-29 17:31:58 +02:00
Ghostkeeper
962e375dad
Remove mocking of deprecated field 
This field is no longer used by the code under test.
 2020-05-29 17:26:33 +02:00
Ghostkeeper
90de482313
Don't mock deprecated property 
This property is deprecated. It's no longer used by the Build Volume code. Apparently it was unnecessary, too.

Done during Turbo Testing and Tooling.
 2020-05-29 17:24:56 +02:00
fieldOfView
cb73cfb0f3 Make add printer dialog resize-aware 2020-05-29 17:22:46 +02:00
Ghostkeeper
e7371bd741
Use extruderList rather than deprecated extruders property 
Done during Turbo Testing and Tooling.
 2020-05-29 17:02:22 +02:00
Nino van Hooff
98587a9008
Merge pull request #7551 from Ultimaker/doxygen_to_restructuredtext_comments 
Converted doxygen style comments to reStructuredText style
 2020-05-29 16:46:25 +02:00
fieldOfView
7c8c1838e0 Make printer name field look less like a search field 2020-05-29 16:21:18 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
1e33360c35 Fix merge mistake in ToolPathUploader 2020-05-29 14:12:47 +02:00
Kostas Karmas
5aff6218d5 Add the offline cloud printers in Cura when they are discovered 
CURA-7458
 2020-05-29 14:02:36 +02:00
fieldOfView
8ce5593eec Add visible scrollbar to list of printer profiles 2020-05-29 13:49:03 +02:00
Remco Burema
8bbb69300c
Fix anonymizing home directory if path contains double-backslash. 2020-05-29 12:38:42 +02:00
Ghostkeeper
5e73412a67
Merge branch 'master' of https://github.com/5axes/Cura into 5axes-master 2020-05-29 11:29:53 +02:00
maukcc
2aedc68892 HMS434 update 
line width removed
 2020-05-29 10:16:45 +02:00
maukcc
043ed2af81 HMS434 update 
Let host know we changed tools at beginning of print
 2020-05-29 10:09:04 +02:00
Ghostkeeper
52a6618630
Write a new starter text and add a screenshot 
This is my best attempt at marketing fluff. I guess people expect something like that here.
 2020-05-29 09:34:00 +02:00
Nino van Hooff
ff3f4c99a8 Remove incorrect comment 2020-05-28 17:34:04 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
 2020-05-28 17:31:24 +02:00
Jaime van Kessel
f7921394bf
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-05-28 17:21:42 +02:00
Nino van Hooff
c2c96faf5f Convert remaining doxygen to rst 2020-05-28 17:13:44 +02:00
Jaime van Kessel
7e53bc179f
Add beta upgrader 
CURA-7413
 2020-05-28 17:13:26 +02:00
Nino van Hooff
fe779d9501 Convert doxygen to rst for Cura scripts 2020-05-28 16:25:26 +02:00
Nino van Hooff
bb2a176e36 Convert doxygen to rst for VersionUpgrades 40+ 2020-05-28 16:21:49 +02:00
Nino van Hooff
5af9faf5e5 Convert doxygen to rst for X3DReader, XmlMaterialProfile, XRayView 2020-05-28 16:08:51 +02:00
Ghostkeeper
2a70813d03
Correct orientation of printer volume 
This seems to have been a mix-up of 'depth' and 'height'. The specs online say that these are the correct dimensions.

Fixes #7827.
 2020-05-28 12:59:40 +02:00