GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 01:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,243 Commits 294 Branches 267 Tags
Commit Graph

9243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Kuipers
e1d98d22f0 Merge branch 'master' into feature_prime_tower_purge 2017-06-26 16:11:41 +02:00
Lipu Fei
8a0afa9c32 Enable prime tower purge volume when prime tower and wipe are both enabled 2017-06-26 15:54:56 +02:00
Jaime van Kessel
568b0c2285 Changed start code of Dagoma printer to indicate it's created by cura. 
Originally it said it was created by Cura-by-dagoma, which is not the case. CURA-3966
 2017-06-26 15:02:24 +02:00
Jaime van Kessel
71c262040f Merge branch 'master' of https://github.com/landru29/Cura 2017-06-26 14:58:37 +02:00
Jaime van Kessel
c36ab386fa Merge branch 'feature_tab_navigation' of https://github.com/fieldOfView/Cura 2017-06-26 14:39:12 +02:00
fieldOfView
0f9cfa0304 Fix tab order after expanding categories or using search 
This reimplements the behavior of pressing tab/backtab to force the correct order of items in the listview.
 2017-06-26 14:35:37 +02:00
Jaime van Kessel
eda6394b34 Merge branch 'mb-fix-layer-view-line-widths' of https://github.com/smartavionics/Cura 2017-06-26 14:22:00 +02:00
Lipu Fei
d3bc625852 Fix prime tower purge description text 
CURA-3094
 2017-06-26 13:49:13 +02:00
Jaime van Kessel
cd17433d1c Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-26 13:17:20 +02:00
Jaime van Kessel
7813bfc543 No longer crash when trying to get non existing extruder stacks 
CURA-3953
 2017-06-26 13:16:14 +02:00
fieldOfView
8917762ed5 Animate scrolling focussed item into view 2017-06-26 13:03:28 +02:00
fieldOfView
edee53b0b1 Scroll setting with active focus into view 2017-06-26 13:00:59 +02:00
Lipu Fei
fe5466872f Merge remote-tracking branch 'upstream/2.6' 2017-06-26 12:59:25 +02:00
Lipu Fei
dc6eef0bc6 Merge pull request #2015 from Ultimaker/fix_override_extruder_settings_with_global_2.6 
fix: copy global settings into extruder msessage for SE (CURA-3930)
 2017-06-26 12:57:39 +02:00
Lipu Fei
bc65cc1102 Fix code style 
CURA-3930
 2017-06-26 12:49:34 +02:00
Jaime van Kessel
572852d2d6 Merge branch '2.6' of github.com:Ultimaker/Cura 2017-06-26 11:49:48 +02:00
Jaime van Kessel
ffd17664d0 Fixed names of 2 pp profiles 
CURA-3960
 2017-06-26 11:49:18 +02:00
Lipu Fei
c2f9786303 Fix enable Prime Power Purge when Prime Tower Wipe is enabled 
CURA-3094
 2017-06-26 10:59:58 +02:00
Jaime van Kessel
7f98646b42 Merge branch 'feature_CURA-3663_optional_offsetting_for_disallowed_areas' of github.com:Ultimaker/Cura 2017-06-26 10:58:16 +02:00
Ghostkeeper
6088617453
Merge branch '2.6' 2017-06-26 10:34:58 +02:00
Ghostkeeper
9cc2b0fc82
Fix link to material name 
The material was named generic_polypropylene, not generic_pp.

Contributes to issue CURA-3960.
 2017-06-26 09:55:52 +02:00
Ghostkeeper
35e0d1e607
Add entry for new materials in 2.6.1 
Contributes to issue CURA-3960.
 2017-06-26 09:24:44 +02:00
Mark Burton
6d6fec46b2 In geometry41core, take the line width/depth from the second vertex rather than the first. 
This change fixes a problem where a sequence of lines that have different widths are displayed
with the widths shifted by 1, i.e. line 1 had the width of line 2 and so on.
 2017-06-26 08:20:13 +01:00
Ghostkeeper
233474756b
Merge branch '2.6' of github.com:Ultimaker/Cura into 2.6 2017-06-26 09:00:02 +02:00
Lipu Fei
af1e18df24 Enabled Prime Power Purge when Prime Tower Wipe is enabled 
CURA-3094
 2017-06-26 08:30:01 +02:00
Lipu Fei
15293964f8 Better description for Prime Tower Purge Volume 
CURA-3094
 2017-06-26 08:29:13 +02:00
