Commit graph

1880 commits

Author SHA1 Message Date
Jack Ha
a9a9390aa6 Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263 2016-12-14 16:52:49 +01:00
Simon Edwards
22012bdb1c Show the Z seam related settings after upgrade. CURA-2953 2016-12-14 13:52:07 +01:00
Ghostkeeper
f4fa3ac53f
Add translation for UM3 and UM3E from XML profiles
Otherwise it would remove all spaces and put everything lowercase, but that didn't work for UM3E.

Contributes to issue CURA-2575.
2016-12-14 13:50:16 +01:00
fieldOfView
9250520628 Fix variant before definition_changes 2016-12-14 13:08:18 +01:00
fieldOfView
dcae7575e4 Fix extraneous empty ("") container being added 2016-12-14 13:07:12 +01:00
fieldOfView
2c79efd8bd Fix [containers] items must be strings 2016-12-14 13:01:32 +01:00
Jaime van Kessel
0bdd06735e Fixed another race condition that sometimes triggered when loading projects
CURA-1263
2016-12-14 11:52:02 +01:00
Simon Edwards
a6194aa2cf Merge pull request #1242 from fieldOfView/fix_definition_changes_upgrade
Make sure definition_changes containers are not upgraded to stacks
2016-12-14 11:03:41 +01:00
Jaime van Kessel
998f127499 Material resolve box is reset properly
CURA-1263
2016-12-14 10:18:05 +01:00
Jaime van Kessel
8f5d410ff6 Only use T in temp command if num extruders is larger than 1 (instead of larger than 0) 2016-12-14 09:51:15 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
fieldOfView
5718ca7852 Make sure definition_changes containers are not upgraded to stacks 2016-12-13 12:04:04 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.
CURA-2917
2016-12-12 16:05:35 +01:00
Jack Ha
5b59f3660b Renamed PrintCore to print core 2016-12-12 11:28:00 +01:00
Jaime van Kessel
0d9355daab All added containers are now set as dirty, so they are saved
CURA-1263
2016-12-12 11:07:29 +01:00
jack
8fdc0a40ce Merge pull request #1235 from Ultimaker/project_save_dialog
Project save dialog
2016-12-12 10:41:49 +01:00
Ghostkeeper
ee19794d92
Sync terminology of print cores with the rest of Cura
In other places we've always used 'print cores' as two words.

Contributes to issue CURA-2947.
2016-12-11 17:41:29 +01:00
Jaime van Kessel
1a456253a0 Added not supported message to USB printing if it's not supported 2016-12-09 17:16:59 +01:00
Jack Ha
10375a57f2 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-08 17:24:36 +01:00
Jack Ha
94ccd4b04b Solve material properties not being saved. CURA-2586 2016-12-08 17:24:25 +01:00
Simon Edwards
b700b3a4d9 "print cores" -> "PrintCores".
CURA-2947 Message "Would you like to update ... into Cura?" not clear
2016-12-08 16:57:53 +01:00
Simon Edwards
882f4c1aef Make the other parts of the Cura UI which have a filter, also search on i18n labels.
CURA-2653 Searching in English while other language set
2016-12-08 16:55:22 +01:00
Simon Edwards
0e3ffe997a Improved text.
CURA-2947 Message "Would you like to update ... into Cura?" not clear
2016-12-08 16:00:49 +01:00
Simon Edwards
81ffc3ae4b Import 'os' directly because we use it directly, even though it still works with out it.
CURA-2953
2016-12-08 15:10:52 +01:00
Arjen Hiemstra
ae389742ff Update OSX removable drive code to handle 10.12 plist format
Fixes CURA-2618
2016-12-08 14:23:33 +01:00
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
Jaime van Kessel
bc8a9c30cf Use right type for logging
CURA-1263
2016-12-08 10:58:17 +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
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
Jaime van Kessel
9f13338c17 Codestyle 2016-12-06 14:28:25 +01:00
Jaime van Kessel
3e54c86c88 Updated documentation for MachineActions 2016-12-06 14:21:57 +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
Simon Edwards
724cc99f59 Make things neater.
CURA-2953 Version upgrade 2.3 to 2.4
2016-12-05 13:31:24 +01:00
Jaime van Kessel
16447f7173 Authentication data is now stripped from project file before saving
CURA-1263
2016-12-05 12:46:53 +01:00
Jaime van Kessel
8f023524d2 Small textual changes for project handling
CURA-1263
2016-12-05 11:44:42 +01:00
Jaime van Kessel
535250e714 Loading a project no longer destroys authentication
CURA-1263
2016-12-05 11:43:27 +01:00
Jaime van Kessel
ceb6017cf4 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-05 11:28:20 +01:00
Jack Ha
7a35e4170b Moved translation functionality needed for 3mf into ThreeMFReader. Fix CURA-3089, impacts CURA-382 2016-12-05 11:28:06 +01:00
Jaime van Kessel
1860b8667b Changed extension of 3mf projects to curaproject.3mf
CURA-1263
2016-12-05 11:27:36 +01:00