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

4773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Kuipers
dd98efb844 JSON fix: global_inherits_stack for all per mesh support settings are now fixed (CUEA-2308) 2016-09-09 14:29:03 +02:00
Tim Kuipers
94bee02995 fix: make global_inherits_stack settings which are retrieved from specific extruder in engine (CURA-2308) 2016-09-09 13:35:00 +02:00
Jaime van Kessel
b6e6871f23 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-09-09 13:28:34 +02:00
Jaime van Kessel
f6c1a46d22 Remove commented out code 
CURA-2234
 2016-09-09 13:28:12 +02:00
Tim Kuipers
791042dcb8 fix: skirt/brim line width and minimal length are retrieved for each extruder (CURA-2308) 2016-09-09 13:24:39 +02:00
Jaime van Kessel
c2341f7cd2 Upgrade profile function now returns empty list if something went wrong. 
Fixes CURA-1493
 2016-09-09 13:23:22 +02:00
Jaime van Kessel
f81a5fe301 Removed very annoying message spam 
CURA-2159
 2016-09-09 13:09:15 +02:00
Jaime van Kessel
677d6556fb Refuse to slice when material is mismatched 
CURA-2271
 2016-09-09 13:02:19 +02:00
Jaime van Kessel
2441275f29 Added message when incompatbile material is selected 
CURA-2271
 2016-09-09 12:57:50 +02:00
Jaime van Kessel
ec587eb0dd If a combination material does not like the setup, we now mark it in red. 
CURA-2271
 2016-09-09 11:59:55 +02:00
Jaime van Kessel
d68f6a4e9a Instead of discarding a profile if it's not compatible, we mark it as such. 
The old approach was far to naive. We actually have 3 states;
- Supported (we have a profile)
- Not supported (Don't have a profile)
- Don't do this, lest you awaken the Old Gods (Error)

In case 1 and 3 we now do have a profile.

CURA-2271
 2016-09-09 11:57:34 +02:00
Jaime van Kessel
e0b6e31056 Added way to mark toolbutton as error aswell 
CURA-2271
 2016-09-09 11:48:01 +02:00
Jaime van Kessel
9770037398 If setting is false, it will still return false (instead of empty string) 
CURA-2271
 2016-09-09 11:44:41 +02:00
Ghostkeeper
b5eb7916c7
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 10:57:51 +02:00
Jaime van Kessel
e7335d9814 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 10:53:21 +02:00
Jaime van Kessel
d34f54a3c7 Right type is now returned if metadata entry is not found 
CURA-2242
 2016-09-09 10:29:16 +02:00
fieldOfView
0828d4f1ca Fix dirty flag of incompatible_materials 2016-09-08 21:11:08 +02:00
fieldOfView
9252a46421 Merge branch '2.3' 2016-09-08 19:51:09 +02:00
Ghostkeeper
e35bc595b6
Fall back to different quality depending on stack 
Falling back to normal.inst.cfg isn't enough. That profile may be filtered out by the machine, variant and material. We need to fall back to a different quality profile depending on the machine, variant and material.

Contributes to issue CURA-844.
 2016-09-08 19:23:18 +02:00
Ghostkeeper
263105c3e7
Use translation of built-in profiles instead of constructing it 
Makes the code much simpler, though some repetition is hard-coded now.

Contributes to issue CURA-844.
 2016-09-08 19:23:18 +02:00
Ghostkeeper
93cd5acbad
Set quality to normal, not quality type 
Even though this key says it's quality, it's not a quality profile, it's a quality type.

Contributes to issue CURA-844.
 2016-09-08 19:23:18 +02:00
Ghostkeeper
761aeb1aa2
Always set type to quality_changes 
Custom profiles are always quality changes. They should always say quality in the original anyway; that was an assumption we've made thousands of times.

Contributes to issue CURA-844.
 2016-09-08 19:23:18 +02:00
Ghostkeeper
23180d408c
Always set quality type to normal 
We don't know the actual quality type, the quality profile that this profile is based on. Maybe there isn't one, even. As a solution we always base imported custom quality profiles on normal.

Contributes to issue CURA-844.
 2016-09-08 19:23:18 +02:00
Ghostkeeper
e16a32ee54
Add missing built-in profiles to _profile_translations 
These profiles were not thought of as built-in. Instead, they were sorta constructed from pieces. That complex piece of code won't be necessary any more after I add this and after Cura 2.3 has proper profile inheritance again.

Contributes to issue CURA-844.
 2016-09-08 19:23:18 +02:00
Apsu
b3f4b08f56 Add gantry height and extruder assembly dimensions 2016-09-08 12:22:29 -05:00
fieldOfView
40ae75f54f Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-08 18:50:53 +02:00
fieldOfView
501afc3f2e Change UM2Ex+ definition to inherit qualities from UM2+ 
CURA-1780
 2016-09-08 18:50:39 +02:00
fieldOfView
8b7a8327e8 Allow machinedefinitions to specify another definition to inherit qualities from 
CURA-1780
 2016-09-08 18:49:34 +02:00
Jack Ha
ce868e2865 Merge branch '2.3' 2016-09-08 17:40:18 +02:00
Jack Ha
f4bf1809c6 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 17:38:16 +02:00
Jack Ha
2138a87582 Busy with CURA-2159 2016-09-08 17:37:49 +02:00
Jaime van Kessel
544941e33e Signals are now only emitted when setting changed instead of always. 2016-09-08 17:20:01 +02:00
Tim Kuipers
38c1bb1420 Merge branch '2.3' 2016-09-08 16:22:16 +02:00
Tim Kuipers
6197a5b77a feat: support_interface_skip_height (CURA-2052) 2016-09-08 16:21:34 +02:00
Tim Kuipers
84fb59a0f3 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 16:19:06 +02:00
Tim Kuipers
750018003d removal: made support_area_smoothing hardcoded (CURA-2296) 2016-09-08 15:39:33 +02:00
Jaime van Kessel
96a1aafb80 Zipfile is now closed when it's done loading 
CURA-2252
 2016-09-08 14:23:35 +02:00
Jaime van Kessel
45a841a52b Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 14:15:54 +02:00
Jaime van Kessel
8a8b55800b Duplicating materialContainers should now duplicate all related material containers 
CURA-2242
 2016-09-08 14:15:00 +02:00
fieldOfView
4de78db87a Revert "Remove "infill mesh" as a standard visible setting" 
This reverts commit 46942d7cf23e32dcdf5dbf00440aa781061f4f65.

It was not my decision to make
 2016-09-08 14:04:58 +02:00
fieldOfView
46942d7cf2 Remove "infill mesh" as a standard visible setting 2016-09-08 14:02:44 +02:00
fieldOfView
37862dde42 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-08 13:58:28 +02:00
fieldOfView
be6bfdd4af Add a "linked" icon to settings that have "global_inherits_stack" set 2016-09-08 13:58:13 +02:00
Ghostkeeper
064871321f
Merge branch '2.3' 2016-09-08 13:43:32 +02:00
Ghostkeeper
35e9a651a1
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 13:18:41 +02:00
Ghostkeeper
557e52e514
Update outdated setting name 
This setting name was changed, but apparently not everywhere.
 2016-09-08 13:06:03 +02:00
Jaime van Kessel
754e0fe613 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-09-08 12:50:30 +02:00
Jaime van Kessel
73c5c34b99 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 12:50:19 +02:00
Jaime van Kessel
09f7d9b999 We shuffle the list of nodes so that the push free won't endlessly repeat the same 2 steps 2016-09-08 12:49:42 +02:00
fieldOfView
8b2e652011 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-08 11:56:23 +02:00