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

5310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
a8ebdc8e39 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-13 21:23:11 +02:00
fieldOfView
a291131aca Fix qml warning when no printer is connected 2016-10-13 21:18:17 +02:00
Ghostkeeper
7d53b955c1 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-13 20:56:35 +02:00
Simon Edwards
2153ee8651 Merge pull request #1042 from Ultimaker/restore_to_default_not_per_extruder 
Only reset the setting for the currently selected extruder.
 2016-10-13 14:53:17 +02:00
Simon Edwards
8b487130d2 Take 'linked' settings into account when reverting. 
CURA-2640 Restore to default not per extruder
 2016-10-13 14:33:29 +02:00
Simon Edwards
79a62ec45f Only reset the setting for the currently selected extruder. 
CURA-2640 Restore to default not per extruder
 2016-10-13 13:48:15 +02:00
fieldOfView
fe60b2fab8 Add missing elide for "Print Setup" label 
And fix some code style
 2016-10-13 13:18:51 +02:00
Ghostkeeper
ce6e3982fe
Make resolve function of bed temperature use max 
We want the bed to have the highest temperature of the two. This causes some melting for softer materials, but it is required for harder materials to stick to the build plate.
 2016-10-13 13:15:16 +02:00
fieldOfView
3a55ec324c Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-13 11:31:20 +02:00
fieldOfView
c9ee7afcb8 Remove superfluous if statement 
CURA-2600
 2016-10-13 11:31:07 +02:00
Simon Edwards
f7fe59c707 A small fix for the case when Cura is starting up and there is no printer. 
CURA-2271 Warn for unsupported material/printcore combinations
 2016-10-13 11:10:40 +02:00
Simon Edwards
f659d01da1 Make the labels in the quality menus match those from the selected extruder. 
CURA-2271 Warn for unsupported material/printcore combinations
 2016-10-13 10:55:32 +02:00
Jaime van Kessel
c0654c56a0 Variants are now taken into account when auto updating material 
CURA-2600
 2016-10-12 19:04:18 +02:00
Jaime van Kessel
939ed60808 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-12 17:50:12 +02:00
Jaime van Kessel
4a31f9c5b6 Removed wrong check for material for quality_changes 
CURA-2635
 2016-10-12 17:49:20 +02:00
Jack Ha
91d0975c95 Merge branch 'not_supported_qualities' into 2.3 2016-10-12 17:33:36 +02:00
Jaime van Kessel
6e9acf77c0 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-12 17:27:01 +02:00
Ghostkeeper
0a39802cb2
Fix resolve function of support_type 
It was not quoted, so it interpreted it as a variable.
 2016-10-12 16:09:15 +02:00
Simon Edwards
c3cf762451 Show the warning color for unsupported materials/qualities by using the new 'supported' metadata flag. 
CURA-2271
 2016-10-12 15:57:50 +02:00
Jaime van Kessel
67a02ee90e ActiveQualityType and activeQualityChangesId now use activeContainer 
CURA-2624
 2016-10-12 13:48:08 +02:00
Simon Edwards
df922f5382 Merge branch 'fix_unsupported_materials_warning' into 2.3 2016-10-12 13:15:06 +02:00
Jaime van Kessel
5e4c99f7e0 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-12 12:00:37 +02:00
Jaime van Kessel
f60146ad26 Active quality ID is selected from active stack instead of global 
CURA-2624
 2016-10-12 11:59:54 +02:00
Ghostkeeper
d9b428e6c8
Get material IDs from correct definition id if quality_definition 
For printers with a quality_definition, such as UM2E+, the material ID needs to be taken for the definition ID specified in the quality_definition metadata field. The self.activeQualityDefinitionId takes care of that, even though it is named wrong (as it applies to materials as well as quality profiles).

Contributes to issue CURA-2600.
 2016-10-12 11:42:07 +02:00
Simon Edwards
ef3e8dc4fa Make sure that the activeQualityChanged signal is emitted when the _active_container_stack changes. 
CURA-2271
 2016-10-12 11:31:18 +02:00
