GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 22:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,438 Commits 286 Branches 260 Tags
Commit Graph

4438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jaime van Kessel
aac19c94a3 Removing a profile now forces a reset of selection 
Fixes CURA-2169
 2016-08-24 13:51:33 +02:00
Jaime van Kessel
3012690abc Also added logging to indicate failure 
CURA-2169
 2016-08-24 13:38:59 +02:00
Jaime van Kessel
b1ae25fb92 Removing containers now returns false if it was unable to remove containers 
CURA-2196
 2016-08-24 13:34:40 +02:00
Jaime van Kessel
e05bb54047 SelectContainer now uses name instead of ID 
CURA-2162
 2016-08-24 13:21:53 +02:00
Jaime van Kessel
9c895d2f31 Added more logging to container duplication 
CURA-2162
 2016-08-24 13:03:51 +02:00
Jaime van Kessel
114899dc91 Merge branch 'cura-2007' of github.com:Ultimaker/Cura 2016-08-24 12:39:33 +02:00
Jaime van Kessel
cbb50eeec6 Added more logging to renaming 
CURA-2165
 2016-08-24 11:51:47 +02:00
Jack Ha
9521a85318 Fix resolve in profile bug. Removed unnecessary imports. Removed unnecessary watch. Contributes to CURA-2007 2016-08-24 11:36:10 +02:00
fieldOfView
d3a0c0fa77 Add documentation 
CURA-2138
 2016-08-24 09:09:09 +02:00
fieldOfView
27b3bd829d Add converted CPE+, PC, TPU & Nylon profiles for UM2+ 
CURA-2138
 2016-08-23 23:03:17 +02:00
fieldOfView
6b6d763657 Make globally incompatible materials not show up in menus 
CURA-2138
 2016-08-23 22:58:37 +02:00
fieldOfView
9496e25e7b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-23 22:10:16 +02:00
fieldOfView
eb176847be Implement "hardware compatible" for XmlMaterialProfile 
CURA-2138
 2016-08-23 22:09:56 +02:00
Ghostkeeper
36a33bb135
Retain quality profile when switching from no quality-changes profile 
The old quality-changes profile was 'empty_quality_changes', not None.

Contributes to issue CURA-2006.
 2016-08-23 17:27:09 +02:00
Ghostkeeper
f9e0e457ea
Retain active quality-changes when changing material 
This wasn't updated yet for the new quality-changes functionality.

Contributes to issue CURA-2006.
 2016-08-23 17:27:09 +02:00
Ghostkeeper
9ba9e90a8f
Turn if-clause into simple input check 
Makes the code more readable in my opinion.

Contributes to issue CURA-2006.
 2016-08-23 17:27:09 +02:00
fieldOfView
35fedbdad6 Don't break the currentExtruderIndex binding 
CURA-2177
 2016-08-23 17:12:55 +02:00
fieldOfView
f1ee6b2b15 Update VersionUpgrade21to22 for new materials 2016-08-23 13:56:20 +02:00
fieldOfView
49ab5d0457 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-23 13:54:38 +02:00
fieldOfView
86ad1777af Fix setting weight of upgraded profile 
self._weight sometimes becomes an int, and ConfigParser does not like ints.
 2016-08-23 13:54:03 +02:00
Jack Ha
0268bf3f56 Cleanup. CURA-2007 2016-08-23 13:18:20 +02:00
Ghostkeeper
8fd3047380
Only take the active machine if not settable per extruder 
Settable per mesh should only have an effect on the per-object settings. This was misguided of me earlier.

Contributes to issue CURA-2006.
 2016-08-23 11:53:57 +02:00
Ghostkeeper
9581257df5
Don't bind provider when setting is per mesh 
This causes settings which are settable per mesh but not per extruder to be configurable per extruder even though they have a linked icon.

Contributes to issue CURA-2006.
 2016-08-23 11:53:57 +02:00
Jaime van Kessel
47d5039c04 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-23 11:53:43 +02:00
fieldOfView
53ce8bc4c9 Fix typo 2016-08-23 11:50:46 +02:00
Jaime van Kessel
e495534219 Rapid succesion of tool operations no longer freeze interface on Ubuntu 
CURA-2158
 2016-08-23 11:50:28 +02:00
fieldOfView
4e6756802f Correct position of prime_tower disallowed area 
CURA-2155
 2016-08-23 11:36:34 +02:00
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +02:00
fieldOfView
344be2687e Display the appropriate profile settings on Profiles page 
CURA-2006
 2016-08-22 22:38:13 +02:00
fieldOfView
cfb062718f Fix creating a clone of criteria 
CURA-2006
 2016-08-22 21:43:32 +02:00
fieldOfView
0f998c6e2e Fix qml warnings 
CURA-2006
 2016-08-22 19:25:42 +02:00
fieldOfView
08091209f1 Fix profile display for printers without machine-specific material profiles 
CURA-2006, CURA-1774
 2016-08-22 19:21:44 +02:00
fieldOfView
62e815a3d8 Fix qml warning 
CURA-2006
 2016-08-22 19:16:59 +02:00