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

23379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orel
da3ea6cfdb Add additional extruder on Dagoma Disco printers. 2020-01-16 17:47:37 +01:00
Orel
8c7ca506ad Introduce Dagoma DiscoUltimate profile and make minor changes on other Dagoma printers profiles. 2020-01-16 16:48:49 +01:00
jos@mauk.cc
61f5b1a993 HMS434 update 
excluded materials
speed settings
 2020-01-16 16:41:14 +01:00
MaukCC
f79b3158e4
Merge pull request #2 from Ultimaker/master 
update
 2020-01-16 16:35:48 +01:00
MaukCC
3b739f8443
Create hms434.def.json 2020-01-16 16:35:23 +01:00
Dimitriovski
ddd2afa08a
Added dummy image downloaded from internet for presentation only. 
CURA-7071
 2020-01-16 16:30:58 +01:00
Dimitriovski
51ec8a539f
Added a 'Marketplace' icon in the header of the Toolbox 
CURA-7071
 2020-01-16 16:30:11 +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
96edf02f1d
Delete hms434.def.json 2020-01-16 16:24:40 +01:00
jos@mauk.cc
18ec19aff3 Merge branch 'master' of https://github.com/maukcc/Cura 2020-01-16 16:22:22 +01:00
jos@mauk.cc
7eacb9f13c HMS434 update 
excluded materials
speed settings
toolchange settings
 2020-01-16 16:21:06 +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
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
FN5969
312cb2cf43
Update tevo_tarantula_pro_extruder_0.def.json 2020-01-15 18:29:46 +03: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
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