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
Arjen Hiemstra
47a388fd2c
Introduce a CuraStackBuilder class
...
It contains factory functions for creating new stacks with certain
quality/material/variant combinations.
2017-04-04 17:38:49 +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
Jaime van Kessel
7e201439d3
Merge branch 'feature_spaghetti_infill' of github.com:Ultimaker/Cura
2017-04-04 13:03:34 +02:00
Jaime van Kessel
68f536dc5f
Merge pull request #1538 from Ultimaker/feature_mold
...
Mould
2017-04-04 12:53:33 +02:00
Lipu Fei
9f5a1b3695
Merge pull request #1564 from nallath/usb_fixes
...
Usb fixes
2017-04-04 12:05:49 +02:00
Lipu Fei
7315a09c7d
Use layer_id to determine total layer count
...
CURA-3615
2017-04-04 11:45:30 +02:00
Ghostkeeper
6f2efbee61
Merge branch '2.5'
2017-04-04 11:24:12 +02:00
Ghostkeeper
28555c685f
Add profiles for 0.8mm ABS and CPE
...
These profiles are not optimised yet. I'm not allowed to optimise them since there seem to be bugs in the optimisation.
2017-04-04 11:23:46 +02:00
jack
0ad344f91d
Merge pull request #1640 from Ultimaker/bugfix_CURA-3421_per_model_combobox
...
CURA-3421 Set SettingsComboBox value if we get undefined from resolve
2017-04-04 10:57:42 +02:00
Jack Ha
535330ef51
Added comments. CURA-3239
2017-04-04 10:29:10 +02:00
Jack Ha
3d16c4120e
Added comments. CURA-3239
2017-04-04 09:59:42 +02:00
Jack Ha
1df9066340
Fix error after refactor, added comments
2017-04-04 09:52:07 +02:00
Ghostkeeper
db4854702b
Add Japanese and Hangul to the language drop-down
...
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.
Contributes to issue CURA-3487.
2017-04-04 09:05:12 +02:00
Ghostkeeper
6a8bcd4da6
Add Japanese and Korean partial translations
...
Normally we don't allow partial translations in here, but this came from higher up: Ultimaker's distributors in Korea and Japan. We're making an exception for those.
Contributes to issue CURA-3487.
2017-04-04 09:05:12 +02:00
Ghostkeeper
d7f603517d
Add Uranium CMake dir if it is set
...
Contributes to issue CURA-3487.
2017-04-04 09:05:12 +02:00
Ghostkeeper
a127d463bc
Add Japanese and Hangul to the language drop-down
...
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.
Contributes to issue CURA-3487.
2017-04-04 09:04:45 +02:00
Ghostkeeper
eab7741711
Add Japanese and Korean partial translations
...
Normally we don't allow partial translations in here, but this came from higher up: Ultimaker's distributors in Korea and Japan. We're making an exception for those.
Contributes to issue CURA-3487.
2017-04-04 09:02:53 +02:00
Ghostkeeper
1bcc19987d
Add Uranium CMake dir if it is set
...
Contributes to issue CURA-3487.
2017-04-03 17:17:04 +02:00
Tim Kuipers
eaca23c50e
feat: support_mesh_drop_down (CURA-2747)
2017-04-03 17:12:59 +02:00
