GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 23:34:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,392 Commits 289 Branches 260 Tags
Commit Graph

699 Commits

Author SHA1 Message Date
Ghostkeeper
c42b275c5d
Merge branch '3.4' 2018-06-06 16:58:01 +02:00
Diego Prado Gesto
1019f2dd65 CURA-5449 Do not check if the name is the correct group name if the 
output device is manual create device and it is marked as temporary.
Wait until all the information is retrieved when the request finishes.
 2018-06-06 14:54:26 +02:00
Lipu Fei
7f7a195627 Fix merge conflicts from 3.4 2018-06-05 09:02:52 +02:00
Ghostkeeper
02a3067a0c
Reset infill line distance when changing density via recommended mode 
Otherwise the change has no effect.

Contributes to issue CURA-5324.
 2018-06-04 16:58:13 +02:00
Diego Prado Gesto
36e72ae744 Merge branch '3.4' into fix_retraction_amount 2018-06-04 14:42:39 +02:00
Ghostkeeper
e4a0345fe4
Fix more minor typing mistakes 
Contributes to issue CURA-5330.
 2018-06-01 16:40:57 +02:00
Ghostkeeper
c3bac474ab
Use CuraContainerRegistry instead of ContainerRegistry 
Because we're calling functions of CuraContainerRegistry.

Contributes to issue CURA-5330.
 2018-06-01 16:33:32 +02:00
Ghostkeeper
ff4a214c24
Add function typing 
This makes MyPy discover a lot of typing errors because it now starts analysing all of these functions.

Contributes to issue CURA-5330.
 2018-06-01 14:53:54 +02:00
Lipu Fei
41e94cd2a1 Fix merge problems from 3.4 2018-06-01 13:51:43 +02:00
Lipu Fei
61a3668a4f Merge remote-tracking branch 'origin/3.4' 2018-06-01 13:51:00 +02:00
Diego Prado Gesto
85560abca3 CURA-5439 Show the keep or discard changes dialog also when the user 
applies a configuration using the Sync button.
 2018-06-01 13:26:14 +02:00
Lipu Fei
eb949472e8 Merge remote-tracking branch 'origin/master' into WIP_improve_initialization 2018-05-31 13:47:27 +02:00
Diego Prado Gesto
931d4716e1 CURA-5404 Retrieve the material settings' values from the variant before 
retrieving it from the definition if there are not defined in the material.
 2018-05-30 16:58:11 +02:00
Lipu Fei
80d4989843 Show keep/discard user settings dialog upon variant change 
CURA-5417
 2018-05-30 09:03:36 +02:00
Lipu Fei
7cf2832183 Fix quality_group is None check in _setQualityGroup() 
CURA-5423
 2018-05-29 13:43:32 +02:00
Lipu Fei
1c3bae3fe4 Show keep/discard dialog upon material change if there are user changes 
CURA-5417
 2018-05-29 10:52:06 +02:00
Diego Prado Gesto
8ad409ff55
Merge branch 'master' into WIP_improve_initialization 2018-05-14 15:15:02 +02:00
Diego Prado Gesto
43657010ba CURA-5164 The Preferences is not a singleton class anymore since in some point 
several instances need to be created.

- In the ThreeMFWorkspaceReader we need to create some temporal
instances of Preferences that makes it not singleton anymore.

- The current preferences are kept in the Application class and so all
the calls to the preferences are changed to get the preferences from
Application.

- The method getInstance in Preferences is kept as deprecated since some
external plugins.
 2018-05-11 08:50:42 +02:00
Jack Ha
467e814f88 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-07 10:30:50 +02:00
Jack Ha
00d8427e42 Add sanity check for GlobalStack CURA-5045 2018-05-07 10:30:45 +02:00
Jaime van Kessel
7c80bc203c Fixed bunch of wrong / missing typing 2018-05-03 21:14:06 +02:00
Jack Ha
efdccb593f Merge branch '3.3' 2018-04-25 16:35:20 +02:00
Lipu Fei
df1e15b1e5 Move the definition_changes fix to CuraContainerStack 
CURA-5281
 2018-04-25 16:12:47 +02:00
