Commit graph

5055 commits

Author SHA1 Message Date
ChrisTerBeke
7a8d562234 Merge branch 'master' into container_stack_improvements 2017-10-31 16:24:05 +01:00
Lipu Fei
324b39fc39 Fix layout for open project dialog
CURA-4503
2017-10-31 16:20:01 +01:00
ChrisTerBeke
e7f1900f71 Remove layer height from custom profiles in dropdown as it might have changed - CURA-4482 2017-10-31 14:01:15 +01:00
alekseisasin
759c494aaa
Merge pull request #2703 from fieldOfView/fix_setting_text_on_focus
Stop SettingTextField from setting values when getting/losing the focus
2017-10-31 12:47:25 +01:00
Aleksei S
f1db8ed001 Show message (hover slieder) if user selected custom quality profile in recomended mode
CURA-4466
2017-10-31 11:07:45 +01:00
Aleksei S
f7ce4cc78a Merge branch 'master' of github.com:Ultimaker/cura 2017-10-31 10:27:35 +01:00
Aleksei S
e0c1afe01f Added Request package information to AboutDialog.qml
CURA-4415
2017-10-31 10:26:42 +01:00
ChrisTerBeke
4701518404 Add default position to fdm extruder definition - CURA-4482 2017-10-31 10:23:30 +01:00
alekseisasin
055b6ebaab
Merge pull request #2691 from Ultimaker/cleaner_open_project_dialog
Cleaner open project dialog & redering on partial pixels fixes
2017-10-31 09:58:52 +01:00
Lipu Fei
67c11b8cdf
Fix code style
CURA-4503
2017-10-31 09:24:32 +01:00
Chris ter Beke
9806ec7374 Resolve merge conflicts with master - CURA-4482 2017-10-31 09:22:03 +01:00
ChrisTerBeke
d718e6e36c Create extruder stack for single extruder machines on start - CURA-4482 2017-10-31 09:08:20 +01:00
Ruben D
93e746b1b3
Warm up to layer_0 temperatures in start g-code
Thanks to nounours2099 for the correction.

Fixes #2631.
2017-10-31 00:23:05 +01:00
fieldOfView
8dfba9a318 Stop SettingTextField from setting values when getting/losing the focus
Fixes #2694
2017-10-30 15:31:14 +01:00
Lipu Fei
e6e61e9a3c
Merge pull request #2697 from Ultimaker/feature_add_user_agreement
Feature add user agreement
2017-10-30 14:50:52 +01:00
Aleksei S
22aaf64b63 Simplified version for validation need to show user agreement
CURA-4501
2017-10-30 14:42:46 +01:00
Lipu Fei
b6dd87081c Add upgrade script for 3.0 to 3.1
CURA-4451

- Add upgrade script for 3.0. to 3.1
- Upgrade old stack files so they will use "empty_quality" as the
  "Not Supported" quality profile.
- Increase SettingVersion to 4
2017-10-30 12:45:25 +01:00
Lipu Fei
c0f1af94ab Show Add Machine dialog after User Agreement dialog is closed
CURA-4501
2017-10-30 10:33:50 +01:00
Mark
0bdc1aad00 Fixed code comments
CURA-4501
2017-10-29 09:04:23 +01:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02:00
Mark
6c04a8be5d same font for checkbox label and some layout anchors 2017-10-27 13:48:55 +02:00
Aleksei S
7e6e0e2021 Remove "not supported" quality files for "Builder premium" printer
CURA-4436
2017-10-27 11:18:46 +02:00
alekseisasin
e8bd404904 Merge pull request #2584 from Builder3D/master
Add Builder Premium
2017-10-27 10:25:11 +02:00
Ghostkeeper
ff5b9eefea
Minor improvement to German translation of 'Check all'
Thanks to @app-js. 'Alles auswählen' didn't fit.

