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

3998 commits

Author SHA1 Message Date
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
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
Lipu Fei
f3a9267fa6 Revert "Make LayerView work with "Purge" line type" 
CURA-3094
 2017-06-23 13:32:18 +02:00
Lipu Fei
81323e555a Make LayerView work with "Purge" line type 
CURA-3094

In CuraEngine, we created a new line type called "Purge" to make Prime
Tower Purge work. This commit makes the LayerView plugin to handle
"Purge" lines correctly.
 2017-06-22 11:39:49 +02:00
Lipu Fei
8393a0efb4 Use resolveOrValue(prime_tower_enable) for prime tower purge "enabled" field 
CURA-3094
 2017-06-22 11:37:17 +02:00
Ghostkeeper
b05f1654f8 Fix spelling of Prime Tower Purge Volume description 
'Useful' is spelled with only one L.

Contributes to issue 3094.
 2017-06-22 11:37:17 +02:00
Jaime van Kessel
1ec9987cc2 Removed prime tower wipe enabled setting 
CURA-3094
 2017-06-22 11:37:17 +02:00
Jaime van Kessel
151d7d285b Added default values & some warnings 
CURA-3094
 2017-06-22 11:37:17 +02:00
Jaime van Kessel
11dad711e6 Added two new required settings for prime tower purge 
CURA-3094
 2017-06-22 11:37:16 +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
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
Ghostkeeper
d6baf98632
Merge branch 'Rigid3D-master' 2017-06-16 11:54:09 +02:00
Ghostkeeper
a488bbe392
Merge branch 'master' of https://github.com/Rigid3D/Cura into Rigid3D-master 2017-06-16 11:53:26 +02:00
Lipu Fei
90436c3b69 Revert "Removed unneeded shader duplication." 
USL-32

This breaks the OpenGL shaders on Windows and Mac.
 2017-06-16 11:48:11 +02:00
Lipu Fei
ade9c296ae Revert "Add #version 120 to make shaders work on Windows" 
USL-32

This breaks OpenGL shaders on Windows and Mac.
 2017-06-16 11:48:01 +02:00
Lipu Fei
adfe6ce63a Add #version 120 to make shaders work on Windows 
USL-32
 2017-06-16 10:59:47 +02:00
Ghostkeeper
3240338f6d
Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-16 09:25:50 +02:00
Ghostkeeper
6c02c46168
Merge branch 'patch-1' of https://github.com/nliaudat/Cura into nliaudat-patch-1 2017-06-16 09:23:19 +02:00
Jaime van Kessel
f7fd28b656 Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-15 21:18:06 +02:00
Jaime van Kessel
856a490acc Removed unneeded shader duplication. 
The work done for USL-43 ensures that all this duplication is no longer needed.
 2017-06-15 21:17:21 +02:00
Ghostkeeper
b4559eba2d
Rename forgotten sanding settings to ironing 
Oops.

Contributes to issue CURA-3903.
 2017-06-15 16:38:12 +02:00
Ghostkeeper
29b90d26b8
Re-enable centre camera on selection 
With Qt 5.8 it works again on Windows.
 2017-06-15 16:16:56 +02:00
Ghostkeeper
092483cac5
Rename setting ids for sanding to ironing 
This makes the code easier to follow since we consistently use the same terms for things in our code as what is user-visible.

Contributes to issue CURA-3903.
 2017-06-15 15:19:45 +02:00
Ghostkeeper
a7ed0d011a
Rename speed settings for sanding to ironing 
This is consistent with the rest. I had forgotten these since they are in a different category.

Contributes to issue CURA-3903.
 2017-06-15 15:17:42 +02:00
Ghostkeeper
66f5b236d6
Merge branch '2.6' 2017-06-15 09:54:19 +02:00
Ghostkeeper
4c8d65a2f4
Re-enable Brazillian Portuguese translation 
It's complete again. Thanks Patola.

Contributes to issue CURA-3885.
 2017-06-15 09:42:30 +02:00
Ghostkeeper
0c9556a48c
Rename Sanding to Ironing 
Just the user-visible name.

Contributes to issue CURA-3903.
 2017-06-15 08:54:44 +02:00
Cláudio Sampaio (Patola)
24e4aa59ad updated strings for cura 2.6 2017-06-14 10:47:40 -03:00
Ghostkeeper
8bce6e060c
Merge branch '2.6' 2017-06-14 10:58:11 +02:00
fieldOfView
49f2fb2cea
Fix filtering maerials after editing materials 
NB: previously the "approximate_diameter" metadata was stored as a number. This caused some issues passing arguments from QML to Python. Now "approximate_diameter" is stored as a string.
 2017-06-14 10:42:04 +02:00
fieldOfView
ed6f4d851c
Update documentation 2017-06-14 10:41:39 +02:00
fieldOfView
1f49a87acb
Update material_diameter when editing the material in MaterialView.qml 2017-06-14 10:41:02 +02:00
Ghostkeeper
baef713f50
Disable incomplete languages 
These translations are incomplete for the 2.6 release.

Contributes to issue CURA-3885.
 2017-06-14 09:37:55 +02:00
Mark
8ab5c7e4cd Merge pull request #1910 from Ultimaker/fix_dialog_sizes 
Fix dialog sizes.
Tested on different OSes and screens, all looked good.
 2017-06-13 13:14:44 +02:00
Ghostkeeper
8302819310
Merge branch '2.6' 2017-06-12 09:23:41 +02:00
Ghostkeeper
38a2685681
Take the maximum of line widths for minimising prime tower thickness 
Otherwise you get layers where the prime tower isn't printed because it is less than twice the line width, and then the prime tower falls away. I'm sure this was the whole intent of this 'max()' clause but it was executed wrongly.
 2017-06-12 09:23:23 +02:00