machines 2024

docs/index.md

@@ -338,7 +338,7 @@ Welcome to the Fabricademy 2024-2025 section. Please visit the pages below for c
 
 Have a taste of the Fabricademy Program by joining the 7-day intensive Bootcamps, every year hosted at a different lab in a different location across the world.
 
-> Get ready for the **Annual Bootcamp 202**5** that will be hosted at our Node [**Green Fabric in Brussels**](https://greenfabric.be/), Belgium, **May 19-24th**!
+> Get ready for the **Annual Bootcamp 2025** that will be hosted at our Node [**Green Fabric in Brussels**](https://greenfabric.be/), Belgium, between **May 19-24th**!
 
 <div class="assignments-grid">
     <div class="row">

docs/tools/machinecatalogue.md

@@ -6,7 +6,7 @@
 A collection of Open Source tools and machines developed by Fabricademy [participants](../participants.md) during the [OS Hardware class](http://fabricademy.fabcloud.io/handbook/classes/07_open_source_hardware/) from [participating nodes](../nodes/index.md)!
 
 
-## Fabricademy 20217-23 OS Machines
+## Fabricademy 20217-25 OS Machines
 
 
 
@@ -45,7 +45,10 @@ A collection of Open Source tools and machines developed by Fabricademy [partici
 | Kumihimo - 2022 | Spool Knitter - 2020 | DIY Looms 2021 | Wool Picking Machine - 2023 |
 |[![](../images/machines/paulinedrawbot.png)](/2020/pauline.gamore/projects/1-final-project/)|[![](../images/machines/kukabatik.png)](http://wiki.textile-academy.org/fabricademy2017/students/clara.davis/open_source_hardware_from_fibers_to_fabric)| [![](../images/machines/shopbotpaint.png)](/2024/asli-aksan/assignments/week10/)| [![](../images/machines/grecia-spinner.png)](/2024/grecia-segovia/project/)|  
 | Drawing Machine - 2020 | Batik kuka Extruder - 2019 | Shopbot - Drawbot 2023 | Melt spinning machine - 2024 |
+|[![](../images/machines/felting_gun.png.png)](/2025/germarilis-ruiz/assignments/week11/)|[![](../images/machines/loom_india.png)](/2025/shefali-desai/assignments/week11/)| [![](../images/machines/cnc_hack_ams.png.png)](/2025/carolina-beirao/assignments/week11/)| [![](../images/machines/cnc-stringart.png)](/2025/yuki-takemura/assignments/week11/)|  
+| Felting gun - 2024 | Laser cut Loom - 2024 | CNC - Drawbot 2024 | CNC - String Art 2024 |
 
+<!--Ikat machine 2024-->
 
 <!-- add links to pages for each machine and image icon for the table, it should be 150x150 72dpi -->
 
@@ -65,8 +68,12 @@ A collection of Open Source tools and machines developed by Fabricademy [partici
 | Bioyarn Extruder 2021 | Alginate Extruder 2018 | Alginator 2020 | DIY Microscope 2023|
 |[![](../images/machines/kombucher.png)](/2019/barbara.arteaga/projects/final-project/) |[![](../images/machines/bioextruder.png)](/2023/marieke-eyndhoven/assignments/week10/) |[![](../images/machines/biogun1.png)](/2023/dineshkumar-gunasekaran/1.Assignments/week10/) |[![](../images/machines/biogun2.png)](/2021/diane.wakim/assignments/week08/)|
 | Kombucher | Bio Extruder 2022 | Biogun 2022 | Biogun 2020 |
-|[![](../images/machines/centrifuge1.png)](/2022/petra-garajova/Final-Project/%7C%20X.%20-%20FABRICATION%20%7C/d._DIYCentrifuge/) |[![](../images/machines/centrifuge2.png)](/2023/silvia-lugo/OPENS.html) |[![](../images/machines/bioreactor1.png)](/2022/vidisha-goel/assignments/week10/) |[![](../images/machines/biostand.png)](/2020/lucrecia.strano/assignments/week07/)|
-| DIY Centrifuge 2021 | Mini Centrifuge 2022 | Bioreactor 2021 | Biomaterials Stand 2019 |
+|[![](../images/machines/centrifuge1.png)](/2022/petra-garajova/Final-Project/%7C%20X.%20-%20FABRICATION%20%7C/d._DIYCentrifuge/) |[![](../images/machines/centrifuge2.png)](/2023/silvia-lugo/OPENS.html) |[![](../images/machines/bioreactor1.png)](/2022/vidisha-goel/assignments/week10/) |[![](../images/machines/biostand.png)](https://class.textile-academy.org/2025/ainhoa-cadarso/assignments/week11/)|
+| DIY Centrifuge 2021 | Mini Centrifuge 2022 | Bioreactor 2021 | Biomaterials stand |
+|[![](../images/machines/bioextruder_jd.png)](/2025/dima-hejap/assignments/week11/) |[![](../images/machines/bioextruder_arm.png)](/2025/anoush-arshakyan/assignments/week11/) |[![](../images/machines/bioreactor-24.png)](/2025/ainhoa-cadarso/assignments/week11/) |[![](../images/machines/biostand.png)](/2020/lucrecia.strano/assignments/week07/)|
+| 3D Bioextruder JD 2024 | 3D Bioextruder ARM 2024 | Bioreactor 2024 | Biomaterials Stand 2020 |
+
+
 
 
 <!-- add links to pages for each machine and image icon for the table, it should be 150x150 72dpi -->
@@ -74,11 +81,13 @@ A collection of Open Source tools and machines developed by Fabricademy [partici
 
 ## Hacking:
 
+- [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)
-- [CNC + Drawbot](/2024/asli-aksan/assignments/week10/)
+- [CNC + Drawbot 2023](/2024/asli-aksan/assignments/week10/)
 - [3D Printer + Drawbot](/2022/iane-cabral/assignments/week10/#drawing)
 - [3D Printer + Bioextruder](/2023/melanie-abel/FabricademYoga/week10/)
-- [3D Printer + Pegboard String Art ](/2024/viviane-labelle/assignments/week10/)
+- [3D Printer + String Art ](/2024/viviane-labelle/assignments/week10/)
 
 ---
 
@@ -86,8 +95,9 @@ A collection of Open Source tools and machines developed by Fabricademy [partici
 ## References & OS Projects developed by the Global Community
 
 
+- [Future Fabrics 2024 Mexico, Yucatan](https://fabricademy.fabcloud.io/fabevents/fab24-textile-challenge/)
 - [SheMakes - Lasercut looms](https://fabricademy.fabcloud.io/shemakes/handbook/2.-innovation-services/Lab-to-Lab-Research/03_MAKE/#looms)
-- [Gawa Loom - Fab Challenge Bhutan 2023](https://fabricademy.fabcloud.io/fabevents/fab23-textile-challenge/)
+- [Gawa Loom - Future Fabrics - Fab Challenge Bhutan 2023](https://fabricademy.fabcloud.io/fabevents/fab23-textile-challenge/)
 - [Studio Hilo - OS Machines](https://www.studiohilo.com/hilo-spinning-machine)
 - [OS Foldable 4-Shaft Weaving Loom](https://asliaydinaksan.github.io/portfolio/2022-12-23-4-shaft-weaving-loom/) by [Aslı Aydın Aksan](https://class.textile-academy.org/2024/asli-aksan/)
 - [Lasercut Loom - Kite Weaving - Waag](https://www.instructables.com/Kite-weaving/)