diff --git a/docs/images/machines/3dprint_stringart.png b/docs/images/machines/3dprint_stringart.png new file mode 100644 index 0000000000000000000000000000000000000000..eb842130cf1b5340a4b81c53a375d19da649e900 Binary files /dev/null and b/docs/images/machines/3dprint_stringart.png differ diff --git a/docs/images/machines/ikat_machine.png b/docs/images/machines/ikat_machine.png new file mode 100644 index 0000000000000000000000000000000000000000..8712871773d4d9be35bb400a8e8e9732c36d2be9 Binary files /dev/null and b/docs/images/machines/ikat_machine.png differ diff --git a/docs/images/machines/smocking_machine.png b/docs/images/machines/smocking_machine.png new file mode 100644 index 0000000000000000000000000000000000000000..f1308cd2a9ae66512a479e244c6851b18f99e91e Binary files /dev/null and b/docs/images/machines/smocking_machine.png differ diff --git a/docs/tools/machinecatalogue.md b/docs/tools/machinecatalogue.md index aca3fbca14961dbf8d48e642799a94fbf63520c7..ff65d27983ccecd21c5f0c3037b8cbbf17ee3b66 100644 --- a/docs/tools/machinecatalogue.md +++ b/docs/tools/machinecatalogue.md @@ -44,14 +44,14 @@ A collection of Open Source tools and machines developed by Fabricademy [partici |[](/2023/phanuwit-kanthatham/assignments/week10/) |[](/2019/jun.kawahara/assignments/week08/) | [](/2022/marisa-satsia/assignments/week10/#totally-diy-looms)|[](/2024/ola-fathalla/assignments/week10/) | | Kumihimo - 2022 | Spool Knitter - 2020 | DIY Looms 2021 | Wool Picking Machine - 2023 | |[](/2020/pauline.gamore/projects/1-final-project/)|[](http://wiki.textile-academy.org/fabricademy2017/students/clara.davis/open_source_hardware_from_fibers_to_fabric)| [](/2024/asli-aksan/assignments/week10/)| [](/2024/grecia-segovia/project/)| -| Drawing Machine - 2020 | Batik kuka Extruder - 2019 | Shopbot - Drawbot 2023 | Melt spinning machine - 2024 | +| Drawing Machine - 2020 | Batik kuka Extruder - 2019 | Shopbot Hack - Drawbot 2023 | Melt spinning machine - 2024 | |[](/2025/germarilis-ruiz/assignments/week11/)|[](/2025/shefali-desai/assignments/week11/)| [](/2025/carolina-beirao/assignments/week11/)| [](/2025/yuki-takemura/assignments/week11/)| -| Felting gun - 2024 | Laser cut Loom - 2024 | CNC - Drawbot 2024 | CNC - String Art 2024 | +| Felting gun - 2024 | Laser cut Loom - 2024 | CNC Hack - Drawbot 2024 | CNC - String Art 2024 | +|[](/2025/zander-webster/assignments/week11/#motorized-fibre-spinning-machine)|[](/2025/sophia-matteo/assignments/week11/)| [](/2024/viviane-labelle/assignments/week10/)| [](/2024/ruby-lennox/development/03-textile-development/#machine-development)| +| Spinning Machine - 2024 | Ikat Machine Hack - 2024 | 3D Print String Art 2024 | Smocking Machine 2024 | -<!--Ikat machine 2024 -Spinning Machine bcn -Loom bcn--> +<!--add bcn loom, puebla, rwanda, koshi...--> <!-- add links to pages for each machine and image icon for the table, it should be 150x150 72dpi --> @@ -73,7 +73,7 @@ Loom bcn--> | Kombucher | Bio Extruder 2022 | Biogun 2022 | Biogun 2020 | |[](/2022/petra-garajova/Final-Project/%7C%20X.%20-%20FABRICATION%20%7C/d._DIYCentrifuge/) |[](/2023/silvia-lugo/OPENS.html) |[](/2022/vidisha-goel/assignments/week10/) |[](https://class.textile-academy.org/2025/ainhoa-cadarso/assignments/week11/)| | DIY Centrifuge 2021 | Mini Centrifuge 2022 | Bioreactor 2021 | Biomaterials stand 2020| -|[](/2025/dima-hejap/assignments/week11/) |[](/2025/anoush-arshakyan/assignments/week11/) |[](/2025/ainhoa-cadarso/assignments/week11/) |[](/2025/gabriella-arnadottir/assignments/week11/#research)| +|[](/2025/dima-hejap/assignments/week11/) |[](/2025/anoush-arshakyan/assignments/week11/) |[](/2025/ainhoa-cadarso/assignments/week11/) |[](/2025/gabriella-arnadottir/assignments/week11/#research)| | 3D Bioextruder JD 2024 | 3D Bioextruder ARM 2024 | Bioreactor 2024 | Dye-rotating machine 2024 | @@ -84,6 +84,7 @@ Loom bcn--> ## Hacking: +- [3] - [AYAB + 3D Printer - Ikat Machine](/2025/sophia-matteo/assignments/week11/) - [CNC + Drawbot 2024](/2025/carolina-beirao/assignments/week11/) - [CNC + Embroidery](http://wiki.textile-academy.org/fabricademy2017/students/sofia.guridi/week8sofia)