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

5199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
b21684c079 Added missing global_extruder_nr for few settings 
CURA-2308
 2016-09-12 14:57:11 +02:00
Jaime van Kessel
cd56f22321 Merge branch 'bugfix_global_inherits_stack' of github.com:Ultimaker/Cura 2016-09-12 14:52:11 +02:00
Jack Ha
2cde439964 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 14:40:41 +02:00
Jack Ha
d173952a3a Update materialmenu when changing material type. Contributes to CURA-2159 2016-09-12 14:40:32 +02:00
Jaime van Kessel
8a8dd20c00 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 14:38:56 +02:00
Jaime van Kessel
b17f8b5dd6 Added min width & height to machine action popup. 2016-09-12 14:38:23 +02:00
Jack Ha
1e0394fb48 Cleanup, forgot to remove debugging stuff. Contributes to CURA-2159 2016-09-12 14:22:23 +02:00
Jack Ha
78c119dbde Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 13:55:14 +02:00
Jack Ha
fb3f03b446 Fixed XML setMetaDataEntry for changing too much meta data. Contributes to CURA-2159 2016-09-12 13:55:05 +02:00
Jaime van Kessel
31bc3d2575 Added maintenance state to display qml 
CURA-2235
 2016-09-12 13:38:30 +02:00
Jaime van Kessel
fcefda9eaf Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 13:31:33 +02:00
Jaime van Kessel
8dbe67a6bf Added printer state to output device 
CURA-2235
 2016-09-12 13:30:43 +02:00
Jack Ha
717437647b Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 13:30:26 +02:00
Jack Ha
df536e158b Fixed XmlMaterialProfile serialize for booleans. Contributes to CURA-2159 2016-09-12 13:30:14 +02:00
Jaime van Kessel
c1d04ac600 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 13:00:47 +02:00
Jaime van Kessel
44092f0b96 Printers with a quality_definition now also create quality changes using that definition 
CURA-1780
 2016-09-12 13:00:01 +02:00
Ghostkeeper
12b967ddb2
Remove debug code 
Don't know who it was or why or when, but it shouldn't be there.
 2016-09-12 12:58:35 +02:00
Jaime van Kessel
03c28537f2 Added function to save a single stack to file. 
CURA-2279
 2016-09-12 11:58:51 +02:00
fieldOfView
edb1a143ea Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-12 10:38:25 +02:00
fieldOfView
8930eae9cd Allow plugins to add additional components to print monitor buttons 
CURA-2277
 2016-09-12 10:38:09 +02:00
fieldOfView
8722a15883 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-12 10:35:21 +02:00
fieldOfView
55c0095b30 Allow plugins to add additional components to Machines detail pane 
CURA-2276
 2016-09-12 10:35:00 +02:00
Ghostkeeper
93d9b98cf5
Merge branch 'master' of https://github.com/Apsu/Cura into Apsu-master 2016-09-12 09:30:54 +02:00
Ghostkeeper
951fbc09f1 Add descriptions for all third-party plug-ins 
From memory.
 2016-09-12 01:57:57 +02:00
Ghostkeeper
866737e830 Add X3G Writer to list of third-party plug-ins 
Shameless self-plug.
 2016-09-12 01:55:01 +02:00
Jaime van Kessel
244332a807 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-09-09 17:28:20 +02:00
Ghostkeeper
8249200121
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 17:26:12 +02:00
Ghostkeeper
03c3b2ac2f
Make empty profile for current settings when upgrading from UM2+ 
This change causes the stack to make a new profile at the top to store current settings in.

Contributes to issue CURA-844.
 2016-09-09 17:23:13 +02:00
fieldOfView
66fc85c6b2 Fix revert accident 2016-09-09 17:10:45 +02:00
Ghostkeeper
1e23141b18 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-09 16:20:06 +02:00
Ghostkeeper
ba6ce52d29 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-09 16:20:06 +02:00
Ghostkeeper
e77ab83084 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-09 16:20:06 +02:00
Ghostkeeper
318b6cf87b 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-09 16:20:06 +02:00
Ghostkeeper
a4c47f26d6 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-09 16:20:06 +02:00
Ghostkeeper
84e91e2bf2 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-09 16:20:06 +02:00
Ghostkeeper
22b890387b
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 15:59:28 +02:00
Tim Kuipers
43bcd75562 JSON fix: support_interface_enable caused circular dependency (CURA-2308) 2016-09-09 15:51:36 +02:00
Tim Kuipers
8341a01412 JSON fix: retrieve extruderValue(.) from specific extruder rather than support_extruder_nr (CURA-2308) 2016-09-09 15:35:19 +02:00
Jaime van Kessel
c254737e25 Simplified the pause code 
Now always follow the states of the remote (instead of using states that can get out of sync)

CURA-2060
 2016-09-09 14:41:30 +02:00
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