Commit graph

17030 commits

Author SHA1 Message Date
Jaime van Kessel
8046e72a10 Added missing file 2016-08-26 09:35:21 +02:00
Jaime van Kessel
e6aec0c64b Use curas own visibility page instead of default by Uranium 2016-08-25 21:21:44 +02:00
Jaime van Kessel
f963ab0fde Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-25 20:46:52 +02:00
Jaime van Kessel
c7126775d5 Fix spelling mistake 2016-08-25 20:46:36 +02:00
fieldOfView
9f2c5a4c92 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-25 17:07:45 +02:00
fieldOfView
94b8e1aff0 Add UM2Ex+ profiles for Nylon, PC, CPE+ and TPU
Contributes to CURA-2138. Ideally these would not have to be copies from the UM2+ profiles. This should be picked up for CURA-1780
2016-08-25 17:07:28 +02:00
Jaime van Kessel
bda6b3067a Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-25 14:34:33 +02:00
Jaime van Kessel
8810fd83cc Slecting object no longer causes slice to trigger
CURA-2181
2016-08-25 14:34:05 +02:00
Ghostkeeper
223489a637
Make mesh-specific global setting solution permanent
We've considered various other solutions but this is the only real solution available to us.

Contributes to issue CURA-2173.
2016-08-25 14:33:53 +02:00
Jaime van Kessel
4f594c9cf3 Removed the timeout for the eject SD card message 2016-08-25 14:21:26 +02:00
fieldOfView
5119a7b6be Add a smidgen of documentation to the previous commit
CURA-2173
2016-08-25 14:08:37 +02:00
fieldOfView
3ca7e2bb8d Momentary fix for CURA-2173
We're not sure about the location and implementation but it fixes an important bug for now. At the very least this needs documentation.
2016-08-25 13:57:21 +02:00
fieldOfView
1b4283257f Make Simple Mode reflect global settings (Support, Adhesion) 2016-08-25 13:41:39 +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
fieldOfView
983d0dd999 Merge commit 'dd647ca07c' 2016-08-25 10:55:31 +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
fieldOfView
5a710175a1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-25 10:46:34 +02:00
fieldOfView
043343d536 Select correctly "inherited" profile when switching to a material that has no qualities of its own
CURA-2095
2016-08-25 10:46:19 +02:00
Jack Ha
77b58d8231 MaterialsPage material label is now also updated after rename. CURA-1969 2016-08-25 10:37:11 +02:00
Jack Ha
2ae998737f Added materialspage Display Name field and made it work. CURA-1969 2016-08-25 09:54:22 +02:00
innovo3d
2e5ffbfe54 Another update to Inventor Json file
Added speed support interface speed
2016-08-24 18:54:37 -05:00
innovo3d
c3ae924ae5 Updated innovo_inventor.def.json settings
Added M140 to turn off heated bed
Changed default extruder temp to 205
Changed print speed defaults
Removed infill overlap override
Removed machine preferences
2016-08-24 18:48:11 -05: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
Ghostkeeper
3b8e84b689 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-24 16:34:32 +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
Ghostkeeper
e460db0704
Update translation templates
These are not the final templates for the next version, but they are what we used for an inventory of the translation costs. I generated them. Might as well just commit the changes.
2016-08-24 16:25:39 +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
e1df8d74d3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-24 15:50:46 +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
Simon Edwards
d0cc37658a Move the combined object to the center of the group after a merge.
Contributes to CURA-2160 "Merging objects results in group jumping off the buildplate"
2016-08-24 15:47:44 +02:00
Jaime van Kessel
aa28ecca37 No longer possible to remove profiles that are in use
CURA-2168
2016-08-24 14:50:51 +02:00
Jaime van Kessel
3ec6c3b977 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-24 14:48:52 +02:00
Jaime van Kessel
17b34fb4e1 It's no longer possible to remove a material that is in use
CURA-2168
2016-08-24 14:48:20 +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
Ghostkeeper
368a836ff2
Move material translations to separate dictionary
This prevents a mix-up of how material names should be translated for quality profiles and how material names should be translated for material profiles.

Contributes to issue CURA-844.
2016-08-24 14:35:40 +02:00
Ghostkeeper
b836311d67
Remove double type-metadata
One was in metadata. That is the correct one. The other is unnecessary and was being ignored, but we don't need to write it.

Contributes to issue CURA-844.
2016-08-24 14:35:40 +02:00
Jaime van Kessel
a177b61153 Renaming a profile will now also reset selection
This forces an update of the display data. Fixes CURA-2164
2016-08-24 13:56:51 +02:00