Nino van Hooff
248a4cbb94
Fix merge issues
...
CURA-6983
2020-01-15 16:14:17 +01:00
Nino van Hooff
182bab6467
Merge remote-tracking branch 'origin/master' into CURA-6983_sync_packages
...
# Conflicts:
# plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py
# plugins/Toolbox/src/Toolbox.py
2020-01-15 15:40:03 +01:00
Nino van Hooff
15dc866cbe
Provess some code review comments
...
CURA-6983
2020-01-15 15:26:31 +01:00
Ghostkeeper
6953c560af
Merge branch 'fix__init__typing' of https://github.com/fieldOfView/Cura into fieldOfView-fix__init__typing
2020-01-15 14:36:40 +01:00
FN5969
bad4abcf89
Merge pull request #1 from FN5969/FN5969-patch-1
...
Add new TEVO Tarantula PRO profile
2020-01-15 16:28:48 +03:00
FN5969
e4ed20b1e9
Add files via upload
2020-01-15 16:22:18 +03:00
Nino van Hooff
b1ecfb627d
Only emit compatible packages from DiscrepanciesPresenter
...
CURA-6983
2020-01-15 12:00:01 +01:00
Kostas Karmas
4cb074c5cd
Merge branch 'master' into CURA-7027_Add_more_materials_from_Marketplace_button
2020-01-15 11:58:53 +01:00
Nino van Hooff
1a1e8a9525
Fix rebase bug regarding package compatibility
...
CURA-6983
2020-01-15 11:54:34 +01:00
Kostas Karmas
dbab3c6e8b
Add more materials from Marketplace menu button
...
This commit adds a button "Add more materials from Marketplace" in the
menu that pops up in the material list while configuring the materials
into custom ones. The button redirects the user to the Marketplace
materials page (https://marketplace.ultimaker.com/app/cura/materials )
CURA-7027
2020-01-15 11:50:59 +01:00
Jaime van Kessel
f9433dba87
Merge branch 'master' of github.com:Ultimaker/Cura
2020-01-15 11:29:42 +01:00
Jaime van Kessel
290761fccd
Fix arranger crash
2020-01-15 11:29:27 +01:00
Evangelos Trantos
ce05f0c5a7
Merge pull request #6964 from Ultimaker/CURA-7087_Machine_specific_materials_not_loaded_correctly
...
Cura 7087 machine specific materials not loaded correctly
2020-01-15 09:06:10 +01:00
fieldOfView
6abf916ced
Fix typing in __init__ methods to appease MYPY
2020-01-14 21:56:06 +01:00
Nino van Hooff
88e5626b59
Fix more Mypy warnings
...
CURA-6983
2020-01-14 17:57:12 +01:00
Jaime van Kessel
6ae3172287
Store metadata when writing the workspace
2020-01-14 15:40:38 +01:00
Jaime van Kessel
b6d1429eb7
Ensure that 3mf workspace reader loads aditional metadata
...
CURA-6627
2020-01-14 15:27:30 +01:00
konskarm
9f023eb28e
Merge pull request #6961 from Ultimaker/CURA-7090
...
CURA-7090/Limit incompatible package message to one per time
2020-01-14 14:18:39 +01:00
Dimitriovski
c8bfb24b92
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090
2020-01-14 14:13:08 +01:00
Dimitriovski
15a3922436
Removed unnecessary checks
...
CURA-7090
2020-01-14 14:07:55 +01:00
Remco Burema
3872e8ffa3
Move 'Toolbar' lower: Toolpanels could be obscured by objects-info.
2020-01-14 12:45:11 +01:00
Dimitriovski
e8f22beb27
Removed unnecessary function and a call to it. Added some typing.
...
CURA-7090
2020-01-14 11:50:47 +01:00
Jaime van Kessel
414b696b32
Use the resetWorkspace for new project
...
This makes it a bit cleaner as we don't have to copy functionality
CURA-6627
2020-01-14 11:04:42 +01:00
Nino van Hooff
4518132ffc
Merge remote-tracking branch 'origin/master'
2020-01-13 14:43:24 +01:00
Nino van Hooff
b6216896cb
Add a script to execute the CI scripts on a local Docker instance
2020-01-13 14:43:11 +01:00
Kostas Karmas
d5cfca4df0
Fix loading machine specific materials
...
The container registry was incorrectly being searched with a
variant_name == None, which always returned an empty printer-specific
materials list. As a result, the generic material settings were always
being loaded if there was no variant specifically indicated inside
the fdm_material file. The printer specific values were consistently
being ignored.
This commit fixes that by removing the search with a variant_name==None
which correctly returns the printer-specific materials list while
loading the materials from the variant nodes.
CURA-7087
2020-01-13 13:44:51 +01:00
Kostas Karmas
601a765f73
Fix typo in comment
2020-01-13 13:44:36 +01:00
Ghostkeeper
122b6318fe
Remove dash if print job name is empty
...
Otherwise it shows ' - Ultimaker Cura' here which looks a bit weird.
2020-01-13 12:32:46 +01:00
Dimitriovski
7359492e11
Added a Tooltip over the Dismiss button. Changed the cursor on hover.
2020-01-13 11:44:23 +01:00
Dimitriovski
071cf5517e
linting
...
CURA-7090
2020-01-13 10:37:40 +01:00
Nino van Hooff
53115dc3b2
Fix Mypy warnings
...
CURA-6983
2020-01-13 09:57:35 +01:00
Nino van Hooff
6aba835c1c
Only show restart dialog when packages were installed
...
CURA-6983
2020-01-13 09:57:14 +01:00
Dimitriovski
3c520fbaf5
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090
2020-01-13 09:55:25 +01:00
Dimitriovski
fbe38dc658
added typing, refactored some functions
...
CURA-7090
2020-01-13 09:55:18 +01:00
MaukCC
ca3cce9252
Merge pull request #1 from Ultimaker/master
...
update
2020-01-13 08:38:46 +01:00
Dimitriovski
071326b890
Added logic for dismissing packages from the Incompatible list
...
CURA-7090
2020-01-11 01:11:49 +01:00
Jaime van Kessel
2a28321588
Fix some more typing
...
For some reaso the server is giving me different reuslts...
2020-01-10 18:03:20 +01:00
Jaime van Kessel
eaf8b3491e
Fix typing issue
2020-01-10 17:49:47 +01:00
Jaime van Kessel
bbee2e0a14
Fix regex for private & long functions
2020-01-10 17:43:40 +01:00
Jaime van Kessel
6e13344809
Add WIP pylint configuration
...
Note that it still needs a bit of tweaking
2020-01-10 16:49:23 +01:00
Dimitriovski
c86cc3ae5a
Added 'dismiss' link and logic for removing the item from the dialog
...
CURA-7090
2020-01-10 16:48:45 +01:00
Jaime van Kessel
e74f049142
Fix bunch of issues found by pylint
2020-01-10 16:37:46 +01:00
Nino van Hooff
2da8040e5a
Show a restart dialog at the end of the cloud sync flow
...
CURA-6983
2020-01-10 15:49:18 +01:00
Jaime van Kessel
bb52ba6848
Codestyle fixes
2020-01-10 15:32:53 +01:00
Jaime van Kessel
49211d3233
remove unused import
2020-01-10 15:22:32 +01:00
Jaime van Kessel
81b33b8649
Add some missing typing
2020-01-10 14:58:53 +01:00
Nino van Hooff
f15e21805c
Remove unused member
...
CURA-6983
2020-01-10 14:29:21 +01:00
Nino van Hooff
35695e5ab6
Install and cloud-subscribe a package when after agreeing to the license
...
CURA-6983
2020-01-10 14:20:58 +01:00
Nino van Hooff
1cf3cd8228
Fix Subscribing to a package
...
CURA-6983
2020-01-10 13:17:48 +01:00
Nino van Hooff
88d210d12d
Fix The toolbox license dialog
...
CURA-6983
2020-01-10 11:47:36 +01:00
