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

13187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisTerBeke
3d42849f90
Merge pull request #3418 from Ultimaker/docker 
Docker support
 2018-03-07 11:08:42 -08:00
Lipu Fei
618bcebd82 Fix create new for conflicting materials in project loading 
CURA-5056
 2018-03-07 16:38:24 +01:00
Lipu Fei
77e3be68b3 Add removeMaterialByRootId() in MaterialManager 
CURA-5056
 2018-03-07 16:38:24 +01:00
Lipu Fei
29792bbdd8 Reschedule update upon incomplete data in MaterialManager 
CURA-5056
 2018-03-07 16:38:24 +01:00
Ian Paschal
a704f59034
Merge pull request #3175 from smartavionics/mb-add-bridge-settings 
Add bridge settings to experimental category.
 2018-03-07 16:30:08 +01:00
Lipu Fei
27cce56467 Add error message for possible bugs in MaterialManager 
CURA-5056
 2018-03-07 11:45:49 +01:00
Lipu Fei
c0d55ac2a8 Postpone signals in project loading to avoid incomplete data update 
CURA-5056
 2018-03-07 11:45:49 +01:00
Aleksei S
23653d7357 Fix: Pressing 'cancel' button during compressing the print job should show "Prepare" page 
CURA-4960
 2018-03-07 11:34:10 +01:00
Ghostkeeper
507de9c22c
Catch timeout exceptions when printing via USB 
If the firmware froze or something...
 2018-03-07 11:30:36 +01:00
Ghostkeeper
ecfb62b69e
Rename ColorChange to FilamentChange 
I think this is more clear to the users what this should actually do.
 2018-03-07 11:01:00 +01:00
Lipu Fei
6cae5c2e35 Remove unnecessary signal connection in MaterialsModel 
CURA-5052
 2018-03-07 10:39:23 +01:00
Lipu Fei
75d9297c7d Optimize 3MF writer and XML material serialization 
CURA-5049
 2018-03-06 17:05:58 +01:00
Ghostkeeper
3b0a9bf16c
Fix checking whether to render objects in X-ray pass 
Otherwise nothing gets drawn there.

Contributes to issue CURA-5040.
 2018-03-06 15:53:34 +01:00
Ghostkeeper
b179edf60e
Document which layer is which pass 
Contributes to issue CURA-5040.
 2018-03-06 15:53:34 +01:00
Lipu Fei
eb84e6aa3e Disable not supported custom profiles 
CURA-5051
 2018-03-06 15:47:49 +01:00
Aleksei S
6bb42da056 Removed related commits to Settins per Object validation and 
added short validation in StartScliceJob
CURA-4972
 2018-03-06 15:40:26 +01:00
Lipu Fei
fb798ab7e5 Small refactor in MachineManager and add more loggings 
CURA-4606

 - Added more info loggings
 - Changed some variant names
 - Use some shortcut variables instead of getInstance()s
 2018-03-06 15:30:39 +01:00
Lipu Fei
cb7677347d Fix material model update upon variant change 
CURA-5052
 2018-03-06 15:27:05 +01:00
Lipu Fei
31b7374689 Fix material settings saving upon dialog close 
CURA-4606

Force to trigger a lose focus on all editing fields so their
onEditingFinished callback will get triggered.
 2018-03-06 13:40:32 +01:00
Tim Kuipers
5950d147ac
Update ISSUE_TEMPLATE.md 
More focus on printer and attaching project file
 2018-03-06 13:20:15 +01:00
Tim Kuipers
f8c129f4c7
Update ISSUE_TEMPLATE.md 
Allow for uploading curaproject files in github directly
 2018-03-06 12:46:48 +01:00
Aleksei S
42ac725705 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-06 12:40:55 +01:00
Aleksei S
1f883f3312 Remove reply hanlder to prevent crash after canceling a printing job 
CURA-4960
 2018-03-06 12:39:54 +01:00
Lipu Fei
ff0d694e72 Select the activated material when material management page shows up 
CURA-4606
 2018-03-06 11:55:24 +01:00
