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

2260 commits

Author SHA1 Message Date
Jack Ha
d4f7a0e16c Bugfix in logging when trying to import broken profile. CURA-787 2016-10-20 11:39:01 +02:00
Tim Kuipers
fd50d9e316 JSON fix: added comment in cool_min_layer_time description about Minimum Speed (CURA-2720) 2016-10-19 14:44:58 +02:00
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
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
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
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
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
Jack Ha
91d0975c95 Merge branch 'not_supported_qualities' into 2.3 2016-10-12 17:33:36 +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
Simon Edwards
df922f5382 Merge branch 'fix_unsupported_materials_warning' into 2.3 2016-10-12 13:15:06 +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
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
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
fieldOfView
0af42587b0 Fix jobname when opening multiple files at once 2016-10-10 18:42:55 +02:00
Tim Kuipers
b38bb5a007 fix: nylon has standby temp 175 (CURA-2567) 2016-10-10 17:17:41 +02:00
fieldOfView
fea0dfdfa1 Put material selection in warning state for unsupported materials 
CURA-2271
 2016-10-10 13:19:20 +02:00
Ghostkeeper
608248bec8
Fix display of inherited materials 
Materials are sometimes inherited, such as for UM2E+. The activeQualityDefinitionId is the definition from which it should get its profiles, including material profiles. Likewise for activeQualityVariantId.

Contributes to issue CURA-2576.
 2016-10-08 17:14:24 +02:00
fieldOfView
90c3a09bc0 Add tooltip for formulas on profile overview tabs 2016-10-08 15:15:12 +02:00
fieldOfView
6bea0ad7b4 Select the currently active extruder on the profiles tab 2016-10-08 15:14:11 +02:00
fieldOfView
5d3d13e9ef Make whole row for user & quality_changes values italic 
The italic pattern is now shared between the sidebar and the profile overview. Current settings (user) and the values set in the custom profile (quality_changes) are now made italic in both places.
 2016-10-08 14:52:39 +02:00
Tim Kuipers
74669d79d1 fix: use machine standby temp rather than Cura standby temp for Nylon fdm_material (CURA-2567) 2016-10-07 15:12:12 +02:00
Tim Kuipers
e2dd9bb958 fix: added missing fdm_materials from fdm_materials repo (CURA-2567) 2016-10-07 14:51:34 +02:00
Tim Kuipers
82c4460adf fix: update materials from fdm_materials (CURA-2567) 2016-10-07 14:43:09 +02:00
Ghostkeeper
bfe3fa733a
Revert "Remove obsolete and outdated material files" 
This reverts commit 47caacfd44. That commit was giving some trouble with our build process. Eventually these files will need to be deleted, but not right before the new release.

Contributes to issue CURA-2567.
 2016-10-07 11:05:41 +02:00
Arjen Hiemstra
47caacfd44 Remove obsolete and outdated material files 
Contributes to CURA-2567
 2016-10-06 17:27:00 +02:00
Ghostkeeper
62d6b1fcdd
Adjust max warning for coasting volume 
It now depends on the machine nozzle size.

Contributes to issue CURA-905.
 2016-10-06 16:06:14 +02:00
Jack Ha
ab23637f3b Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 15:23:14 +02:00
Jack Ha
8b61215270 Added infill_mesh and infill_mesh_order to excluded list in SettingView. CURA-1993 2016-10-06 15:23:04 +02:00
Tim Kuipers
f62a120533 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 15:08:27 +02:00
Tim Kuipers
aaaf1dfc58 JSOn fix: cap extruder switch retraction speed to machine_max_feedrate_e (CURA-905) 
just like the normal retraction speeds.
 2016-10-06 15:08:17 +02:00
fieldOfView
c056d44785 Made quality profile weights consistent 
draft: -2
fast: -1
normal: 0
high: 1

CURA-2549
 2016-10-06 14:07:01 +02:00
Tim Kuipers
7e8ce98f48 JSON fix: typo (CURA-905) 2016-10-06 12:15:57 +02:00
Tim Kuipers
32f506c6e1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 12:13:54 +02:00
Tim Kuipers
e63b572417 JSON fix: fixed raft warnings flawed logic (CURA-905) 
For layer_0_z_overlap we are only sure to overextrude when the overlap is more than the airgap.

Layer height warnings are now based on line widths for raft, because the line widths are way larger than the nozzle size.
 2016-10-06 12:13:47 +02:00
Tim Kuipers
edd06f860a JSON fix: retractions speed warnings and raft margin warning based on likely possible testing values (CURA-905) 2016-10-06 12:11:40 +02:00
Ghostkeeper
8644fb7113
Never animate progress bars if they are invisible 
This is now the responsibility of the theme rather than the interface element, since the theme defines the animation itself. This makes it that the interface element doesn't need to worry about things like its style or animation.

Contributes to issue CURA-2497.
 2016-10-06 11:54:21 +02:00
Ghostkeeper
06a0a0b95e
Progress bar never indeterminate if invisible 
Because if the progress bar is indeterminate, it triggers redraws for every frame to create the animation of the progress bar bouncing, regardless of whether it is visible or not. So now we make it indeterminate regardless of what state it is in.

Contributes to issue CURA-2497.
 2016-10-05 13:35:12 +02:00