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

863 Commits

Author SHA1 Message Date
fieldOfView
00250acb10 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-29 16:35:32 +02:00
fieldOfView
6c16d82736 Add material type as a column in the Material manager 
...and a color swatch for good measure.
 2016-08-29 16:35:10 +02:00
Jaime van Kessel
70af60c5fb Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-29 16:18:46 +02:00
Jaime van Kessel
9a753680e7 Setting pane now uses correct profiles to display setting values 
CURA-2185
 2016-08-29 16:18:15 +02:00
fieldOfView
71a77c1fb7 Decrease number of instances of InstanceContainerModel 
Updates to InstanceContainerModel are becoming expensive because there are so many instances of that model. The MaterialMenu used three, and the MaterialMenu is instantiated three times for a dual extrusion printer.

CURA-2193
 2016-08-29 15:35:14 +02:00
fieldOfView
7a1f7b3654 Make automatic drop to buildplate optional. 2016-08-28 16:30:22 +02:00
Jaime van Kessel
af4ea9183c Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-26 16:23:47 +02:00
fieldOfView
3b1c11bfcf Put materials into branded material submenus 
CURA-2194
 2016-08-26 15:43:50 +02:00
Jaime van Kessel
fcfbf78f9e Implemented importing multiple profiles from .curaprofile file 
CURA-2099
 2016-08-26 14:37:21 +02:00
fieldOfView
e19a7914b1 Prevent error when the active printerOutputDevice has no cameraImage 2016-08-26 13:21:32 +02:00
Jaime van Kessel
ced6cd7320 Exporting a profile now exports all profiles in a zipped container 
CURA-2099
 2016-08-26 12:55:31 +02:00
fieldOfView
0799a9e278 Move branded materials into a submenu 
CURA-2194
 2016-08-26 11:59:19 +02:00
Jaime van Kessel
8046e72a10 Added missing file 2016-08-26 09:35:21 +02:00
Jaime van Kessel
e6aec0c64b Use curas own visibility page instead of default by Uranium 2016-08-25 21:21:44 +02:00
Jaime van Kessel
c7126775d5 Fix spelling mistake 2016-08-25 20:46:36 +02:00
fieldOfView
1b4283257f Make Simple Mode reflect global settings (Support, Adhesion) 2016-08-25 13:41:39 +02:00
Jack Ha
77b58d8231 MaterialsPage material label is now also updated after rename. CURA-1969 2016-08-25 10:37:11 +02:00
Jack Ha
2ae998737f Added materialspage Display Name field and made it work. CURA-1969 2016-08-25 09:54:22 +02:00
Jaime van Kessel
a904067d7a Added label property to XML profile (as per 1.2 spec) 
CURA-1968
 2016-08-24 15:50:12 +02:00
Jaime van Kessel
aa28ecca37 No longer possible to remove profiles that are in use 
CURA-2168
 2016-08-24 14:50:51 +02:00
Jaime van Kessel
17b34fb4e1 It's no longer possible to remove a material that is in use 
CURA-2168
 2016-08-24 14:48:20 +02:00
Jaime van Kessel
a177b61153 Renaming a profile will now also reset selection 
This forces an update of the display data. Fixes CURA-2164
 2016-08-24 13:56:51 +02:00
Jaime van Kessel
aac19c94a3 Removing a profile now forces a reset of selection 
Fixes CURA-2169
 2016-08-24 13:51:33 +02:00
Jaime van Kessel
e05bb54047 SelectContainer now uses name instead of ID 
CURA-2162
 2016-08-24 13:21:53 +02:00
Jaime van Kessel
114899dc91 Merge branch 'cura-2007' of github.com:Ultimaker/Cura 2016-08-24 12:39:33 +02:00
Jack Ha
9521a85318 Fix resolve in profile bug. Removed unnecessary imports. Removed unnecessary watch. Contributes to CURA-2007 2016-08-24 11:36:10 +02:00
fieldOfView
27b3bd829d Add converted CPE+, PC, TPU & Nylon profiles for UM2+ 
CURA-2138
 2016-08-23 23:03:17 +02:00
fieldOfView
35fedbdad6 Don't break the currentExtruderIndex binding 
CURA-2177
 2016-08-23 17:12:55 +02:00
Jack Ha
0268bf3f56 Cleanup. CURA-2007 2016-08-23 13:18:20 +02:00
Ghostkeeper
8fd3047380
Only take the active machine if not settable per extruder 
Settable per mesh should only have an effect on the per-object settings. This was misguided of me earlier.

Contributes to issue CURA-2006.
 2016-08-23 11:53:57 +02:00
Ghostkeeper
9581257df5
Don't bind provider when setting is per mesh 
This causes settings which are settable per mesh but not per extruder to be configurable per extruder even though they have a linked icon.

Contributes to issue CURA-2006.
 2016-08-23 11:53:57 +02:00
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +02:00
fieldOfView
0f998c6e2e Fix qml warnings 
CURA-2006
 2016-08-22 19:25:42 +02:00
fieldOfView
62e815a3d8 Fix qml warning 
CURA-2006
 2016-08-22 19:16:59 +02:00
fieldOfView
b9af9dce1f Tweak profile overview layout 
CURA-2006
 2016-08-22 19:00:49 +02:00
fieldOfView
3671d241d5 Show color + material in menus and Materials page 
CURA-2108
 2016-08-22 17:34:33 +02:00
fieldOfView
320cddb073 Don't show "nozzle" on Materials page when there are no variants 2016-08-22 16:41:21 +02:00
fieldOfView
c32700b7b4 Fix "Set as Active Extruder" menu item 2016-08-22 16:30:34 +02:00
fieldOfView
900f953298 Make sure extruder menus are only shown if there the machine extruders 2016-08-22 16:15:59 +02:00
Ghostkeeper
bb90c593b9 Merge branch 'feature_quality_changes' 2016-08-22 15:13:27 +02:00
Ghostkeeper
f296b77d2c
Fix check for presence of global_inherits_stack 
My mistake.

Contributes to issue CURA-2006.
 2016-08-22 14:17:47 +02:00
Ghostkeeper
42399e82fb
) 
Contributes to issue CURA-2006.
 2016-08-22 11:36:33 +02:00
Ghostkeeper
1c1bfbe114
Fix providing of global_inherits_stack settings 
I've rewritten this part and documented what each case catches. There is a base case which is not required any more since we removed the global tab, but I left it in for defense.

Contributes to issue CURA-2006.
 2016-08-22 11:34:17 +02:00
fieldOfView
1003066ce1 Show qualities for the material associated with the currently selected quality 
CURA-2095
 2016-08-22 11:31:31 +02:00
fieldOfView
7efde6b164 Prevent qml warning when no printer is connected 2016-08-20 23:42:51 +02:00
fieldOfView
2f3f57c43d Code-style 2016-08-20 23:40:43 +02:00
Ghostkeeper
eaa7d716f5 Revert "Properly send global settings to the global stack" 
This reverts commit 9d0acf5b036ee4749af0034969c683e39cc547d3.
It was not so proper after all.

Contributes to issue CURA-2006.
 2016-08-19 15:48:35 +02:00
Jaime van Kessel
286949dad1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-19 09:36:56 +02:00
fieldOfView
6e422e611c Change Simple Mode "print brim" to print a brim or raft 
CURA-2135
 2016-08-18 13:11:14 +02:00
Jaime van Kessel
eae2e0da90 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-18 12:44:53 +02:00