Lipu Fei
ec9be7a103 Merge remote-tracking branch 'origin/3.3' 2018-04-25 12:55:21 +02:00
Lipu Fei
1d8c2bea98 Do not reset quality if the current custom quality is based on not supported 
CURA-5285
 2018-04-25 12:40:10 +02:00
Lipu Fei
c4994918c8 Make sure all stacks in a loaded machine have non-empty definition_changes container 
CURA-5281
 2018-04-25 11:16:02 +02:00
Ghostkeeper
5648bc82e7
Merge branch '3.3' 2018-04-23 14:07:46 +02:00
Diego Prado Gesto
b8a26f3187 CURA-5218 Disable the Activate and Duplicate button in the management 
page if the selected profile is not supported
 2018-04-20 17:04:51 +02:00
Lipu Fei
db5c18295b Merge remote-tracking branch 'origin/3.3' 2018-04-19 09:20:22 +02:00
Lipu Fei
372419c223 Fix fallback quality setting 
CURA-5218
 2018-04-18 11:24:09 +02:00
Lipu Fei
650638fcdd Fix setting default quality 
CURA-5218
 2018-04-18 11:20:43 +02:00
Lipu Fei
7326ee8c40 Fix typo 
CURA-5218
 2018-04-18 11:19:04 +02:00
Lipu Fei
bae1d2a59d Switch to a default quality if the specified is not available 
CURA-5218
 2018-04-18 11:16:19 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02:00
Lipu Fei
7eba73adc5 Handle excluded_materials in getAvailableMaterials() 
CURA-5223

Move the handling of excluded_materials into MaterialManager
getAvailableMaterials().
 2018-04-12 16:12:07 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00
Lipu Fei
33949c3b71 Update build plate compatibility upon extruder enabled/disabled 
CURA-5219
 2018-04-12 14:02:56 +02:00
Lipu Fei
1c4c3a4a0b Fix quality changes that are based on no-long-available quality_type 
CURA-5218
 2018-04-12 13:58:20 +02:00
Lipu Fei
8d3c3c0e80 Fix the case that a quality_type is not available 
CURA-5218
 2018-04-12 13:58:20 +02:00
Lipu Fei
b55570f3fb Merge branch '3.3' 2018-04-10 13:13:38 +02:00
Lipu Fei
b314d2bbe2 Fix extruder nr handling for -1 Not Overriden 
CURA-5213
 2018-04-10 12:56:20 +02:00
Aleksei S
720a85dd06 Remove comment 
CURA-4844
 2018-03-29 14:31:25 +02:00
Aleksei S
c81d5d9741 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-29 11:54:43 +02:00
Aleksei S
290adbd906 Fix: bed leveling for UM+ 
CURA-4844
 2018-03-29 11:53:31 +02:00
Jack Ha
c9dc429b2b CURA-5045 solve merge conflicts 2018-03-29 09:22:19 +02:00
Diego Prado Gesto
acff530871 CURA-5169 Fix a typo 2018-03-28 15:54:42 +02:00
Lipu Fei
9efad28599 Fix setQualityChangesGroup when quality_type is not_supported 
CURA-5169
 2018-03-28 12:55:43 +02:00
Diego Prado Gesto
79daf3706b CURA-5158 Create a custom signal that is emitted when global container 
changes and output devices change.
 2018-03-28 11:07:48 +02:00
Lipu Fei
98eed89686 Remove global changed check that prevents signal emit 
CURA-5157
 2018-03-27 14:32:40 +02:00
Jack Ha
ca4cb419ff CURA-5157 prevent some startup crash after upgrading from 2.7 2018-03-27 14:08:12 +02:00