Commit graph

7827 commits

Author SHA1 Message Date
Lipu Fei
20f28b3fa2 Set dir names in config to allow UM detect old cura dir
CURA-3529
2017-04-11 09:18:19 +02:00
Jack Ha
e3f7c4ec8a Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-10 16:58:14 +02:00
Jack Ha
c989496a13 Fix load (3mf) groups. Also add convex hull decorator to children of node. CURA-3671 2017-04-10 16:11:42 +02:00
Jaime van Kessel
bc78bf94ab Fixed buttons not visible on my screen
CURA-3642
2017-04-10 14:06:10 +02:00
Jaime van Kessel
303a320c4e Merge branch 'bugfix_CURA-3642_dpi_ask_project_dialog' of github.com:Ultimaker/Cura 2017-04-10 13:49:09 +02:00
Jaime van Kessel
d02aa7f6a3 Fixed order of close & disconnect
This would cause the state change caused by close to not be sent to the printer. Fixes CURA-3668
2017-04-10 13:32:37 +02:00
Jaime van Kessel
f5785662f2 Fixed another broken logging 2017-04-10 13:19:05 +02:00
Jaime van Kessel
abe70c3a92 Fixed broken logging 2017-04-10 13:12:14 +02:00
Jack Ha
3263ca4e2d Revert file permissions. CURA-3670 2017-04-10 11:17:44 +02:00
Jack Ha
3d8e94964b Fixed one_at_a_time and arranger. CURA-3670 2017-04-10 11:16:34 +02:00
Jaime van Kessel
c94b05e0f4 Minor refactor 2017-04-07 16:52:19 +02:00
Jaime van Kessel
670de52ec9 Minor refactor; renamed start_priority to last_priority 2017-04-07 16:45:59 +02:00
Jaime van Kessel
e26ade0e6f Multiplying now also gives a message if it could not find a suitable spot for some objects 2017-04-07 16:40:39 +02:00
Jaime van Kessel
f9fbd8c02e Only push free nodes inside buildplate 2017-04-07 16:22:44 +02:00
Jaime van Kessel
f42efcb7e0 Removed count from findNodePlacement
CURA-3239
2017-04-07 16:16:38 +02:00
Jaime van Kessel
04eca9073a Moved multiply objects to job
CURA=3239
2017-04-07 16:11:23 +02:00
Jaime van Kessel
b2183352b8 Added message if arrange all could not find location for all objects
CURA-3239
2017-04-07 15:19:30 +02:00
Jaime van Kessel
2008383118 Added disallowed areas to arranger
CURA-3239
2017-04-07 15:14:27 +02:00
Jaime van Kessel
552b1ed4e8 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-07 11:03:19 +02:00
Jaime van Kessel
ffa0e3e5e2 CuraApplication now also registers object defined by QTApplication
CURA-3633
2017-04-07 11:02:53 +02:00
Ghostkeeper
5a39ed6793
Merge branch 'maukcc-master' 2017-04-07 10:09:53 +02:00
Tim Kuipers
36255fcabb The magic_spiralize setting is no longer settable per mesh (or extruder)
by smartavionics, Mark Burton
2017-04-06 17:51:06 +02:00
Jack Ha
7ddecc0077 Fixed arranger rotating some models. CURA-3239 2017-04-06 17:09:45 +02:00
Jack Ha
91edf5589e Fixed outside boundary check boo boo. CURA-3239 2017-04-06 16:01:57 +02:00
MaukCC
2ea6487368 Update cartesio.def.json 2017-04-06 15:27:59 +02:00
Jack Ha
203ebcf1a1 Arranger findNodePlacements now places objects on top of build plate. CURA-3239 2017-04-06 14:56:54 +02:00
MaukCC
cb86482d44 Update cartesio_extruder_0.def.json 2017-04-06 14:29:36 +02:00
MaukCC
7936696239 Update cartesio_extruder_3.def.json 2017-04-06 14:28:51 +02:00
Lipu Fei
1965b02fdf Fix size problem for open project dialog
CURA-3642
2017-04-06 14:28:45 +02:00
MaukCC
438ae5c29b Update cartesio_extruder_2.def.json 2017-04-06 14:28:22 +02:00
MaukCC
5495937198 Update cartesio_extruder_0.def.json 2017-04-06 14:27:42 +02:00
MaukCC
8f170a49f3 Update cartesio_extruder_1.def.json 2017-04-06 14:26:56 +02:00
MaukCC
5754df5061 Update cartesio_extruder_0.def.json 2017-04-06 14:25:47 +02:00
MaukCC
d7caa860a7 Update cartesio.def.json 2017-04-06 14:13:05 +02:00
Jack Ha
cebe52b1fe Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-06 14:08:00 +02:00
Jack Ha
88a8ed9752 Merge branch '2.5' 2017-04-06 14:07:50 +02:00
Jack Ha
f04981b08c Fixed wifi missing some lines. CURA-3664 2017-04-06 14:06:38 +02:00
MaukCC
e5d6fbcf1e Update cartesio_0.25.inst.cfg 2017-04-06 14:04:58 +02:00
MaukCC
66b5a1d0bc Update cartesio_0.8.inst.cfg 2017-04-06 14:04:39 +02:00
Jaime van Kessel
02d4bd75fe Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-06 14:04:14 +02:00
MaukCC
f54e671ede Update cartesio_0.4.inst.cfg 2017-04-06 14:04:07 +02:00
Jaime van Kessel
a4afde39ff Handle connecting & disconnecting a bit more elegant
CURA-3603
2017-04-06 14:03:41 +02:00
Jaime van Kessel
953d59788e Only try to close connection when there is a connection to close
CURA-3603
2017-04-06 13:57:39 +02:00
MaukCC
288e519278 Update cartesio.def.json 2017-04-06 12:13:39 +02:00
Jack Ha
ed0fb1b0ab Arrange All now places excessive objects outside build plate. CURA-3239 2017-04-06 09:47:57 +02:00
Jaime van Kessel
8f6a210c75 Merge branch 'fix_workspacedialog_typo' of git://github.com/fieldOfView/Cura 2017-04-05 17:03:44 +02:00
Jaime van Kessel
064b823ce3 Arrange job now groups all transformations.
This ensures that we can un & re do the aranging
2017-04-05 16:59:30 +02:00
Jaime van Kessel
03db47afd9 Added progress message to arrangeObjectsJob 2017-04-05 16:42:13 +02:00
MaukCC
8d49bbd2f5 Update cartesio.def.json 2017-04-05 16:40:02 +02:00
Jaime van Kessel
d5682e6e29 ArrangeObjectsJob now yields after each object 2017-04-05 16:26:34 +02:00