Skip to content
Snippets Groups Projects
Commit 66413b44 authored by Loes's avatar Loes
Browse files

update

parent 7260061c
No related branches found
No related tags found
No related merge requests found
Pipeline #153977 passed
Stage: test
    Stage: deploy
      Hide whitespace changes
      Inline Side-by-side
      docs/files/recipes/testing.md
      + 28
      − 28
      View file @ 66413b44
      #Heat and water test
      ##Heat test 1: 50 degrees celcius
      ##Heat test 1: 50 - 70 degrees celcius
      I put them in the oven at the lowest setting of 50 centigrade.
      I put them in the oven at the lowest setting of 50 centigrade for 10 mins, then for 45 mins. Then I turned the oven up to 70 degrees and again checked after 10 and 45 mins.
      | Sample | 50 C for 10 mins | 50 C for 45 mins | 50 C for 90 mins |
      | Sample | 50 C for 10 mins | 50 C for 45 mins | 70 C for 10 mins | 70 C for 45 mins |
      |-----|------------|---------|--------------|--------|
      | Alginate foil | - | | |
      | Alginate composite | curls | | |
      | Agar foil | curls | | |
      | Madder copper dye | - | | |
      | Kombucha paper | - | | |
      | Biosilicone | melted | | |
      | Biofoam | softens | | |
      | Bioresin | softens | | |
      | Starch rubber | - | | |
      | Agar composite | - | | |
      | Mango leather | softens | | |
      | Biolinoleum | softens | | |
      | Alginate foil | - | - | more brittle |
      | Alginate composite | curls | no change | no change |
      | Agar foil | curls | - | slightly brittle |
      | Madder copper dye | - | - | - |
      | Kombucha paper | - | wax softened | no change |
      | Biosilicone | melted | no change | no change |
      | Biofoam | softens | wrinkles, slightly harder skin | softer inside, harder skin, wrinkles |
      | Bioresin | softens | no change | no change |
      | Starch rubber | - | more brittle | softened|
      | Agar composite | - | - | - |
      | Mango leather | softens | no change | no change (beeswax slightly sticky) |
      | Biolinoleum | softens | no change | no change |
      | **Other samples here!!!!**
      ##Water test 1: water resistant (spraying)
      ......@@ -44,17 +44,17 @@ I sprayed water onto the samples
      I submerged the samples in water at room temperature.
      | Sample | 30 mins | 1 hour | 8 hours | 24 hours
      | Sample | 30 mins | 1 hour | 2 hours | 4 hours
      |-----|------------|---------|--------------|--------|
      | Alginate foil | curls, turns thick and white | | |
      | Alginate composite | curls | | |
      | Agar foil | softens | | |
      | Madder copper dye | - | | |
      | Kombucha paper | softens | | |
      | Biosilicone | softens | | |
      | Biofoam | softens, soaks up water a little| | |
      | Bioresin | softens | | |
      | Starch rubber | softens, like wet gouda cheese | | |
      | Agar composite | - | | |
      | Mango leather | softens and gets a little slimy | | |
      | Biolinoleum | softens a little| | |
      \ No newline at end of file
      | Alginate foil | curls, turns thick and white | no change| |
      | Alginate composite | curls | no change| |
      | Agar foil | softens | no change | |
      | Madder copper dye | - | - | |
      | Kombucha paper | softens | - | |
      | Biosilicone | softens | soft and thicker | |
      | Biofoam | softens, soaks up water a little| edges turn transparent | |
      | Bioresin | softens | soft and thicker| |
      | Starch rubber | softens, like wet gouda cheese | no change | |
      | Agar composite | - | - | |
      | Mango leather | softens and gets a little slimy | falls apart | X| X|X
      | Biolinoleum | softens a little| soft and flexible | |
      \ No newline at end of file
      docs/projects/final-project.md
      + 29
      − 28
      View file @ 66413b44
      ......@@ -94,35 +94,36 @@ Anyone dedicated to biofabricating materials and some experience in at least one
      | Nr | Title | Price | Image | Link |
      |-----|-----------------|---------|--------------------------|--------|
      | 1 | Biofoam | €0,50 | ![](../images/finalpics-16_foam.jpg) | [Recipe](../files/recipes/biofoam) |
      | 2 |Extra Flexible Foil| €0,78 | ![](../images/finalpics-67.jpg) | [Recipe](../files/recipes/biofoilextraflexible) |
      | 3 | Bioresin | €2,56 | ![](../images/finalpics-37.jpg) | [Recipe](../files/recipes/bioresin) |
      | 4 | Biosilicone | €1,68| ![](../images/finalpics-45_silicone.jpg) | [Recipe](../files/recipes/biosilicon) |
      | 5 | Starch rubber | €2,26 | ![](../images/finalpics-47.jpg) | [Recipe](../files/recipes/biorubber) |
      | 6 | Biolinoleum | €0,78 | ![](../images/finalpics-56.jpg) | [Recipe](../files/recipes/biolino) |
      | 7 | Egg shell powder | €0,00 | ![](../images/) | [Recipe](../files/recipes/eggshellpowder) |
      | 8 | Alginate net | €0,00 | ![](../images/finalpics.jpg) | [Recipe](../files/recipes/alginatenet) |
      | 15 | Alginate foil | €0,00 | ![](../images/finalpics-52.jpg) | [Recipe](../files/recipes/alginatefoil) |
      | 17 | Alginate string | €0,00 | ![](../images/finalpics-72.jpg) | [Recipe](../files/recipes/alginatestring) |
      | 13 | Agar foil | €0,00 | ![](../images/finalpics-80.jpg) | [Recipe](../files/recipes/agarfoil) |
      | 14 | Agar net composite | €0,57 | ![](../images/finalpics-58.jpg) | [Recipe](../files/recipes/agarcomposite) |
      | 16 | Re-used PLA scraps | €0,00 | ![](../images/finalpics-61.jpg) | [Recipe](../files/recipes/recycledPLA) |
      | 9 | Alum crystal silk | €0,00 | ![](../finalpics-5.jpg/) | [Recipe](../files/recipes/alumcrystalsilk) |
      | 1 | Biofoam | €0,50 | ![](../images/finalpics-16_foam.jpg) | [Recipe](../../files/recipes/biofoam) |
      | 2 |Extra Flexible Foil| €0,78 | ![](../images/finalpics-67.jpg) | [Recipe](../../files/recipes/biofoilextraflexible) |
      | 3 | Bioresin | €2,56 | ![](../images/finalpics-37.jpg) | [Recipe](../../files/recipes/bioresin) |
      | 4 | Biosilicone | €1,68| ![](../images/finalpics-45_silicone.jpg) | [Recipe](../../files/recipes/biosilicon) |
      | 5 | Starch rubber | €2,26 | ![](../images/finalpics-47.jpg) | [Recipe](../../files/recipes/biorubber) |
      | 6 | Biolinoleum | €0,78 | ![](../images/finalpics-56.jpg) | [Recipe](../../files/recipes/biolino) |
      | 7 | Egg shell powder | €0,00 | ![](../images/) | [Recipe](../../files/recipes/eggshellpowder) |
      | 8 | Alginate net | €0,00 | ![](../images/finalpics.jpg) | [Recipe](../../files/recipes/alginatenet) |
      | 15 | Alginate foil | €0,00 | ![](../images/finalpics-52.jpg) | [Recipe](../../files/recipes/alginatefoil) |
      | 17 | Alginate string | €0,00 | ![](../images/finalpics-72.jpg) | [Recipe](../../files/recipes/alginatestring) |
      | 13 | Agar foil | €0,00 | ![](../images/finalpics-80.jpg) | [Recipe](../../files/recipes/agarfoil) |
      | 14 | Agar composite | €0,57 | ![](../images/finalpics-58.jpg) | [Recipe](../../files/recipes/agarcomposite) |
      | 16 | Re-used PLA scraps | €0,00 | ![](../images/finalpics-61.jpg) | [Recipe](../../files/recipes/recycledPLA) |
      | 9 | Alum crystal silk | €0,00 | ![](../finalpics-5.jpg/) | [Recipe](../../files/recipes/alumcrystalsilk) |
      | 10| Borax crystals | €0,00 | ![](../images/finalpics-10.jpg) | [Recipe](../../files/recipes/boraxcrystals) |
      | 11| Kombucha paper | €0,00 | ![](../images/finalpics-14.jpg) | [Recipe](../files/recipes/kombuchapaper) |
      | 12 | Overripe mango leather | €0,00 | ![](../images/finalpics-20.jpg) | [Recipe](../files/recipes/mangoleather) |
      | 19 | Tanned fish skin | €0,00 | ![](../images/finalpics-76.jpg) | [Recipe](../files/recipes/fishskin) |
      | 20| Madder dye | €0,00 | ![](../images/finalpics-88.jpg) | [Recipe](../files/recipes/madderdye) |
      | 21| Copper oxide | €0,00 | ![](../images/finalpics-93.jpg) | [Recipe](../files/recipes/copperoxide) |
      | 22 | Red cabbage dye | €0,00 | ![](../images/finalpics-101.jpg) | [Recipe](../files/recipes/cabbagedye) |
      | 23 | Coffee waste dye | €0,00 | ![](../images/finalpics-119.jpg) | [Recipe](../files/recipes/coffeedye) |
      | 24 | Bacterial dye on silk | €0,00 | ![](../images/finalpics-124.jpg) | [Recipe](../files/recipes/bacterialdye) |
      | 25 | Flower paper | €0,00 | ![](../images/finalpics-127.jpg) | [Recipe](../files/recipes/flowerpaper) |
      | 26 | Avocado stone dye | €0,00 | ![](../images/finalpics-136.jpg) | [Recipe](../files/recipes/avodye) |
      | 27 | Yellow onion skin dye | €0,00 | ![](../images/finalpics-143.jpg) | [Recipe](../files/recipes/oniondye) |
      | 28 | Beetroot dye | €0,00 | ![](../images/finalpics-157.jpg) | [Recipe](../files/recipes/beetrootdye) |
      | 29 | Hibiscus dye | €0,00 | ![](../images/finalpics-162.jpg) | [Recipe](../files/recipes/hibiscusdye) |
      | 30 | PH modifiers for biochromes | €0,00 | ![](../images/) | [Recipe](../files/recipes/phmodifiers) |
      | 11| Kombucha paper | €0,00 | ![](../images/finalpics-14.jpg) | [Recipe](../../files/recipes/kombuchapaper) |
      | 12 | Overripe mango leather | €0,00 | ![](../images/finalpics-20.jpg) | [Recipe](../../files/recipes/mangoleather) |
      | 19 | Tanned fish skin | €0,00 | ![](../images/finalpics-76.jpg) | [Recipe](../../files/recipes/fishskin) |
      | 20| Madder dye | €0,00 | ![](../images/finalpics-88.jpg) | [Recipe](../../files/recipes/madderdye) |
      | 21| Copper oxide | €0,00 | ![](../images/finalpics-93.jpg) | [Recipe](../../files/recipes/copperoxide) |
      | 22 | Red cabbage dye | €0,00 | ![](../images/finalpics-101.jpg) | [Recipe](../../files/recipes/cabbagedye) |
      | 23 | Coffee waste dye | €0,00 | ![](../images/finalpics-119.jpg) | [Recipe](../../files/recipes/coffeedye) |
      | 24 | Bacterial dye on silk | €0,00 | ![](../images/finalpics-124.jpg) | [Recipe](../../files/recipes/bacterialdye) |
      | 25 | Flower paper | €0,00 | ![](../images/finalpics-127.jpg) | [Recipe](../../files/recipes/flowerpaper) |
      | 26 | Avocado stone dye | €0,00 | ![](../images/finalpics-136.jpg) | [Recipe](../../files/recipes/avodye) |
      | 27 | Yellow onion skin dye | €0,00 | ![](../images/finalpics-143.jpg) | [Recipe](../../files/recipes/oniondye) |
      | 28 | Beetroot dye | €0,00 | ![](../images/finalpics-157.jpg) | [Recipe](../../files/recipes/beetrootdye) |
      | 29 | Hibiscus dye | €0,00 | ![](../images/finalpics-162.jpg) | [Recipe](../../files/recipes/hibiscusdye) |
      | 30 | PH modifiers for biochromes | €0,00 | ![](../images/) | [Recipe](../../files/recipes/phmodifiers) |
      | 30 | Coffee waste leather | €0,00 | ![](../images/) | [Recipe](../../files/recipes/phmodifiers) |
      ......
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment