2489 Commits

Author SHA1 Message Date
Jaime van Kessel
6237767ba5 Fixed error message when using locked SD
CURA-1187
2016-03-29 11:52:14 +02:00
Tim Kuipers
981e3f3851 JSON: fix: max_value for call_fan_speed_min (CURA-863) 2016-03-29 10:42:13 +02:00
Tim Kuipers
5bb63c5cfb Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-29 10:34:13 +02:00
Ghostkeeper
16bb754da2 Merge pull request #683 from thopiekar/master-i18n-cmake-fix
CMake: Remove all slashes from language codes
2016-03-29 10:33:48 +02:00
Ghostkeeper
9294b14677 Merge pull request #682 from thopiekar/2.1-i18n-cmake-fix
CMake: Remove all slashes from language codes
2016-03-29 10:33:14 +02:00
Tim Kuipers
3a3c7fbbc8 JSON: updated Olsson block heat zone length (CURA-1281) 2016-03-29 10:31:33 +02:00
Thomas-Karl Pietrowski
f28cfbf735 CMake: Remove all slashes from language codes
Related to: 6833363b53
2016-03-29 10:17:53 +02:00
Thomas-Karl Pietrowski
7e339ce512 CMake: Remove all slashes from language codes
Related to: 6833363b53
2016-03-29 10:16:50 +02:00
Jaime van Kessel
51b9ac78bd Added speed of light as max value for speed
CURA-1252
2016-03-25 15:18:18 +01:00
Jaime van Kessel
89162e3286 Fixed crash caused by circular dependency 2016-03-25 14:08:50 +01:00
Jaime van Kessel
637f793f48 Simplified some of the inheritance functions 2016-03-25 14:03:49 +01:00
Jaime van Kessel
918d8005bc Removing unneeded overwritten settings 2016-03-25 13:59:43 +01:00
Jaime van Kessel
99de21fba7 Setting one at a time mode now decreases size of build volume
CURA-1245 CURA-1224
2016-03-25 10:59:11 +01:00
Jaime van Kessel
6c2878221d Removed color from convex hull node when it has profile / setting
CURA-1251
2016-03-25 10:49:09 +01:00
Tim Kuipers
cb43dfb964 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-24 17:30:10 +01:00
Tim Kuipers
355f5210c9 JSON: travel_avoid_distance should default to nozzle_outer radius, not diameter (CURA-1195) 2016-03-24 17:29:46 +01:00
Jaime van Kessel
2db7f6e47a Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-24 16:41:59 +01:00
Jaime van Kessel
d3a6f63d1f 3MF no longer fails when there is no transformation matrix 2016-03-24 16:41:25 +01:00
Tim Kuipers
11a65e249d JSON: changed description and name of cooling settings (CURA-863) 2016-03-24 15:55:20 +01:00
Tim Kuipers
90e81de8cd JSON: fixed gantry heights of Olsson block machines to match difference with UM2 nozzle (CURA-1281) 2016-03-24 14:19:53 +01:00
Tim Kuipers
1f38402645 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-24 14:11:21 +01:00
Tim Kuipers
178943aa59 JSON: introduce machine_heat_zone_length for Olsson block based on guessing (CURA-1281)
The heat zone length is only used in dual extrusion settings, which are unavailable for UM2+ and UM2 with olsson block
2016-03-24 14:11:10 +01:00
Tim Kuipers
78e844ef18 JSON: made UM2E_olsson inherit from UM2_olsson (CURA-1281) 2016-03-24 14:08:58 +01:00
Jaime van Kessel
2cda0283c7 Increased width of sidebar a bit to improve readability for other languages
CURA-1268
2016-03-24 14:00:23 +01:00
Tim Kuipers
7edb9ab3a0 JSON: introduce basic Olsson nozzle stats (CURA-1281) 2016-03-24 13:54:17 +01:00
Tim Kuipers
1f4763fca2 JSON: edit machine height based on longer olsson nozzle (CURA-1281) 2016-03-24 13:53:22 +01:00
Tim Kuipers
2e7d370497 JSON: include Olsson nozzle tip outer diameter (CURA-1281) 2016-03-24 13:49:13 +01:00
Jaime van Kessel
7045d67bde Layer data is now processed layer by layer.
This is done to prevent the very large messages that would be sent otherwise.
Protobuf can't do anything with messages above 512MB. As we no longer send a
"collection" message, this should no longer occur.
CURA-1210
2016-03-24 12:14:31 +01:00
Jaime van Kessel
9242ddc9e3 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-24 09:46:50 +01:00
Jaime van Kessel
c1af2c4ae0 3mf reader now uses correct coordinate frame 2016-03-24 09:46:28 +01:00
Tim Kuipers
69fab0489d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 18:43:28 +01:00
Tim Kuipers
6e7be5995c profiles: got print speed from old cura (CURA-1195) 2016-03-23 18:26:03 +01:00
Tim Kuipers
978cf3e824 JSON fix: removed inherit cause it already had an inherit_function (CURA-1195) 2016-03-23 18:19:50 +01:00
Tim Kuipers
47b04efcfe profiles fixes: removed double settings, introduced missing ones (CURA-1195)
I've made it such that all ABS and CPE profiles contain the same settings and also all PLA profiles contain the same settings. This is to verify that no settings have been overlooked.
2016-03-23 18:09:59 +01:00
Tim Kuipers
2539042858 profiles: did all profiles ABS and CPE with Paul by hand (CURA-1195)
also reordered settings to match Pauls sheet
2016-03-23 17:43:09 +01:00
Ghostkeeper
81fe0ab958 Update translation templates
Includes the new strings after string freeze.

