11187 Commits

Author SHA1 Message Date
Mark
cb0f94eed0 Resolve merge conflict 2017-11-01 10:57:16 +01:00
Aleksei S
1de61600a7 Checkbox position and warning in log file
CURA-4503
2017-11-01 10:45:09 +01:00
Mark
512541be08 Change the font of the checkbox
CURA-4503
2017-11-01 10:44:46 +01:00
ChrisTerBeke
957009a768 Fix finding global quality for multi extrusion machines - CURA-4482 2017-10-31 17:32:21 +01:00
alekseisasin
fb87b73bbe
Merge pull request #2591 from BagelOrb/trihex_infill
trihex infill
2017-10-31 17:25:31 +01:00
ChrisTerBeke
8f41185f22 Fix extruder manager single instance from qml - CURA-4482 2017-10-31 17:18:19 +01:00
ChrisTerBeke
2e1da58570 Cleanup - CURA-4482 2017-10-31 17:06:34 +01:00
ChrisTerBeke
ce896177cb Cleanup 3mf workspace reader - CURA-4482 2017-10-31 16:32:04 +01:00
ChrisTerBeke
7a8d562234 Merge branch 'master' into container_stack_improvements 2017-10-31 16:24:05 +01:00
ChrisTerBeke
8676792ef8 Disable annoying debug message about not found printer definition 2017-10-31 16:23:45 +01:00
ChrisTerBeke
c59e4bb3e1 Cleanup machine settings action - CURA-4482 2017-10-31 16:20:25 +01:00
Lipu Fei
324b39fc39 Fix layout for open project dialog
CURA-4503
2017-10-31 16:20:01 +01:00
ChrisTerBeke
cc6be48a79 Always use extruder stack when updating material diameter - CURA-4482 2017-10-31 16:19:16 +01:00
ChrisTerBeke
b8757b46b3 Always use extruder stack in machine settings action plugin, keep support for older project files - CURA-4482 2017-10-31 16:16:51 +01:00
ChrisTerBeke
f421166b18 Clarify 3mf saving multi extrusion setting - CURA-4482 2017-10-31 16:11:27 +01:00
ChrisTerBeke
52782b8d13 Always use the extruder stacks to determine model color in solid view - CURA-4482 2017-10-31 16:08:59 +01:00
ChrisTerBeke
a7383b42d5 Always use extruder stack when adding settings per object - CURA-4482 2017-10-31 16:04:06 +01:00
ChrisTerBeke
77cd10374c Always set the active extruder stack when loading project file settings - CURA-4482 2017-10-31 16:00:22 +01:00
ChrisTerBeke
c23c031152 Always use extruder stacks in slice info - CURA-4482 2017-10-31 14:51:31 +01:00
ChrisTerBeke
cc267646e7 Always use extruder stacks when building slicer message and deprecate otherwise - CURA-4482 2017-10-31 14:48:52 +01:00
ChrisTerBeke
911f619000 Fix for getting machine extruders from manager instance - CURA-4482 2017-10-31 14:43:48 +01:00
ChrisTerBeke
f20ba4a118 Only create new extruder stack for single extrusion machine if it does not exist yet - CURA-4482 2017-10-31 14:37:58 +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
ChrisTerBeke
569047693e Rename loop variable to be more explicit - CURA-4482 2017-10-31 13:55:47 +01:00
ChrisTerBeke
359514e08b Cleanup CuraContainerRegistry.py - CURA-4482 2017-10-31 13:49:04 +01:00
ChrisTerBeke
dfe0212a41 Comment out unneeded materials fetching 2017-10-31 13:48:08 +01:00
ChrisTerBeke
6ac8163589 Cleanup CuraApplication.py - CURA-4482 2017-10-31 13:43:01 +01:00
ChrisTerBeke
bc6984a0ed Fixes for selecting active variant, material and quality - CURA-4482 2017-10-31 13:19:28 +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
Diego Prado Gesto
d7b75cab2e CURA-4502 Minor changes 2017-10-31 11:42:46 +01:00
Lipu Fei
22e36ff3af Fix not supported quality profile list
CURA-4451
2017-10-31 11:21:34 +01:00
Aleksei S
4e40da54b3 Merge branch 'master' of github.com:Ultimaker/cura 2017-10-31 11:08:55 +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
Andreea Scorojitu
e36cefedf6
Update ChangeLog.txt 2017-10-31 10:47:57 +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
Ghostkeeper
92cf76b30b
Merge branch '3.0' 2017-10-31 09:57:42 +01:00
Andreea Scorojitu
d7b0583640 Update changelog to the current 3.0.4 version 2017-10-31 09:52:30 +01:00
ChrisTerBeke
f36c9ffbc0 Create extruder stack for single extrusion machines when adding new machine - CURA-4482 2017-10-31 09:49:24 +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
Aleksei S
7f02ddd6e9 Simplified version for validation need to show user agreement
CURA-4501
2017-10-30 15:43:40 +01:00
Lipu Fei
aab601927c Show Add Machine dialog after User Agreement dialog is closed
CURA-4501
2017-10-30 15:43:40 +01:00
Lipu Fei
b5904cd239 Fix code style
CURA-4501
2017-10-30 15:43:40 +01:00
Mark
ca8127c047 Fixed code comments
CURA-4501
2017-10-30 15:43:39 +01:00
Mark
9aebb395ab Refactor and cleanup
CURA-4501
2017-10-30 15:43:39 +01:00