From 0e69338fca0296b5b57ea4a32ab9af1c0159785d Mon Sep 17 00:00:00 2001 From: thies Date: Thu, 2 Mar 2023 14:13:11 +0100 Subject: [PATCH 1/4] Merge branch 'mod_patch' into main --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 164b929..c39dc04 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,13 @@ SPDX-License-Identifier: CC-BY-SA-4.0 ![Ansicht im Raum](res/assets/media/img/FC5-Render-preview.webp) -## Einführung +## Einleitung -Pilzmyzelkomposite sind kreislaufgerechte Kompositmaterialien, bestehend aus Reststoffen und einem Pilzgeflecht (Pilzmyzel). Dabei durchwächst ein Pilz ein Substrat und verbindet dieses miteinander, welches nach der Trocknung Formstabil ist. -Dieses Repository ist die Anleitung für die Herstellung von Akustikabsorbern aus diesem Material, wie sie in der Raumansicht oben illustriert sind. +Die Entwicklung dieses Repositories findet im Rahmen des Fabcity Interfacerprojektes statt und stellt den Herstellungsprozess zu der Forschnungsfrage, wie gut lassen sich Akustikabsorber aus Pilzmyzelmaterialien in einem Fablab mit der Unterstützung digitaler Werkzeuge reproduzieren, dar. + +Die dabei verwendeten Pilzmyzelkomposite sind kreislaufgerechte Kompositmaterialien, bestehend aus agrarischen Reststoffen und einem Pilzgeflecht (Pilzmyzel). Bei der Herstellung durchwächst dabei ein Pilz ein Substrat in einer Form und verbindet die Partikel des Substrates durch sein Pilzgeflecht miteinander. Nach der Trocknung entsteht daraus ein formstabiler Körper, der für die Schallabsorption eingesetzt werden kann. + +Das Repository beinhaltet die Anleitung zur Herstellung von Akustikabsorbern sowie Befestigungssystemen mit dem oben illustrierten Erscheinungsbild. --- ### Effektive Schallabsorption @@ -26,7 +29,7 @@ Abgesehen vom Befestigungssytem, besteht die Akustikabsorber ausschließlich aus --- ### Reproduzierbar in Fablabs und offenen Laboren -Am Beispiel von Akustikabsorbern untersuchen wir auf praktische Weise, wie gut sich Prototypen der Pilzmyzelkomposite in einem Fablab mit Unterstützung digitaler Werkzeuge reproduzieren lassen. +Bei der Erstllung der Herstellungsmethode wurde darauf Wert gelegt, dass sich die Akustikabsorber aus Pilzmyzelmaterialien mit den Möglichkeiten von Fablabs und offenen Laboren für Biologie reproduzieren lassen. --- ## Repository From 8bae9488cfa2292fad066ae9c73244f3d7b943f6 Mon Sep 17 00:00:00 2001 From: thies Date: Thu, 2 Mar 2023 14:19:59 +0100 Subject: [PATCH 2/4] readme text --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c39dc04..5ab9f9b 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ SPDX-License-Identifier: CC-BY-SA-4.0 Die Entwicklung dieses Repositories findet im Rahmen des Fabcity Interfacerprojektes statt und stellt den Herstellungsprozess zu der Forschnungsfrage, wie gut lassen sich Akustikabsorber aus Pilzmyzelmaterialien in einem Fablab mit der Unterstützung digitaler Werkzeuge reproduzieren, dar. -Die dabei verwendeten Pilzmyzelkomposite sind kreislaufgerechte Kompositmaterialien, bestehend aus agrarischen Reststoffen und einem Pilzgeflecht (Pilzmyzel). Bei der Herstellung durchwächst dabei ein Pilz ein Substrat in einer Form und verbindet die Partikel des Substrates durch sein Pilzgeflecht miteinander. Nach der Trocknung entsteht daraus ein formstabiler Körper, der für die Schallabsorption eingesetzt werden kann. +Die dabei verwendeten Pilzmyzelkomposite sind kreislaufgerechte Kompositmaterialien, bestehend aus agrarischen Reststoffen und einem Pilzgeflecht (Pilzmyzel). Bei der Herstellung durchwächst dabei ein Pilz ein Substrat in einer Form und verbindet die Partikel des Substrates durch Adhäsion miteinander. Nach der Trocknung entsteht daraus ein formstabiler Körper, der für die Schallabsorption eingesetzt werden kann. -Das Repository beinhaltet die Anleitung zur Herstellung von Akustikabsorbern sowie Befestigungssystemen mit dem oben illustrierten Erscheinungsbild. +Dieses Repository beinhaltet die Anleitung zur Herstellung von Akustikabsorbern sowie einem Befestigungssystem mit dem oben illustrierten Erscheinungsbild. --- ### Effektive Schallabsorption From 34a28e88f1bd84b45547fae42ef27a12526f2122 Mon Sep 17 00:00:00 2001 From: thies Date: Thu, 2 Mar 2023 14:22:40 +0100 Subject: [PATCH 3/4] readme text --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ab9f9b..ae38915 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0 ## Einleitung -Die Entwicklung dieses Repositories findet im Rahmen des Fabcity Interfacerprojektes statt und stellt den Herstellungsprozess zu der Forschnungsfrage, wie gut lassen sich Akustikabsorber aus Pilzmyzelmaterialien in einem Fablab mit der Unterstützung digitaler Werkzeuge reproduzieren, dar. +Die Entwicklung dieses Repositories findet im Rahmen des Fabcity Interfacerprojektes statt und bietet die Herstellungsmethode zu der Forschnungsfrage, wie gut lassen sich Akustikabsorber aus Pilzmyzelmaterialien in einem Fablab mit der Unterstützung digitaler Werkzeuge reproduzieren. Die dabei verwendeten Pilzmyzelkomposite sind kreislaufgerechte Kompositmaterialien, bestehend aus agrarischen Reststoffen und einem Pilzgeflecht (Pilzmyzel). Bei der Herstellung durchwächst dabei ein Pilz ein Substrat in einer Form und verbindet die Partikel des Substrates durch Adhäsion miteinander. Nach der Trocknung entsteht daraus ein formstabiler Körper, der für die Schallabsorption eingesetzt werden kann. From 4bf22226d1d5f85b14d576db16012c4aa37eec1a Mon Sep 17 00:00:00 2001 From: thies Date: Thu, 2 Mar 2023 14:37:10 +0100 Subject: [PATCH 4/4] rm empty readmes --- .../mod/casting_from_3D_positive_mould/res/README.md | 10 ---------- .../res/assets/README.md | 10 ---------- .../res/assets/media/README.md | 9 --------- .../res/assets/media/img/README.md | 9 --------- .../mod/casting_from_3D_positive_mould/src/README.md | 9 --------- .../casting_from_3D_positive_mould/src/mech/README.md | 10 ---------- mod/mould/mod/direct_3D_negative_mould/res/README.md | 10 ---------- .../mod/direct_3D_negative_mould/res/assets/README.md | 10 ---------- .../res/assets/media/README.md | 9 --------- .../res/assets/media/img/README.md | 9 --------- mod/mould/mod/direct_3D_negative_mould/src/README.md | 9 --------- .../mod/direct_3D_negative_mould/src/mech/README.md | 10 ---------- mod/mounting_system/res/README.md | 10 ---------- mod/mounting_system/res/assets/README.md | 10 ---------- mod/mounting_system/res/assets/media/README.md | 10 ---------- mod/mounting_system/res/assets/media/img/README.md | 9 --------- mod/mounting_system/src/README.md | 9 --------- mod/mounting_system/src/mech/README.md | 10 ---------- res/assets/media/img/README.md | 10 ---------- 19 files changed, 182 deletions(-) delete mode 100644 mod/mould/mod/casting_from_3D_positive_mould/res/README.md delete mode 100644 mod/mould/mod/casting_from_3D_positive_mould/res/assets/README.md delete mode 100644 mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/README.md delete mode 100644 mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/README.md delete mode 100644 mod/mould/mod/casting_from_3D_positive_mould/src/README.md delete mode 100644 mod/mould/mod/casting_from_3D_positive_mould/src/mech/README.md delete mode 100644 mod/mould/mod/direct_3D_negative_mould/res/README.md delete mode 100644 mod/mould/mod/direct_3D_negative_mould/res/assets/README.md delete mode 100644 mod/mould/mod/direct_3D_negative_mould/res/assets/media/README.md delete mode 100644 mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/README.md delete mode 100644 mod/mould/mod/direct_3D_negative_mould/src/README.md delete mode 100644 mod/mould/mod/direct_3D_negative_mould/src/mech/README.md delete mode 100644 mod/mounting_system/res/README.md delete mode 100644 mod/mounting_system/res/assets/README.md delete mode 100644 mod/mounting_system/res/assets/media/README.md delete mode 100644 mod/mounting_system/res/assets/media/img/README.md delete mode 100644 mod/mounting_system/src/README.md delete mode 100644 mod/mounting_system/src/mech/README.md delete mode 100644 res/assets/media/img/README.md diff --git a/mod/mould/mod/casting_from_3D_positive_mould/res/README.md b/mod/mould/mod/casting_from_3D_positive_mould/res/README.md deleted file mode 100644 index 73caa0e..0000000 --- a/mod/mould/mod/casting_from_3D_positive_mould/res/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `res/` - -Stands for "resources", and should hold any files that are part of the sources of the project, but are not source code, design, scripts or documentation text files. This includes also binary files, next to text files. The sub-dirs within res/assets/ and res/ should be the same (excluding of course res/assets/assets/). - diff --git a/mod/mould/mod/casting_from_3D_positive_mould/res/assets/README.md b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/README.md deleted file mode 100644 index 8f86ec7..0000000 --- a/mod/mould/mod/casting_from_3D_positive_mould/res/assets/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `res/assets/` - -All binary (and potentially large text-)resources should go here, as this allows to go "clean-slate" with this data from time to time, to reduce clone size, if done as a git sub-module (which can also be done later). Having it as a git sub-module, also allows to not fetch it at all, if storage or bandwidth is an issue, and it is not required for the task at hand. The sub-dirs within res/assets/ and res/ should be the same (excluding of course res/assets/assets/). - diff --git a/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/README.md b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/README.md deleted file mode 100644 index f12d89f..0000000 --- a/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/README.md +++ /dev/null @@ -1,9 +0,0 @@ - - -# README `res/assets/media/` - -null \ No newline at end of file diff --git a/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/README.md b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/README.md deleted file mode 100644 index 443e1b2..0000000 --- a/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/README.md +++ /dev/null @@ -1,9 +0,0 @@ - - -# README `res/assets/media/img/` - -null \ No newline at end of file diff --git a/mod/mould/mod/casting_from_3D_positive_mould/src/README.md b/mod/mould/mod/casting_from_3D_positive_mould/src/README.md deleted file mode 100644 index 032a63d..0000000 --- a/mod/mould/mod/casting_from_3D_positive_mould/src/README.md +++ /dev/null @@ -1,9 +0,0 @@ - - -# README `src/` - -Source files - Editable files (Think: Word, not PDF) \ No newline at end of file diff --git a/mod/mould/mod/casting_from_3D_positive_mould/src/mech/README.md b/mod/mould/mod/casting_from_3D_positive_mould/src/mech/README.md deleted file mode 100644 index 75efe6c..0000000 --- a/mod/mould/mod/casting_from_3D_positive_mould/src/mech/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `src/mech/` - -Mechanical "blueprints" - Computer Aided Design (CAD) files - diff --git a/mod/mould/mod/direct_3D_negative_mould/res/README.md b/mod/mould/mod/direct_3D_negative_mould/res/README.md deleted file mode 100644 index 73caa0e..0000000 --- a/mod/mould/mod/direct_3D_negative_mould/res/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `res/` - -Stands for "resources", and should hold any files that are part of the sources of the project, but are not source code, design, scripts or documentation text files. This includes also binary files, next to text files. The sub-dirs within res/assets/ and res/ should be the same (excluding of course res/assets/assets/). - diff --git a/mod/mould/mod/direct_3D_negative_mould/res/assets/README.md b/mod/mould/mod/direct_3D_negative_mould/res/assets/README.md deleted file mode 100644 index 8f86ec7..0000000 --- a/mod/mould/mod/direct_3D_negative_mould/res/assets/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `res/assets/` - -All binary (and potentially large text-)resources should go here, as this allows to go "clean-slate" with this data from time to time, to reduce clone size, if done as a git sub-module (which can also be done later). Having it as a git sub-module, also allows to not fetch it at all, if storage or bandwidth is an issue, and it is not required for the task at hand. The sub-dirs within res/assets/ and res/ should be the same (excluding of course res/assets/assets/). - diff --git a/mod/mould/mod/direct_3D_negative_mould/res/assets/media/README.md b/mod/mould/mod/direct_3D_negative_mould/res/assets/media/README.md deleted file mode 100644 index f12d89f..0000000 --- a/mod/mould/mod/direct_3D_negative_mould/res/assets/media/README.md +++ /dev/null @@ -1,9 +0,0 @@ - - -# README `res/assets/media/` - -null \ No newline at end of file diff --git a/mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/README.md b/mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/README.md deleted file mode 100644 index 443e1b2..0000000 --- a/mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/README.md +++ /dev/null @@ -1,9 +0,0 @@ - - -# README `res/assets/media/img/` - -null \ No newline at end of file diff --git a/mod/mould/mod/direct_3D_negative_mould/src/README.md b/mod/mould/mod/direct_3D_negative_mould/src/README.md deleted file mode 100644 index 032a63d..0000000 --- a/mod/mould/mod/direct_3D_negative_mould/src/README.md +++ /dev/null @@ -1,9 +0,0 @@ - - -# README `src/` - -Source files - Editable files (Think: Word, not PDF) \ No newline at end of file diff --git a/mod/mould/mod/direct_3D_negative_mould/src/mech/README.md b/mod/mould/mod/direct_3D_negative_mould/src/mech/README.md deleted file mode 100644 index 75efe6c..0000000 --- a/mod/mould/mod/direct_3D_negative_mould/src/mech/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `src/mech/` - -Mechanical "blueprints" - Computer Aided Design (CAD) files - diff --git a/mod/mounting_system/res/README.md b/mod/mounting_system/res/README.md deleted file mode 100644 index 73caa0e..0000000 --- a/mod/mounting_system/res/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `res/` - -Stands for "resources", and should hold any files that are part of the sources of the project, but are not source code, design, scripts or documentation text files. This includes also binary files, next to text files. The sub-dirs within res/assets/ and res/ should be the same (excluding of course res/assets/assets/). - diff --git a/mod/mounting_system/res/assets/README.md b/mod/mounting_system/res/assets/README.md deleted file mode 100644 index 8f86ec7..0000000 --- a/mod/mounting_system/res/assets/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `res/assets/` - -All binary (and potentially large text-)resources should go here, as this allows to go "clean-slate" with this data from time to time, to reduce clone size, if done as a git sub-module (which can also be done later). Having it as a git sub-module, also allows to not fetch it at all, if storage or bandwidth is an issue, and it is not required for the task at hand. The sub-dirs within res/assets/ and res/ should be the same (excluding of course res/assets/assets/). - diff --git a/mod/mounting_system/res/assets/media/README.md b/mod/mounting_system/res/assets/media/README.md deleted file mode 100644 index 1a727a9..0000000 --- a/mod/mounting_system/res/assets/media/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `res/assets/media/` - -null - diff --git a/mod/mounting_system/res/assets/media/img/README.md b/mod/mounting_system/res/assets/media/img/README.md deleted file mode 100644 index da7fd6e..0000000 --- a/mod/mounting_system/res/assets/media/img/README.md +++ /dev/null @@ -1,9 +0,0 @@ - - -# README `res/assets/media/img/` - -null diff --git a/mod/mounting_system/src/README.md b/mod/mounting_system/src/README.md deleted file mode 100644 index 032a63d..0000000 --- a/mod/mounting_system/src/README.md +++ /dev/null @@ -1,9 +0,0 @@ - - -# README `src/` - -Source files - Editable files (Think: Word, not PDF) \ No newline at end of file diff --git a/mod/mounting_system/src/mech/README.md b/mod/mounting_system/src/mech/README.md deleted file mode 100644 index 75efe6c..0000000 --- a/mod/mounting_system/src/mech/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `src/mech/` - -Mechanical "blueprints" - Computer Aided Design (CAD) files - diff --git a/res/assets/media/img/README.md b/res/assets/media/img/README.md deleted file mode 100644 index b3f2f29..0000000 --- a/res/assets/media/img/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `res/media/` - -Non-binary (and usually rather small) media goes here. Media are (mainly) images, audio recordings and videos. -