4235 Commits

Author SHA1 Message Date
fieldOfView
85f53be9e2 Tone down striped shader colors 2016-07-25 21:59:37 +02:00
fieldOfView
785d7cf6d1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 18:01:23 +02:00
fieldOfView
4014cb11f9 Reinstate UMO wizard
CURA-1732
2016-07-25 18:00:17 +02:00
Tim Kuipers
07e876d06f Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 17:46:57 +02:00
Tim Kuipers
8cdf20c6bf Merge branch 'Johan3DV-layerview_dev' 2016-07-25 17:44:24 +02:00
fieldOfView
5f26372b96 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 17:39:57 +02:00
fieldOfView
1057634e47 Remove (non-functional) layer number from print monitor
CURA-1940
2016-07-25 17:39:43 +02:00
Jack Ha
d82249e260 Fix for one-at-a-time. CURA-1707 2016-07-25 17:09:06 +02:00
Jack Ha
d77f6e86e4 Added an extruded convex hull as a raft instead of a grey plane.
- New shader transparent_object.shader
- Raft thickness is calculated in BuildVolume and used in
  ConvexHullDecorator, notified by a Signal.
- Removed old grey plane from BuildVolume.
- Vertex data below build plane is no longer discarded (caused convex
  hulls that are too small).
- Uses new functions in MeshBuilder (update Uranium as well).

CURA-1707
2016-07-25 16:45:38 +02:00
Tim Kuipers
c6e9e62e73 Merge branch 'layerview_dev' of https://github.com/Johan3DV/Cura into Johan3DV-layerview_dev 2016-07-25 16:41:13 +02:00
Jaime van Kessel
2d34e2b28e Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 15:44:55 +02:00
Jaime van Kessel
70242ba502 Saving a file no longer causes a re-slice
CURA-1933
2016-07-25 15:44:16 +02:00
fieldOfView
0e557feb4b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 14:58:22 +02:00
fieldOfView
7ce5e71b4c Code cleanup 2016-07-25 14:58:12 +02:00
Tim Kuipers
6b3a25a491 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 14:50:11 +02:00
Tim Kuipers
59e8525855 JSON fix: flow temp graph reenabled (CURA-1174) 2016-07-25 14:50:05 +02:00
Jaime van Kessel
b28cf14288 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 13:51:27 +02:00
Jaime van Kessel
f51cffdf2e We now ask the stack for the position (instead of definition) 2016-07-25 13:50:47 +02:00
Thomas Karl Pietrowski
93a0637b23 Merge pull request #866 from thopiekar/master-CURA-1445-only
CURA-1445: Using getDisplayString(ISO8601) in SliceInfo
2016-07-25 13:42:26 +02:00
Thomas Karl Pietrowski
d9839ee41d SliceInfo: Using getDisplayString(ISO8601) instead 2016-07-25 13:40:19 +02:00
fieldOfView
87abed39f0 Fix two warnings on startup
CURA-1758
2016-07-25 11:41:54 +02:00
fieldOfView
ac0de58ecb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 11:30:47 +02:00
fieldOfView
374ec8e577 Don't show user/quality emphasis on Per Object Settings 2016-07-25 11:30:30 +02:00
Jaime van Kessel
5d19113f8e Merge branch 'feature_stripe_shader' of github.com:Ultimaker/Cura 2016-07-25 10:51:45 +02:00
Jaime van Kessel
6883747671 Merge branch 'feature_remove_global_tab' of github.com:Ultimaker/Cura 2016-07-25 10:47:52 +02:00
Jaime van Kessel
000c4d5f41 Fixed issue where changing a setting would cause mismatch between stacks
CURA-1758
2016-07-25 09:58:33 +02:00
Ghostkeeper
4e9bfc6573
Display some skirt/brim settings if skirt/brim enabled
Some needed to be updated because they concern both skirt and brim. Others missed the check entirely.

