Lipu Fei
67c11b8cdf
Fix code style
...
CURA-4503
2017-10-31 09:24:32 +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
Diego Prado Gesto
eb0b08a813
CURA-4470 Hide quality slider handle when quality profile doesn't exist
2017-10-22 18:35:05 +02:00
Buco
f1d125b232
Added quality profiles
...
Made some changes to the main profiles and added quality profiles for each material.
2017-10-20 16:09:26 +02:00
ChrisTerBeke
3fcf20c714
Merge pull request #2564 from BagelOrb/slicing_mode
...
Adds a UI setting for the new slicing tolerance option in the engine.
2017-10-20 09:49:05 +02:00
Diego Prado Gesto
d2d28fbdfb
CURA-4470 Fix quality slider not selecting correct quality profile
...
Compare selected quality by quality_type instead of id when loading a
project file from older versions of Cura.
2017-10-19 20:49:11 +02:00
Tim Kuipers
823d11f0e1
rename slicing mode ==> slicing tolerance
2017-10-19 17:14:01 +02:00
Tim Kuipers
4650a12324
slicing mode
2017-10-19 17:14:01 +02:00
ChrisTerBeke
30281f17f3
Add simple mode settings flag for user created profile - CURA-4466
2017-10-19 17:03:31 +02:00
ChrisTerBeke
3354f58ddb
Remove BAM qualities
2017-10-19 15:14:28 +02:00
Diego Prado Gesto
1a47ec85ca
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-10-19 13:58:19 +02:00
Diego Prado Gesto
0e74f9d881
CURA-4248 - Fix some mistakes in the formulas in quality profiles
2017-10-19 13:54:10 +02:00
Ghostkeeper
5a125aa514
Rename printCoreRow to variantRow
...
Because on only one of our printers it's actually a print core. Internally we've always called it the variant.
2017-10-19 13:38:08 +02:00
Lipu Fei
946b8ae92d
Remove executable bit for non-executable files
2017-10-19 10:28:57 +02:00
Diego Prado Gesto
d3e8915b30
Merge branch 'master' into CURA-4248_BAM
2017-10-19 10:26:25 +02:00
Lipu Fei
475f6223d4
Remove executable bit for json files
2017-10-19 10:24:38 +02:00
ChrisTerBeke
3ddb277477
Remove double sidebar header item, fixes #2605
2017-10-18 16:01:14 +02:00
ChrisTerBeke
b2dbefc823
Update helper text for custom changes in recommended settings - CURA-4333
2017-10-18 15:44:02 +02:00
ChrisTerBeke
795eda64e3
Merge branch 'master' into CURA-4248_BAM
2017-10-18 15:08:51 +02:00
ChrisTerBeke
7d58208507
Fix BAM draft quality weight - CURA-4248
2017-10-18 14:19:11 +02:00
