ChrisTerBeke
d32b7f0091
Merge branch 'master' into container_stack_improvements
2017-11-06 09:49:44 +01:00
ChrisTerBeke
2f0e81a819
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-06 09:49:33 +01:00
ChrisTerBeke
28ce2b1dc6
Ignore VariSlice plugin
2017-11-06 09:49:13 +01:00
Ruben D
c61b9c41ab
Fix translation of Unable to slice message
...
Previously the {0} would be filled in at runtime, causing the translation to no longer be found in the catalogue.
Contributes to issue CURA-4091.
2017-11-06 03:55:49 +01:00
Ruben D
0d71443bd2
Move 'Remove Empty First Layers' setting to mesh fixes category
...
It used to be in 'support' since it's something you may want to decide on depending on whether you have support or not. It could also go in 'Special Modes', but I think this is more specified.
2017-11-05 23:24:07 +01:00
Diego Prado Gesto
74a7f02166
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-02 13:21:25 +01:00
Diego Prado Gesto
a4441e2bdb
CURA-4481 Setting description improved
2017-11-02 13:20:25 +01:00
Lipu Fei
25c41062e1
Fix material upgrade and version checking
...
CURA-4519
Less duplicated code, but it's still one of the worst parts...
2017-11-02 13:01:49 +01:00
Diego Prado Gesto
a623c2ae75
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-02 09:53:36 +01:00
Diego Prado Gesto
d503283089
CURA-4509 Minor fix that avoids crashes when there is no specified
...
material (such as in UM2)
2017-11-02 09:51:57 +01:00
ChrisTerBeke
142ff4e9dc
Merge pull request #2669 from fieldOfView/feature_jogging
...
Jogging
2017-11-01 16:15:40 +01:00
Aleksei S
87a7bf72a8
Monitor view, "connect" button position
...
CURA-4509
2017-11-01 15:57:30 +01:00
ChrisTerBeke
4326884f97
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-01 15:54:43 +01:00
alekseisasin
db51054984
Merge pull request #2700 from fieldOfView/feature_cleanup_save_monitor_area
...
Cleanup save/monitor button area
2017-11-01 15:53:20 +01:00
ChrisTerBeke
e2c62a4609
Revert "Remove unnecessary properties which after update triggered view rendering"
...
This reverts commit ee228155af
2017-11-01 15:50:23 +01:00
ChrisTerBeke
e29fdbe76d
Cleanup - CURA-4482
2017-11-01 14:32:58 +01:00
ChrisTerBeke
e23e6cfa31
Fix for global quality in case of user created quality profile - CURA-4482
2017-11-01 13:59:21 +01:00
Diego Prado Gesto
7f76749e2c
Merge branch 'CURA-4062_layerview_laggy'
2017-11-01 13:37:44 +01:00
ChrisTerBeke
97421ecf58
Create container stacks when loading older project file - CURA-4482
2017-11-01 13:31:25 +01:00
Diego Prado Gesto
c85e10f4c5
CURA-4062 Minor changes
2017-11-01 13:31:17 +01:00
ChrisTerBeke
743285f426
Merge branch 'master' into container_stack_improvements
2017-11-01 12:32:37 +01:00
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