Cyrille Meichel
f7a1c8dbb2 Add DiscoEasy printer (dagoma.fr) 2017-06-26 01:02:52 +02:00
Tim Kuipers
49e53c2cda Revert "dark layer view" 
This reverts commit 67a4ec2a9e56ba6df31fa06efe49a69aa1b2d20f.
 2017-06-23 17:25:53 +02:00
Ghostkeeper
7386b0bced
Remove translation for Material category 
It looks very wierd to have the Material category label translated but not the rest of the categories. I don't know the proper translations for the rest, so I must remove this one. The label is left intact though.

Contributes to issue CURA-3950.
 2017-06-23 16:50:36 +02:00
Ghostkeeper
8c9d051479
Re-enable Korean translations 
They are complete now, as far as we agreed on (only the setting descriptions). They may now be re-enabled.

Contributes to issue CURA-3950.
 2017-06-23 16:42:47 +02:00
Ghostkeeper
b68d8d98be
Update Korean translations 
These files are directly copied from our Korean translator.

Contributes to issue CURA-3950.
 2017-06-23 16:36:53 +02:00
Jaime van Kessel
2cfd6165fa Merge pull request #1992 from onitake/fix_remove_debian_gitignore 
Remove debian/ from gitignore
 2017-06-23 16:36:47 +02:00
Ghostkeeper
dc638fecbf
Mark 0.8mm CPE+ and PC profiles as experimental 
These profiles have been tested and they are in the process of optimising them, but there is still some room for improvement there so this is supposed to lower the expectations of our users.

Contributes to issue CURA-3960.
 2017-06-23 16:04:06 +02:00
Jaime van Kessel
ccb3f225ff Preheat now shows error color like all other input fields 2017-06-23 15:49:46 +02:00
Jaime van Kessel
78141cf330 Merge branch 'fix_layerview_small_windows' of https://github.com/fieldOfView/Cura 2017-06-23 15:11:57 +02:00
Jaime van Kessel
31dcb6f41f Decreased height of progress bar 
CURA-3856
 2017-06-23 14:41:23 +02:00
Jaime van Kessel
8a8123a021 Correctly set User-Agent header 2017-06-23 14:35:15 +02:00
Ghostkeeper
269bc5f61f
Correct setting version of UM2+ polypropylene profiles 
Missed that one, but thankfully the Cura log reminds us.

Contributes to issue CURA-3960.
 2017-06-23 14:34:52 +02:00
Ghostkeeper
504bf5067c
Fix metadata of Ultimaker 2+ propylene profiles 
Note that Git says that Fast was renamed to Verydraft, but in reality Fast was renamed to Draft and Draft was renamed to Verydraft.

Contributes to issue CURA-3960.
 2017-06-23 14:24:14 +02:00
Jaime van Kessel
dea95cb0ea Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-23 14:17:35 +02:00
Jaime van Kessel
32c699e4a1 Updated layout 2017-06-23 14:17:22 +02:00
Ghostkeeper
25d2c10548
Optimise Ultimaker 2+ polypropylene profiles 
These are optimised to the level of the materials: Anything that is common between quality profiles with the same material and nozzle gets bubbled to the profile for that material (per nozzle). It doesn't bubble any further (to the variant) because that could have an impact on the other profiles.
This basically only removes settings because where these settings then bubble to is the material profile in the fdm_materials repository. And a lot of settings are just removed because they are equal to the default.

Contributes to issue CURA-3960.
 2017-06-23 14:15:27 +02:00
Lipu Fei
dbf0cf347c Default to 0 if we cannot find the theme 
CURA-3873
 2017-06-23 13:59:05 +02:00
Jaime van Kessel
37162683e5 Show result message after installing / upgrading plugin with the browser 
CURA-3856
 2017-06-23 13:51:13 +02:00
Jaime van Kessel
867dd04681 PluginBrowser strings are now translatable 
CURA-3856
 2017-06-23 13:43:08 +02:00
Lipu Fei
2438effe0a Use 0.5 as max warning value for prime tower purge volume 
CURA-3094

Purging more than 0.5mm^3 of material can be way too much, so we use
0.5mm^3 as the maximum warning value for the prime tower purge volume.
 2017-06-23 13:34:19 +02:00
Lipu Fei
eb254b085a Use "Prime Tower Purge Volume" for setting label 
CURA-3094
 2017-06-23 13:34:09 +02:00
Jaime van Kessel
f5a43b48c2 Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-23 13:32:46 +02:00
Jaime van Kessel
83b3dcbb2f Freshly installed plugins can't be downloaded again anymore 
CURA-3856
 2017-06-23 13:32:19 +02:00
Lipu Fei
f3a9267fa6 Revert "Make LayerView work with "Purge" line type" 
CURA-3094
 2017-06-23 13:32:18 +02:00