Commit graph

6496 commits

Author SHA1 Message Date
Ghostkeeper
a18f77abdd
Move exclude_materials into material profiles
They are there not 'hardware compatible' any more.

Contributes to issue CURA-5460.
2018-07-10 15:26:23 +02:00
Ghostkeeper
f712fc0f36
No longer add incompatible materials to materials menus
This removes the need for the 'compatible' role but I'll keep it in for now in case we want to change the design of this later.

Contributes to issue CURA-5460.
2018-07-10 15:26:23 +02:00
Ghostkeeper
c0fc0a7eba
Disable material if not compatible
Similar to how it's displayed in the printer.

Contributes to issue CURA-5460.
2018-07-10 15:26:23 +02:00
Ghostkeeper
16226bdd48
Move exclude_materials into the material profiles
An accompanying commit should be done in the fdm_materials repository.

Contributes to issue CURA-5460.
2018-07-10 15:26:23 +02:00
Ghostkeeper
f0ef236df0
Change tab to spaces 2018-07-10 13:33:30 +02:00
Lipu Fei
e5a11c1f7b Fix getContainerMetaDataEntry()
CURA-5408
2018-07-09 15:12:53 +02:00
Ian Paschal
a596c5a034 Code-style fixes
Contributes to CURA-5408
2018-07-09 14:39:13 +02:00
Aleksei S
52f6037576 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-09 14:21:17 +02:00
Aleksei S
77bd6cf749 Read material weight from container
CURA-5408
2018-07-09 14:20:51 +02:00
Ian Paschal
9bf4541e06
Merge pull request #3697 from smartavionics/mb-supported-skin-fan
Added support_fan_enable and support_supported_skin_fan_speed settings.
2018-07-06 23:17:42 +02:00
alekseisasin
a499a6bb66
Merge pull request #4027 from Ultimaker/feature_prime_tower_shells
Prime Tower Shells
2018-07-06 14:39:29 +02:00
Ghostkeeper
ec00e5b721
Remove references to deleted settings
Also convert the values for prime_tower_min_volume to make it behave similar to what the minimum volume used to be. This feature fixed a bug with the computation from volume to thickness. Now it's correct but we have to correct the old values to be still the same (approximately) as what used to be the end result.

Contributes to issue CURA-5457.
2018-07-05 13:22:17 +02:00
Ghostkeeper
807e8410c0
Give warning when sum of volumes exceeds volume of prime tower
It could happen that the desired volume is not entirely reached in the inner shells because of rounding the volume up to the nearest perimeter on the outer shells.

Contributes to issue CURA-5457.
2018-07-05 10:31:23 +02:00
Ghostkeeper
192a581d6d
Don't round the warning threshold
The threshold is not visible. It's not necessary to round.

Contributes to issue CURA-5457.
2018-07-05 09:50:05 +02:00
Mark
20180e3804
Merge pull request #4022 from Ultimaker/remove_id_raise3d
Remove ID from Raise3D definition
2018-07-05 09:44:42 +02:00
Ghostkeeper
9e18bb8b4c
Remove ID from Raise3D definition
These IDs are not used and should never be added again.
2018-07-04 17:31:58 +02:00
Diego Prado Gesto
3b406b5467 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-04 14:32:05 +02:00
Diego Prado Gesto
4722b5387b CURA-5334 Add extruder definition for Wanhao printers, Uni Print 3d and
Tevo Tornado. Those definitions were added without extruder definitions.
2018-07-04 14:22:22 +02:00
Ghostkeeper
8ff4327c41
Remove Wipe Nozzle After Switch and Purge Volume settings
The entire purging algorithm is gone now since it purges by printing the prime tower. The prime tower should be sufficiently strong now to not need this.

Contributes to issue CURA-5457.
2018-07-04 14:17:57 +02:00
Ghostkeeper
7b2a5c9160
Remove prime_tower_wall_thickness setting
The wall thickness now depends on the order in which the prime towers are folded, which is really hard to obtain within an inheritance formula. So we forego one of the settings and compute the required thickness to obtain the desired volume in the engine where the shell order is known.

