GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-20 04:39:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
35,982 Commits 295 Branches 268 Tags
Commit Graph

7710 Commits

Author SHA1 Message Date
Jaime van Kessel
e7f2acfeab Build volume message now shows for default of 30 sec 2016-08-26 09:51:41 +02:00
Ghostkeeper
223489a637
Make mesh-specific global setting solution permanent 
We've considered various other solutions but this is the only real solution available to us.

Contributes to issue CURA-2173.
 2016-08-25 14:33:53 +02:00
fieldOfView
5119a7b6be Add a smidgen of documentation to the previous commit 
CURA-2173
 2016-08-25 14:08:37 +02:00
fieldOfView
3ca7e2bb8d Momentary fix for CURA-2173 
We're not sure about the location and implementation but it fixes an important bug for now. At the very least this needs documentation.
 2016-08-25 13:57:21 +02:00
fieldOfView
5a710175a1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-25 10:46:34 +02:00
fieldOfView
043343d536 Select correctly "inherited" profile when switching to a material that has no qualities of its own 
CURA-2095
 2016-08-25 10:46:19 +02:00
Jack Ha
2ae998737f Added materialspage Display Name field and made it work. CURA-1969 2016-08-25 09:54:22 +02:00
Simon Edwards
d0cc37658a Move the combined object to the center of the group after a merge. 
Contributes to CURA-2160 "Merging objects results in group jumping off the buildplate"
 2016-08-24 15:47:44 +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
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
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
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
53ce8bc4c9 Fix typo 2016-08-23 11:50:46 +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
fieldOfView
08091209f1 Fix profile display for printers without machine-specific material profiles 
CURA-2006, CURA-1774
 2016-08-22 19:21:44 +02:00
Ghostkeeper
bb90c593b9 Merge branch 'feature_quality_changes' 2016-08-22 15:13:27 +02:00
Ghostkeeper
aefb36d1ec
Update activeValidationState if setting validation changed 
This was removed from onGlobalSettingChanged but never re-added anywhere.

I've updated it to check for both the global and the active stack, since some settings modify only the global stack (such as layer height).

Contributes to issue CURA-2006.
 2016-08-22 13:42:14 +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
52dda935fc Switch to a generic quality profile if a material has no specific qualities 
CURA-2095
 2016-08-22 11:14:53 +02:00
fieldOfView
d8d328c491 Code style 2016-08-19 17:22:55 +02:00
Jaime van Kessel
a01a541c5d When two nodes overlap, only one is pushed free 
Fixes CURA-2137
 2016-08-19 11:21:49 +02:00
Jaime van Kessel
e3d4a33954 Fixed legacy profile reader 
Updated some settings that were changed from 2.1 to 2.2. Also fixed some
architecture changes that were not changed correctly (or at all)

CURA-1493 and CURA-1779
 2016-08-19 10:38:18 +02:00
Ghostkeeper
0c0871656b
Cache container registry before for loop 
Slight performance increase. We should pay more attention to this kind of thing.

Contributes to issue CURA-2006.
 2016-08-18 17:26:51 +02:00
fieldOfView
55942af9f7 Remove non-existing blackmagic/dual setting from defaults 2016-08-18 13:09:15 +02:00
fieldOfView
64510a6825 Listen to extruder-stack changes for extruder_prime_pos* 
CURA-1944
 2016-08-18 08:54:13 +02:00
fieldOfView
198a201612 Change _active_container_stack to _global_container_stack 
... to prevent confusion. In MachineManager.py the _active_container_stack variable name is used for the global-or-active-extruder stack. CURA-1944
 2016-08-18 08:43:53 +02:00
fieldOfView
7528b2d970 code style 2016-08-17 10:04:09 +02:00
Jaime van Kessel
6b4e0740a3 Merge pull request #924 from Ultimaker/feature_machinesettings 
Machine Settings plugin
 2016-08-17 09:34:11 +02:00
fieldOfView
50cef30346 Don't increase BuildVolume above machine_height for one_at_a_time 2016-08-16 18:46:32 +02:00
fieldOfView
063faf1520 Move the "Changes on Printer" dialog to JediWifiPrinting 
...to have full control over the terminology
CURA-2116
 2016-08-16 16:48:35 +02:00
fieldOfView
b2143e7d43 Remove code duplication 
CURA-2116
 2016-08-16 15:25:44 +02:00
Jack Ha
8c0837d75d Merge master. CURA-2006 2016-08-16 15:08:25 +02:00
Jack Ha
80214d07bc Prettier number display in Profiles page. CURA-2006 2016-08-16 15:03:01 +02:00
Jack Ha
83b89d09d8 Fix for could not find quality xxx 2016-08-16 13:34:47 +02:00
Jack Ha
759ef29b1d Fix keep user settings dialog. 2016-08-16 13:12:34 +02:00
fieldOfView
8c63216fdf Get how we name variants from the machine definition 
CURA-2116
 2016-08-16 10:18:57 +02:00
fieldOfView
6bcea1e309 Add prime tower to disallowed areas 
CURA-1944
 2016-08-16 09:25:00 +02:00
fieldOfView
f5d6c6024e Update buildvolume when extruder prime location is changed 
CURA-1944
 2016-08-15 15:48:25 +02:00
fieldOfView
48cfea01d0 Set sensible defaults for which "Dual Extrusion" settings are visible 
CURA-916
 2016-08-15 15:34:54 +02:00
fieldOfView
b7b0faf44a Fix sorting of settings on Profile manager page 
CURA-2123
 2016-08-15 15:17:59 +02:00
Aldo Hoeben
f2d35cd57d Merge pull request #918 from Ultimaker/feature_terminology 
Update UI texts to be compliant to Ultimaker dictionary
 2016-08-15 11:35:19 +02:00