GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 08:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,653 Commits 291 Branches 260 Tags
Commit Graph

1172 Commits

Author SHA1 Message Date
fieldOfView
20c9cb2547 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-07 15:38:39 +02:00
fieldOfView
a998d59693 Fix setting heated bed upgrade option 
A new variant was created, but the property was set on the old variant.

CURA-2253
 2016-09-07 15:38:27 +02:00
Jaime van Kessel
bbb211b0f6 Saving profile to g-code with empty container no longer results in empty string 2016-09-07 15:28:58 +02:00
fieldOfView
8c2a8944e8 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-07 13:57:21 +02:00
fieldOfView
fe34938bce Update wording 2016-09-07 13:57:09 +02:00
Simon Edwards
cce94c8043 Added skin_overlap <= infill_overlap mapping. 
Contributes to CURA-844 Profile converter 2.1 ==> 2.2
 2016-09-07 11:32:25 +02:00
Simon Edwards
86369ce1da Profile import now supports 2.1 profiles and does any needed conversion work. 
Contributes to CURA-2252 Import ini profile fails in 2.3
 2016-09-07 11:13:25 +02:00
Jaime van Kessel
1bafac94bd Value functions are now correcty copied when using per-object settings 
CURA-2224
 2016-09-07 09:55:22 +02:00
fieldOfView
7a6124f221 Get the overhang angle from the proper multiextrusion stack 
CURA-2289
 2016-09-06 14:58:29 +02:00
fieldOfView
fc6e92e10f Fix uploading custom firmware on windows 
The simple string replacement left an extraneous "/" in front of the path, which Windows can't handle. QUrl.toLocalFile() does a proper conversion.

CURA-955
 2016-09-06 13:07:15 +02:00
fieldOfView
edd9643703 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-06 10:56:38 +02:00
Jaime van Kessel
6db03538a1 Removed capital letter 
CURA-955
 2016-09-06 09:23:20 +02:00
Jaime van Kessel
d1eb8231a1 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-06 09:09:20 +02:00
Jaime van Kessel
71e6733c8e Firmware update logging now uses correct path 
CURA-955
 2016-09-06 09:08:46 +02:00
fieldOfView
fcf89b79c6 Update wording of error messages 2016-09-06 08:55:32 +02:00
fieldOfView
2380614bd8 Update wording of error messages 
Clearly list problem first, followed by possible resolvement.
 2016-09-06 08:43:00 +02:00
fieldOfView
5f3ec7c910 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-05 16:29:27 +02:00
fieldOfView
bd8db49a95 Add layer data type and color for Support Interface 
CURA-2049
 2016-09-05 16:29:15 +02:00
Jaime van Kessel
de8785da37 All machines that suport USB connection now get the upgrade firmware action for free! 
CURA-955
 2016-09-05 15:48:31 +02:00
Jaime van Kessel
66f773434f UpgradeFirmwareAction now supports custom firmware uploading 
CURA-955
 2016-09-05 15:42:09 +02:00
Jaime van Kessel
2c82f5a177 Instead of writing quality + user to g-code, we now write quality_changes + user 2016-09-02 16:36:49 +02:00
fieldOfView
d610a30ccb Fix overhang display if the overhang angle is set to its default value 2016-09-02 13:17:31 +02:00
Jaime van Kessel
6c9b04182c Minor text change in changelog 
CURA-2218
 2016-09-02 13:06:10 +02:00
Jaime van Kessel
d7d1804319 Added correct exception handling for .curaprofile importing 
CURA-2252
 2016-09-02 10:16:11 +02:00
Jaime van Kessel
7451e9d6ae Removed auto-temp from changelog 
We didn't actually finish it, so it shouldn't be in changelog
 2016-09-02 09:19:55 +02:00
Jaime van Kessel
c65e79a5db Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-01 16:52:13 +02:00
Jaime van Kessel
697329f5d2 Fixed review issues 
CURA-2108
 2016-09-01 16:43:40 +02:00
fieldOfView
a2d74cc984 Fix documentation 2016-09-01 16:23:06 +02:00
Jaime van Kessel
392e3a4385 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-01 14:45:00 +02:00
Jaime van Kessel
a68e112060 Fixed resolvement not being overwritten by user changes 2016-09-01 14:44:29 +02:00
fieldOfView
aa689dc2fb Fix layerview for grouped objects 
The "ghosts" would be rendered over grouped objects, thereby making them not visible. Note that this quick fix comes at the price of slightly "muddying" all the layerview colors. A better fix was proposed here (but it is not yet working correctly): https://github.com/Ultimaker/Cura/pull/906

CURA-2246
 2016-09-01 13:34:18 +02:00
Jaime van Kessel
bef410b4a3 Machines are now flattened before merging them 
This ensures that machines are overwritten correctly

CURA-2108
 2016-09-01 11:26:13 +02:00
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