GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,033 Commits 293 Branches 266 Tags
Commit Graph

991 Commits

Author SHA1 Message Date
fieldOfView
ac4b6c092f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-26 10:17:05 +02:00
Jaime van Kessel
76723c2412 Removed 50 ms delay in staring top layer calculation 2016-07-26 09:55:04 +02:00
Thomas Karl Pietrowski
8597b5c9be CURA-1923: SliceInfo: Sending data threaded 
The idea is to make the sending process, so it won't block the UI until the data is sent or the timeout has reached.
This commit does the following:
* Increasing the timeout to 5s
-> As we are sending our data threaded now this won't hurt. At least for clients in slow networks.
* Moving section for "sending data to info_url" into a seperate thread.
* Starting the thread instead and collecting all threads in a list
* Removing all threads from the list, if they have already finished their work.
* When the SliceInfo Extension gets __del__'d, it will wait for the threads until they finish.

Contributes to CURA-1923
 2016-07-25 22:25:26 +02:00
fieldOfView
85f53be9e2 Tone down striped shader colors 2016-07-25 21:59:37 +02:00
fieldOfView
785d7cf6d1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 18:01:23 +02:00
fieldOfView
4014cb11f9 Reinstate UMO wizard 
CURA-1732
 2016-07-25 18:00:17 +02:00
Tim Kuipers
c6e9e62e73 Merge branch 'layerview_dev' of https://github.com/Johan3DV/Cura into Johan3DV-layerview_dev 2016-07-25 16:41:13 +02:00
Jaime van Kessel
70242ba502 Saving a file no longer causes a re-slice 
CURA-1933
 2016-07-25 15:44:16 +02:00
Jaime van Kessel
b28cf14288 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 13:51:27 +02:00
Thomas Karl Pietrowski
93a0637b23 Merge pull request #866 from thopiekar/master-CURA-1445-only 
CURA-1445: Using getDisplayString(ISO8601) in SliceInfo
 2016-07-25 13:42:26 +02:00
Thomas Karl Pietrowski
d9839ee41d SliceInfo: Using getDisplayString(ISO8601) instead 2016-07-25 13:40:19 +02:00
fieldOfView
ac0de58ecb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 11:30:47 +02:00
fieldOfView
374ec8e577 Don't show user/quality emphasis on Per Object Settings 2016-07-25 11:30:30 +02:00
Jaime van Kessel
5d19113f8e Merge branch 'feature_stripe_shader' of github.com:Ultimaker/Cura 2016-07-25 10:51:45 +02:00
Jaime van Kessel
6883747671 Merge branch 'feature_remove_global_tab' of github.com:Ultimaker/Cura 2016-07-25 10:47:52 +02:00
Ghostkeeper
54685e8898
Rename setting skirt_minimal_length to skirt_brim_minimal_length 
Also updated the description and made it a bit more accurate. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
 2016-07-22 17:12:34 +02:00
Ghostkeeper
d4f96ab62d
Rename setting skirt_line_width to skirt_brim_line_width 
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
 2016-07-22 17:00:30 +02:00
Ghostkeeper
cb4c1fd08c
Rename skirt_speed to skirt_brim_speed 
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
 2016-07-22 16:45:11 +02:00
fieldOfView
6cc6e79e65 Stripe objects that are outside the build volume 
This way they can not be confused with objects that are rendered with a (future) grey materialcolor.
 2016-07-22 14:24:52 +02:00
Johan K
4c402e5bb7 Removed the layer data empty guard in ProcessSlicedLayers as the problem was solved in the backend. 2016-07-22 10:22:07 +02:00
Johan K
c6790981d6 Merge branch 'master' of https://github.com/Ultimaker/Cura into layerview_dev 2016-07-22 10:21:41 +02:00
fieldOfView
7302baa7da Add icon to settings that can only be set globally (for all extruders) 
CURA-1758
 2016-07-21 15:12:25 +02:00
Jaime van Kessel
8eef34ac45 USB printer connection is now reset when print is completed 
CURA-1822
 2016-07-21 10:30:22 +02:00
