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
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
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
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
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
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
Jaime van Kessel
3e07105edf
Fix incorrect typing
2020-01-10 11:42:17 +01:00
Jaime van Kessel
261ecfacc1
Merge branch 'master' of github.com:Ultimaker/Cura
2020-01-10 11:21:56 +01:00
Dimitriovski
e5f464f7e7
typing
2020-01-10 10:44:29 +01:00
Kostas Karmas
3ce52423fa
Change description of nozzle wipes settings
...
CURA-6968
2020-01-09 15:06:58 +01:00
Jaime van Kessel
f15e0c5477
Merge branch 'CURA-7038_remove_labels_if_no_packages' of github.com:Ultimaker/Cura
2020-01-09 13:25:39 +01:00
Jaime van Kessel
6e05393539
Merge branch 'CURA-6577_rebased' of github.com:Ultimaker/Cura
2020-01-09 13:14:46 +01:00
Dimitriovski
4b757b6be9
Added missing call to function from a refactoring
2020-01-08 17:34:51 +01:00
Remco Burema
1f722d4de0
Minimum support area was always supposed to be small.
2020-01-08 16:28:28 +01:00
Dimitriovski
98a825fbf1
Rebased the subscribe function to use latest version of HttpRequestManager
...
CURA-6577
2020-01-08 11:51:07 +01:00
Dimitriovski
2a01d5c4a6
linting
...
CURA-7038
2020-01-07 15:20:28 +01:00
Dimitriovski
6240522cd6
removed print statement
2020-01-07 14:44:46 +01:00
Dimitriovski
fc504a7cb6
Removed redundant string comparison
...
CURA-7038
2020-01-07 14:43:49 +01:00
Dimitriovski
75d2a72424
Remove the label(s) from the compatibility dialog if there are no packages
...
CURA-7038
2020-01-07 14:19:31 +01:00
Jaime van Kessel
a1f8c3f281
Merge branch 'CURA-6255_incorrect_usage_of__file__' of github.com:Ultimaker/Cura
2020-01-07 14:10:19 +01:00
Remco Burema
a0a5785092
Adjusted mylan-m200 gocde per request (see github #6921 ).
2020-01-07 13:43:30 +01:00
Remco Burema
9c0bd00714
Move settings to the right _visibility_ categories as well.
2020-01-07 13:40:24 +01:00
Lipu Fei
0a495b3f6f
Remove unused code in Toolbox
...
CURA-6387
2020-01-07 12:44:45 +01:00
Lipu Fei
a84e6c3c92
Fix Toolbox due to network manager refactor
...
CURA-6387
2020-01-07 11:37:37 +01:00
Lipu Fei
4f91389941
Fix QML warnings
2020-01-07 11:37:37 +01:00
Lipu Fei
045f4c51fa
Fix BaseMaterialsModel's QTimer lifecycle
2020-01-07 11:37:37 +01:00
Jaime van Kessel
523b4e96a8
Ensure that post processing scripts are correctly reloaded on project loading
...
Previously it would not re load post processing plugins if it was updating an existing machine
Fixes #6881
2020-01-07 10:45:57 +01:00
Jaime van Kessel
2a09404235
Change ModuleNotFoundError to ImportError
...
THat's what you get from developing with Python 3.6 instead of 3.5
2020-01-06 15:53:55 +01:00
Jaime van Kessel
116ea76fbb
Don't register SentryLogger if sentry_sdk is not available
2020-01-06 15:17:20 +01:00
