3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
17030 commits 340 branches 299 tags 734 MiB
Commit graph

4475 commits

Author SHA1 Message Date
Lipu Fei
a2e84bbe97 Fix set quality group in init machine 2018-02-27 13:49:20 +01:00
Lipu Fei
75573da9dd Fix merge conflicts with master 2018-02-27 13:08:29 +01:00
Lipu Fei
5412a29ef9 Fix update quality upon material change 2018-02-27 13:05:19 +01:00
Jack Ha
df46241225 CURA-4606 CURA-5012 corrected and moved approximateMaterialDiameter to ExtruderStack 2018-02-27 13:03:08 +01:00
Ghostkeeper
c47045a42e
Revert "CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished" 
This reverts commit 269b52487e. It was crashing Cura when pressing F5.
The completion of this job should not be moved to Uranium because the job exists only in Cura.

Contributes to issue CURA-4912.
 2018-02-27 11:47:17 +01:00
Jack Ha
22cf5abec2 Merge branch 'master' into refactoring_machine_manager 2018-02-27 10:24:56 +01:00
Lipu Fei
17d3be03b4 Use getMaterialManager() in ContainerManager 2018-02-26 19:38:44 +01:00
Lipu Fei
d9d2cc9069 Remove unused code in PrintInformation 2018-02-26 19:37:29 +01:00
Lipu Fei
a74f84fce7 Add comment why sorting the material group map 2018-02-26 19:35:56 +01:00
Lipu Fei
0b8678d2ae Explicitly create MachineManager 2018-02-26 19:33:16 +01:00
Ian Paschal
f98b60f549
Merge pull request #2827 from Ultimaker/thopiekar-UM-watch-files-for-modification 
CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished
 2018-02-26 16:58:55 +01:00
Jack Ha
d471e34e48 Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-26 16:33:32 +01:00
Jack Ha
c23827cfa1 CURA-4606 CURA-5003 activate duplicated material and always switch to correct material after some material change 2018-02-26 16:33:25 +01:00
Lipu Fei
9ddc6a52b7 Refactor fix for extruder stack material diameters and nozzle sizes 2018-02-26 11:40:21 +01:00
Jack Ha
2df9802ba5 CURA-4606 CURA-5010 fix print information crashing on printer switch 2018-02-26 09:57:16 +01:00
Jack Ha
11be94c735 Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-26 09:30:33 +01:00
Aleksei S
ed7dec0cae Fix: per model settings validation 
CURA-4972
 2018-02-23 13:05:29 +01:00
Lipu Fei
f487c5b084 Fix profile management page 2018-02-22 23:31:41 +01:00
Lipu Fei
a3a206c6dd Quality groups are QObjects 2018-02-22 23:07:49 +01:00
Lipu Fei
e53048079d Remove debugging logs 2018-02-22 23:05:06 +01:00
Lipu Fei
8dfa52f15c Fix material menu model extruder binding and initial update 2018-02-22 20:58:54 +01:00
Jack Ha
cad6a3bb3d CURA-4606 CURA-5003 select and activate material after create, duplicate 2018-02-22 17:14:23 +01:00
Lipu Fei
d2ffd59431 Switch to the new quality profile when it is created 2018-02-22 16:53:13 +01:00
Jack Ha
a8bd57a9eb CURA-4606 CURA-5003 brands sections in materials management page are now case insensitive 2018-02-22 16:17:32 +01:00
Lipu Fei
32e1015f25 WIP: Cleanup PrintInformation 2018-02-22 16:07:56 +01:00
Jack Ha
5a6e84a57f Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-22 15:52:22 +01:00
Jack Ha
c7499d6e17 CURA-4606 CURA-5003 fix saving material metadata when switching material; fix crashing on fallback material on materials without fallback 2018-02-22 15:52:02 +01:00
Lipu Fei
ab8fda8812 Fix createMachine: evaluate material diameter if it is a function 2018-02-22 15:21:48 +01:00
Lipu Fei
392f729731 Reduce number of QML singletons 2018-02-22 14:21:10 +01:00
Lipu Fei
b415a36110 WIP: Remove delayed update in MachineManager 2018-02-22 13:58:35 +01:00
Lipu Fei
25dd63dc21 WIP: Cleanup MachineManager 2018-02-22 13:45:46 +01:00
Lipu Fei
7a2c25226a Fix initial quality_changes group setup 2018-02-22 12:59:26 +01:00
Lipu Fei
b014800eac Fix various quality related issues 2018-02-22 11:00:32 +01:00
Lipu Fei
3095140bc3 Fix quality/qualityChanges group initialization 2018-02-22 10:27:18 +01:00
Jack Ha
3591e01b25 CURA-4606 CURA-5002 fix crash with machine with variants, but no variants defined 2018-02-22 09:20:33 +01:00
Lipu Fei
d83b803fe0 Fix: Update active material names if materials lookup table gets updated 2018-02-21 16:47:12 +01:00
Lipu Fei
7a3ebe1a42 Fix NozzleMenu active nozzle bullet 2018-02-21 16:36:42 +01:00
Jack Ha
244b109403 CURA-4606 CURA-4995 switching print core now correctly updates the material 2018-02-21 16:30:45 +01:00
Jack Ha
5ba0ac8a43 CURA-4606 switch to first extruder when switching machines; this prevents crashing when switching to single extruder machine 2018-02-21 15:59:49 +01:00
Jack Ha
788e4a1c8e Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-21 14:41:53 +01:00
Jack Ha
d72f8e8750 CURA-4606 fix warning materials on machines that do not have has_variant_materials 2018-02-21 14:41:45 +01:00
Lipu Fei
70d5cd2462 Fix: Replace all activeQualityName with activeQualityOrQualityChangesName 2018-02-21 14:30:33 +01:00
Jack Ha
435e99a2dd Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-21 14:16:32 +01:00
Jack Ha
631b72c007 CURA-4606 in all quality profiles, rename all the specific 1.75mm materials back to the generic material 2018-02-21 14:16:26 +01:00
Lipu Fei
9a354efd19 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-21 14:05:19 +01:00
Jack Ha
b3ef4a05d5 CURA-4606 skip non global qualities when looking for extruder qualities 2018-02-21 13:18:59 +01:00
Lipu Fei
b7659edd3b WIP: Remove unused ID role in QualityProfilesModel 2018-02-21 12:40:56 +01:00
Lipu Fei
3364e24988 WIP: Be less wordy 2018-02-21 12:39:54 +01:00
Lipu Fei
02472f6ad2 WIP: Fix material name update upon machine switching 2018-02-21 12:39:04 +01:00
Lipu Fei
c411091fde WIP: Only add global_quality containers for global stack qualities 2018-02-21 11:47:08 +01:00