 Lipu Fei
|
7f7a195627
Fix merge conflicts from 3.4
|
6 years ago |
|
Lipu Fei
|
39b71add07
Reader classes are responsible for adding their mime types
|
6 years ago |
|
Diego Prado Gesto
|
43657010ba
CURA-5164 The Preferences is not a singleton class anymore since in some point
|
6 years ago |
|
Lipu Fei
|
53495604f8
Merge remote-tracking branch 'origin/feature_show_config_errors'
|
6 years ago |
|
Mark
|
f61efb8e20
resolve merge conflict
|
6 years ago |
|
Lipu Fei
|
62521e93db
Make sure that project writer runs on Qt thread
|
6 years ago |
|
Ghostkeeper
|
1769a69792
Don't crash Cura when material file is wrongly formatted
|
6 years ago |
|
Ghostkeeper
|
e96c50a582
Fall back to FDMPrinter if definition can't be loaded
|
6 years ago |
|
Lipu Fei
|
4615c756a7
More clear error handling for container deserialization
|
6 years ago |
|
Ghostkeeper
|
572721e20d
Catch ContainerFormatError when deserialising containers
|
6 years ago |
|
Jack Ha
|
c9dc429b2b
CURA-5045 solve merge conflicts
|
6 years ago |
|
Ghostkeeper
|
e174a015ce
Remove unused function
|
6 years ago |
|
Ghostkeeper
|
8b75a0e92b
Better error handling if there is no global stack
|
6 years ago |
|
Ghostkeeper
|
d9e8d64e3f
Add typing for _determineGlobalAndExtruderStackFiles
|
6 years ago |
|
Diego Prado Gesto
|
3fb14691a9
CURA-5160 Skip empty quality when load project file
|
6 years ago |
|
Ghostkeeper
|
6d3fed8f52
Allow getContainer() to return None
|
6 years ago |
|
Lipu Fei
|
6d21a6bddb
Show printer group and which machine to update in project loading
|
6 years ago |
|
Ian Paschal
|
d7b0f11ddf
CURA-4400 Fixed project loading
|
6 years ago |
|
Lipu Fei
|
d78e2d56f7
Fix quality and variant processing in project loading
|
6 years ago |
|
Lipu Fei
|
22573a685d
Fix quality definition comparison in quality importing
|
6 years ago |
|
Lipu Fei
|
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles
|
6 years ago |
|
Lipu Fei
|
86afd6f5ff
Do not overwrite existing metadata with in material deserializeMetadata()
|
6 years ago |
|
Lipu Fei
|
dc427488a2
Fix extruder position check in project loading
|
6 years ago |
|
Lipu Fei
|
7312ed8e3c
Fix project loading for version upgrade
|
6 years ago |
|
Lipu Fei
|
e09325bf82
Fix project loading for version upgrade
|
6 years ago |
|
fieldOfView
|
4c66c935af
Merge branch 'master' into feature_setting_visibility_profiles
|
6 years ago |
|
Lipu Fei
|
8c7e413038
Remove unnecessary setGlobalContainerStack() in project loading
|
6 years ago |
|
Lipu Fei
|
15f017b404
Set dirty for containers created in project loading
|
6 years ago |
|
Lipu Fei
|
ef8cd304dc
No keep/discard setting dialog in project loading
|
6 years ago |
|
Lipu Fei
|
b8d3cbfe16
Refactor project loading
|
6 years ago |
|
Lipu Fei
|
618bcebd82
Fix create new for conflicting materials in project loading
|
6 years ago |
|
Lipu Fei
|
c0d55ac2a8
Postpone signals in project loading to avoid incomplete data update
|
6 years ago |
|
fieldOfView
|
97d7354839
Merge branch 'master' into feature_setting_visibility_profiles
|
6 years ago |
|
Lipu Fei
|
ca88e0df88
Add doc for calllater active machine in project loading
|
6 years ago |
|
Lipu Fei
|
2f86687320
Fix init machine for machines loaded from project files
|
6 years ago |
|
Jack Ha
|
22cf5abec2
Merge branch 'master' into refactoring_machine_manager
|
6 years ago |
|
Lipu Fei
|
12c51f4066
Use setActiveMachine() in project loading
|
6 years ago |
|
Ghostkeeper
|
b5d1e5be36
Remove 'None' default for quality_type
|
6 years ago |
|
Diego Prado Gesto
|
f5b3775b7c
CURA-4966 When loading a project, check the quality in all the extruder stacks and replace with
|
6 years ago |
|
Lipu Fei
|
62c31c2f6c
WIP: Remove old QualityManager
|
6 years ago |
|
Aleksei S
|
86b31c3a6c
Fix: in 3.0 version we did not save quality type under extruder.cfg in project
|
6 years ago |
|
fieldOfView
|
74fe281e1d
Sync currently selected preset between visibility-page and -menu
|
6 years ago |
|
Lipu Fei
|
ffa4df6a06
Merge 3.2 into master
|
6 years ago |
|
Jack Ha
|
a460804bbe
CURA-4924 always use interpolation = None for configparser, preventive
|
6 years ago |
|
Lipu Fei
|
367e50669d
Refactor code
|
6 years ago |
|
Lipu Fei
|
0e5c67a38f
Merge remote-tracking branch 'origin/master' into CURA-3710_setting_visibility_preset
|
6 years ago |
|
Diego Prado Gesto
|
e38cf957bb
CURA-4839 Avoid creating unique names for the extruder instance
|
6 years ago |
|
Diego Prado Gesto
|
7a84712fc9
CURA-4854 Revert some changes in 619a8cc that make that issue not working
|
7 years ago |
|
Aleksei S
|
54dc63a596
Add missing changes
|
7 years ago |
|
Lipu Fei
|
1c605a5108
Fix different strategies for machine and quality in project loading
|
7 years ago |
