GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 23:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,877 Commits 291 Branches 265 Tags
Commit Graph

913 Commits

Author SHA1 Message Date
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
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
Arjen Hiemstra
57f63bfc73 Update material container's name when its "material" metadata key changes 
Contributes to CURA-342
 2016-07-11 14:57:28 +02:00
Arjen Hiemstra
f49528b71f Do not try to set base_file metadata if it was never set before 
Contributes to CURA-341
 2016-07-11 14:57:28 +02:00
Jack Ha
0745b3bbf5 Unbreak LayerView. 
CURA-1381
 2016-07-11 10:29:21 +02:00
Jaime van Kessel
b48db45a37 Merge pull request #859 from thopiekar/master-CURA-1831-newer 
[CURA-1831] Adding only the basic workaround for OSX
 2016-07-11 09:22:08 +02:00
Ghostkeeper
6fbac2f7ee Better fallbacks if MachineInstance missing profiles 
They now fallback to "empty" so that it can still construct a valid
instance, albeit with a missing profile (such as material), if some
profile is missing from the original machine instance file.

Contributes to issue CURA-844.
 2016-07-11 00:49:18 +02:00
Thomas-Karl Pietrowski
a854554d94 CURA-1831: Adding only the basic workaround for OSX 2016-07-08 16:56:12 +02:00
Jaime van Kessel
25d13969ee Filename is now correctly set for 3mf 
CURA-1622
 2016-07-08 15:58:33 +02:00
Jaime van Kessel
19933cb4e7 Improved robustness of Platform physics by checking if the hulls are calculated before trying to intersect them. 
fixes CURA-1827
 2016-07-08 15:17:28 +02:00
Jaime van Kessel
1ced206c5d Codestyle 2016-07-08 14:12:44 +02:00
fieldOfView
c36af13daf Fix PerObjectSettings, which were broken due to the material editing merge 
CURA-342
 2016-07-07 18:25:20 +02:00
fieldOfView
8d56d25a8e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-07 18:11:29 +02:00
fieldOfView
a774f06237 Hide checks if the printer is not connected, hide bed temperature if no bed is installed 
CURA-1385
 2016-07-07 17:54:43 +02:00
awhiemstra
90af9e3986 Merge pull request #846 from Ultimaker/feature_material_editing 
Material Editing Support
 2016-07-07 17:34:57 +02:00
Arjen Hiemstra
571523e0ef Ensure an XML material always has a description and adhesion_info metadata entry 
Contributes to CURA-342
 2016-07-07 17:30:39 +02:00
fieldOfView
66dd4a7a50 Add exception logging 
CURA-1385
 2016-07-07 17:08:03 +02:00
Jack Ha
6374eee7b4 Fix LayerView cursor issue. 
CURA-1381
 2016-07-07 16:55:56 +02:00
Jack Ha
3e869048fd Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 16:23:53 +02:00
Jack Ha
342d4f1b82 Changed tooltip extremely small. 
CURA-1671
 2016-07-07 16:23:27 +02:00
Jaime van Kessel
c38797b4fe Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 16:15:12 +02:00
Jaime van Kessel
a76f6375c7 Added way to stop the heating of bed / hotend in checkup 
CURA-1385
 2016-07-07 15:56:14 +02:00
Ghostkeeper
9d1ea28b49
Remove old commented-out code 
The function it calls no longer exists. The protobuf message it listens to was renamed and the renamed message is properly listened to in the line above.

Contributes to issue CURA-1687.
 2016-07-07 15:51:25 +02:00
Ghostkeeper
8f5e56c66e
Make documentation specify filename without extension 
Contributes to issue CURA-844.
 2016-07-07 15:22:27 +02:00