3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 18:57:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14766 commits 302 branches 270 tags 773 MiB
Commit graph

14766 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
caf700750c Revert "Fix duplicating SettingOverrideDecorator settings" 
This reverts commit 977eb8c94d.

This has been fixed in a different way in c7a3d33411
 2018-03-27 08:32:13 +02:00
Aleksei S
b36bfa87bd Merge branch '3.3' of github.com:Ultimaker/cura into 3.3 2018-03-26 17:12:31 +02:00
Aleksei S
2240c38fd7 Exclude HIPS and PETG material for UM 
CURA-5149
 2018-03-26 17:11:38 +02:00
Ian Paschal
57991a44d5 CURA-5141 Suggestions from Terri 2018-03-26 16:59:24 +02:00
Aleksei S
60d22bd92b Merge branch 'master' of github.com:Ultimaker/cura 2018-03-26 16:53:41 +02:00
Aleksei S
f021c83a3e Exclude HIPS and PETG material type from all UM printers. 
CURA-5149
 2018-03-26 16:50:59 +02:00
Jack Ha
6619bd40cb CURA-5149 moved excluded_materials to all UM printers 2018-03-26 16:49:56 +02:00
Ghostkeeper
6d3fed8f52
Allow getContainer() to return None 
And in the rest of the locations we must then check if it's None and handle that gracefully.
Here we assume that the getContainer message shows a message to the user if necessary. For now we'll just log it.

Contributes to issue CURA-5045.
 2018-03-26 15:48:03 +02:00
Jack Ha
38e15f009f CURA-5149 add possibility to exclude specific items from materials list 2018-03-26 15:20:31 +02:00
Jack Ha
2a39d81a3c Revert "Filter generic list for Ultimaker printers." 
This reverts commit 767789d394.
 2018-03-26 15:07:37 +02:00
Jack Ha
18e3e084a5 Revert "Check for Ultimaker printers based on manufacturer" 
This reverts commit 5b36b4fb84.
 2018-03-26 15:07:35 +02:00
Jack Ha
07ac09e878 Revert "Use set for searching" 
This reverts commit 80c2b3b7e8.
 2018-03-26 15:07:27 +02:00
Lipu Fei
80c2b3b7e8 Use set for searching 
CURA-5149
 2018-03-26 14:40:25 +02:00
Lipu Fei
5b36b4fb84 Check for Ultimaker printers based on manufacturer 
CURA-5149
 2018-03-26 14:40:25 +02:00
Ian Paschal
5b371ac375 CURA-5141 Update changelog to 3.3 2018-03-26 14:36:24 +02:00
Diego Prado Gesto
689f208615 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-26 14:15:10 +02:00
Diego Prado Gesto
2486303011 CURA-5134 Use the built-in windowClosed method instead of quit when 
finishing installing or uninstalling plugins, otherwise the temporary
data is not stored in the config file.
This caused some problems with the lazy uninstall plugins since the list
was never stored.
 2018-03-26 14:12:27 +02:00
jack
96842ea7e6
Merge pull request #3229 from Ultimaker/feature_persistent_postprocessing 
Persistent Post-Processing Scripts
 2018-03-26 14:01:07 +02:00
Ghostkeeper
e2724f53ad
Only check for loaded plug-ins at initial call to loadAllScripts 
Not for every call to loadScripts.
 2018-03-26 13:55:15 +02:00
Aleksei S
4567388daa Merge branch 'master' of github.com:Ultimaker/cura 2018-03-26 13:52:18 +02:00
Aleksei S
767789d394 Filter generic list for Ultimaker printers. 
CURA-5149
 2018-03-26 13:51:37 +02:00
Ghostkeeper
14936fdf21
Move looping over script directories to separate function 
Removes some code repetition.
 2018-03-26 13:50:29 +02:00
Diego Prado Gesto
92661eb35c Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-26 11:53:46 +02:00
Diego Prado Gesto
04c21f3f30 CURA-4557 Minor changes in the message. 2018-03-26 11:52:39 +02:00
Ian Paschal
8871ac9955 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-03-26 11:30:59 +02:00
Ian Paschal
66fa1c0a31 CURA-5140 Fixed typo 2018-03-26 11:30:57 +02:00
Jack Ha
c7a3d33411 CURA-5138 generate unique name for each per object setting container, fix per object settings being lost when multiplying 2018-03-26 11:20:35 +02:00
jack
ff7e0bf5f9
Merge pull request #3559 from Ultimaker/feature_gz_reader 
Feature gz reader update
 2018-03-26 09:38:11 +02:00