Fixes #2689.
2017-10-27 09:33:40 +02:00
Diego Prado Gesto
92ac7c5a15 Merge branch 'CURA-4451_not_support_container' 2017-10-26 16:55:17 +02:00
Diego Prado Gesto
9b066ea78b CURA-4451 Bring back again the PP 0.4 fast profile of UM2+ that was
deleted by mistake
2017-10-26 15:27:01 +02:00
fieldOfView
fff9330949 Merge branch 'master' into fix_is_clustersize
# Conflicts:
#	plugins/UM3NetworkPrinting/UM3InfoComponents.qml
#	resources/qml/Menus/MaterialMenu.qml
#	resources/qml/Menus/NozzleMenu.qml
2017-10-26 11:09:13 +02:00
ChrisTerBeke
a5ec64bf7c Remove builder premium extruder definitions - CURA-4451 2017-10-26 09:55:01 +02:00
ChrisTerBeke
ac40de7272 Remove builder premium resources that were used for testing (separate PR to add them back) - CURA-4451 2017-10-26 09:54:06 +02:00
ChrisTerBeke
b1a4c3488f Merge branch 'master' into CURA-4451_not_support_container 2017-10-26 09:48:52 +02:00
ChrisTerBeke
fc48ba7bae Remove all not supported quality profiles - CURA-4451 2017-10-26 09:48:31 +02:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
2017-10-26 09:23:27 +02:00
Lipu Fei
e4fec1f63d Move SaveButton downwards
CURA-4490

Move SaveButton downwards so it doesn't overlay with the estimated print
time in some language.
2017-10-25 16:35:38 +02:00
Diego Prado Gesto
56171776f6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-10-25 13:57:04 +02:00
Diego Prado Gesto
87ba4056ee CURA-4485 Minor changes 2017-10-25 13:55:30 +02:00
Ghostkeeper
73e809b956
Remove specialised start g-code from Creality CR-10
By request from Michael.
This makes it the same as the start g-code for the Custom FDM Printer, which apparently works better.
2017-10-25 13:20:05 +02:00
fieldOfView
ff847aa329 Fix qml error when there is no connected printer
Also fixes code style
2017-10-25 11:52:43 +02:00
Diego Prado Gesto
7404df66ac CURA-4481 Disable "Remove empty layers" when support is enabled.
When support is enabled then it doesn't matter if the user choose
whether to remove or not the empty layers, because it's done after
generating supports. In order to avoid confusion to the user, the
setting is disabled.
2017-10-24 16:46:45 +02:00
Diego Prado Gesto
ba3f1362e6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-10-24 15:59:17 +02:00
Diego Prado Gesto
0eedfa5c18 CURA-4485 Disabling automatic material and variant when connecting to a
printer within a cluster of more than 1 printer.
2017-10-24 15:45:20 +02:00
Jack Ha
a66d27e30e CURA-4176 reintroduced Wall Extruder. Added limit_to_extruder trick in wall_line_width as suggested in issue to evade inheritance problems. 2017-10-24 15:01:57 +02:00
ChrisTerBeke
c679f4aa6b Merge branch 'master' into CURA-4451_not_support_container 2017-10-24 13:41:14 +02:00
ChrisTerBeke
9083fe1bf0 Add not supported instance container type and qt role - CURA-4451 2017-10-24 11:53:56 +02:00
Jack Ha
d8e1b5b9b4 CURA-4481 add setting Remove Empty First Layers 2017-10-24 11:25:12 +02:00
ChrisTerBeke
b50f027c83 Add not supported role to profiles model 2017-10-24 10:25:53 +02:00
ChrisTerBeke
35684e0aa4 Move profiles dropdown text generator to separate method 2017-10-24 09:57:48 +02:00
ChrisTerBeke
3794ae16ae Dont show layer height text in profiles drop down when there is not layer height set - CURA-4451 2017-10-23 17:41:58 +02:00
Jack Ha
c56d135b15 Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-23 14:20:22 +02:00
Jack Ha
4cfd0de580 CURA-4248 hide settings in UI for Surface Energy and Adhesion Tendency 2017-10-23 14:20:10 +02:00
ChrisTerBeke
ff732720ca Set quality slider active index to -1 for user created profile, fix for CURA-4466 2017-10-23 12:45:07 +02:00