Tim Kuipers
76bd1cc78c
JSON: language fixes by Jeroen (CURA-1309)
2016-03-31 16:14:48 +02:00
Jaime van Kessel
f3d600b72e
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-31 13:51:19 +02:00
Jaime van Kessel
b7a465afd6
Added round to top/bottom layer calculation
...
This is because 1.12 / 0.04 = 28.000000000000004 according to python.
The math.ceil then ensured that the result was 29 (instead of expected 28)
CURA-1140
2016-03-31 13:50:04 +02:00
Tim Kuipers
9a780b56ef
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-31 12:51:26 +02:00
Tim Kuipers
b8dee1b166
JSON: max warning value draft shield height
2016-03-31 12:51:15 +02:00
Jaime van Kessel
effcbe5842
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-31 10:39:28 +02:00
Jaime van Kessel
82eda02d37
Created a new category (experimental) & moved a number of settings there
...
CURA-1267
2016-03-31 10:38:54 +02:00
Tim Kuipers
52d064d7ab
JSON: bug fix last commit (CURA-1309)
2016-03-30 19:19:44 +02:00
Tim Kuipers
92cb16cf8c
JSON: Connect zigzags was visibile with zigzags disabled (CURA-1309)
2016-03-30 19:15:51 +02:00
Tim Kuipers
4c47615145
JSON+profiles: removed shell thickness as a whole (CURA-1309)
2016-03-30 19:12:41 +02:00
Tim Kuipers
c8aa770fed
JSON: language fixes by Tim (CURA-1309)
2016-03-30 19:00:59 +02:00
Tim Kuipers
3b7650729a
JSON: changed order of settings (CURA-1309)
...
Changes made by Jeroen
2016-03-30 18:58:57 +02:00
Tim Kuipers
4501ec98b7
JSON: reintroduced moved skin_no_small_gaps_heuristic (CURA-1309)
...
Changes made by Jeroen to setting which changed order
2016-03-30 18:56:29 +02:00
Tim Kuipers
50aa14fc16
JSON: updated settings descriptions (CURA-1309)
...
Changes made by Jeroen to settings which changed order
2016-03-30 18:56:05 +02:00
Tim Kuipers
ffe1b4bc1e
JSON: updated settings descriptions (CURA-1309)
...
Changes made by Jeroen to settings which didn't change order
2016-03-30 18:55:43 +02:00
Jaime van Kessel
c91a87cbf8
Minor codestyle changes
...
CURA-1210
2016-03-30 09:24:50 +02:00
Tim Kuipers
3aced8fb64
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-29 16:58:53 +02:00
Tim Kuipers
82d3c19fe1
JSON: fix min_value for magic_fuzzy_skin_point_density (CURA-1225)
...
value is based on firmware flood limit based on baudrate
2016-03-29 16:58:44 +02:00
Jaime van Kessel
b5107b6ffa
Misclicking tool panel no longer hides it
2016-03-29 15:47:40 +02:00
Jaime van Kessel
ced7484953
Misclicking tool panel no longer hides it
2016-03-29 15:43:45 +02:00
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