12919 Commits

Author SHA1 Message Date
Lipu Fei
f51129b103 Remove TestTools plugin 2018-02-22 21:47:06 +01:00
Lipu Fei
8dfa52f15c Fix material menu model extruder binding and initial update 2018-02-22 20:58:54 +01:00
Lipu Fei
68b1a374e0 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-22 16:53:32 +01:00
Lipu Fei
d2ffd59431 Switch to the new quality profile when it is created 2018-02-22 16:53:13 +01:00
Diego Prado Gesto
94ca4fffe3 CURA-4946 In the gcode just store the default machine definition 2018-02-22 16:46:48 +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
Jack Ha
b23a85aa37 Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-22 16:14:24 +01:00
Jack Ha
b209badf68 CURA-4606 CURA-5003 fix density and diameter in material manager 2018-02-22 16:14:11 +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
21e4ed1ae9 Fix punchtec extruder IDs 2018-02-22 15:17:15 +01:00
Lipu Fei
881fb0c08c Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-22 15:14:31 +01:00
Lipu Fei
0846021b67 Fix imade3d jellybox quality profiles 2018-02-22 15:12:15 +01:00
Lipu Fei
a88e69d109 Revert "WIP: Fix quality profiles for abax_pri5"
Keep the old quality profiles for now to make it safe.
2018-02-22 15:01:03 +01:00
Jack Ha
b29d091b1d Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-22 14:28:09 +01:00
Jack Ha
32afa9bfd4 CURA-4606 CURA-5003 fixed sometimes crash material management page upon opening, provide correct containerId to MaterialView 2018-02-22 14:27:58 +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
f946f62db1 WIP: Cleanup Upgrade 30 to 31 2018-02-21 20:27:33 +01:00
Lipu Fei
47e4b35e70 WIP: Cleanup 2018-02-21 19:44:42 +01:00
Lipu Fei
7ea245a57d Fix: Show longer names on profile management page 2018-02-21 17:28:32 +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
4b1ec905c1 Fix UM2 qualities 2018-02-21 16:39:34 +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
Aleksei S
2cfb7de25a Merge branch 'master' of github.com:Ultimaker/cura 2018-02-21 14:55:19 +01:00
Aleksei S
3ed9ac1e83 Fix: Monitor icon state was not updated properly
CURA-4977
2018-02-21 14:54:05 +01:00
Ian Paschal
98a05ae483 Fixed typo ("coping" -> "copying") 2018-02-21 14:44:27 +01:00
Ian Paschal
fcff00e9da Remove plugins from preferences since they're now managed via the plugin browser 2018-02-21 14:42:28 +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
Lipu Fei
a4a1babc59 WIP: Fix UM2 quality profiles
- Remove layer_height from the profiles because they are not global
   qualities
 - The layer_heights are the same as the default ones so no need to
   make specific global qualities for UM2
2018-02-21 11:37:17 +01:00
Lipu Fei
6cd47453bb WIP: Fix activeMaterialsCompatible() 2018-02-21 11:36:46 +01:00