3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
12911 commits 306 branches 272 tags 787 MiB
Commit graph

5755 commits

Author SHA1 Message Date
Jack Ha
b209badf68 CURA-4606 CURA-5003 fix density and diameter in material manager 2018-02-22 16:14:11 +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
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
25dd63dc21 WIP: Cleanup MachineManager 2018-02-22 13:45:46 +01:00
Lipu Fei
b014800eac Fix various quality related issues 2018-02-22 11:00:32 +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
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
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
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
Lipu Fei
02472f6ad2 WIP: Fix material name update upon machine switching 2018-02-21 12:39:04 +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
ec8ee6e31a WIP: Fix quality name in workspace summary dialog 2018-02-21 11:22:10 +01:00
Lipu Fei
6e5fed6b5e WIP: Fix quality name in SettingView 2018-02-21 11:21:16 +01:00
Lipu Fei
c65192000e WIP: Fix material name fetching in QML 2018-02-21 11:19:18 +01:00
Jack Ha
0649f177b4 Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-21 11:13:44 +01:00
Jack Ha
2e3e01ff95 CURA-4606 Cleanup WorkspaceSummaryDialog and prepare for single extrusion mode 2018-02-21 11:13:35 +01:00
Lipu Fei
be211b7311 WIP: Fix quality profiles for abax_pri5 
- Removed redundant quality profiles for abax_pri5 and reuse the abax_pri3
   ones
 - Fix abax_pri5 definition file: has_machine_quality = true
 2018-02-21 11:06:28 +01:00
Lipu Fei
c338e1b7d6 WIP: Fix quality profiles for abax_pri3 
- Fixed duplicated quality_type and name for qualities "Fast" and "Fine"
 - Moved global settings to separate global quality files
 - Fix abax_pri3 definition file: has_machine_quality = true
 - MAYBE FIXME: Normal and Fast have the same layer height. Don't know if
   that's intended. They are kept as before.
 2018-02-21 11:06:28 +01:00
Jack Ha
c3349baf39 CURA-4606 fix bug concerning activeMaterialsCompatible; factor out activeQualityName 2018-02-21 10:36:51 +01:00
Jack Ha
ad6548a5dc CURA-4606 factored activeMaterialName out 2018-02-21 10:35:17 +01:00
Jack Ha
b9e7ee18a6 CURA-4606 fixed menu setting nozzle 2018-02-20 13:06:54 +01:00
Jack Ha
a2f3cdc0be Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-20 11:36:59 +01:00
Jack Ha
605043235a CURA-4606 fixed create profile from profile context menu 2018-02-20 11:36:51 +01:00
Lipu Fei
c432d4ffbb WIP: Simplify global stack and extruder stack activation and fixes 2018-02-20 11:16:51 +01:00
Ian Paschal
1bdd50e17f CURA-4790 Removed "bold" property 2018-02-20 11:04:23 +01:00
Ian Paschal
c7f8044a32 CURA-4790 Changed light weights back to normal 2018-02-20 10:46:01 +01:00
Lipu Fei
6cc65e97f2 WIP: Cleanup MaterialsModel 2018-02-20 09:13:11 +01:00
Lipu Fei
27f7d16a57 WIP: Make import/export profile work 2018-02-19 21:47:12 +01:00
Lipu Fei
5bb6efcb3e WIP: Cleanup MachineManager 2018-02-19 21:20:10 +01:00
Lipu Fei
0c3ac090c9 WIP: Cleanup 2018-02-19 21:11:01 +01:00
Lipu Fei
5b37de8adb WIP: Fix quality renaming 2018-02-19 20:33:36 +01:00
Lipu Fei
486bcae677 WIP: Fix remove quality 2018-02-19 20:21:02 +01:00
Lipu Fei
65e01d6203 WIP: Refactor Profile management code 2018-02-19 20:01:51 +01:00
Ian Paschal
1d4d592d45 CURA-4790 Added weight properties to theme 2018-02-19 16:52:32 +01:00
Jack Ha
bd10f23311 CURA-4606 reimplemented duplicate profile 2018-02-19 16:47:04 +01:00
Jack Ha
7a78f9821f CURA-4606 fixed Create profile 2018-02-19 16:15:35 +01:00
Jack Ha
8efe13a55a CURA-4606 fix profiles page Active button 2018-02-19 15:24:58 +01:00
Jack Ha
3ff9cb6b1e CURA-4606 added first Profile management page 2018-02-19 15:07:50 +01:00
Lipu Fei
2d5f65a954 WIP: Fix NozzleMenu QObject result type 2018-02-19 14:23:05 +01:00