deploy: 3a1b94b

fablabbcn · Oct 15, 2024 · 4407543 · 4407543
1 parent 1db87e0
commit 4407543
Show file tree

Hide file tree

Showing 7 changed files with 439 additions and 439 deletions.
diff --git a/2023-24/year-1/index.html b/2023-24/year-1/index.html
diff --git a/2023-24/year-2/index.html b/2023-24/year-2/index.html
@@ -5334,25 +5334,6 @@ <h1 class="module-title">Year 2</h1>
 <h2 id="modules-by-track">Modules by Track<a class="headerlink" href="#modules-by-track" title="Permanent link">⇝</a></h2>
 <div class="highlight-section overview-page">
 
-    <div class="highlight-block">
-        <div class="icon-highlight-container">
-
-                <svg class="icon-highlight" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc.--><path d="M342.6 9.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l9.4 9.4L28.1 342.6C10.1 360.6 0 385 0 410.5v5.5c0 53 43 96 96 96h5.5c25.5 0 49.9-10.1 67.9-28.1L448 205.3l9.4 9.4c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3l-32-32-96-96-32-32zM205.3 256 352 109.3l50.7 50.7-96 96H205.3z"/></svg>
-
-        </div>
-        <div class="highlight-text">
-            <h3>Application</h3>
-            <ul>
-
-
-                        <!-- <li>Term s<a href="/2023-24/year-2/modules/thesis-project"><strong> Thesis Project </strong> | Workshop</a></li> -->
-                        <li><a href="/2023-24/year-2/modules/thesis-project"><strong> Thesis Project</strong></a></li>
-
-
-            </ul>
-        </div>
-    </div>
-
     <div class="highlight-block">
         <div class="icon-highlight-container">
 
@@ -5364,11 +5345,6 @@ <h3>Reflection</h3>
             <ul>
 
 
-                        <!-- <li>Term s<a href="/2023-24/year-2/modules/circular-matter"><strong> Circular Matter </strong> | Elective</a></li> -->
-                        <li><a href="/2023-24/year-2/modules/circular-matter"><strong> Circular Matter</strong></a></li>
-
-
-
                         <!-- <li>Term s<a href="/2023-24/year-2/modules/business-innovation"><strong> Business Innovation </strong> | Elective</a></li> -->
                         <li><a href="/2023-24/year-2/modules/business-innovation"><strong> Business Innovation</strong></a></li>
 
@@ -5378,6 +5354,11 @@ <h3>Reflection</h3>
                         <li><a href="/2023-24/year-2/modules/theories-of-the-urban"><strong> Theories of the Urban</strong></a></li>
 
 
+
+                        <!-- <li>Term s<a href="/2023-24/year-2/modules/circular-matter"><strong> Circular Matter </strong> | Elective</a></li> -->
+                        <li><a href="/2023-24/year-2/modules/circular-matter"><strong> Circular Matter</strong></a></li>
+
+
             </ul>
         </div>
     </div>
@@ -5430,6 +5411,25 @@ <h3>Exploration</h3>
         </div>
     </div>
 
+    <div class="highlight-block">
+        <div class="icon-highlight-container">
+
+                <svg class="icon-highlight" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc.--><path d="M342.6 9.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l9.4 9.4L28.1 342.6C10.1 360.6 0 385 0 410.5v5.5c0 53 43 96 96 96h5.5c25.5 0 49.9-10.1 67.9-28.1L448 205.3l9.4 9.4c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3l-32-32-96-96-32-32zM205.3 256 352 109.3l50.7 50.7-96 96H205.3z"/></svg>
+
+        </div>
+        <div class="highlight-text">
+            <h3>Application</h3>
+            <ul>
+
+
+                        <!-- <li>Term s<a href="/2023-24/year-2/modules/thesis-project"><strong> Thesis Project </strong> | Workshop</a></li> -->
+                        <li><a href="/2023-24/year-2/modules/thesis-project"><strong> Thesis Project</strong></a></li>
+
+
+            </ul>
+        </div>
+    </div>
+
 </div>
 
 <!-- Source file information -->

diff --git a/2024-25/year-1/index.html b/2024-25/year-1/index.html
@@ -5338,6 +5338,11 @@ <h3>Application</h3>
             <ul>
 
 
+                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/design-studio-01"><strong> Design Studio 01 </strong> | Course</a></li> -->
+                        <li><a href="/2024-25/year-1/t-1/design-studio-01"><strong> Design Studio 01</strong></a></li>
+
+
+
                         <!-- <li>Term 1<a href="/2024-25/year-1/t-1/landing"><strong> Landing </strong> | Workshop</a></li> -->
                         <li><a href="/2024-25/year-1/t-1/landing"><strong> Landing</strong></a></li>
 
@@ -5347,38 +5352,33 @@ <h3>Application</h3>
                         <li><a href="/2024-25/year-1/t-1/design-studio-intro-week"><strong> Design Studio Intro Week</strong></a></li>
 
 
-
-                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/design-studio-01"><strong> Design Studio 01 </strong> | Course</a></li> -->
-                        <li><a href="/2024-25/year-1/t-1/design-studio-01"><strong> Design Studio 01</strong></a></li>
-
-
             </ul>
         </div>
     </div>
 
     <div class="highlight-block">
         <div class="icon-highlight-container">
 
