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

1520 Commits

Author SHA1 Message Date
Thomas Karl Pietrowski
cf55178a11 Removing unused code 
We are collecting here a lot of data, which doesn't get submitted.
 2016-09-05 19:05:26 +02:00
Thomas Karl Pietrowski
dd02243790 SliceInfo: Adding log message and pass exception 
* removes unused "e"
* Using logException correctly

Conflicts:
	plugins/SliceInfoPlugin/SliceInfo.py
 2016-09-05 18:54:52 +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
Thomas Karl Pietrowski
6688b99cae CURA-1445: Adding md5 hashes 
... for every model placed on the build plate.
 2016-09-03 14:03:18 +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
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