Mark Burton
1ed5a00198 Added skin densities and layer 3 settings + tweaked various defaults. 2018-03-06 10:47:28 +00:00
Lipu Fei
27b3a71a98 Sort branded materials for dropdown menu 
CURA-4606
 2018-03-06 11:26:16 +01:00
ChrisTerBeke
96b40433a9 Merge branch 'master' into docker 2018-03-06 11:19:30 +01:00
Ian Paschal
8d5a643c9b Removed print() statement 2018-03-06 10:51:39 +01:00
Ghostkeeper
3e8f29d380
Allow floating point values for moving print head 
The X, Y, Z coordinates and speed don't necessarily have to be full millimetres or millimetres per minute.

Fixes #3271.
 2018-03-06 09:37:47 +01:00
ChrisTerBeke
5a8f2040d3 Add method to machine manager to get a machine stack by definition id 2018-03-05 17:53:40 +01:00
Aleksei S
9901780dbc Merge branch 'master' of github.com:Ultimaker/cura 2018-03-05 16:45:42 +01:00
Aleksei S
a35d4ae400 Fix: After clicking "cancel" button while sending a print job 
the connection is disconnected
CURA-4960
 2018-03-05 16:43:58 +01:00
Jaime van Kessel
2de587a8c6 Made some changes so the code also works with lower versions of Qt & pyQt 2018-03-05 15:32:46 +01:00
ChrisTerBeke
cd01b096b5 Emit backend errors so we can process them differently than through a qml notification 2018-03-05 14:33:13 +01:00
Lipu Fei
3004b146ad Fix: move createQualityChanges() to QualityManager 
CURA-4606
 2018-03-05 13:36:13 +01:00
ChrisTerBeke
52735fb9a9 Merge branch 'docker' of https://github.com/Ultimaker/Cura into docker 2018-03-05 13:34:35 +01:00
Lipu Fei
91e3e6b50c
Merge pull request #3377 from Ultimaker/refactoring_machine_manager 
CURA-4606 Refactoring MachineManager
 2018-03-05 13:27:21 +01:00
Lipu Fei
6199e8e15a Fix merge conflicts with master 2018-03-05 13:27:00 +01:00
Ghostkeeper
32fedf9559
Obtain filament diameter from stack for length calculation 
Otherwise we get it from the global stack which is always 2.85mm.

Fixes #3284.
 2018-03-05 13:02:11 +01:00
Ghostkeeper
08f114ee6e
Don't make print estimates translateable 
This was very very confusing for our translators. And all of the translators basically came down to the same translation: Leave it untranslated. So let's make it a bit easier on them and don't allow this to be translated.
If we really want the currency to be translated to the correct position, Qt has currency printing in its locale as an option too.
 2018-03-05 13:02:11 +01:00
Lipu Fei
a29a6122f1 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-05 11:29:21 +01:00
Lipu Fei
072c85bacf Put authors back for 3rd party variants 2018-03-05 11:16:47 +01:00
Ian Paschal
1c7fdfd871 CURA-5032 Incorporated additional feedback 2018-03-05 11:13:38 +01:00
Lipu Fei
c99fca0890 Put adhesion_type back to imade3d profiles 2018-03-05 11:09:54 +01:00
Lipu Fei
6d97fd8dc2 Revert "WIP: Fix quality profiles for abax_pri3" 
This reverts commit c338e1b7d69c252ae80d9590700823108a37f320.
 2018-03-05 11:01:52 +01:00
Lipu Fei
eb5ce04229 Fix code style in materialspage 2018-03-05 10:59:10 +01:00
Lipu Fei
caca5e5021 Fix code style in materialspage 2018-03-05 10:57:36 +01:00
Lipu Fei
6c42b662c8 Add doc for apply_to_all in XMLMaterialProfile 2018-03-05 10:54:01 +01:00
Aleksei S
6781627672 Fix: Flat model and reset all rotation did not work 
CURA-5039
 2018-03-05 10:42:09 +01:00
Lipu Fei
d79a9f6449 Add logging for quality settings model 2018-03-05 10:35:54 +01:00