-                <svg class="icon-highlight" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc.--><path d="M416 208c0 45.9-14.9 88.3-40 122.7l126.6 126.7c12.5 12.5 12.5 32.8 0 45.3s-32.8 12.5-45.3 0L330.7 376c-34.4 25.2-76.8 40-122.7 40C93.1 416 0 322.9 0 208S93.1 0 208 0s208 93.1 208 208zM208 352a144 144 0 1 0 0-288 144 144 0 1 0 0 288z"/></svg>
+                <svg class="icon-highlight" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc.--><path d="M297.2 248.9c14.4-20.6 22.8-45.7 22.8-72.9 0-70.7-57.3-128-128-128S64 105.3 64 176c0 27.2 8.4 52.3 22.8 72.9 3.7 5.3 8.1 11.3 12.8 17.7 12.9 17.7 28.3 38.9 39.8 59.8 10.4 19 15.7 38.8 18.3 57.5H109c-2.2-12-5.9-23.7-11.8-34.5-9.9-18-22.2-34.9-34.5-51.8-5.2-7.1-10.4-14.2-15.4-21.4C27.6 247.9 16 213.3 16 176 16 78.8 94.8 0 192 0s176 78.8 176 176c0 37.3-11.6 71.9-31.4 100.3-5 7.2-10.2 14.3-15.4 21.4-12.3 16.8-24.6 33.7-34.5 51.8-5.9 10.8-9.6 22.5-11.8 34.5h-48.5c2.6-18.7 7.9-38.6 18.3-57.5 11.5-20.9 26.9-42.1 39.8-59.8 4.7-6.4 9-12.4 12.7-17.7zM192 128c-26.5 0-48 21.5-48 48 0 8.8-7.2 16-16 16s-16-7.2-16-16c0-44.2 35.8-80 80-80 8.8 0 16 7.2 16 16s-7.2 16-16 16zm0 384c-44.2 0-80-35.8-80-80v-16h160v16c0 44.2-35.8 80-80 80z"/></svg>
 
         </div>
         <div class="highlight-text">
-            <h3>Exploration</h3>
+            <h3>Reflection</h3>
             <ul>
 
 
-                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/agriculture-zero"><strong> Agriculture Zero </strong> | Workshop</a></li> -->
-                        <li><a href="/2024-25/year-1/t-1/agriculture-zero"><strong> Agriculture Zero</strong></a></li>
+                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/documenting-design"><strong> Documenting Design </strong> | Seminar</a></li> -->
+                        <li><a href="/2024-25/year-1/t-1/documenting-design"><strong> Documenting Design</strong></a></li>
 
 
 
-                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/extended-intelligences"><strong> Extended Intelligences </strong> | Workshop</a></li> -->
-                        <li><a href="/2024-25/year-1/t-1/extended-intelligences"><strong> Extended Intelligences</strong></a></li>
+                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/design-with-others"><strong> Design With Others </strong> | Workshop</a></li> -->
+                        <li><a href="/2024-25/year-1/t-1/design-with-others"><strong> Design With Others</strong></a></li>
 
 
 
-                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/biology-zero"><strong> Biology Zero </strong> | Workshop</a></li> -->
-                        <li><a href="/2024-25/year-1/t-1/biology-zero"><strong> Biology Zero</strong></a></li>
+                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/living-with-your-own-ideas"><strong> Living with Your Own Ideas </strong> | Workshop</a></li> -->
+                        <li><a href="/2024-25/year-1/t-1/living-with-your-own-ideas"><strong> Living with Your Own Ideas</strong></a></li>
 
 
             </ul>
@@ -5388,26 +5388,26 @@ <h3>Exploration</h3>
     <div class="highlight-block">
         <div class="icon-highlight-container">
 
-                <svg class="icon-highlight" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc.--><path d="M297.2 248.9c14.4-20.6 22.8-45.7 22.8-72.9 0-70.7-57.3-128-128-128S64 105.3 64 176c0 27.2 8.4 52.3 22.8 72.9 3.7 5.3 8.1 11.3 12.8 17.7 12.9 17.7 28.3 38.9 39.8 59.8 10.4 19 15.7 38.8 18.3 57.5H109c-2.2-12-5.9-23.7-11.8-34.5-9.9-18-22.2-34.9-34.5-51.8-5.2-7.1-10.4-14.2-15.4-21.4C27.6 247.9 16 213.3 16 176 16 78.8 94.8 0 192 0s176 78.8 176 176c0 37.3-11.6 71.9-31.4 100.3-5 7.2-10.2 14.3-15.4 21.4-12.3 16.8-24.6 33.7-34.5 51.8-5.9 10.8-9.6 22.5-11.8 34.5h-48.5c2.6-18.7 7.9-38.6 18.3-57.5 11.5-20.9 26.9-42.1 39.8-59.8 4.7-6.4 9-12.4 12.7-17.7zM192 128c-26.5 0-48 21.5-48 48 0 8.8-7.2 16-16 16s-16-7.2-16-16c0-44.2 35.8-80 80-80 8.8 0 16 7.2 16 16s-7.2 16-16 16zm0 384c-44.2 0-80-35.8-80-80v-16h160v16c0 44.2-35.8 80-80 80z"/></svg>
+                <svg class="icon-highlight" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc.--><path d="M416 208c0 45.9-14.9 88.3-40 122.7l126.6 126.7c12.5 12.5 12.5 32.8 0 45.3s-32.8 12.5-45.3 0L330.7 376c-34.4 25.2-76.8 40-122.7 40C93.1 416 0 322.9 0 208S93.1 0 208 0s208 93.1 208 208zM208 352a144 144 0 1 0 0-288 144 144 0 1 0 0 288z"/></svg>
 
         </div>
         <div class="highlight-text">
