Lipu Fei
|
3e23659c79
|
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
|
2018-02-28 15:29:22 +01:00 |
|
Ghostkeeper
|
4757f9dc0c
|
Remove invalid alias
This alias was referring to something that didn't exist any more and this broke our application menu.
Contributes to issue CURA-5029.
|
2018-02-28 13:49:11 +01:00 |
|
Andreea Scorojitu
|
356e13c225
|
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
2018-02-28 13:34:38 +01:00 |
|
Andreea Scorojitu
|
7881dce638
|
Remove_installed_plug-ins_submenu_CURA-5029
The Installed plugins from the Plugins menu is replaced by the browser plugin window.
|
2018-02-28 13:33:02 +01:00 |
|
Lipu Fei
|
6b0095014a
|
Fix merge conflicts from master
|
2018-02-28 12:52:45 +01:00 |
|
Lipu Fei
|
7f5bb70bee
|
Remove redundant setProperties
CURA-4916
|
2018-02-28 12:46:00 +01:00 |
|
Aleksei S
|
e533c4604c
|
Update infill scroll bar if setting is changed in custom mode
CURA-4916
|
2018-02-28 10:52:46 +01:00 |
|
Jack Ha
|
01071da4c1
|
CURA-4606 corrected slider bar, it now updates correctly from 0 available qualities to 1 available quality
|
2018-02-27 16:33:37 +01:00 |
|
Jack Ha
|
df46241225
|
CURA-4606 CURA-5012 corrected and moved approximateMaterialDiameter to ExtruderStack
|
2018-02-27 13:03:08 +01:00 |
|
Jack Ha
|
d79206301d
|
CURA-4606 CURA-5012 fix incompatible diameter update message in materialview
|
2018-02-27 11:43:54 +01:00 |
|
Jack Ha
|
22cf5abec2
|
Merge branch 'master' into refactoring_machine_manager
|
2018-02-27 10:24:56 +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 |
|
Ghostkeeper
|
c16214e0f3
|
Traditional Chinese is complete again
At least, complete for 3.2.
|
2018-02-26 15:48:04 +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 |
|
Lipu Fei
|
f487c5b084
|
Fix profile management page
|
2018-02-22 23:31:41 +01:00 |
|
Lipu Fei
|
dec7ad25e2
|
Fix activate newly created custom quality profile
|
2018-02-22 23:08:26 +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
|
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
|
881fb0c08c
|
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
|
2018-02-22 15:14:31 +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
|
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 |
|
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
|
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
|
2e3e01ff95
|
CURA-4606 Cleanup WorkspaceSummaryDialog and prepare for single extrusion mode
|
2018-02-21 11:13:35 +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 |
|
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 |
|