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

5951 Commits

Author SHA1 Message Date
Jaime van Kessel
bacac1e42e XML material profile merging is now far less naive. 
It's still a work in progress, as it doesn't succeed in all cases just yet.

CURA-2108
 2016-09-01 11:25:52 +02:00
Jaime van Kessel
1fda24c43f Removed dead code 
CURA-2108
 2016-08-31 15:09:04 +02:00
Jack Ha
c10f04d638 Typo in changelog 2016-08-31 12:53:14 +02:00
Jaime van Kessel
32b9d20647 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-31 09:32:12 +02:00
Jaime van Kessel
a1e315ef95 Updated changelog 
CURA-2000
 2016-08-31 09:31:19 +02:00
jack
3ead74ea17 Merge pull request #957 from Ultimaker/feature_layerview_ghosts2 
Show "ghosts" for all objects on the buildplate in layerview
 2016-08-30 17:06:35 +02:00
Jaime van Kessel
fbbbdb61e3 Merge branch 'feature_material_inheritance' of github.com:Ultimaker/Cura 2016-08-30 16:05:10 +02:00
Jaime van Kessel
1940d45971 Added way to acces inherited files 
CURA-2108
 2016-08-30 16:04:05 +02:00
Jaime van Kessel
7a54f21633 Added inherited_files property 2016-08-30 14:51:27 +02:00
Jaime van Kessel
6a2e5ffe77 Added inheritance support to XML material profile deserialization 
CURA-2108
 2016-08-30 14:48:34 +02:00
fieldOfView
a8d8a8a7ed CodeStyle 2016-08-30 14:09:16 +02:00
fieldOfView
4593e8615e Fix hiding extruder selection when switching to a signle extrusion printer 
CURA-2207
 2016-08-30 14:08:29 +02:00
fieldOfView
b0d0d81dc3 Revert "Render ghost behind all objects in layerview" 
I did not mean to merge this yet.

This reverts commit 18e1fc59daabfe1b27d1cb9529d129880a158ee2.
 2016-08-30 13:32:33 +02:00
fieldOfView
46ee6c0713 Show "ghosts" for all objects on the buildplate in layerview 
Simpler implementation that works.
CURA-1601
 2016-08-30 13:27:19 +02:00
fieldOfView
18e1fc59da Render ghost behind all objects in layerview 
CURA-1601
 2016-08-30 13:21:58 +02:00
Jaime van Kessel
1ef24c9e9d CHanged function called by bedlevel action qml 
CURA-2199
 2016-08-29 16:35:39 +02:00
Jack Ha
e0e1147708 Somewhat working materialspage duplicate. Contributes to CURA-1969 2016-08-29 14:40:37 +02:00
Jack Ha
2daf0b1683 Cleanup after mistakenly committing crap. 2016-08-29 09:42:35 +02:00
Jack Ha
6a2c97e4ac Merge 2016-08-29 09:31:28 +02:00
fieldOfView
30a679ddf9 Reduce loadingtime of XmlMaterialProfiles by 25% 
XmlMaterialProfile did a lot of findInstanceContainers() by GUID and base_file. If base_file is always set, matching GUID is superfluous.

This shaved off 20% loading time of the application (43 vs 34 seconds) on a cached load.
 2016-08-26 17:18:35 +02:00
fieldOfView
43438dd84f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-26 17:02:35 +02:00
fieldOfView
0e2d35a88d Use parseBool instead of inline variation 
CURA-2138
 2016-08-26 17:02:21 +02:00
Jaime van Kessel
af4ea9183c Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-26 16:23:47 +02:00
Jaime van Kessel
7a7b634108 Eject message is now hidden when eject is done 
CURA-2200
 2016-08-26 16:23:23 +02:00
Jaime van Kessel
fcfbf78f9e Implemented importing multiple profiles from .curaprofile file 
CURA-2099
 2016-08-26 14:37:21 +02:00
fieldOfView
baad88fb6c Remove incorrectly copy/pasted code 
CURA-2199
 2016-08-26 13:22:21 +02:00
