3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
5352 commits 312 branches 275 tags 718 MiB
Commit graph

5352 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
e2d32ef963 Change references from Uranium to Cura 2016-10-17 14:17:28 +02:00
fieldOfView
98a2ebc157 Fix translation of machines page and some other references to Uranium 
CURA-570
 2016-10-17 14:10:02 +02:00
Jack Ha
1cd5052666 Fixed translation of 4 words in profiles page. CURA-570 2016-10-17 13:57:24 +02:00
Jaime van Kessel
9c73c248ed Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 16:14:47 +02:00
Jaime van Kessel
cda8fd5827 Revert buttons now work for single extrusion machines again 2016-10-16 16:14:05 +02:00
Jaime van Kessel
807a92957f Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 14:45:52 +02:00
Jaime van Kessel
95f2b84fb5 Fixed importing profiles for machines with inheritance 2016-10-16 14:20:04 +02:00
Jaime van Kessel
87fc0db543 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 13:16:21 +02:00
Jaime van Kessel
3afd813e5e Profiles page is now correctly updated when single extrusion machine is used 2016-10-15 19:23:07 +02:00
Jaime van Kessel
a3df53c1e1 Quality_changes are now taken into account for UM3Extended 
CURA-2690
 2016-10-15 18:36:05 +02:00
Jaime van Kessel
d12219cab8 Right profile is now checked again in dropdown 
CURA-2690
 2016-10-15 17:10:26 +02:00
Jaime van Kessel
ff24def63c Use globalProfileId to check if we need to show changed settings 
CURA-2690
 2016-10-15 17:05:55 +02:00
Ghostkeeper
4769b22138
Sort profiles on extruder position before exporting 
In the importer the extruders are sorted on extruder position. In the exporter they need to be in the same order.

Contributes to issue CURA-2655.
 2016-10-14 11:46:39 +02:00
Ghostkeeper
b04e98c4b0 Merge pull request #993 from nickthetait/gh-issue-980 
Matchup JSON formatting for fdmprinter with code conventions
 2016-10-14 11:15:55 +02:00
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
nickthetait
1bc2f1e189 More formatting updates 2016-10-13 08:11:15 -06:00
nickthetait
bf331f39af Merge branch 'um-master' into gh-issue-980 
Conflicts:
	resources/definitions/fdmprinter.def.json
 2016-10-13 08:01:00 -06:00
Simon Edwards
e2a66b33e0 Merge branch '2.3' 2016-10-13 14:54:13 +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
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
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
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
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