GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-16 19:41:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,142 Commits 295 Branches 268 Tags
Commit Graph

9142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jaime van Kessel
14fb01ee46 Merge branch '2.6' of github.com:Ultimaker/Cura 2017-06-22 10:24:36 +02:00
Jaime van Kessel
7b7580daaf Merge branch 'fix_single_extrusion_multiple_stacks' of https://github.com/fieldOfView/Cura into 2.6 2017-06-22 10:12:49 +02:00
Lipu Fei
5900bb8622 Use "Ultimaker" as the author for ultimaker plugins 
CURA-3712
 2017-06-22 08:58:54 +02:00
Lipu Fei
4ea8cc448a Use semantic versioning for all plugin.json 
CURA-3712
 2017-06-22 08:57:47 +02:00
Lipu Fei
73f598ff9f Fix code style 
CURA-3712
 2017-06-22 08:54:04 +02:00
fieldOfView
de01155630 Add documentation 2017-06-21 19:15:05 +02:00
fieldOfView
adc547fa36 Don't send extruder stack settings to CuraEngine when there is just one extruder 
When there is 1 extruder, the frontend stores all settings in the global stack. Sending an extruder stack confuses CuraEngine into using the values of the extruder stack, which results in defaults being used.
 2017-06-21 19:00:18 +02:00
Tim Kuipers
cfe1dd4fb6 fix: group selection box uses proper rendermode now (CURA-3846) 
Renderer.RenderMode doesn't exist any more.
This should have been fixed way back when RenderBatch was introduced
 2017-06-21 15:05:49 +02:00
Jaime van Kessel
827ec9b6a5 Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-21 14:28:10 +02:00
Jaime van Kessel
e3629cec39 Replaced catalog metadata entry with i18n-catalog 
CURA-3712 & Cura-3856
 2017-06-21 14:24:00 +02:00
Ghostkeeper
1d23d659f0
Merge branch '2.6' 2017-06-21 12:29:23 +02:00
Ghostkeeper
8aa420be62
Fix location of log on Windows 
It's a bit longer, but hopefully clear for both advanced system engineers and for rookies.
 2017-06-21 11:53:38 +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
Jaime van Kessel
44125d3275 Moved certain meta data entries to seperate file 
CURA-3856 & CURA-3712
 2017-06-21 11:22:35 +02:00
Ghostkeeper
015c253252
Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-19 11:34:06 +02:00
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
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.
2.6.0 		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
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