Commit graph

6996 commits

Author SHA1 Message Date
Arjen Hiemstra
d3f58a049b Add missing ":" 2016-12-08 13:22:24 +01:00
Arjen Hiemstra
c212014d88 Fix VersionUpgrade to handle both formats of ContainerStack files
Contributes to CURA-3098
2016-12-08 13:16:37 +01:00
Jack Ha
ab16722047 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-08 12:45:50 +01:00
Jack Ha
701eba3a0e Made 3mf mesh centering more robust. 2016-12-08 12:45:38 +01:00
Jaime van Kessel
0f910ae7a2 Merge branch 'master' of github.com:Ultimaker/Cura into project_save_dialog 2016-12-08 12:37:40 +01:00
Jaime van Kessel
1752c56272 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-08 12:37:20 +01:00
Jaime van Kessel
7ed5a7768a Use logException instead of just log for project loading
CURA-1263
2016-12-08 11:59:37 +01:00
Jaime van Kessel
36d743384c Initial work for adding a save dialog for project saving
CURA-1263
2016-12-08 11:56:42 +01:00
Arjen Hiemstra
3449108d59 Update 3MFWorkspaceReader to handle the new format of ContainerStack
Contributes to CURA-3098
2016-12-08 11:53:15 +01:00
Jack Ha
0d023a196e Code layout. CURA-2763 2016-12-08 11:21:30 +01:00
jack
332ef2ed19 Merge pull request #1228 from Ultimaker/extruder_tab_layout
Added hover color for machine selection. CURA-2763
2016-12-08 11:19:51 +01:00
Jack Ha
054e73383d Added hover color for machine selection. CURA-2763 2016-12-08 11:12:48 +01:00
Simon Edwards
70affc46a3 Merge pull request #1224 from Ultimaker/extruder_tab_layout
Extruder tab layout CURA-2763
2016-12-08 11:11:13 +01:00
Jaime van Kessel
bc8a9c30cf Use right type for logging
CURA-1263
2016-12-08 10:58:17 +01:00
Jaime van Kessel
96f82c1d73 Build volume now works correctly for single extrusion machines
CURA-3105
2016-12-08 10:54:13 +01:00
jack
035ced7ea0 Merge pull request #1226 from fieldOfView/theme_fixes
Tweak 2.4 sidebar changes
2016-12-08 10:41:51 +01:00
Ghostkeeper
9f7f181e33
Update Nylon profiles
This is an update from our materials team.
2016-12-08 10:28:11 +01:00
fieldOfView
ace4bfba10 Fix QML error about use of anchors in a row 2016-12-07 22:30:31 +01:00
fieldOfView
d67395b42b Codestyle & documentation update 2016-12-07 22:23:06 +01:00
fieldOfView
bd4cac53b4 Fix colors to adhere to hig 2016-12-07 22:10:22 +01:00
fieldOfView
18fb379fbe Add tooltips for Setup/Monitor and Recommended/Custom tabs 2016-12-07 19:40:33 +01:00
fieldOfView
e642b4ebe9 Tweak 2.4 sidebar changes
* Make extruder-tabs more clear on badly calibrated displays
* Make infill selection same width as other "Recommended" controls
* Move printer selection to the top bar
* Add animation to support extruder selection combobox
2016-12-07 17:41:04 +01:00
jack
9d2768c27a Merge pull request #1215 from Ultimaker/upgrade_to_2.4
CURA-2953 Version upgrade 2.3 to 2.4
2016-12-07 16:58:31 +01:00
Jack Ha
7694b8f128 Cannot do it simpler. CURA-2763 2016-12-07 15:40:25 +01:00
Jack Ha
4ecd1a0fe3 Simplifying layout by removing unneeded elements. CURA-2763 2016-12-07 15:16:47 +01:00
Jack Ha
67f1afb9ce Revert "Show extruder tabs only in custom mode. CURA-2763"
This reverts commit f916c9b4cf.
2016-12-07 14:32:40 +01:00
Ghostkeeper
34a8ba49e9
Update quality profiles
These are the latest profile updates from materials.
2016-12-07 13:47:16 +01:00
Jaime van Kessel
ba55c37850 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-07 12:58:14 +01:00
Jaime van Kessel
d326f175c9 Build volume is now correctly drawn if there is no object & bed adhesion is none
CURA-2625
2016-12-07 12:57:30 +01:00
Ghostkeeper
178e7c8a82
Adjust cool down speed modifier default
This is part of the weekly profile update from the materials team.
2016-12-07 12:03:43 +01:00
Arjen Hiemstra
b1e8b01549 Reduce time spent in "Preparing to slice" by optimizing vertex data sending
This effectively is a limited form of MeshData::getTransformed that ignores
normals and performs a faster transformation.

Contributes to CURA-2687
2016-12-06 17:35:26 +01:00
Simon Edwards
e1d7a9faec Properly support the extrauder trains.
CURA-2953 Version upgrade 2.3 to 2.4
2016-12-06 17:03:35 +01:00
Tim Kuipers
976f822158 JSON fix: give pre_print_temp and post_print_temp back their default_temp 2016-12-06 16:49:57 +01:00
Jaime van Kessel
126b6d75dd Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-06 16:43:47 +01:00
Jaime van Kessel
2f98917a17 Travel avoid distance is now only used for extruder that actually prints
CURA-2625
2016-12-06 16:39:12 +01:00
Jack Ha
f916c9b4cf Show extruder tabs only in custom mode. CURA-2763 2016-12-06 16:32:34 +01:00
Jack Ha
3efc5d63ef Improved layout, removed material name from extruder name. CURA-2763 2016-12-06 16:11:08 +01:00
Ghostkeeper
e1b4379c74
Add park distance setting
As a result, the description of the other two settings no longer needs to mention that it is used by the park distance.

Contributes to issue CURA-2795.
2016-12-06 16:01:08 +01:00
Jack Ha
b120cba148 Better colors. CURA-2763 2016-12-06 15:56:20 +01:00
Jack Ha
30a74fb2c1 Layout changes, extruders are now displayed as extruder tabs. CURA-2763 2016-12-06 15:49:34 +01:00
Jaime van Kessel
9f13338c17 Codestyle 2016-12-06 14:28:25 +01:00
Jaime van Kessel
2cf82d1b0b Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-06 14:22:41 +01:00
Jaime van Kessel
3e54c86c88 Updated documentation for MachineActions 2016-12-06 14:21:57 +01:00
Jack Ha
a65a81e60b colours 2016-12-06 14:14:24 +01:00
Jack Ha
ed7ec58822 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-06 11:52:14 +01:00
Jack Ha
64c0cbd0a4 Fix clean config cura, recommended mode support extruder update. CURA-3033 2016-12-06 11:48:49 +01:00
Tim Kuipers
f4979be5cb JSON fix: description of speed_travel_layer_0 now includes explanation of inheritance function (CURA-3066) 2016-12-06 11:48:04 +01:00
Jaime van Kessel
5aa394b197 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-06 11:39:37 +01:00
Jaime van Kessel
58e7e6ef5a Added default_printing_temperature property
CURA-2586
2016-12-06 11:38:56 +01:00
Jack Ha
e846a9aebc Added logging for CURA-2918 2016-12-06 10:46:47 +01:00