GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 08:44:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,746 Commits 291 Branches 260 Tags
Commit Graph

6417 Commits

Author SHA1 Message Date
Remco Burema
5039d8db05 Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree 2019-08-20 13:53:12 +02:00
Ghostkeeper
dcf7ed9969
Fix finding materials by GUID 
See, I made the mistake again.

Contributes to issue CURA-6600.
 2019-08-19 16:38:59 +02:00
Ghostkeeper
443495973f
Don't use deprecated material manager any more 
Contributes to issue CURA-6600.
 2019-08-19 16:16:28 +02:00
Jaime van Kessel
2417705dfd Prevent crashes when duplicating a material 
CURA-6600
 2019-08-19 11:42:52 +02:00
Remco Burema
7ed8d0b2f7 Remove deprecated .getMetadata() call. 
part of CURA-6600
 2019-08-16 09:37:58 +02:00
Remco Burema
7fb9642e45 Replace deprecated .getContainer() calls with .container 
part of CURA-6600
 2019-08-15 13:40:08 +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
Lipu Fei
2ed5fd73bc Use certifi CA certs with urllib requests 
CURA-6698
 2019-08-13 12:59:27 +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
ChrisTerBeke
945e5f08a3
Fix checking if still connected or not 2019-08-12 20:08:57 +02:00
Ghostkeeper
2bf4ac8522
No longer trigger rebuilding node tree from quality manager 
Also remove part of that from the material manager while we're at it.

Contributes to issue CURA-6600.
 2019-08-12 17:29:05 +02:00
ChrisTerBeke
77adbdd286 Simpler check if group host 2019-08-12 17:19:20 +02:00
Ghostkeeper
5bbb44bfdf
Remove buildplate loading of materials and don't check if variant is there 
So now we no longer make material subprofiles per buildplate.
And now we create subprofiles for variants regardless if the variant exists or not.

Contributes to issue CURA-6600.
 2019-08-12 16:49:57 +02:00
Ghostkeeper
1bd287f888
Move getting variant manager out of the loop 
This mostly just makes it easier for me to debug where the manager is obtained from the deprecated singleton signal.

Contributes to issue CURA-6600.
 2019-08-12 16:49:57 +02:00
ChrisTerBeke
2fb1311d93 Don't register devices needlessly, for now remove initial update 2019-08-12 16:33:59 +02:00
Lipu Fei
b65482e992 Fix typing 2019-08-12 12:22:57 +02:00
Lipu Fei
5804110c15
Merge pull request #4598 from DesktopMetal/feature_support_line_directions 
Feature: "Support Infill/Interface Line Directions"
 2019-08-12 10:47:08 +02:00
Lipu Fei
3a10345c01
Fix version upgrade 2019-08-12 10:37:00 +02:00
ChrisTerBeke
5ac6b7d1e8
Fix typing of received printers 2019-08-12 01:27:32 +02:00
ChrisTerBeke
e977cdd431
Add legacy 'Connect over Network' button back 2019-08-12 01:19:41 +02:00
ChrisTerBeke
c52974afb9 Fix possible property access on NoneType 2019-08-09 13:12:08 +02:00
ChrisTerBeke
e9305a20a6 cleanup not host message 2019-08-09 12:45:38 +02:00
ChrisTerBeke
90c69e079c Fix cluster host checking, show neat actionable message when not host 2019-08-09 12:38:25 +02:00
ChrisTerBeke
669e64afdb Move cloud flow message to correct folder 2019-08-09 10:09:54 +02:00
ChrisTerBeke
11ef53905b Fix refresh button functionality for network printing 2019-08-09 09:24:32 +02:00
ChrisTerBeke
a063c33d4c
Fix target URL for cloud links in monitor page 2019-08-08 22:47:07 +02:00
Ian Paschal
9a29c77228 Remove debug property 
Contributes to CS-251
 2019-08-08 15:23:29 +02:00
Ian Paschal
1aed8a1fa5 Add manage printer link 
Contributes to CS-251
 2019-08-08 15:20:37 +02:00
ChrisTerBeke
2ed033da7c
Add specific message when connecting to slave, prevent duplicate messages 2019-08-07 01:02:46 +02:00
ChrisTerBeke
8a2e394abc
Fix adding by manual IP, code improvements 2019-08-07 00:38:07 +02:00
ChrisTerBeke
ac177659e5
Fixes for add by IP 2019-08-06 21:46:37 +02:00
ChrisTerBeke
e4fa5ffbc7 Fix some cluster API calls that use redirects 2019-08-06 09:29:25 +02:00
ChrisTerBeke
6ea766e145 Fix relative import in plugin 2019-08-06 09:21:22 +02:00
ChrisTerBeke
28f00bea31
Typing fixes, add some comments 2019-08-05 19:58:41 +02:00
ChrisTerBeke
0099e640c5
Remove debug print statement 2019-08-05 19:45:39 +02:00
ChrisTerBeke
e0d34915e8
Use relative imports in plugin 2019-08-05 19:43:30 +02:00
ChrisTerBeke
f9c543dac8
Remove unused imports 2019-08-05 19:38:46 +02:00
ChrisTerBeke
a1b986fd3a
Some fixes and cleanup for the network plugin 2019-08-05 19:37:35 +02:00
ChrisTerBeke
d19e13daa6
Delete __init__.py 2019-08-04 22:20:03 +02:00
ChrisTerBeke
22aff6468f
Delete ThingiBrowser 2019-08-04 22:18:02 +02:00
ChrisTerBeke
66dbbf7fb6 Use correct none checking (hopefully) 2019-08-02 15:59:55 +02:00
ChrisTerBeke
a2345d3004 Fix 2019-08-02 15:54:52 +02:00
ChrisTerBeke
91ac7dbc24 Some defenses against possible None values 2019-08-02 15:46:14 +02:00
ChrisTerBeke
bd4c4b1f1d 2nd round of CI codestyle fixes 2019-08-02 15:37:11 +02:00
ChrisTerBeke
b2719af0e3 Merge branch 'master' into CS-234_network_plugin_code_quality 2019-08-02 15:30:04 +02:00
ChrisTerBeke
e7fdd02b6f First round of CI codestyle fixes 2019-08-02 15:26:24 +02:00
ChrisTerBeke
1fa5628cb2 Rename output device to prevent inheritance naming confusion 2019-08-02 15:16:08 +02:00