Commit graph

6772 commits

Author SHA1 Message Date
ChrisTerBeke
474db38ddf Fix failing test for um3_extended 0.8 variant 2018-03-14 13:30:20 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles
Setting Visibility Presets sidebar menu
2018-03-14 13:25:59 +01:00
Lipu Fei
d6b270954a Fix the case when no quality is available
CURA-5044

The tooltip should also show up if there is no quality available.
2018-03-14 13:11:24 +01:00
Lipu Fei
fcd50b0cf2 Fix code style
CURA-5044
2018-03-14 13:10:58 +01:00
Lipu Fei
b8c32eb166 Fix typo in ConfigurationListView.qml 2018-03-14 12:59:48 +01:00
Diego Prado Gesto
23a2b6e0f7 CURA-4870 Don't show the configuration selector if the printer is not a
network printer (for example don't show if is USB)
2018-03-14 11:54:10 +01:00
Aleksei S
160a59191b Show Tooltip for the unavailable slider's area
CURA-5044
2018-03-14 11:45:00 +01:00
Diego Prado Gesto
c69987b824 CURA-4870 Reintroduce the "Check compatibility" link in the sidebar 2018-03-14 11:26:22 +01:00
Lipu Fei
f5f8bf19ec Fix QML warnings 2018-03-14 11:05:32 +01:00
Lipu Fei
4cc2d882d3 Fix merge conflicts
CURA-4879
2018-03-14 10:53:10 +01:00
Lipu Fei
cff1e8639d Fix preferred material PLA for printrbot simple makers kit
CURA-5089
2018-03-14 10:48:05 +01:00
Lipu Fei
17525b9cb6
Merge pull request #3421 from timur-tabi/master
Add definition for Printrbot Simple Maker's Kit 1405
2018-03-14 10:47:20 +01:00
Ghostkeeper
00bd306307
Merge branch 'M&P-Setting-Optimization' 2018-03-14 09:02:38 +01:00
Mark Burton
4aa89068d7 Now, wall_min_flow and wall_min_flow_retract are hidden if overlap compensation is disabled. 2018-03-13 19:00:27 +00:00
fieldOfView
73558c9e36 Fix rendering depth pass 2018-03-13 19:44:53 +01:00
Lipu Fei
d2eb01d137 Fix material name update on sidebar
CURA-5084
2018-03-13 17:41:15 +01:00
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button
[Feature] Sync Button
2018-03-13 16:52:39 +01:00
Lipu Fei
5adb769cf8 Fix value function for extruders_enabled_count
CIRA-5056
2018-03-13 16:48:44 +01:00
Lipu Fei
e91b955f1e
Merge pull request #3485 from Ultimaker/CURA-5059_reset_icon_visibility
Cura 5059 reset icon visibility
2018-03-13 16:11:58 +01:00
Diego Prado Gesto
855df814d8 CURA-4870 Fix some style with brackets in QML 2018-03-13 16:11:51 +01:00
THeijmans
6b7fc8b903 Removed retraction z hops from variants
To make single extrusion mode work.
2018-03-13 15:00:24 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Diego Prado Gesto
9196802e83 CURA-4870 Clean the error messages from qml by not rendering components
if there is no outputDevice defined.
2018-03-13 13:40:31 +01:00
Ian Paschal
516772e1f7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-03-13 13:29:03 +01:00
Ian Paschal
d10f0f7781 CURA-5071 Added brackets 2018-03-13 13:29:00 +01:00
Jack Ha
d6979bc89a CURA-4400 using an intermediate variable prevents an empty popup that occured now and then 2018-03-13 13:14:33 +01:00
Guillem
1bb5b8ff3e add Copy all values to all extruders
context menu option
2018-03-13 12:31:03 +01:00
fieldOfView
0caea24afc Add depth pass for picking a location 2018-03-13 12:14:05 +01:00
THeijmans
392605014a Merge branch 'M&P-Setting-Optimization' of https://github.com/Ultimaker/Cura into M&P-Setting-Optimization
Fixed conflicts
2018-03-13 11:58:33 +01:00
THeijmans
4c61ea5ba9 Single extrusion settings for travels
Updated single extrusion settings, so z hops are removed and travels are shortened for single extrusion.
2018-03-13 11:45:19 +01:00
Aleksei S
73517cd176 The infill denstiy was updated twice, first in Custom view and then in Recomended view
CURA-5071
2018-03-13 11:41:48 +01:00
Diego Prado Gesto
d807ce57a5 CURA-4870 Disable rename button in MachinesPage when the selected item
is a network printer since the name is the name of the host printer (or
group)
2018-03-13 10:49:29 +01:00
Lipu Fei
40d3e09d90 Merge remote-tracking branch 'origin/master' into CURA-5059_reset_icon_visibility 2018-03-13 10:25:01 +01:00
Ghostkeeper
b4a40915bb
Code style: Brackets on new line
Contributes to issue CURA-4606.
2018-03-13 09:28:01 +01:00
Ghostkeeper
d904f677bc
Store extruder position of quality groups as int
Instead of as a string with a number in it.
For the actual global stack's extruders we still need to convert to string, sadly. I could go refactor that too, but then I won't be going home until 23 o'clock or something.

Contributes to issue CURA-4606.
2018-03-12 17:08:13 +01:00
Mark
981c47ed87 Put the support extruder dropdown behind the checkbox to prevent scrolling 2018-03-12 17:03:10 +01:00
Ian Paschal
8db4396ee7
Merge pull request #3436 from Ultimaker/feature_enable_disable_extruder
CURA-4400 Feature enable disable extruder
2018-03-12 16:42:25 +01:00
Ghostkeeper
05c034558d
Set default layer height via preferred quality type
So the layer heights are correct for each quality type but the default is still 0.2mm.

Contributes to issue CURA-4981.
2018-03-12 16:03:42 +01:00
Aleksei S
7574ab0883 Connect infill Lines checkbox did not work 2018-03-12 15:52:16 +01:00
Aleksei S
c3b659c5d4 Fix: reset icon dissapears for default values
CURA-5059
2018-03-12 15:15:19 +01:00
Diego Prado Gesto
96fcfd9e2f Merge branch 'feature_sync_button' of github.com:Ultimaker/Cura into feature_sync_button 2018-03-12 15:11:11 +01:00
Ian Paschal
a5ba4799f0 CURA-4870 Final icon changes from Luke 2018-03-12 14:48:39 +01:00
Diego Prado Gesto
cc009a94ee CURA-4870 Remove "check compatibility" message.
Move the buildplate information to the bottom, below the extruders.
2018-03-12 14:19:06 +01:00
Diego Prado Gesto
ec2201b57c CURA-4870 Move the printer type and the buildplate selector to the top
of the sidebar and set them separate from the extruder related
selectors.
2018-03-12 11:57:53 +01:00
Mark Burton
88c2e37ce4 Added wall_min_flow and wall_min_flow_retract settings.
Wall lines whose flow is < wall_min_flow are converted into travel moves.
2018-03-12 10:25:39 +00:00
Jack Ha
1f8be6ad3c CURA-4400 moved default extruder value to value instead of default_value because of engine 2018-03-12 11:05:55 +01:00
Jack Ha
552618fcd4 CURA-4400 added function to find model index by extruder position in SettingExtruder 2018-03-12 09:56:08 +01:00
Mark Burton
239961cc48 Merge remote-tracking branch 'upstream/master' into mb-retract-on-long-combs 2018-03-12 08:22:53 +00:00
Mark Burton
b732a84a6a Added retraction_combing_max_distance setting.
When this is non-zero, combing travel moves that are longer will use retraction.
2018-03-12 08:21:11 +00:00
Jack Ha
d70cc072e9 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 09:06:24 +01:00