GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-13 06:41:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,225 Commits 295 Branches 268 Tags
Commit Graph

21225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisTerBeke
36f6bdca18 Bring cast back to fix typing 2019-08-15 14:36:25 +02:00
ChrisTerBeke
83ce3f6ea6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2019-08-15 14:30:25 +02:00
ChrisTerBeke
6833323845 UM3PrinterAction - refactor to property, remove discovery start from reset 2019-08-15 14:30:11 +02:00
Remco Burema
1609138d4d Remove deprecated ContainerNode.getChildNode(...) calls. 
part of CURA-6600
 2019-08-15 13:56:41 +02:00
Lipu Fei
581cde1ddf Use HTTPS for firmware update check URLs 2019-08-15 13:42:13 +02:00
Ghostkeeper
fb509a0692
Fix setting the global quality node 
Otherwise you'd get a KeyError there.

Contributes to issue CURA-6600.
 2019-08-15 13:41:11 +02:00
Remco Burema
7fb9642e45 Replace deprecated .getContainer() calls with .container 
part of CURA-6600
 2019-08-15 13:40:08 +02:00
Lipu Fei
4feb22e065 Fix version upgrade for imade3d jellybox 
CURA-6709
 2019-08-15 13:37:04 +02:00
Jaime van Kessel
76729360e1 Remove unused code 
CURA-6600
 2019-08-15 13:33:17 +02:00
Jaime van Kessel
c0f70c447e Ensure that the materials are loaded again 
CURA-6600
 2019-08-15 13:32:42 +02:00
ChrisTerBeke
ab4fd3a7f9 Merge branch 'master' of https://github.com/Ultimaker/Cura 2019-08-15 13:21:17 +02:00
ChrisTerBeke
eb5e1904ab Fix setting printer type on print job 2019-08-15 13:21:10 +02:00
Jaime van Kessel
6a3a23a725 Add time logging about how long it took to construct the container tree 
CURA-6600
 2019-08-15 13:11:45 +02:00
Lipu Fei
f20696966d Fix logging in FirmwareUpdateChecker 2019-08-15 13:03:51 +02:00
Ghostkeeper
f440535581
Add platform mesh for Creality Ender-3 
Provided by Sprint8 in #6204, but I think the mesh was obtained from an older Cura version.

This fixes #6204.
 2019-08-15 11:31:19 +02:00
Lipu Fei
214194de85
Merge pull request #6202 from Ultimaker/CURA-6717_machine_heated_build_volume 
Add machine_heated_build_volume.
 2019-08-15 09:37:18 +02:00
Lipu Fei
e8fd013329 Fix OAuth2 test 2019-08-15 09:23:05 +02:00
Lipu Fei
4c792419e3 Use QDesktopServices.openUrl() instead of webbrowser 2019-08-15 08:57:19 +02:00
Lipu Fei
a2dcbc3be7 Use certifi for firmware update checker 
CURA-6698
 2019-08-14 14:57:52 +02:00
Lipu Fei
6b93c97a5e Use certifi for uploading crash reports 
CURA-6698
 2019-08-14 14:55:36 +02:00
ChrisTerBeke
e6d30516aa Fix status interval check for cloud devices 2019-08-14 14:21:16 +02:00
Remco Burema
f947269cf8 Add machine_heated_build_volume. 
See also the engine.
part of CURA-6717
 2019-08-14 11:59:13 +02:00
Lipu Fei
00334ee5a9 Hide default build plate temperature 
CURA-6716
 2019-08-14 10:58:48 +02:00
Lipu Fei
4947757688 Hide default material print temperature 
CURA-6716
 2019-08-14 10:55:12 +02:00
ChrisTerBeke
fcd5a563e4 Use cluster_size property from zeroconf if available 2019-08-13 21:42:44 +02:00
Ghostkeeper
47fe4b4c90
Re-add getMetadata() 
We need to deprecate it to not break functionality of old plug-ins and such.

Contributes to issue CURA-6600.
 2019-08-13 17:20:59 +02:00
Ghostkeeper
7d1f8e981b
Fix models using new MaterialNode class 
The new one doesn't have getMetadata. Maybe we should allow it to have that actually.

Contributes to issue CURA-6600.
 2019-08-13 17:20:58 +02:00
