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
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
43c7373368
Ignore any files not ending in .qml when adding QML resources
...
Qt 5.8 includes compiled QML caching, which creates .qmlc files on disk.
These shouldn't be added as actual QML objects. In addition, anything
that does not end in .qml is probably not something that can actually be
parsed as QML, so ignore those too.
2017-04-04 17:35:32 +02:00
Ghostkeeper
0dfe3f4109
Merge branch '2.5'
2017-04-04 17:25:50 +02:00
Ghostkeeper
81e639522d
Streamline headers of translation files
...
They now show correct attribution and sort of correct times, and they are consistent. Only ptbr isn't updated yet, because I expect an update soon from our translator.
Contributes to issue CURA-3487.
2017-04-04 17:24:33 +02:00
Lipu Fei
3f82eae73c
Use layer_id to determine total layer count
...
CURA-3615
2017-04-04 16:52:53 +02:00
Ghostkeeper
20ca0720ea
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-04-04 16:51:32 +02:00
jack
38fe709736
Merge pull request #1648 from Ultimaker/bugfix_CURA-3615_fix_raft_layer_count
...
CURA-3615 Fix total layer count when raft is enabled
2017-04-04 16:47:07 +02:00
Lipu Fei
6b9d3e8041
Merge pull request #1636 from fieldOfView/fix_recent_dialogs
...
Fix issues with Workspace and Profile Changes dialogs
2017-04-04 14:35:12 +02:00
Lipu Fei
db1c6e4163
Merge pull request #1649 from Ultimaker/fix_setting_speed
...
Fix delays when settings change from error to valid
2017-04-04 14:33:44 +02:00
Ghostkeeper
6366d303f0
Update translations for 2.5
...
These are the translation files we received from Bothof. They have not been checked or corrected yet.
Contributes to issue CURA-3487.
2017-04-04 14:33:42 +02:00
Arjen Hiemstra
7015702832
Add a change timer to perform the error state checking
...
This pulls the checkStackHaveErrors code out of the critical path when
editing settings, instead moving it to be handled later. This greatly
reduces the delay that happens when editing settings.
Fixes CURA-3653
Contributes to #1631
2017-04-04 13:39:18 +02:00
Jaime van Kessel
a69bf967e5
Merge branch 'master' of github.com:Ultimaker/Cura
2017-04-04 13:31:02 +02:00
Jaime van Kessel
d5382c7924
Merge branch 'revise_jellybox_support' of git://github.com/IMADE3D/cura
2017-04-04 13:28:53 +02:00