Jaime van Kessel
ced6cd7320 Exporting a profile now exports all profiles in a zipped container 
CURA-2099
 2016-08-26 12:55:31 +02:00
Jaime van Kessel
8810fd83cc Slecting object no longer causes slice to trigger 
CURA-2181
 2016-08-25 14:34:05 +02:00
Jaime van Kessel
4f594c9cf3 Removed the timeout for the eject SD card message 2016-08-25 14:21:26 +02:00
Jaime van Kessel
656a56632e Socket is now re-created if terminate is called and there is no engine process 
CURA-2158
 2016-08-25 11:44:46 +02:00
Jaime van Kessel
f9c66526b6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-25 10:50:38 +02:00
Jaime van Kessel
6c0aa0fa4f Tweaks to slicing engine restart behavior 
CURA-2158
 2016-08-25 10:49:35 +02:00
Jack Ha
2ae998737f Added materialspage Display Name field and made it work. CURA-1969 2016-08-25 09:54:22 +02:00
Seva Alekseyev
8ba9ff53e5 X3D loading performance: vertex organization for faster transforms 2016-08-24 17:28:31 +02:00
Seva Alekseyev
a43efcde05 Code review issues 2016-08-24 17:28:30 +02:00
Seva Alekseyev
13ead1e4de Holeless Disk2D fix 2016-08-24 17:28:30 +02:00
Seva Alekseyev
a27f82e64b Merging all shapes into a single mesh during X3D loading 2016-08-24 17:28:30 +02:00
Seva Alekseyev
5cb9f97986 Slicing logic now index-aware, correctly processes scenes with vertex reuse 2016-08-24 17:28:30 +02:00
Seva Alekseyev
8190b9875e In X3D import, setSelectable(true) for the whole scene 2016-08-24 17:28:30 +02:00
Seva Alekseyev
d9e07f66a6 Fixes for quad geometries 2016-08-24 17:28:30 +02:00
Seva Alekseyev
db5d238898 Fix for the Extrusion node, the trickiest geometry of them all 2016-08-24 17:28:30 +02:00
Seva Alekseyev
43de0e1c06 Bug fix 2016-08-24 17:28:30 +02:00
Seva Alekseyev
87bff34eb6 Support for explicit length unit override in X3D header 2016-08-24 17:28:30 +02:00
Seva Alekseyev
e4049296d9 Initial support for the X3D scene file format (see http://www.web3d.org/). 
For now, just mesh import. Supports all geometry nodes in Rendering, Geometry3D, CAD geometry modules. No support for materials, color, or textures. Normals in the file (if any) are ignored. Light sources, viewpoints, sensors, world, shaders, scripts also ignored.
 2016-08-24 17:28:30 +02:00
Jaime van Kessel
8df5bba6e9 Removing auto rename if certain properties are changed 2016-08-24 17:11:29 +02:00
Jaime van Kessel
221da85783 Backend state is now set to processing when cura frontend is done sending 
This is instead of waiting for the backend to send it's first progress message.
This gives the feel of a more snappy response.
 2016-08-24 16:59:12 +02:00
Jaime van Kessel
3b9a642d02 Disabled renaming if type of material is changed by user 
CURA-1968
 2016-08-24 16:30:13 +02:00
Jaime van Kessel
3a921264fc Explicitly check label xml element if it's none 
For some stupid reason, an XML element evaluates to false.
CURA-1968
 2016-08-24 16:10:21 +02:00
Jaime van Kessel
a904067d7a Added label property to XML profile (as per 1.2 spec) 
CURA-1968
 2016-08-24 15:50:12 +02:00
Ghostkeeper
d046cd764a
Update version upgrade system for new quality-changes profiles 
The quality profile now sometimes gets updated to a quality profile, and sometimes to a quality-changes profile, depending on whether the profile is built-in or not.

Contributes to issue CURA-2006.
 2016-08-24 14:35:40 +02:00