Ghostkeeper
54b46abd0f
Use specific classes instead of ContainerNode superclass 
Also update the usage of these nodes because the getContainer() function is deprecated.

Contributes to issue CURA-6600.
 2019-08-13 17:20:58 +02:00
Ghostkeeper
5738af4bb8
No longer use deprecated MaterialManager when asking for available materials 
Use the ContainerTree structure instead. That's what it's for.

Contributes to issue CURA-6600.
 2019-08-13 17:20:58 +02:00
Ghostkeeper
7f84145c9a
Rewrite MaterialManager.getAvailableMaterials to use ContainerTree 
Makes it a lot simpler since the nodes in the tree already encoded the fallback mechanism.
However I'm dropping support for filtering by diameter here, since the diameter is not known in the ContainerTree. I'm also dropping support for build plate materials for simplicity and to stay lean.

Contributes to issue CURA-6600.
 2019-08-13 17:20:58 +02:00
Jaime van Kessel
7af6d16de9 Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-08-13 16:40:41 +02:00
Jaime van Kessel
c218b7ac56 Fix the tests for materialnode 
CURA-6600
 2019-08-13 16:22:33 +02:00
Ghostkeeper
6a5f425468
Fix running tests via CMake 
The Settings folder conflicts with the same folder in Uranium, so it couldn't find MockContainer from the Uranium version.

Contributes to issue CURA-6600.
 2019-08-13 16:20:21 +02:00
Ghostkeeper
efaa96bca3
Fix building stack from freshly-loaded definition 
The definition may not have been added to the forest yet.

Contributes to issue CURA-6600.
 2019-08-13 15:44:17 +02:00
ChrisTerBeke
998f58d3fa Tweak offline check interval for cloud device 2019-08-13 15:19:30 +02:00
Ghostkeeper
93851a95d5
Remove unused variable 
Contributes to issue CURA-6600.
 2019-08-13 15:04:06 +02:00
Ghostkeeper
6a8e1557c3
Merge branch 'feature_intent' into feature_intent_container_tree 
Conflicts:
	.gitlab-ci.yml
	cura/Machines/MaterialManager.py
	cura/Machines/VariantManager.py
	cura/Settings/ContainerManager.py
	cura/Settings/MachineManager.py
	tests/TestMachineManager.py
 2019-08-13 14:59:05 +02:00
Ghostkeeper
20201c65e6
Merge branch 'master' into feature_intent 
Conflicts:
	resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously
	tests/TestMachineManager.py -> Due to changes in conftest.py
	tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties
 2019-08-13 14:43:28 +02:00
Ghostkeeper
8fb0a09460
Remove unused imports 
Contributes to issue CURA-6600.
 2019-08-13 14:06:42 +02:00
Ghostkeeper
01eaaf045d
Remove initialisation of tree in material manager 
This is now all contained in the ContainerTree code.

Contributes to issue CURA-6600.
 2019-08-13 14:04:57 +02:00
Lipu Fei
5294e721ac
Merge pull request #6198 from Ultimaker/CS-234_reduce_network_manager_instances 
Only create API client when actually used
 2019-08-13 13:49:19 +02:00
Ghostkeeper
66939192f9
Expand documentation of Maximum Deviation 
Fixes #6187.
 2019-08-13 13:41:05 +02:00
ChrisTerBeke
33876e9ca9 Set group_name correct with cloud devices, possibly fixes CS-225 2019-08-13 13:01:47 +02:00
Lipu Fei
2ed5fd73bc Use certifi CA certs with urllib requests 
CURA-6698
 2019-08-13 12:59:27 +02:00
ChrisTerBeke
2a9be0cdfe Only create API client when actually used 2019-08-13 12:55:54 +02:00
Lipu Fei
349f4ccf28 Fix test command for plugins 2019-08-13 09:26:34 +02:00
Lipu Fei
3e5c693e89 Fix gitlab runner tags 2019-08-13 09:19:54 +02:00
ChrisTerBeke
445fb59c12
Fix setting connection state after re-connect, don't re-register output device 2019-08-12 23:22:16 +02:00
ChrisTerBeke
2ed3af5989
Fix removing output device when signing out 2019-08-12 22:59:43 +02:00
ChrisTerBeke
27905a02a9
Fix re-connecting after network comes back 2019-08-12 21:47:15 +02:00