Jaime van Kessel
33313ddb70 Fixed some imports for USB printing 2016-07-20 15:15:16 +02:00
Jaime van Kessel
6ec69d523b Fixed reloading meshes for 3mf 
CURA-1622
 2016-07-20 13:05:45 +02:00
Jaime van Kessel
f52a3c1b9d Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-19 16:56:43 +02:00
Jaime van Kessel
da047c6f90 Added benchmark time logs 2016-07-19 16:56:26 +02:00
Jack Ha
0bf037a160 Solved merge conflict 2016-07-19 10:27:59 +02:00
Jaime van Kessel
fd96e47117 Removed fixed height for checkup buttons again. 
Turned out that this was already fixed, so a fixed height isn't needed.

CURA-422
 2016-07-19 09:25:36 +02:00
Jaime van Kessel
48620801d1 Merge pull request #843 from thopiekar/master-CURA-1775 
[CURA-1775] CuraEngineBackend: Keep the last 200 lines of logged messages
 2016-07-18 16:51:18 +02:00
Jack Ha
2936ad508c Merge branch 'master' into cura-1707 2016-07-18 16:06:08 +02:00
Ghostkeeper
31901606b8
Properly translate default profiles 
Otherwise the machine instance doesn't get loaded.

Contributes to issue CURA-844.
 2016-07-18 16:02:41 +02:00
Jack Ha
b3837fbafd Raft thickness lowers the build volume. 
CURA-1707
Now adding more visuals for better UX.
 2016-07-18 16:02:24 +02:00
Jaime van Kessel
48d39ce387 material_guid is now also a setting in fdmprinter 
CURA-1836
 2016-07-18 11:46:12 +02:00
Jaime van Kessel
7a43164654 Both material weights & lengths are now exposed 
CURA-1038
 2016-07-15 15:49:25 +02:00
Jaime van Kessel
d48b4bf790 Material GUID is now sent to engine for each extruder 
CURA-1836
 2016-07-15 13:23:25 +02:00
Jaime van Kessel
bd183266c6 Forced size of heatup buttons in checkup 
CURA-422
 2016-07-15 13:11:36 +02:00
Johan K
3d413df215 Changed the point data type sent from the backend from int64 to float. 
Added extruder information to LayerPolygon
 2016-07-14 11:08:05 +02:00
Arjen Hiemstra
f92f0c52c6 Another stray conflict marker 2016-07-13 14:33:42 +02:00
Arjen Hiemstra
36c185e921 Remove stray git conflict markers 2016-07-13 14:31:20 +02:00
Arjen Hiemstra
3f1bd5b586 Update changelog with corrections done after release 
Also make sure to include all CureEngine features listed in the
online changelog

Contributes to CURA-1688
 2016-07-13 14:21:59 +02:00
Jaime van Kessel
ec0e19e175 Removed material profiles field from sliceinfo 2016-07-13 14:20:41 +02:00
Ghostkeeper
b33c2f9c25
Even better fallbacks for unknown subprofiles 
These fallbacks specify their types so that they can be found with the filters.

Contributes to issue CURA-844.
 2016-07-13 12:06:18 +02:00
Jaime van Kessel
de408666c3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-13 11:39:05 +02:00
fieldOfView
7eee1efa14 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-13 11:19:05 +02:00
fieldOfView
c37163059a Update wording to reflect the official HBK is also supported 2016-07-13 11:18:45 +02:00
Jaime van Kessel
726eb97d9f Machine_id instead of definition_id is now used to link extruders 
Contributes to CURA-1898
 2016-07-13 11:17:44 +02:00
Simon Edwards
642ea6791b When saving the quality profile data, also incorporate any user settings/changes. 
Contributes to CURA-1727 GCode Profile reading/writing: Broken and needs update
 2016-07-13 09:29:47 +02:00
Simon Edwards
64ecb114b8 Store the Quality profile for the 'global' and extruders in the gcode. Read in all of the quality profile during import. 
Contributes to CURA-1727 GCode Profile reading/writing: Broken and needs update
 2016-07-12 12:41:49 +02:00
Jaime van Kessel
b5aa7c3545 Remove the extruder id from settingoverride decorator if the machine does not have multi extrusion 
CURA-1876 & CURA-1768
 2016-07-12 10:34:58 +02:00