Ghostkeeper
17a610a3a6
Merge branch 'fieldOfView-feature_lsit_themes'
2017-06-19 11:33:13 +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
Jaime van Kessel
5375d43320
Merge branch 'fix_layerview_python3.6' of https://github.com/sheinz/Cura
2017-06-19 11:13:31 +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
Gregor Riepl
f32eb564de
Remove debian/ from gitignore
2017-06-19 08:50:54 +02:00
Ghostkeeper
e16d88517d
Merge branch '2.6'
2017-06-16 15:54:59 +02:00
Ghostkeeper
694254e299
Fix MIME type of material resources
...
Because of this wrong MIME type, the material profile would get saved using the preferred extension of the instance container, .inst.cfg. This would then get interpreted as having the MIME type of instance containers, and then it would fail to load because it is not an INI file.
Now it stores it as .xml.fdm_material and so the MIME type database interprets it as an XML file.
Contributes to issue CURA-3937.
2017-06-16 15:54:42 +02:00
Jaime van Kessel
41c5aaed69
Merge branch '2.6' of github.com:Ultimaker/Cura
2017-06-16 13:53:05 +02:00
Ghostkeeper
8c5c28d399
Convert tabs to spaces
...
Contributes to issue CURA-3916.
2017-06-16 13:23:54 +02:00
Ghostkeeper
455c5d7865
Merge branch 'beeverycreative-master'
2017-06-16 13:19:23 +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
Mark Burton
8ca01de762
Merge branch 'master' into mb-group-walls
2017-06-16 11:29:00 +01: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
175ac67e18
Merge branch 'nliaudat-patch-1'
2017-06-16 09:25:33 +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
Jaime van Kessel
2adf97ba2d
Also apply the filtering on the quality and user profiles model
...
CURA-3935
2017-06-15 17:18:04 +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
Jaime van Kessel
c93acc12e7
Merge branch '2.6' of github.com:Ultimaker/Cura
2017-06-15 15:28:34 +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
e003abf895
Only display global quality changes profiles
...
There's one copy for every stack. It doesn't matter which one we take as long as they have the same name. Global is always present, even in single extrusion. Seems the most logical one to display.
Contributes to issue CURA-3935.
2017-06-15 14:38:04 +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
53d870148d
Merge branch 'Patola-2.6' into 2.6
2017-06-15 09:30:38 +02:00
Ghostkeeper
c7260611ca
Merge branch '2.6' of https://github.com/Patola/Cura into Patola-2.6
2017-06-15 09:27:49 +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
ebd2f0b415
Fix switching to quality changes profiles
...
It would put the global quality changes profile in each of the extruders, thus not giving any per-extruder settings.
Contributes to issue CURA-3935.
2017-06-14 15:30:55 +02:00
Ghostkeeper
f4e620c458
Remove unused variable
...
Contributes to issue CURA-3935.
2017-06-14 13:40:57 +02:00
Jaime van Kessel
7551c83612
QualityChanges are now also removed if a machine has a parentDefinition
...
CURA-3929
2017-06-14 11:04:22 +02: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
8f7471a892
Remove debug statement
2017-06-14 10:41:53 +02:00
fieldOfView
ed6f4d851c
Update documentation
2017-06-14 10:41:39 +02:00
fieldOfView
c9998ca6fe
Set properties for all containers with the same base_file metadata entry
2017-06-14 10:41:23 +02:00
fieldOfView
a7cdf49018
Fix setting metadata on fdmmaterial containers
2017-06-14 10:41:12 +02:00
fieldOfView
1f49a87acb
Update material_diameter when editing the material in MaterialView.qml
2017-06-14 10:41:02 +02:00
fieldOfView
5550fe0da8
Fix confusion around the use of the word "global"
2017-06-14 10:40:52 +02:00