Contributes to issue CURA-1678.
2016-07-22 17:23:03 +02:00
Ghostkeeper
54685e8898
Rename setting skirt_minimal_length to skirt_brim_minimal_length
Also updated the description and made it a bit more accurate. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 17:12:34 +02:00
Ghostkeeper
3042b6af5f
Rename skirt size to bed adhesion size
Because it concerns not only the skirt, but also the brim and raft (and X/Y offset but I didn't include that in the name).

Contributes to issue CURA-1678.
2016-07-22 17:06:35 +02:00
Ghostkeeper
d4f96ab62d
Rename setting skirt_line_width to skirt_brim_line_width
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 17:00:30 +02:00
Ghostkeeper
5e2f1688b4
Rename setting jerk_skirt to jerk_skirt_brim
Because it concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 16:53:41 +02:00
Ghostkeeper
23f643aabc
Rename setting acceleration_skirt to acceleration_skirt_brim
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 16:49:31 +02:00
Ghostkeeper
cb4c1fd08c
Rename skirt_speed to skirt_brim_speed
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 16:45:11 +02:00
Jaime van Kessel
be252fb84f We now check if a setting can also be removed to get the same state
THis should prevent the reset buttons from showing up when there is nothing going on.

CURA-1758
2016-07-22 15:31:37 +02:00
fieldOfView
6cc6e79e65 Stripe objects that are outside the build volume
This way they can not be confused with objects that are rendered with a (future) grey materialcolor.
2016-07-22 14:24:52 +02:00
Jaime van Kessel
fa61a9e3f0 Removed bunch of unneeded global inheritance stuff
CURA-1758
2016-07-22 14:04:35 +02:00
fieldOfView
a2972e26f5 Remove the "from" convert_function for extruder settings
Fixes CURA-1974
2016-07-22 13:45:53 +02:00
fieldOfView
9171908c8b Show weights as well as lengths
CURA-1038
2016-07-22 13:44:45 +02:00
fieldOfView
1f53ce0d4d Fix weight calculation
CURA-1038
2016-07-22 13:43:26 +02:00
Jaime van Kessel
83ec6e849a Multiple changes when quality profiles have different values should no longer break the link
CURA-1758
2016-07-22 13:16:35 +02:00
Jaime van Kessel
df46a61d38 Active stack should no longer influence changing of targeted settings
CURA-1758
2016-07-22 11:44:37 +02:00
Jaime van Kessel
cafb46cb1d First container is now updated withouth recursion possible
We now use a set of keys that we are handling in order to prevent the lock

CURA-1758
2016-07-22 10:43:26 +02:00
Johan K
4c402e5bb7 Removed the layer data empty guard in ProcessSlicedLayers as the problem was solved in the backend. 2016-07-22 10:22:07 +02:00
Johan K
c6790981d6 Merge branch 'master' of https://github.com/Ultimaker/Cura into layerview_dev 2016-07-22 10:21:41 +02:00
Jaime van Kessel
8307dba643 Revert "Commented out 2 lines of code that caused issues with reset"
This reverts commit 568d30d17b85dc1fd5bd4ab784e750ac237cdb39. Turned out this causes recursion issue when changing materials
2016-07-22 09:33:44 +02:00
Jaime van Kessel
7e48b6ad4c Removed global_inherit_stack from support enable and support type
CURA-1758
2016-07-22 09:03:14 +02:00
Jaime van Kessel
87b9b17f98 Now the right extruder is actually used (instead of randomly mixing it up)
CURA-1758
2016-07-21 21:42:02 +02:00
Jaime van Kessel
568d30d17b Commented out 2 lines of code that caused issues with reset
The documentation doesn't mention why the code is there, so i've commented them out for the time beeing

CURA-1758
2016-07-21 21:19:25 +02:00
Jaime van Kessel
4346d5a233 Settings now point to the right extruder stack
CURA-1758
2016-07-21 20:54:02 +02:00
fieldOfView
dd78561e25 Remove global tab
CURA-1758
2016-07-21 15:35:20 +02:00