Jaime van Kessel
7914e90702 Merge branch 'cura-2605' of github.com:Ultimaker/Cura into 2.3 2016-10-11 16:39:12 +02:00
fieldOfView
34630fa646 Also show the "unsupported" warning when a custom profile is selected 
...by making sure we're looking at the quality container (not quality_changes) of the active extruder/stack

CURA-2271
 2016-10-11 16:36:32 +02:00
Arjen Hiemstra
50390dae03 Replace all instances of "layer_height" in functions with resolveOrValue 
Since we have layer_height in quality profiles (and cannot remove it) we
need to handle this. It turns out using resolveOrValue is a quick fix.

Fixes CURA-2604
 2016-10-11 16:03:57 +02:00
fieldOfView
95fabbaf6d Don't allow creating profiles based on empty_profile 
...because empty_profile has no quality_type
CURA-2271
 2016-10-11 15:22:17 +02:00
Jack Ha
d45f61f778 Comment. CURA-2605 2016-10-11 15:13:16 +02:00
fieldOfView
e312530840 Fix errors on profiles page for unsupported material combinations 
CURA-2271
 2016-10-11 15:07:27 +02:00
Jack Ha
b119be7d11 Remove settings from extruder that are not settable_per_extruder. CURA-2605 2016-10-11 15:00:17 +02:00
fieldOfView
f2e054b449 Fix the active quality id 
activeQualityId and activeQualityName were not referencing the same profile. activeMaterialName seems to have the correct one.

CURA-2271
 2016-10-11 14:27:02 +02:00
fieldOfView
bf0c6dc1d4 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-11 14:21:57 +02:00
fieldOfView
16d5633b74 Fix "unsupported" warning on UM2+ 0.25 and 0.8 variants 
Contributes to 2271, fixes 2616
 2016-10-11 14:21:40 +02:00
Tim Kuipers
70ab3d7b1b Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-11 14:08:18 +02:00
Tim Kuipers
63afe917e5 JSON fix: combing mode has link icon now (CURA-2568) 2016-10-11 14:08:10 +02:00
fieldOfView
15a870c050 Add some documentation 
CURA-2544
 2016-10-11 13:39:44 +02:00
fieldOfView
1fd7c2793c Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-11 13:35:27 +02:00
fieldOfView
7e99fcc5d7 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-11 13:35:04 +02:00
fieldOfView
d04e6a6644 Use buffered writing for writing gcode to removable drives 
GCode files are still written line by line, but python is instructed to use buffering. This greatly decreases the total time required to write large(ish) files to USB drives, while having minimal impact on memory use.

CURA-2544
 2016-10-11 13:34:48 +02:00
Ghostkeeper
0c604ca002
Update translation of PostProcessingPlugin 
These were missed previous time because I had my extract script set-up wrong.

Contributes to issue CURA-570.
 2016-10-11 13:34:02 +02:00
Tim Kuipers
311ebdc3ba fix: changelog clarity improvements suggested by nickthetait (CURA-2000) 2016-10-11 11:35:20 +02:00
Tim Kuipers
3b38d52c75 fix: changelog bugfixes formatting (CURA-2000) 2016-10-11 11:22:16 +02:00
fieldOfView
0af42587b0 Fix jobname when opening multiple files at once 2016-10-10 18:42:55 +02:00
fieldOfView
6852e59404 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-10-10 17:50:01 +02:00
fieldOfView
879ab529f2 Fix deleting grouped object using the context-menu 
CURA-2573
 2016-10-10 17:48:00 +02:00
Tim Kuipers
b38bb5a007 fix: nylon has standby temp 175 (CURA-2567) 2016-10-10 17:17:41 +02:00
fieldOfView
b4a2a0a417 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2.3-rc1 2016-10-10 14:35:08 +02:00
fieldOfView
472ba7ed26 Fix exporting materials for machines other than those in the product_id_map 
CURA-2583
 2016-10-10 14:34:53 +02:00