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

2175 Commits

Author SHA1 Message Date
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
e3629cec39 Replaced catalog metadata entry with i18n-catalog 
CURA-3712 & Cura-3856
 2017-06-21 14:24:00 +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
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
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
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
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
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
a7cdf49018
Fix setting metadata on fdmmaterial containers 2017-06-14 10:41:12 +02:00
fieldOfView
5550fe0da8
Fix confusion around the use of the word "global" 2017-06-14 10:40:52 +02:00
fieldOfView
944318d44a
Fix loading material diameter and GUID from XML file 2017-06-14 10:40:43 +02:00
Jaime van Kessel
4fa9b94e30 Minor code cleanup 2017-06-13 16:28:41 +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
Mark
9f66bc8090 Merge pull request #1910 from Ultimaker/fix_dialog_sizes 
Fix dialog sizes.
Tested on different OSes and screens, all looked good.
 2017-06-08 11:08:56 +02:00
Ghostkeeper
2ede856dd7
Merge branch '2.6' 2017-06-07 17:30:40 +02:00
sheinz
de62a3c0fe Fix displaying layers with python3.6 2017-06-06 23:47:40 +03:00
Jaime van Kessel
b18b1d3cd0 Only disable timer of backend if it's initialised 
Fixes #1939
 2017-06-06 15:42:49 +02:00
Ghostkeeper
2fb7821972
Merge branch '2.6' 2017-05-31 17:17:32 +02:00
Ghostkeeper
654b9cfa1c
Fix global container stack variable 
The definition changes are only on the global container stack. That's the one that was meant here.

Contributes to issue CURA-3875.
 2017-05-31 17:17:11 +02:00
fieldOfView
163707df01 Fix definition changes for UMO upgrade options 2017-05-31 17:03:42 +02:00
Mark
7bc715a9bd fixed too big dialogs and hidden checkboxes 2017-05-31 12:46:07 +02:00
Ghostkeeper
cbe4891784
Merge branch '2.6' 2017-05-30 13:36:04 +02:00
Mark
6ba2764efc Use .3mf on MacOS as project extension 
CURA-3886
 2017-05-30 09:57:41 +02:00
Tim Kuipers
3b62c4a59a fix: changelog attribution to community members (CURA-3879) 2017-05-29 16:31:11 +02:00
Tim Kuipers
b01f1bdbb3 feat: 2.6 beta changelog (CURA-3879) 2017-05-29 16:27:09 +02:00
Ghostkeeper
b8f290d835
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-29 15:40:24 +02:00
Ghostkeeper
8ec9337077
Merge branch 'feature_extruder_per_feature' 2017-05-29 15:40:06 +02:00
Lipu Fei
c977a895ee Merge branch '2.6' 2017-05-29 15:29:40 +02:00
Tim Kuipers
8365d866a3 feat: 2.6 beta changelog (CURA-3879) 2017-05-29 15:19:43 +02:00
Lipu Fei
8ede981a2c Set version in <fdmmaterial> when saving XML material files 
CURA-3884
 2017-05-29 14:19:52 +02:00
Jaime van Kessel
ca922e9e9d The monitor item is now actually used to display information on monitor page 
The UM3 now provides camera image in this way

CURA-3826
 2017-05-29 13:47:41 +02:00
Ghostkeeper
ce6814d45d Add default for colour code of material 
Otherwise you get an error that the colour code could not be found.

Fixes #1869.
 2017-05-24 15:20:59 +02:00
Jaime van Kessel
e6f61f3bbc When trying to convert None to RGBA, log it and return a usable default 
contributes to #1869
 2017-05-24 11:38:38 +02:00
Lipu Fei
29c883d489 Fix option_extruder case for per object settings panel 
CURA-3814
 2017-05-24 09:36:07 +02:00
Lipu Fei
9a08e0cc27 Only use <fdmmaterial version> for detecting material file version 
CURA-3540
 2017-05-23 11:51:31 +02:00
Jaime van Kessel
cc3402ab81 Added RunTime exception catching for image_reply 
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
 2017-05-22 14:50:03 +02:00
Jaime van Kessel
f9f0fa852f Added RunTime exception catching for image_reply 
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
 2017-05-22 14:48:42 +02:00
Jaime van Kessel
4b826b747b Added exception handling to XML parsing 
CURA-3843
 2017-05-19 13:54:31 +02:00
Jaime van Kessel
75b3f08318 Removed unneeded logging 
THis caused a massive logging spam
 2017-05-19 13:09:41 +02:00