Arjen Hiemstra
cdb235740d
Use fdmprinter.json If we have no active machine instead of returning None
...
This prevents issues where backend creation would end up in an infinite
loop while there was no active machine.
Contributes to CURA-1376
2016-04-11 13:01:03 +02:00
Tim Kuipers
e28bed6006
JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374)
2016-04-08 16:43:18 +02:00
Jaime van Kessel
bc0d8818cf
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-04-08 09:59:35 +02:00
Jaime van Kessel
e034e3f9e1
Extra hull area now matches the assumptions in the rest of the code
...
It's now also correct according to the original documentation.
CURA-435
2016-04-08 09:58:34 +02:00
ckielstra
75d3a13659
Spelling
2016-04-08 09:51:46 +02:00
Jaime van Kessel
24950627dc
Removable drives with any name are now accepted by OSX
...
I have no idea why the old plugin only accepted drives with the name
"MASS STORAGE DEVICE", but it now simply lists all removable drives
CURA-1365
2016-04-07 13:31:20 +02:00
Jaime van Kessel
b62c890bfa
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-04-06 17:24:40 +02:00
Jaime van Kessel
c176c608d7
Added extra mm to UM2+ lower right disallowed area
...
CURA-1166
2016-04-06 17:23:11 +02:00
Ghostkeeper
3a478dac12
Fix inaccuracy in change log
...
You can't actually set a profile per object. You can set settings per object.
Contributes to issue CURA-1326.
2016-04-06 16:47:21 +02:00
Jaime van Kessel
34b0d051fb
Updated changelog for 2.1 release
...
CURA-1326
2016-04-06 15:02:49 +02:00
Jaime van Kessel
e2e25ea3e8
Merge branch '2.1-max_message_size_fix' of https://github.com/Ultimaker/Cura into 2.1
2016-04-06 11:42:38 +02:00
Jaime van Kessel
610533aa15
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-04-06 10:52:21 +02:00
Jaime van Kessel
5f74113a45
Fixed changelog plugin so it shows correctly again
...
CURA-1326
2016-04-06 10:51:45 +02:00
fieldOfView
2cedfbfbb7
Change splash-screen so it does not say "developer version", pending a release "real soon now"
...
CURA-1341
2016-04-05 22:28:52 +02:00
Jaime van Kessel
6a4b83b54b
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-04-05 10:28:29 +02:00
fieldOfView
78038e90b8
Removed Olsson block upgrade option from UM2Extended
2016-04-05 09:52:33 +02:00
Tim Kuipers
efdd92d358
JSON: fix: hide alternate skin rotation when skin pattern is concentric (CURA-1235)
2016-04-04 14:27:19 +02:00
Jaime van Kessel
bfba095655
Updated disallowed areas for um2 & um2+
...
CURA-1166
2016-04-04 14:13:18 +02:00
Jaime van Kessel
c1e0b38b8e
Moved multiple settings (draft shield, coasting, conical support, etc) into experimental
...
CURA-1267
2016-04-04 13:42:15 +02:00
Jaime van Kessel
9fce463153
Removed olson block as upgrade from UM2
...
Fixes CURA-1280
2016-04-04 13:34:43 +02:00
Jaime van Kessel
f5457504d3
One at a time iterator no longer ignores objects higher than gantry height
...
Due to changes in build volume, those objects are already ignored.
CURA-1224
2016-04-04 11:25:41 +02:00
Jaime van Kessel
83e30b7cf1
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-04-04 10:30:19 +02:00
Jaime van Kessel
819c9568b1
Backend now correctly handles machine instance change
...
CURA-1323
2016-04-04 10:29:42 +02:00
Ghostkeeper
14f7299a6c
Update template files
...
Contributes to issue CURA-1190.
2016-04-01 16:46:06 +02:00
Jaime van Kessel
2b8914ea46
Removed duplicate settings from machine profiles
...
CURA-1166
2016-04-01 16:39:32 +02:00
Jaime van Kessel
fdb951ffe6
Changed silly typo
...
No issue number, but this *needs* to be in 2.1
Signed off by Jaime & Ruben
2016-04-01 16:33:33 +02:00
Jaime van Kessel
ee4ec23174
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-04-01 13:58:29 +02:00
Jaime van Kessel
ca70b275d8
Revert "Changed wait for subprocess to poll"
...
This reverts commit e463c93f77
.
2016-04-01 13:58:11 +02:00
Ghostkeeper
f4ca245271
Update translation templates
...
Templates are auto-generated from source.
Contributes to issue CURA-1190.
2016-04-01 11:47:30 +02:00
Ghostkeeper
fd75276ed8
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
...
Conflicts:
resources/machines/fdmprinter.json
2016-03-31 18:42:03 +02:00
Ghostkeeper
2d86606b5a
Use double quotes for string
...
Contributes to issue CURA-1309.
2016-03-31 18:31:04 +02:00
Ghostkeeper
53018b49a4
Restore Extra Skin Wall Count description
...
Contributes to issue CURA-1309.
2016-03-31 18:26:20 +02:00
Ghostkeeper
b2042b84f9
Capitalise all setting labels
...
Contributes to issue CURA-1309.
2016-03-31 18:11:59 +02:00
Ghostkeeper
5387699174
American spelling
...
Contributes to issue CURA-1309.
2016-03-31 18:04:26 +02:00
Ghostkeeper
b11051b281
Improve language construction
...
Contributes to issue CURA-1309.
2016-03-31 17:56:00 +02:00
Ghostkeeper
3a7a1a4baa
Remove superfluous spaces
...
Contributes to issue CURA-1309.
2016-03-31 17:47:15 +02:00
Jaime van Kessel
f1a5de50e8
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-31 17:37:02 +02:00
Jaime van Kessel
e463c93f77
Changed wait for subprocess to poll
...
The wait is a suspect in a MAC issue. CURA-1300
2016-03-31 17:35:57 +02:00
Tim Kuipers
d237148441
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-31 16:51:26 +02:00
Tim Kuipers
29de13a661
JSON: removed setting description override (CURA-1309)
...
Proposed by Jeroen and backed by Tim. The new global description precludes everything said in the override description already now
2016-03-31 16:51:06 +02:00
Jaime van Kessel
926dc1a010
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-31 16:46:00 +02:00
Jaime van Kessel
6951b78ee0
Set magic_fuzzy_skin_thickness min value to 0.001
...
CURA-1125
2016-03-31 16:45:15 +02:00
Tim Kuipers
2290c8298d
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-31 16:15:05 +02:00
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