-            <h3>Reflection</h3>
+            <h3>Exploration</h3>
             <ul>
 
 
-                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/living-with-your-own-ideas"><strong> Living with Your Own Ideas </strong> | Workshop</a></li> -->
-                        <li><a href="/2024-25/year-1/t-1/living-with-your-own-ideas"><strong> Living with Your Own Ideas</strong></a></li>
+                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/extended-intelligences"><strong> Extended Intelligences </strong> | Workshop</a></li> -->
+                        <li><a href="/2024-25/year-1/t-1/extended-intelligences"><strong> Extended Intelligences</strong></a></li>
 
 
 
-                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/documenting-design"><strong> Documenting Design </strong> | Seminar</a></li> -->
-                        <li><a href="/2024-25/year-1/t-1/documenting-design"><strong> Documenting Design</strong></a></li>
+                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/agriculture-zero"><strong> Agriculture Zero </strong> | Workshop</a></li> -->
+                        <li><a href="/2024-25/year-1/t-1/agriculture-zero"><strong> Agriculture Zero</strong></a></li>
 
 
 
-                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/design-with-others"><strong> Design With Others </strong> | Workshop</a></li> -->
-                        <li><a href="/2024-25/year-1/t-1/design-with-others"><strong> Design With Others</strong></a></li>
+                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/biology-zero"><strong> Biology Zero </strong> | Workshop</a></li> -->
+                        <li><a href="/2024-25/year-1/t-1/biology-zero"><strong> Biology Zero</strong></a></li>
 
 
             </ul>
@@ -5425,13 +5425,13 @@ <h3>Instrumentation</h3>
             <ul>
 
 
-                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/fundamentals-digital-fabrication"><strong> Fundamentals of Digital Fabrication </strong> | Seminar</a></li> -->
-                        <li><a href="/2024-25/year-1/t-1/fundamentals-digital-fabrication"><strong> Fundamentals of Digital Fabrication</strong></a></li>
+                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/the-machine-paradox"><strong> The Machine Paradox </strong> | Workshop | Seminar</a></li> -->
+                        <li><a href="/2024-25/year-1/t-1/the-machine-paradox"><strong> The Machine Paradox</strong></a></li>
 
 
 
-                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/the-machine-paradox"><strong> The Machine Paradox </strong> | Workshop | Seminar</a></li> -->
-                        <li><a href="/2024-25/year-1/t-1/the-machine-paradox"><strong> The Machine Paradox</strong></a></li>
+                        <!-- <li>Term 1<a href="/2024-25/year-1/t-1/fundamentals-digital-fabrication"><strong> Fundamentals of Digital Fabrication </strong> | Seminar</a></li> -->
+                        <li><a href="/2024-25/year-1/t-1/fundamentals-digital-fabrication"><strong> Fundamentals of Digital Fabrication</strong></a></li>
 
 
             </ul>

diff --git a/2024-25/year-1/t-1/the-machine-paradox/index.html b/2024-25/year-1/t-1/the-machine-paradox/index.html
@@ -5602,7 +5602,7 @@ <h2 id="course-resources">Course Resources<a class="headerlink" href="#course-re
 <ul>
 <li><a href="https://hackmd.io/@fablabbcn/theparadoxmachine">Hackmd Documentation</a> - Collection of presentations, links and reources for the course.</li>
 <li><a href="https://miro.com/app/board/uXjVNaaI5lo=/?share_link_id=211542821117">Miro Board</a></li>
-<li><a href="https://docs.google.com/presentation/d/12z48dSxuSXtdz_SZrQg6c65z50ptIDCCSUzh9GiSNIw/edit?usp=sharing">Main Presentation</a></li>
+<li><a href="https://docs.google.com/presentation/d/1RpulespmfM56jrsVVu-wSrBUAQkj-bsYd4ItujQDpUI/edit#slide=id.gfc4bed69d2_0_516">Main Presentation</a></li>
 <li><a href="https://docs.google.com/presentation/d/15KO0wCPPbD59EVw_6xRo_4ZkEceN0HR65-qRN1_MxBE/edit?usp=sharing">TAUMS Showcase</a></li>
 </ul>
 <h2 id="additional-resources">Additional Resources<a class="headerlink" href="#additional-resources" title="Permanent link">⇝</a></h2>

diff --git a/search/search_index.json b/search/search_index.json