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
Jaime van Kessel
a9234e0196
Merge branch 'master' of github.com:Ultimaker/Cura
2017-04-05 16:25:57 +02:00
Jaime van Kessel
7ea8017bb4
Moved arranging of nodes to it's own job
2017-04-05 16:25:34 +02:00
MaukCC
575256227c
Update cartesio_0.4.inst.cfg
2017-04-05 16:19:06 +02:00
MaukCC
2c12e5e4d9
Update cartesio_0.25.inst.cfg
2017-04-05 16:17:42 +02:00
MaukCC
6bc76f7b8c
Update cartesio_0.4.inst.cfg
2017-04-05 16:16:03 +02:00
MaukCC
0f5bcb57e0
Update cartesio_0.25.inst.cfg
2017-04-05 16:12:29 +02:00
MaukCC
eee382b1d8
Update cartesio_0.25.inst.cfg
2017-04-05 16:09:28 +02:00
MaukCC
cb943cba98
Update cartesio_0.4.inst.cfg
2017-04-05 16:07:13 +02:00
Jack Ha
07ed1bedc3
Fix boo boo with open multi files including project files.
2017-04-05 16:07:02 +02:00
Jaime van Kessel
b5c6ca0973
Starting Cura when no machines added but with a model no longer causes exceptions
2017-04-05 16:01:36 +02:00
Jaime van Kessel
1d10caf1ec
Merge branch 'master' of github.com:Ultimaker/Cura
2017-04-05 15:26:19 +02:00
Jaime van Kessel
ad4e1b3b18
ConvexHull Scene node no longe re-builds the shader every time it's created
...
This took about 12ms per object, which was quite noticable if there were multiple objects
2017-04-05 15:25:20 +02:00
fieldOfView
8b694e1787
Fix typo in WorkspaceDialog.qml
2017-04-05 15:12:55 +02:00
Jack Ha
667fa08770
Merge branch 'master' of github.com:Ultimaker/Cura
2017-04-05 15:05:28 +02:00
Jack Ha
6a3d8504a1
Fix g-code reader after adding arranger. CURA-3239
2017-04-05 14:27:04 +02:00
Ghostkeeper
0414811079
Correct description of support roof pattern
...
This was a copy-paste error.
Contributes to issue CURA-3491.
2017-04-05 14:07:45 +02:00
Ghostkeeper
89b296ef65
Describe the value of the support interface density settings rather than the action
...
We use an object form rather than a verb form.
Contributes to issue CURA-3491.
2017-04-05 14:06:23 +02:00
Ghostkeeper
945c438c22
Remove support interface resolution settings
...
This reverts commit 92d34a8d7293923646224054c2afcfa57504847e, but not entirely because I wanted to retain the new description for support interface resolution itself.
Contributes to issue CURA-3491.
2017-04-05 14:02:19 +02:00
Ghostkeeper
d65cc00c69
Rephrase description of enable support bottoms
...
It must have a different phrasing than 'support bottom', or else it won't give an actual explanation of what support bottoms are, but 'flooring' was not acceptable.
Contributes to issue CURA-3491.
2017-04-05 13:39:03 +02:00
Ghostkeeper
e09dc40dff
Switch descriptions of support top and bottom speed
...
Had it wrong way around on what it affects.
Contributes to issue CURA-3491.
2017-04-05 13:33:42 +02:00
Jaime van Kessel
ae95f41a3e
Removed include of cpack from cmake lists
2017-04-05 13:29:25 +02:00
Jaime van Kessel
1278b09b01
Delete CPackConfig.cmake
2017-04-05 13:24:52 +02:00
Jack Ha
30484461cf
Faster arranging for same sized objects. CURA-3239
2017-04-05 11:41:18 +02:00
Jack Ha
4c9ec3c22d
Better result (but slower) for arranger. CURA-3239
2017-04-05 11:29:57 +02:00
Jack Ha
87577f3e23
Improve ugly code for Arranger. CURA-3239
2017-04-05 11:26:29 +02:00
Jaime van Kessel
4626bc37a9
Improved documentation
2017-04-05 11:05:48 +02:00
Jaime van Kessel
ecf905f580
Merge branch 'feature_arrange_cleanup' of github.com:Ultimaker/Cura
2017-04-05 10:45:42 +02:00
Jack Ha
4e91d55bdf
Fix Arranger bestSpot. CURA-3239
2017-04-05 10:41:54 +02:00
Jack Ha
ddd8f12a60
Merge branch 'master' of github.com:Ultimaker/Cura
2017-04-05 10:19:27 +02:00
Jack Ha
1a01d1b193
Change permissions back to 644
2017-04-05 10:19:12 +02:00
Jack Ha
2d6df1ae4a
Fix workspacedialog booboo typo.
2017-04-05 10:18:36 +02:00
Ghostkeeper
210e9b5869
Merge branch '2.5'
2017-04-05 09:53:53 +02:00
Ghostkeeper
7b4375e3d1
Adjust minimum value warnings for line width
...
This was discussed with Tom from materials. The minimum warning value is now a linear function with a y-intercept. I tuned it so that it just sails under the minimum values of all of our profiles.
2017-04-05 09:53:14 +02:00
MaukCC
513ede0fda
Update cartesio.def.json
2017-04-05 09:07:14 +02:00
MaukCC
8ff057d483
Update cartesio.def.json
2017-04-05 09:05:29 +02:00
MaukCC
e6bdf8c8f6
Update cartesio.def.json
2017-04-05 09:04:16 +02:00
MaukCC
edbfd4343a
Update cartesio.def.json
2017-04-04 20:46:37 +02:00
MaukCC
21c14f58aa
Update cartesio.def.json
2017-04-04 18:05:27 +02:00
MaukCC
bb200fa9e8
Update cartesio.def.json
2017-04-04 18:04:25 +02:00
MaukCC
c9397fd986
Update cartesio.def.json
2017-04-04 18:01:52 +02:00
Arjen Hiemstra
d3d2bdfaeb
getResolveOrValue has become obsolete now that stack.getProperty can return a resolve
2017-04-04 17:41:43 +02:00
Arjen Hiemstra
a16b5d73b6
Partial fix for infinite recursion when trying to call getProperty
2017-04-04 17:41:21 +02:00
Arjen Hiemstra
82333a244b
Add some initial code to use the new classes to create new machines
2017-04-04 17:40:58 +02:00
Arjen Hiemstra
cbc19b13eb
Deprecate the activeMachineName/Id properties in favour of activeMachine
2017-04-04 17:40:34 +02:00
Arjen Hiemstra
7eb5441ebc
Add an "activeMachine" property to MachineManager
...
Directly exposes the global container stack to QML.
2017-04-04 17:39:57 +02:00
