22486 Commits

Author SHA1 Message Date
Mark Burton
856f998e24 Added Hole Horizontal Expansion setting. 2020-01-21 08:35:24 +00:00
MakeIt3D
39780636a9 Add MAKEiT Pro-MX Profile (#6983)
CURA-7125
2020-01-20 14:53:48 +01:00
Ghostkeeper
92926cfc21
Revert "Limit retraction_combing_max_distance to be no lower than retraction_min_travel"
This reverts commit 3b1e88e49c005657e463f6c76c505ad253ce8636.
It was changing the default behaviour for these printers.

Contributes to issue CURA-6860.
2020-01-20 10:47:46 +01:00
Ghostkeeper
8f6fb5e007
Revert "Properly override retraction_combing_max_distance"
This reverts commit 5ddee1e70fbc2bec6b8ccc1531d146f7d79cec1b. It was changing the default behaviour for this printer.

Contributes to issue CURA-6860.
2020-01-20 10:46:55 +01:00
Ghostkeeper
5ddee1e70f
Properly override retraction_combing_max_distance
Since by default it now defines a value for this one rather than default_value, this override had broken. Thank you, tests.

Contributes to issue CURA-6860.
2020-01-20 09:51:30 +01:00
Ghostkeeper
3b1e88e49c
Limit retraction_combing_max_distance to be no lower than retraction_min_travel
Retraction_min_travel overrides retraction_combing_max_distance in CuraEngine, so it has no effect to make it any lower.

Contributes to issue CURA-6860.
2020-01-20 09:41:48 +01:00
Ghostkeeper
0e5654e44b
Guard against selection pass not existing yet
It could happen that the selection pass is not initialised because you're right clicking on the screen before the first render has happened.

Hopefully this fixes #6976.
2020-01-17 13:09:19 +01:00
ninovanhooff
8bf7666493
Merge pull request #6986 from Ultimaker/CURA-7027_Add_more_materials_from_Marketplace_button
Cura 7027 add more materials from marketplace button
2020-01-16 16:26:38 +01:00
ninovanhooff
4b60da6802
Update resources/qml/Actions.qml
Remove redundant icon from marketplaceMaterialsAction
2020-01-16 16:26:15 +01:00
MaukCC
1814b67b67 HMS434 update (#6826)
Material exclusion update
2020-01-16 16:13:27 +01:00
Jaime van Kessel
fc25a07666
Update platform offset for 3dtech 2020-01-16 16:11:04 +01:00
David Souza
d6392c117d Add 3D Tech Printer (#6948)
* Add a new Machine Profile for 3DTech
2020-01-16 16:10:24 +01:00
Nino van Hooff
59331666db Add missing cloud package manager
CURA-6983
2020-01-16 15:45:42 +01:00
Kostas Karmas
50fbe02c58 Add comment
CURA-7027
2020-01-16 15:19:51 +01:00
Kostas Karmas
18e5d76990 Fix button to open in-Cura Marketplace materials
The button was opening the online Marketplace, which was wrong.
This fix changes the behavior to open the in-Cura Marketplace at
the materials tab.

In order to achieve that, the button calls an action called
materialsMarketplace, which in turn is connected through a
Connection in the ApplicationMenu. When the action is triggered,
it first launched the Toolbox and then it sets its category to
the materials tab.

Since the callExtensionMethod does not allow us to provide input
arguments to the called method, a new method had to be created in
the toolbox that changes the view to the materials tab, instead
of immediately calling the setViewCategory("material").

CURA-7027
2020-01-16 15:11:34 +01:00
Nino van Hooff
8dffed9195 Fix 2 mypy errors
CURA-6983
2020-01-16 14:58:09 +01:00
Nino van Hooff
46133fe2f3 Do not start Sync flow when there are no compatible packages to sync
(and remove unused import)

CURA-6983
2020-01-16 14:44:37 +01:00
Nino van Hooff
6763bed95f Fix Toolbox import error (continued)
(and remove unused import)

CURA-6983
2020-01-16 14:39:10 +01:00
Nino van Hooff
52d2fa47e9 Merge remote-tracking branch 'origin/master' 2020-01-16 14:13:29 +01:00
Nino van Hooff
4ba8b4ae91 Fix Toolbox import error
(and remove unused import)

CURA-6983
2020-01-16 14:13:16 +01:00
Ghostkeeper
d18c0703b4
Fix getting correct initial extruder number
As found in the discussion in #6847.

This was done as a 5 minute fix.
2020-01-16 13:59:02 +01:00
Lipu Fei
f5a64704bd Fix branch checkout for PRs with GitHub workflow 2020-01-16 13:27:17 +01:00
Jaime van Kessel
ab6effb712
No longer use sceneLock for startSliceJob 2020-01-16 12:58:01 +01:00
Jaime van Kessel
fa3a985404
Rename 2 functions that didn't adhere to codestyle
CURA-6983
2020-01-15 16:57:40 +01:00
Jaime van Kessel
0f7f39745d
Add missing typing
CURA-6983
2020-01-15 16:57:10 +01:00
Jaime van Kessel
f12501aec4
Move the message to body instead of title
CURA-6983
2020-01-15 16:46:04 +01:00
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
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
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