Aleksei S
2a4addefbf
Merge branch 'master' of github.com:Ultimaker/cura
2017-10-27 11:20:53 +02:00
Aleksei S
7e6e0e2021
Remove "not supported" quality files for "Builder premium" printer
...
CURA-4436
2017-10-27 11:18:46 +02:00
Lipu Fei
fe70e19089
Reset extruder numbers whose values are no longer valid
...
CURA-4176
After the user changes the number of extruders for a machine, some
extruder number settings may not have valid values any more. These
settings need to be reset.`
2017-10-27 10:59:03 +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
Aleksei S
ee228155af
Remove unnecessary properties which after update triggered view rendering
...
CURA-4062
2017-10-27 09:24:31 +02:00
ChrisTerBeke
b91824aab1
Move towards making extruder manager a first class citizen - CURA-4482
2017-10-26 17:54:36 +02:00
Diego Prado Gesto
92ac7c5a15
Merge branch 'CURA-4451_not_support_container'
2017-10-26 16:55:17 +02:00
Diego Prado Gesto
b9c318d432
CURA-4451 Minor changes
2017-10-26 16:53:31 +02:00
Diego Prado Gesto
524ace9b04
Merge branch 'CURA-4451_not_support_container' of https://github.com/Ultimaker/Cura into CURA-4451_not_support_container
2017-10-26 15:30:07 +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
ChrisTerBeke
723f6ce226
Only get extruder settings from extruder stack - CURA-4482
2017-10-26 15:10:52 +02:00
ChrisTerBeke
38fdb5e56f
Refactor extruders model to always use extruder stacks + cleanup - CURA-4482
2017-10-26 14:45:24 +02:00
Aleksei S
938ae5af1d
Added function to catch prepare and monitor button click
...
CURA-4062
2017-10-26 14:36:23 +02:00
ChrisTerBeke
8378c6f3c9
Always add extruder quality changes when getting quality changes by name - CURA-4482
2017-10-26 14:30:18 +02:00
ChrisTerBeke
d6ef96a825
Add todo comment
2017-10-26 14:07:47 +02:00
ChrisTerBeke
0021dee84b
Always use extruder stacks when copying value to all extruder - CURA-4482
2017-10-26 14:04:05 +02:00
ChrisTerBeke
0b57096056
Always use extruder stacks when switching global container in machine manager - CURA-4482
2017-10-26 13:44:47 +02:00
ChrisTerBeke
7975420901
Always set active extruder index when loading active machine on start - CURA-4482
2017-10-26 13:34:59 +02:00
Lipu Fei
7d46eead60
Fix broken unit tests due to evaluation context
...
CURA-4498
2017-10-26 12:49:41 +02:00
ChrisTerBeke
62cb5a48cb
Refactor user profiles model to always use extruder stack - CURA-4482
2017-10-26 12:42:33 +02:00
ChrisTerBeke
59580c0ade
Remove commented out code - CURA-4482
2017-10-26 11:52:58 +02:00
ChrisTerBeke
152f6f8405
More profiles model refactoring - CURA-4482
2017-10-26 11:51:24 +02:00
ChrisTerBeke
de34464e47
Update ProfilesModel to always use extruder stacks + some refactoring - CURA-4482
2017-10-26 11:38:21 +02:00
Lipu Fei
2f441ba7e1
Remove debugging log lines
...
CURA-4451
2017-10-26 11:36:59 +02:00
Lipu Fei
9488d543de
Merge pull request #2677 from fieldOfView/fix_isclusterprinter
...
Fix qml error when there is no connected printer
2017-10-26 11:23:39 +02:00
Lipu Fei
701e9a91c2
Allow using longer accent for machines in job names
2017-10-26 11:13:30 +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
fieldOfView
5638ebe8cf
Tweak appearance of the menu button
2017-10-26 11:05:59 +02:00
ChrisTerBeke
f0ed3bc588
Always populate extruder stacks when creating global stack - CURA-4482
2017-10-26 11:05:35 +02:00
ChrisTerBeke
c54dc0a723
Merge branch 'master' into container_stack_improvements
2017-10-26 10:19:45 +02:00
ChrisTerBeke
8826f86b54
Remove debug logging - CURA-4451
2017-10-26 09:58:01 +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
ChrisTerBeke
0377edaa0f
resolve conflicts
2017-10-26 09:26:18 +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
fieldOfView
c9ad5eaedb
Add menu icon
2017-10-26 00:00:39 +02:00
fieldOfView
078fd074e5
Add initial menu stub
2017-10-26 00:00:07 +02:00
fieldOfView
4bb67fbd82
Add setting visibility profile menu button
2017-10-25 17:04:23 +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
ChrisTerBeke
88ffe0d358
correctly show not supported when any of the extruders has a not supported profile - CURA-4451
2017-10-25 15:57:53 +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
ChrisTerBeke
9b62b48509
WIP - CURA-4451
2017-10-25 13:27:35 +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
Ghostkeeper
9ad0fd2b83
Remove dash if plug-in author is empty
...
Contributes to issue CURA-4477.
2017-10-25 11:28:41 +02:00
Aleksei S
d2873dc65a
The view class were not added after to the rendering list after changing them
...
CURA-4062
2017-10-25 11:06:12 +02:00