Contributes to issue CURA-1190.
2016-03-23 16:45:41 +01:00
Jaime van Kessel
5ec774f796 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 15:12:26 +01:00
Jaime van Kessel
3663f8ca20 Backend now logs return codes of processes
CURA-1133
2016-03-23 15:11:56 +01:00
Tim Kuipers
f7c842dabe JSON fix: default retraction amount on UM2+ is 6mm (CURA-1195) 2016-03-23 14:02:10 +01:00
Tim Kuipers
fd27fcb52d profiles: removed superfluous/outdated infill_wipe_dist (CURA-1195) 2016-03-23 13:50:34 +01:00
Tim Kuipers
a7aafe958b profiles: removed superfluous speed_slowdown_layers (CURA-1195) 2016-03-23 13:49:08 +01:00
Tim Kuipers
fc974c25c2 profiles: removed superfluous/outdated travel_avoid_distance (CURA-1195) 2016-03-23 13:47:12 +01:00
Tim Kuipers
12349d1228 profiles: removed superfluous/outdated retraction_min_travel (CURA-1195) 2016-03-23 13:45:38 +01:00
Tim Kuipers
40adb5b7e3 profiles: removed superfluous/outdated retraction_count_max (CURA-1195) 2016-03-23 13:42:19 +01:00
Tim Kuipers
6a150b3b7d profiles: removed superfluous cool_fan_full=2 (CURA-1195) 2016-03-23 13:28:27 +01:00
Tim Kuipers
5037fab1b3 JSON: fixed defaults which should hold for all machines (CURA-1195) 2016-03-23 13:26:51 +01:00
Tim Kuipers
8eb4007334 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 12:40:56 +01:00
Tim Kuipers
feb1ed4c2e JSON fix: handle fuzzy skin min/max (CURA-1225) 2016-03-23 12:40:46 +01:00
Ghostkeeper
be57fa03d2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 12:14:53 +01:00
Ghostkeeper
71721811f5
Rename Shell Speed to Wall Speed
It only applies to the walls, not the skin, after all.

Contributes to issue CURA-1183.
2016-03-23 12:14:16 +01:00