 Jack Ha
|
b3f6e5c9e0
CURA-5327 renamed MachineManager._updateMaterialWithVariant to updateMaterialWithVariant
|
6 years ago |
|
Lipu Fei
|
74e3785a03
Fix material update upon loading a machine
|
6 years ago |
|
Ghostkeeper
|
8202b62343
Merge branch '3.4'
|
6 years ago |
|
Ghostkeeper
|
624bbbeb4a
Account for the fact that createMachine can return None
|
6 years ago |
|
Ghostkeeper
|
c42b275c5d
Merge branch '3.4'
|
6 years ago |
|
Diego Prado Gesto
|
1019f2dd65
CURA-5449 Do not check if the name is the correct group name if the
|
6 years ago |
|
Lipu Fei
|
7f7a195627
Fix merge conflicts from 3.4
|
6 years ago |
|
Ghostkeeper
|
02a3067a0c
Reset infill line distance when changing density via recommended mode
|
6 years ago |
|
Diego Prado Gesto
|
36e72ae744
Merge branch '3.4' into fix_retraction_amount
|
6 years ago |
|
Lipu Fei
|
41e94cd2a1
Fix merge problems from 3.4
|
6 years ago |
|
Lipu Fei
|
61a3668a4f
Merge remote-tracking branch 'origin/3.4'
|
6 years ago |
|
Diego Prado Gesto
|
85560abca3
CURA-5439 Show the keep or discard changes dialog also when the user
|
6 years ago |
|
Lipu Fei
|
eb949472e8
Merge remote-tracking branch 'origin/master' into WIP_improve_initialization
|
6 years ago |
|
Diego Prado Gesto
|
931d4716e1
CURA-5404 Retrieve the material settings' values from the variant before
|
6 years ago |
|
Lipu Fei
|
80d4989843
Show keep/discard user settings dialog upon variant change
|
6 years ago |
|
Lipu Fei
|
7cf2832183
Fix quality_group is None check in _setQualityGroup()
|
6 years ago |
|
Lipu Fei
|
1c3bae3fe4
Show keep/discard dialog upon material change if there are user changes
|
6 years ago |
|
Diego Prado Gesto
|
8ad409ff55
Merge branch 'master' into WIP_improve_initialization
|
6 years ago |
|
Diego Prado Gesto
|
43657010ba
CURA-5164 The Preferences is not a singleton class anymore since in some point
|
6 years ago |
|
Jack Ha
|
467e814f88
Merge branch 'master' of github.com:Ultimaker/Cura
|
6 years ago |
|
Jack Ha
|
00d8427e42
Add sanity check for GlobalStack CURA-5045
|
6 years ago |
|
Jaime van Kessel
|
7c80bc203c
Fixed bunch of wrong / missing typing
|
6 years ago |
|
Jack Ha
|
efdccb593f
Merge branch '3.3'
|
6 years ago |
|
Lipu Fei
|
df1e15b1e5
Move the definition_changes fix to CuraContainerStack
|
6 years ago |
|
Lipu Fei
|
ec9be7a103
Merge remote-tracking branch 'origin/3.3'
|
6 years ago |
|
Lipu Fei
|
1d8c2bea98
Do not reset quality if the current custom quality is based on not supported
|
6 years ago |
|
Lipu Fei
|
c4994918c8
Make sure all stacks in a loaded machine have non-empty definition_changes container
|
6 years ago |
|
Ghostkeeper
|
5648bc82e7
Merge branch '3.3'
|
6 years ago |
|
Diego Prado Gesto
|
b8a26f3187
CURA-5218 Disable the Activate and Duplicate button in the management
|
6 years ago |
|
Lipu Fei
|
db5c18295b
Merge remote-tracking branch 'origin/3.3'
|
6 years ago |
|
Lipu Fei
|
372419c223
Fix fallback quality setting
|
6 years ago |
|
Lipu Fei
|
650638fcdd
Fix setting default quality
|
6 years ago |
|
Lipu Fei
|
7326ee8c40
Fix typo
|
6 years ago |
|
Lipu Fei
|
bae1d2a59d
Switch to a default quality if the specified is not available
|
6 years ago |
|
Ghostkeeper
|
133f6f43fe
Merge branch '3.3'
|
6 years ago |
|
Lipu Fei
|
7eba73adc5
Handle excluded_materials in getAvailableMaterials()
|
6 years ago |
|
Lipu Fei
|
6d2e49c228
Merge remote-tracking branch 'origin/3.3'
|
6 years ago |
|
Lipu Fei
|
33949c3b71
Update build plate compatibility upon extruder enabled/disabled
|
6 years ago |
|
Lipu Fei
|
1c4c3a4a0b
Fix quality changes that are based on no-long-available quality_type
|
6 years ago |
|
Lipu Fei
|
8d3c3c0e80
Fix the case that a quality_type is not available
|
6 years ago |
|
Lipu Fei
|
b55570f3fb
Merge branch '3.3'
|
6 years ago |
|
Lipu Fei
|
b314d2bbe2
Fix extruder nr handling for -1 Not Overriden
|
6 years ago |
|
Aleksei S
|
720a85dd06
Remove comment
|
6 years ago |
|
Aleksei S
|
c81d5d9741
Merge branch 'master' of github.com:Ultimaker/cura
|
6 years ago |
|
Aleksei S
|
290adbd906
Fix: bed leveling for UM+
|
6 years ago |
|
Jack Ha
|
c9dc429b2b
CURA-5045 solve merge conflicts
|
6 years ago |
|
Diego Prado Gesto
|
acff530871
CURA-5169 Fix a typo
|
6 years ago |
|
Lipu Fei
|
9efad28599
Fix setQualityChangesGroup when quality_type is not_supported
|
6 years ago |
|
Diego Prado Gesto
|
79daf3706b
CURA-5158 Create a custom signal that is emitted when global container
|
6 years ago |
|
Lipu Fei
|
98eed89686
Remove global changed check that prevents signal emit
|
6 years ago |