fieldOfView
3ebc90337c Merge branch 'master' into fix_support_eraser_related 2018-03-24 19:05:56 +01:00
Ian Paschal
76b837e1cb
Merge pull request #2333 from fieldOfView/feature_xmlmaterials_cura_settings 
Cura-specific settings in xmlmaterials
 2018-03-23 19:52:01 +01:00
Diego Prado Gesto
6dc416e180 CURA-5128 Change method name to be more clear. 
Remove a line introduced by mistake in previous commit.
 2018-03-23 17:21:09 +01:00
Diego Prado Gesto
bc5881fe1d Merge branch 'master' into feature_gz_reader 2018-03-23 17:15:55 +01:00
Diego Prado Gesto
dd0d0d20e9 CURA-5128 Modify the GCode parser to use a stream instead of a file so 
we can reuse methods for the GCodeGZReader.
 2018-03-23 17:14:53 +01:00
fieldOfView
78b49e8400 When multiplying a parented node, multiply the parent instead (like groups) 2018-03-23 16:35:36 +01:00
fieldOfView
977eb8c94d Fix duplicating SettingOverrideDecorator settings 
A deepcopy of a SettingOverrideDecorator also creates a deepcopy of a SettingContainer. This SettingContainer has the same id as the original, which makes CuraContainerStack.replaceContainer reject the new SettingContainer.
 2018-03-23 16:10:02 +01:00
fieldOfView
251e24fedc Merge branch 'master' into feature_xmlmaterials_cura_settings 2018-03-23 14:57:31 +01:00
Ghostkeeper
de20d23df6
Merge branch '3.1' 
There was a fix for NVidia on Fedora still on 3.1.
 2018-03-23 14:29:46 +01:00
Ghostkeeper
4196624373
Merge branch 'CURA-5135_easy_fix' 2018-03-23 14:23:34 +01:00
Ghostkeeper
8a36f1e074
Make opacity depend on enabled 
Simplifies the code a bit.

Contributes to issue CURA-5128.
 2018-03-23 14:23:10 +01:00
Aleksei S
d859f71d6e Fix: The Print simulation view was broken because of constant refresheing scene 
CURA-5142
 2018-03-23 11:41:34 +01:00
Ian Paschal
e8491b4a83 CURA-5135 Easy version 
This is the easy fix. When a plugin is downloading, the other plugins' download buttons are not possible to be clicked. This avoids having to write any new logic. It does detract a bit from the user experience though.

The complicated version requires re-writing a big part of the plugin browser code to enable the queueing of downloads and stuff. That's sort of how it "should" be but is a lot more work.
 2018-03-23 11:10:21 +01:00
Ghostkeeper
749846e09c
Shorten 'Save to Removable Drive' translation 
Wechseldatenträger was a bit too long to fit on that button.

Fixes #2643.
 2018-03-23 09:49:47 +01:00
fieldOfView
3078ac2d2d Prevent scaling support eraser with scaled parent 2018-03-23 09:46:05 +01:00
Ghostkeeper
9d63258703
Merge branch 'master' into feature_persistent_postprocessing 2018-03-22 19:19:05 +01:00
Ghostkeeper
3eb50cf37e
Only list configurations if we're still connected 
Otherwise there are no available configurations, so no syncing.
 2018-03-22 17:30:15 +01:00
Ian Paschal
30b75c7988 CURA-5140 Show confirmation rather than switching to monitor tab 2018-03-22 17:05:07 +01:00
fieldOfView
e7ca4f327e Fix reading and writing yes/no as boolean values 2018-03-22 16:55:12 +01:00
Ghostkeeper
4430a15a2f
Remove needlessly specific super call 
There is only one parent.

Contributes to issue CURA-5128.
 2018-03-22 16:34:11 +01:00
Ghostkeeper
378cde202c
Correct documentation 
Contributes to issue CURA-5128.
 2018-03-22 16:33:30 +01:00
Lipu Fei
fd2abdd9fb
Merge pull request #3507 from guillemavila/Copy-all-values-to-all-extruders 
add Copy all values to all extruders
 2018-03-22 16:16:30 +01:00