GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 16:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,033 Commits 290 Branches 260 Tags
Commit Graph

5800 Commits

Author SHA1 Message Date
Jack Ha
ac76d6ea52 Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder 2018-03-01 13:14:10 +01:00
Jack Ha
71e631150d CURA-4400 update extruder disabled color 2018-03-01 13:06:12 +01:00
Jack Ha
c94d88cd9d CURA-4400 added context menu on right click extruder in SidebarHeader 2018-03-01 12:58:27 +01:00
Lipu Fei
580244a546 Split material models into separate files 2018-03-01 11:50:55 +01:00
Lipu Fei
b5cf6b7531 Rename selectedQualityItem and add docs 2018-03-01 11:16:22 +01:00
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
Jack Ha
86c13e86c7 CURA-4400 first version that disables extruder and updates available quality profiles 2018-02-28 12:56:00 +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
Lipu Fei
75573da9dd Fix merge conflicts with master 2018-02-27 13:08:29 +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
Ghostkeeper
b54d709f96
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2018-02-27 10:25:11 +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
Ghostkeeper
94bce53691
Update headers 2018-02-26 15:47:07 +01:00
Ghostkeeper
6169c36b06
Merge branch 'update-zh_TW-translation-3.2' of https://github.com/dinowchang/Cura into dinowchang-update-zh_TW-translation-3.2 2018-02-26 15:45:33 +01:00
Ghostkeeper
cde67ab84c
Add warning for low Retraction Min Travel 
Because if you set it to be too close to the line width, you'll get retractions between every skin line.
 2018-02-26 14:48:43 +01:00
Ghostkeeper
91d271b993
Reset UM2+ PP profiles retraction minimum travel 
These settings were set to be lower than the line width. I'm resetting them so that they will again be 2 times the line width. Otherwise we'll get retractions between every skin line which is really bad for PP.

Fixes #3171.
 2018-02-26 14:48:43 +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
Ghostkeeper
ce125a41a5
Merge branch 'feature_zigzag_all_infill' 2018-02-23 13:19:24 +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
Ghostkeeper
fc9b2c3529
Limit infill zigzaggify setting to infill extruder 
Let's give it the same properties as the infill pattern setting.

Contributes to issue CURA-4017.
 2018-02-22 16:44:39 +01:00
Ghostkeeper
dba748bd8a
Add new setting for zig-zaggifying support 
You can now also use the zigzag type patterns for support.

Contributes to issue CURA-4017.
 2018-02-22 16:43:50 +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
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