Commit graph

4023 commits

Author SHA1 Message Date
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
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
Tim Kuipers
49e53c2cda Revert "dark layer view"
This reverts commit 67a4ec2a9e.
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
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
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
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
Ghostkeeper
4b6f9be4ed
Correct names
The old names are what the materials team uses internally, and sorta old names too.

Contributes to issue CURA-3960.
2017-06-23 13:05:58 +02:00
Ghostkeeper
fa394a0171
Remove Not-Supported profiles for CPE+ and PC
They are now supported. This breaks the stacks of people who had these profiles active when they upgraded from 2.6.0 to 2.6.1, which causes them to get a screen of which printer they want to add, and they lose their current settings. But we decided that this use case is too slim to make an entire version upgrade for this patch-version release.

Contributes to issue CURA-3960.
2017-06-23 12:58:33 +02:00
Ghostkeeper
71197e9101
Optimise new profiles
This removes all settings that are equal to the defaults. Some settings are 'common' between all profiles of the same material. I've let those settings bubble up to the material profiles but that change is then obviously only apparent in the fdm_materials repository.

Contributes to issue CURA-3960.
2017-06-23 12:45:40 +02:00
Ghostkeeper
5f6894c523
Add PP profiles for UM2+
These new profiles are directly copied from what the material team provides. They should now be optimised.

Contributes to issue CURA-3960.
2017-06-23 11:14:21 +02:00
Ghostkeeper
a8f2f6560f
Add PP profiles
These are copied from the materials team and should now be optimised.

Contributes to issue CURA-3960.
2017-06-23 11:07:25 +02:00
Ghostkeeper
8ffc3eabdb
Add 0.8mm profiles for CPE+ and PC
These are copied directly from the materials team and should now be optimised.

Contributes to issue CURA-3960.
2017-06-23 11:06:46 +02:00
Ghostkeeper
85bcc56a64
Update TPU profiles
These profiles are improved by the materials team. This is directly copied from them and should now be optimised for our use.

Contributes to issue CURA-3960.
2017-06-23 11:05:33 +02:00
Jaime van Kessel
217eecccb9 Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-23 09:57:34 +02:00
Jaime van Kessel
3049fb4da2 Made setting warning colors for dark theme a bit darker. 2017-06-23 09:57:07 +02:00
Tim Kuipers
67a4ec2a9e dark layer view 2017-06-22 18:56:55 +02:00
Jaime van Kessel
9e275cd41c Merge branch 'feature_dark_theme' of https://github.com/fieldOfView/Cura 2017-06-22 18:44:16 +02:00
Ghostkeeper
bc219a06fe
Add MaterialsModel to make material list update upon metadata change
This new model inherits from InstanceContainersModel. The only change is that it updates when the metadata of a material container changes. This is needed to make the list of materials update when the material diameter changes.

Contributes to issue CURA-2822.
2017-06-22 18:17:16 +02:00
Ghostkeeper
0e23930bfe
Fix checking whether the old material diameter was the same
Getting the old material diameter wasn't working properly.

Contributes to issue CURA-2822.
2017-06-22 18:17:16 +02:00
Ghostkeeper
1d048f39db
Fix getting old material diameter
This diameter works. I still don't know why the properties/diameter one didn't work, but this is good too since they are now equal.

Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
Ghostkeeper
b37fa6f718
Implement warning message when you change material diameter
The undo functionality currently gives an error though. Investigating...

Contributes to issue CURA-2822.
2017-06-22 18:17:15 +02:00
fieldOfView
48efcdf6e4 Use a PointingRectangle for the LayerView pane 2017-06-22 14:59:15 +02:00
fieldOfView
29e152582f Make layerview panel hug the bottom of small windows
Fixes https://github.com/Ultimaker/Cura/issues/2013
2017-06-22 14:30:26 +02:00
Lipu Fei
293c1690c6 Change to use machine_nozzle_id
CURA-3872

We cannot assume that all nozzles will have IDs like "<type> <size>"
such as "AA 0.4", so we should use a complete string as the nozzle IDs.
2017-06-22 14:00:04 +02:00
Lipu Fei
46b6e5b0a1 Add machine_nozzle_type and set them in UM3 and UM3XL variants
CURA-3872

We add a new setting "machine_nozzle_type" to give the engine
information about the nozzle type, such as "AA" and "BB". This is
applicable to UM3 and UM3XL.
2017-06-22 14:00:04 +02:00
Lipu Fei
73f598ff9f Fix code style
CURA-3712
2017-06-22 08:54:04 +02:00
Ghostkeeper
1d23d659f0
Merge branch '2.6' 2017-06-21 12:29:23 +02:00
Ghostkeeper
e7d5618148
Re-enable Japanese translation
Note that this only includes the setting descriptions.

Contributes to issue CURA-3950.
2017-06-21 11:30:16 +02:00
Ghostkeeper
24b19fa0a5
Convert tab to spaces
We indent with spaces, not tab. This one was mixed.
2017-06-21 11:29:35 +02:00
Ghostkeeper
1e0b82829b
Update Japanese translation
This translation is only translating the setting descriptions. However it is also missing one translation: smooth spiralized contours. We decided not to block these translations just for that one. It was also missing another translation: Support bottom pattern. I inferred that from the description of Support Roof Pattern, basically doing the translation myself.

Contributes to issue CURA-3950.
2017-06-21 11:27:25 +02:00
fieldOfView
73e951d402 Darken buildplate 2017-06-19 15:48:04 +02:00
fieldOfView
07dc19c299 Add a dark theme
Based on the work by @rudowinger
2017-06-19 13:24:01 +02:00
Ghostkeeper
015c253252
Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-19 11:34:06 +02:00
Jaime van Kessel
80cb0e5aac Merge pull request #1961 from fieldOfView/feature_moai_updates
Update Peopoly Moai definition
2017-06-19 11:21:33 +02:00
Ghostkeeper
9acaef8ecc
Merge branch 'feature_lsit_themes' of https://github.com/fieldOfView/Cura into fieldOfView-feature_lsit_themes 2017-06-19 11:05:20 +02:00
Ghostkeeper
8c5c28d399
Convert tabs to spaces
Contributes to issue CURA-3916.
2017-06-16 13:23:54 +02:00
Ghostkeeper
a060cfbc66
Merge branch 'master' of https://github.com/beeverycreative/Cura into beeverycreative-master 2017-06-16 13:18:30 +02:00
Ghostkeeper
107b47ef18
Merge branch 'maukcc-master' 2017-06-16 12:57:24 +02:00
Ghostkeeper
e11a52b4ac
Fix infill pattern
Since the value is interpreted as Python code, it needs to have an extra set of quotes to be interpreted as a string instead of a variable.

Contributes to issue CURA-3907.
2017-06-16 12:46:52 +02:00
Ghostkeeper
a1cbdc10df
Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-16 12:43:29 +02:00
Lipu Fei
5647800aec Merge pull request #1978 from Ultimaker/feature_sanding_horizontal
Horizontal Ironing
2017-06-16 11:55:45 +02:00