3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-09 07:56:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
21759 commits 302 branches 270 tags 770 MiB
Commit graph

21759 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
f5639192ee
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-26 16:27:19 +02:00
Jaime van Kessel
b19e7cd027
Add warning icon when not all extruders have same intent 
CURA-6601
 2019-09-26 16:26:55 +02:00
Remco Burema
3c2467b6d6 Merge branch 'feature_intent' of https://github.com/Ultimaker/Cura into feature_intent 2019-09-26 14:02:32 +02:00
Remco Burema
e452c640d4 Set empty intent if quality is empty. 
... instead of crashing.
Not _really_ part of a ticket, but I'm solving  this now because otherwise I can't even _reproduce_ the steps for the bug in CURA-6807
 2019-09-26 14:02:21 +02:00
Jaime van Kessel
eced1fe907
Fix updating a profile with changed settings 2019-09-26 14:02:11 +02:00
Jaime van Kessel
b7b34eb6f7
Re-add the reset custom settings button to recommended panel 
CURA-6810
 2019-09-26 13:39:16 +02:00
Jaime van Kessel
785c33abec
Change the action_button_hover color in dark theme 
This makes it actually visible.
 2019-09-26 13:16:52 +02:00
Jaime van Kessel
b72b542d21
Add missing font & color 
CURA-6810
 2019-09-26 12:55:14 +02:00
Ghostkeeper
648f167911
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2019-09-26 11:14:32 +02:00
Ghostkeeper
0161a1eca5
Fix dual extrusion for Magna Dual 
Contributes to issue CURA-6813.
 2019-09-26 11:14:01 +02:00
Nino van Hooff
e9965ab2a6 Revert the OneAtATimeIterator to the pre 06-2018 implementation. 
This seems like a better starting point to fix print head collisions,
because we got less bug reports for it compared to the 2018 rewrite.

CURA-6785
 2019-09-26 10:42:54 +02:00
Ghostkeeper
541bd3811e
Fix whitespace 
Contributes to issue CURA-6813.
 2019-09-26 10:33:44 +02:00
Ghostkeeper
d670ec7266
Merge branch 'master' of https://github.com/F-Fischer/Cura into F-Fischer-master 2019-09-26 10:30:16 +02:00
Jaime van Kessel
7db44ac789
Merge branch 'master' of github.com:Ultimaker/Cura 2019-09-26 09:46:30 +02:00
Jaime van Kessel
241ca56e6e
Fix stupid derp issue 
I really need coffee before coding
 2019-09-26 09:46:02 +02:00
Ghostkeeper
5464a2075d
Upgrade TiZYX quality profiles to most recent version 
Otherwise they don't get loaded.
These profiles didn't use any of the settings that were renamed or removed, so they can be upgraded with just their setting version.

Contributes to issue CURA-6774.
 2019-09-26 09:44:56 +02:00
Jaime van Kessel
b7c04691d2
Merge branch 'master' of github.com:Ultimaker/Cura 2019-09-26 09:12:16 +02:00
Jaime van Kessel
dbbeeef9a5
Don't render buildvolume if it's set to invisible 2019-09-26 09:11:54 +02:00
F-Fischer
8b321bc398 Pull Request Requested changes 2019-09-25 13:52:42 -03:00
Lipu Fei
9ced5e9205 Fix QObject segfaults in QML 
CURA-6599
 2019-09-25 14:38:38 +02:00
Lipu Fei
d1330e5ffa Fix updating custom quality menu model 
CURA-6599
 2019-09-25 14:36:46 +02:00
Ghostkeeper
23cc73a78f
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2019-09-25 11:53:44 +02:00
Ghostkeeper
0c873d1757
Fix inheritance of support interface line direction settings 
Fixes #6412.
 2019-09-25 11:42:34 +02:00
Ghostkeeper
9f1b434a7e
Don't show support brim width if support brim is disabled 2019-09-25 11:15:21 +02:00
maukcc
31a78975ec HMS434 update and material exclusion 2019-09-25 10:23:20 +02:00
Lipu Fei
f395c92732 Fix custom profile menu 
CURA-6599
 2019-09-25 08:28:24 +02:00
Lipu Fei
f2e518da6b Fix code style and typing 2019-09-25 08:23:57 +02:00
Lipu Fei
07269e4988 Merge remote-tracking branch 'origin/master' into feature_intent 2019-09-25 08:03:37 +02:00
Lipu Fei
af1a03d02f
Merge pull request #6400 from Ultimaker/CURA-6799_pause_at_height_resume_speed 
Cura 6799 pause at height resume speed
 2019-09-25 08:01:13 +02:00
Remco Burema
8412288cb2 Ignore leftover buildplate/'global' variants. 
part of CURA-6802
 2019-09-24 16:39:45 +02:00
Nino van Hooff
2fa4230d1c Only consider feedrates for extrusions (Pause At Height) 
CURA-6799
 2019-09-24 16:11:00 +02:00
Remco Burema
78effbb191 Upgrade globals as well. 
part of CURA-6802
 2019-09-24 15:57:30 +02:00
Jaime van Kessel
26d1b4057d
Merge branch '4.3' of github.com:Ultimaker/Cura 2019-09-24 14:38:13 +02:00
Jaime van Kessel
1fc2ea7cd2
Merge pull request #6398 from Ultimaker/CURA-6768_4.3_translations_lionbridge 
Update translations for Cura 4.3 from Lionbridge
 2019-09-24 14:37:31 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Ghostkeeper
0b4a3039e5
Remove multi-buildplate option 
It doesn't work any more.
 2019-09-24 14:24:57 +02:00
Jaime van Kessel
a741530db2
Also ensure that the container tree is used when selecting an intent 
CURA-6807
 2019-09-24 13:17:36 +02:00
Ellecross
4272a50515 Added CS tickets to the change log 2019-09-24 12:26:24 +02:00
Jaime van Kessel
f469b99471
Create intent nodes based on the selected quality type 
Previously it would use the material type from the material, but since
the material from the node can be different to that of the quality, we need
to use the one from quality instead (This is due to the fallback system)

CURA-6807
 2019-09-24 11:57:50 +02:00
Lipu Fei
bd314a765f Update setting_version 
CURA-6799
 2019-09-24 11:19:03 +02:00
Jaime van Kessel
984bee6f7e
Merge branch 'master-reweight-stages' of https://github.com/thopiekar/Cura 2019-09-24 11:14:42 +02:00
Lipu Fei
1977a865f1 Fix HMS434 version upgrade 
CURA-6774
 2019-09-24 11:05:52 +02:00
Lipu Fei
a6218179a9
Merge pull request #6329 from maukcc/master 
HMS434 change
 2019-09-24 11:04:50 +02:00
Ghostkeeper
9024567522
Remove multi-buildplate option 
It doesn't work any more.
 2019-09-24 11:04:00 +02:00
Jaime van Kessel
56c7fb9f7d
Merge branch 'CURA-6800_project_file_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-24 10:34:21 +02:00
Jaime van Kessel
2d1dec098b
Merge branch '4.3' of github.com:Ultimaker/Cura 2019-09-24 09:27:23 +02:00
Jaime van Kessel
3ab0b5decf
Add extra exception handling for UFPwriter 2019-09-24 09:24:36 +02:00
Jaime van Kessel
4dc918c647
Fix unit test 2019-09-23 17:09:54 +02:00
maukcc
184116995c HMS434 outside wall 2019-09-23 16:35:41 +02:00
Nino van Hooff
2a488b48e9 Restore feedrate at end of Pause at Height script for Repetier. 
CURA-6799
 2019-09-23 16:31:24 +02:00