3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 17
17030 commits 305 branches 272 tags 787 MiB
Commit graph

17030 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
3012690abc Also added logging to indicate failure 
CURA-2169
 2016-08-24 13:38:59 +02:00
Jaime van Kessel
b1ae25fb92 Removing containers now returns false if it was unable to remove containers 
CURA-2196
 2016-08-24 13:34:40 +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
9c895d2f31 Added more logging to container duplication 
CURA-2162
 2016-08-24 13:03:51 +02:00
Jaime van Kessel
114899dc91 Merge branch 'cura-2007' of github.com:Ultimaker/Cura 2016-08-24 12:39:33 +02:00
Jaime van Kessel
cbb50eeec6 Added more logging to renaming 
CURA-2165
 2016-08-24 11:51:47 +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
d3a0c0fa77 Add documentation 
CURA-2138
 2016-08-24 09:09:09 +02:00
fieldOfView
27b3bd829d Add converted CPE+, PC, TPU & Nylon profiles for UM2+ 
CURA-2138
 2016-08-23 23:03:17 +02:00
fieldOfView
6b6d763657 Make globally incompatible materials not show up in menus 
CURA-2138
 2016-08-23 22:58:37 +02:00
fieldOfView
9496e25e7b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-23 22:10:16 +02:00
fieldOfView
eb176847be Implement "hardware compatible" for XmlMaterialProfile 
CURA-2138
 2016-08-23 22:09:56 +02:00
Ghostkeeper
36a33bb135
Retain quality profile when switching from no quality-changes profile 
The old quality-changes profile was 'empty_quality_changes', not None.

Contributes to issue CURA-2006.
 2016-08-23 17:27:09 +02:00
Ghostkeeper
f9e0e457ea
Retain active quality-changes when changing material 
This wasn't updated yet for the new quality-changes functionality.

Contributes to issue CURA-2006.
 2016-08-23 17:27:09 +02:00
Ghostkeeper
9ba9e90a8f
Turn if-clause into simple input check 
Makes the code more readable in my opinion.

Contributes to issue CURA-2006.
 2016-08-23 17:27:09 +02:00
fieldOfView
35fedbdad6 Don't break the currentExtruderIndex binding 
CURA-2177
 2016-08-23 17:12:55 +02:00
daid
dd647ca07c Merge pull request #1 from Ultimaker/ultimaker_materials 
Add an initial set of Ultimaker materials
 2016-08-23 15:38:42 +02:00
Jaime van Kessel
3a48fc23d1 Added logging for the time it took to upload a print 2016-08-23 13:56:50 +02:00
fieldOfView
f1ee6b2b15 Update VersionUpgrade21to22 for new materials 2016-08-23 13:56:20 +02:00
fieldOfView
49ab5d0457 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-23 13:54:38 +02:00
fieldOfView
86ad1777af Fix setting weight of upgraded profile 
self._weight sometimes becomes an int, and ConfigParser does not like ints.
 2016-08-23 13:54:03 +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
Jaime van Kessel
47d5039c04 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-23 11:53:43 +02:00
fieldOfView
53ce8bc4c9 Fix typo 2016-08-23 11:50:46 +02:00
Jaime van Kessel
e495534219 Rapid succesion of tool operations no longer freeze interface on Ubuntu 
CURA-2158
 2016-08-23 11:50:28 +02:00
fieldOfView
4e6756802f Correct position of prime_tower disallowed area 
CURA-2155
 2016-08-23 11:36:34 +02:00
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +02:00
fieldOfView
344be2687e Display the appropriate profile settings on Profiles page 
CURA-2006
 2016-08-22 22:38:13 +02:00
fieldOfView
cfb062718f Fix creating a clone of criteria 
CURA-2006
 2016-08-22 21:43:32 +02:00
Seva Alekseyev
44cf044395 X3D loading performance: vertex organization for faster transforms 2016-08-22 14:57:28 -04:00
fieldOfView
0f998c6e2e Fix qml warnings 
CURA-2006
 2016-08-22 19:25:42 +02:00
fieldOfView
08091209f1 Fix profile display for printers without machine-specific material profiles 
CURA-2006, CURA-1774
 2016-08-22 19:21:44 +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
1c87c17d77 Fix MachineSettingsAction after CURA-2006 2016-08-22 18:45:18 +02:00
fieldOfView
9981cfbf6a Simplify interface of UMOUpgradeSelection 2016-08-22 18:44:46 +02:00
fieldOfView
3671d241d5 Show color + material in menus and Materials page 
CURA-2108
 2016-08-22 17:34:33 +02:00
fieldOfView
cb6353ba2a Fix machine_has_heated_bed default 2016-08-22 17:16:08 +02:00
fieldOfView
5bf19f9ff2 Fix preferred material for cases when there more than 1 "pla" materials 2016-08-22 17:12:39 +02:00
fieldOfView
756422fc0e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-22 16:41:31 +02:00
fieldOfView
320cddb073 Don't show "nozzle" on Materials page when there are no variants 2016-08-22 16:41:21 +02:00
Seva Alekseyev
eed26d40a2 Code review issues 2016-08-22 10:35:59 -04:00
Jaime van Kessel
2ad907cdd1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-22 16:32:18 +02:00
Jaime van Kessel
fc5900c05a Width of the scrollview is now a bit wider, so minus signs don't fall off 
CURA-2131
 2016-08-22 16:30:56 +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
f91c101b85 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-22 15:17:31 +02:00