fieldOfView
1924946b59
Merge branch 'master' into feature_mesh_types
...
# Conflicts:
# plugins/SolidView/SolidView.py
2017-11-18 11:28:15 +01:00
Aleksei S
93de006271
Remove suffix .curaproject for case "import models"
2017-11-17 15:22:29 +01:00
ChrisTerBeke
f48539cc93
Merge pull request #2685 from Ultimaker/container_stack_improvements
...
Container stack improvements
2017-11-17 13:09:54 +01:00
Lipu Fei
2c39612bc8
Fix UM2 upgrade regarding the variant
...
CURA-4482
UM2 by default doesn't have variants, but if the user enables Olsson
Block, the variant option will become available. This commit fixes the
following cases:
- Make sure that the variant is set on the extruder stack but not the
global stack
- Extruder stacks don't contain information such as has_variant. Such
info should be retrieved from the global stack and not just from the
definition container because they can be overriden by other
containers.
2017-11-17 12:47:30 +01:00
Lipu Fei
e246784df2
Use parseBool() for metadata bool values
...
CURA-4482
2017-11-17 12:43:30 +01:00
Lipu Fei
cd37f91a0a
Remove unnecessary code in BuildVolume
...
CURA-4482
2017-11-17 11:02:41 +01:00
Thomas Karl Pietrowski
b2da4894b1
CuraApplication: Rename file --> file_name
...
'file' is a built-in function!
2017-11-15 01:21:08 +01:00
ChrisTerBeke
88cf40e2d7
Merge branch 'master' into container_stack_improvements
2017-11-10 14:35:13 +01:00
fieldOfView
9c3e50c494
Ignore models without a convex hull when auto arranging
2017-11-09 19:21:05 +01:00
Jaime van Kessel
f2e7fef747
Update PreviewPass so that only slicable objects are rendered
2017-11-09 13:51:47 +01:00
fieldOfView
0b11117d6d
Set a property for non-printing-meshes
...
Remove code duplication
2017-11-09 12:28:55 +01:00
fieldOfView
ff14db9133
Remove convex hull for meshes that don't print geometry
...
Anti-overhang, Infill and Cutting meshes don't print geometry, so they don't need to push other objects away.
2017-11-09 11:29:50 +01:00
Jaime van Kessel
06045f036e
Added previewPass
2017-11-08 16:37:24 +01:00
Lipu Fei
d65ae62876
Merge pull request #2743 from Ultimaker/headless_cura
...
Headless cura
2017-11-07 11:07:43 +01:00
ChrisTerBeke
d32b7f0091
Merge branch 'master' into container_stack_improvements
2017-11-06 09:49:44 +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
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
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
ChrisTerBeke
97421ecf58
Create container stacks when loading older project file - CURA-4482
2017-11-01 13:31:25 +01:00
Mark
3ba7db1420
Merge branch 'master' into headless_cura
2017-11-01 13:25:09 +01:00
ChrisTerBeke
957009a768
Fix finding global quality for multi extrusion machines - CURA-4482
2017-10-31 17:32:21 +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
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
ChrisTerBeke
4701518404
Add default position to fdm extruder definition - CURA-4482
2017-10-31 10:23: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
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
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
69cd00d1c7
Do not take into account the active materials when importing a quality profile
...
CURA-4451
When importing a quality profile, it should not fail/succeed based on
which materials are activated at the moment. The imported quality
profile will be available when the user switches to a compatible
settings.
2017-10-30 13:13:54 +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
fieldOfView
2d109090bc
Show material name instead of extruder number
2017-10-30 12:40:41 +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
5db0fc7785
Add useragreement screen on first run of Cura
...
CURA-4501
2017-10-28 15:43:01 +02:00
Diego Prado Gesto
fb88dd6326
CURA-4492 Postponed signals are now emitted even if we need user
...
interaction when changing quality profiles
2017-10-27 13:32:51 +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
ChrisTerBeke
723f6ce226
Only get extruder settings from extruder stack - CURA-4482
2017-10-26 15:10:52 +02:00