Contributes to issue CURA-5457.
2018-07-04 13:45:44 +02:00
Ian Paschal
d4aaec7355 CURA-5537 Style improvements 2018-07-04 12:51:01 +02:00
Diego Prado Gesto
5b251fc6dc CURA-5334 Remove machine nozzle size from machine definitions and move
it to extruder definitions.
2018-07-04 12:00:38 +02:00
Ian Paschal
bc05839940 CURA-5537 improve styling of toolbox 2018-07-03 15:54:20 +02:00
Mark
1f51d83fa7
Merge pull request #3982 from fieldOfView/fix_dark_theme_artefact
Fix a bright line/gap between the viewport and sidebar due to rounding
2018-07-02 16:50:56 +02:00
Mark
f3d92ecdbf
Merge pull request #3986 from fieldOfView/fix_always_ask
Clarify Profile Override preference options
2018-07-02 16:43:20 +02:00
alekseisasin
debe142c18
Merge pull request #3914 from Ultimaker/CURA-5334_extruder_def_for_all
CURA-5334 Add extruder definitions for all single-extrusion machines
2018-07-02 15:56:45 +02:00
Jack Ha
e11ce2674f CURA-5334 formatting 2018-07-02 15:10:27 +02:00
Aleksei S
914b3a648b Added setting for initial layer support distance
CURA-5527
2018-07-02 14:21:13 +02:00
Jack Ha
3761123513 Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-07-02 14:11:24 +02:00
Jack Ha
e842ca37fb CURA-5334 adding more material_diameter properties 2018-07-02 13:48:21 +02:00
Jack Ha
5aba2e4b90 CURA-5334 corrected extruders that didn't have a material_diameter yet 2018-07-02 13:38:18 +02:00
Diego Prado Gesto
ee2dfffb84
Merge pull request #3977 from fieldOfView/fix_preference_pages
Fixes for preference pages
2018-06-29 15:00:39 +02:00
Diego Prado Gesto
eca855c8c2 Merge branch '3.4'
Fix some conflicts. Change the weights of the global UMO profiles.
2018-06-28 14:43:39 +02:00
fieldOfView
1f7ef027ec Clarify Profile Override preference options 2018-06-27 10:16:39 +02:00
fieldOfView
756288bbb4 Fix a bright line/gap between the viewport and sidebar due to rounding 2018-06-26 22:34:06 +02:00
Ghostkeeper
8e6b5a0d6a
Decimate UMS5 platform mesh
This mesh has a lot of structure underneath the build plate which can't even be seen really. We can reduce the resolution of that so that it falls under the norm of 1MB per build plate mesh that we hold for all our printers.
2018-06-26 15:56:13 +02:00
fieldOfView
3546af86e8 Select the current profile when showing the profiles page 2018-06-26 12:02:41 +02:00
fieldOfView
05b3654346 Fix color of selected items in Profiles and Materials pages 2018-06-26 11:45:07 +02:00
Mark
feeb00618d Merge branch 'uni-print-3d-support' of https://github.com/machinekoder/Cura 2018-06-26 09:28:05 +02:00
Alexander Rössler
88197c4978 definitions/UNI-PRINT-3D: add to Other category 2018-06-25 20:37:25 +02:00
Diego Prado Gesto
9689104a2d CURA-5496 Change the ultimaker original profiles by removing the 0.3 and
adding the 0.6mm. layer heigh.
2018-06-25 15:58:13 +02:00
Diego Prado Gesto
62ca661d0e CURA-5496 Remove wrong settings from the UM2 global profiles. 2018-06-25 15:27:53 +02:00
Lipu Fei
140e38ac1c Fix merge conflicts
CURA-5496
2018-06-25 14:26:13 +02:00
Lipu Fei
65f696a14f Simplify the case of UMO Dual
CURA-5496
2018-06-25 14:24:25 +02:00
Lipu Fei
8d0b364b44 UMO+ shares the same quality profiles as UMO
CURA-5496
2018-06-25 14:21:02 +02:00
Ghostkeeper
e8573dfe3b
Merge branch '3.4' 2018-06-25 13:44:21 +02:00
Ghostkeeper
cfa5d88faf
Merge branch '3.4' of https://github.com/Patola/Cura into Patola-3.4 2018-06-25 13:41:46 +02:00
Diego Prado Gesto
cb2097eafc CURA-5496 Use setting_version 5 in the UMO and UMODual global quality
profiles.
2018-06-25 11:52:48 +02:00
Diego Prado Gesto
2a75aebab9 Merge branch '3.4' 2018-06-25 11:51:48 +02:00
Diego Prado Gesto
9f1ad08bc2 CURA-5496 Add global profiles for the UMO, UMO+ and UMODual. 2018-06-25 11:35:17 +02:00