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

22575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nino van Hooff
2f3cf3c493 LicenseDialog layout tweaking 
CURA-7129
 2020-01-22 10:53:43 +01:00
Nino van Hooff
b3812a3630 Add icon to licenseDialog (clowd flow) 
CURA-7129
 2020-01-21 17:07:21 +01:00
Kostas Karmas
037e4d5b5f Merge branch 'PurpleHullPeas-add_mp_mini_delta' 2020-01-21 16:59:24 +01:00
Kostas Karmas
c0052ad492 Merge branch 'add_mp_mini_delta' of https://github.com/PurpleHullPeas/Cura into PurpleHullPeas-add_mp_mini_delta 2020-01-21 16:29:53 +01:00
Ghostkeeper
a3825c1f14
Merge branch 'master' into CURA-6627_Store_extra_data_project_files 2020-01-21 15:14:45 +01:00
Dimitriovski
369329c476
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition 2020-01-21 15:08:24 +01:00
Dimitriovski
5c498de1e4
Use meaningful variable name && some TODOs for later. 
CURA-7090
 2020-01-21 15:07:11 +01:00
Dimitriovski
e7ed93c132
fixed typing 
CURA-7090
 2020-01-21 14:51:53 +01:00
Nino van Hooff
1287ebdc51 Change backgroundColor and margin for licenseDialog 
CURA-7129
 2020-01-21 14:43:02 +01:00
ninovanhooff
d86b1bec2e
Merge pull request #7003 from Ultimaker/ci_invalid_import_checker 
ci_invalid_import_checker
 2020-01-21 12:38:54 +01:00
Dimitriovski
8abaa60052
Passed the sdk_version to the reevalute() function 
CURA-7090
 2020-01-21 11:24:31 +01:00
konskarm
d8abd24bfe
Merge pull request #6992 from Ultimaker/CURA-6984_decline_sync 
CURA-6984_decline_sync
 2020-01-21 10:47:22 +01:00
Ghostkeeper
5d21872e50
Take nozzle offsets into account when placing prime tower 
extruderValues('machine_nozzle_offset_x') := [0, 20, -18]
map(abs(extruderValues('machine_nozzle_offset_x') := [0, 20, 18]
max(map(abs(extruderValues('machine_nozzle_offset_x') := 20

So we take the highest offset of all extruders to get the area that can be reached by all extruders. And we take the abs() of all extruder values because positive or negative only means that the other extruders get offset in the same direction.

Fixes #6997.
 2020-01-21 10:31:47 +01:00
Dimitriovski
365c30fadb
Added check to reevaluate dismissed incompatible packages (in case the package gets updated and has the correct SDK version) 
CURA-7090-addition
 2020-01-21 09:52:33 +01:00
Nino van Hooff
2e20bf6a98 Update invalid imports checker documentation 
Makes it consistent with other checkers we already have
 2020-01-20 16:35:32 +01:00
Nino van Hooff
b830a6faa3 Rewrite invalid imports checker to Python 
Makes it consistent with other checkers we already have
 2020-01-20 16:24:26 +01:00
Jaime van Kessel
06ccd882e1
Add missing typing 
CURA-6627
 2020-01-20 16:03:56 +01:00
Jaime van Kessel
52ce106399
Change _loadMetadata to be static 
CURA-6627
 2020-01-20 15:37:57 +01:00
Jaime van Kessel
bee641da5a
Remove local import of json 
CURA-7005
 2020-01-20 15:30:23 +01: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
Nino van Hooff
66105e8a3a Add invalid imports checker 
Since plugins.* is not available on the PATH for some builds,
they should not be used. Relative imports are preferred
 2020-01-20 09:51:22 +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
Nino van Hooff
b03be75a13 Show error messages for cloud flow errors 
- failed downloads
- failed installs

CURA-6984
 2020-01-17 13:54:39 +01:00
Nino van Hooff
9dd50c8804 Replace buttons by PrimaryButtons for cloud sync dialogs 
CURA-6984
 2020-01-17 13:54:39 +01:00
Nino van Hooff
4e8534b93b Unsubscribe from package when a license is declined (cloud flow) 
CURA-6984
 2020-01-17 13:54:39 +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
712cebcdd2
Let 3mf workspace reader read from files per plugin 
CURA-6627
 2020-01-16 11:43:07 +01:00
Jaime van Kessel
46050f9618
Use getter instead of protected attribute 
CURA-6627
 2020-01-16 11:25:30 +01:00
Jaime van Kessel
4e0e0c0339
Add skipkeys flag to writing plugin metadata to workspace 
CURA-6627
 2020-01-16 11:19:29 +01:00
Jaime van Kessel
b8dbc1d160
Store the data from each plugin in it's own folder 
CURA-6627
 2020-01-16 09:50:45 +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