GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-17 15:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,300 Commits 295 Branches 268 Tags
Commit Graph

6300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Edwards
a3ffc9e46f 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:12:43 +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
8b75dd5f97 Merge branch '2.3' 2016-10-13 10:59:32 +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
8faa69795a Merge pull request #1039 from Ultimaker/not_supported_qualities 
Show the warning color for unsupported materials/qualities
 2016-10-12 17:35:05 +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
Jaime van Kessel
dc34b898d4 Added max recreateNetworkManager count increase per update 
CURA-2630
 2016-10-12 16:35:22 +02:00
Ghostkeeper
fcb88f06ab
Fix typo in incompatibility warning message 
This is the actual fix that we couldn't do due to the string freeze.

Contributes to issue CURA-2626.
 2016-10-12 16:18:54 +02:00
Ghostkeeper
19c4b7251d
Merge branch '2.3' 2016-10-12 16:11:58 +02:00
Ghostkeeper
15c65396a9
Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-12 16:11:07 +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
Jaime van Kessel
91521eb49d Added logging if connection to network printer was closed 
CURA-2630
 2016-10-12 16:02:35 +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
2337a78a71 Camera requests now also set last_request_time 
CURA-2630
 2016-10-12 15:08:23 +02:00
Jaime van Kessel
a9b45572cc PostReply is now always reset correctly 
CURA-2630
 2016-10-12 14:50:58 +02:00
Jaime van Kessel
2638365839 LastRequestTime is reset on connection close 
CURA-2630
 2016-10-12 14:36:41 +02:00
Jack Ha
371bdb8df1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-12 13:58:19 +02:00
Jack Ha
3f6877d2ec Keep per object extruder when switching machines. CURA-2533 2016-10-12 13:58:09 +02:00
Jaime van Kessel
67a02ee90e ActiveQualityType and activeQualityChangesId now use activeContainer 
CURA-2624
 2016-10-12 13:48:08 +02:00
Simon Edwards
e686164b29 Merge branch '2.3' 2016-10-12 13:15:25 +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
557a85a626 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-12 12:01:58 +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
4f5f959746
Merge branch '2.3' 2016-10-12 11:42:28 +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
80a5978d54 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-11 17:04:04 +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
9e18d2571a Merge branch '2.3' 
* 2.3:
  Replace all instances of "layer_height" in functions with resolveOrValue
  Fix "unsupported" warning on UM2+ 0.25 and 0.8 variants
 2016-10-11 16:04:13 +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
b7096c8f72 Merge branch '2.3' 2016-10-11 14:09:34 +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
1bafe75664 Merge branch '2.3' 2016-10-11 13:40: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