_art/huevember_24.md

@@ -1,6 +0,0 @@
----
-image: "/assets/images/Hexaitos/Jagal/huevember_2024.jpg"
-thumb: "/assets/images/Hexaitos/Jagal/huevember_2024_thumb.jpg"
-alt: "A half-body painting of an anthropomorphic bateleur eagle walking through a field."
-desc: "Huevember 2024 (Day 2) – Jagal"
----

_art/ref_anthro_faulty.md

@@ -1,6 +1,6 @@
 ---
 image: "/assets/images/Hexaitos/FaultyArts/hexaitos_bateleur.png"
-thumb: "/assets/images/Hexaitos/FaultyArts/hexaitos_bateleur_thumb.jpg"
+thumb: "/assets/images/Hexaitos/FaultyArts/hexaitos_bateleur_thumb.png"
 alt: "A reference sheet for an anthropomorphic bateleur eagle"
 desc: "Hexaitos ref sheet – FaultyArts"
 ---

_art/spooky_icon_24.md

@@ -1,6 +1,6 @@
 ---
 image: "/assets/images/Hexaitos/CZGoldEdition/spookyHexaitos_icon.png"
-thumb: "/assets/images/Hexaitos/CZGoldEdition/spookyHexaitos_icon_thumb.jpg"
+thumb: "/assets/images/Hexaitos/CZGoldEdition/spookyHexaitos_icon.png"
 alt: "A spooky icon of an anthropomorphic bateleur eagle"
 desc: "Spooky icon portrait 2024 – CZGoldEdition"
 ---

_site/art.html

@@ -33,19 +33,10 @@
             </div>
         </div>
     
-        <div class="responsive">
-            <div class="gallery">
-                <a target="_blank" href="/assets/images/Hexaitos/Jagal/huevember_2024.jpg">
-                <img src="/assets/images/Hexaitos/Jagal/huevember_2024_thumb.jpg" alt="A half-body painting of an anthropomorphic bateleur eagle walking through a field." width="600" height="400">
-                </a>
-                <div class="desc">Huevember 2024 (Day 2) – Jagal</div>
-            </div>
-        </div>
-    
         <div class="responsive">
             <div class="gallery">
                 <a target="_blank" href="/assets/images/Hexaitos/FaultyArts/hexaitos_bateleur.png">
-                <img src="/assets/images/Hexaitos/FaultyArts/hexaitos_bateleur_thumb.jpg" alt="A reference sheet for an anthropomorphic bateleur eagle" width="600" height="400">
+                <img src="/assets/images/Hexaitos/FaultyArts/hexaitos_bateleur_thumb.png" alt="A reference sheet for an anthropomorphic bateleur eagle" width="600" height="400">
                 </a>
                 <div class="desc">Hexaitos ref sheet – FaultyArts</div>
             </div>
@@ -54,7 +45,7 @@
         <div class="responsive">
             <div class="gallery">
                 <a target="_blank" href="/assets/images/Hexaitos/CZGoldEdition/spookyHexaitos_icon.png">
-                <img src="/assets/images/Hexaitos/CZGoldEdition/spookyHexaitos_icon_thumb.jpg" alt="A spooky icon of an anthropomorphic bateleur eagle" width="600" height="400">
+                <img src="/assets/images/Hexaitos/CZGoldEdition/spookyHexaitos_icon.png" alt="A spooky icon of an anthropomorphic bateleur eagle" width="600" height="400">
                 </a>
                 <div class="desc">Spooky icon portrait 2024 – CZGoldEdition</div>
             </div>

_site/index.html

@@ -41,11 +41,7 @@
             
         <p>If you want to get in touch, look at the <a href="contact.html">contact</a> page! You can find me on plenty of websites or just send me an email – I am always happy to talk to new people! I don’t usually bite. Unless you want me to >:3</p>
 
-<<<<<<< HEAD
-        <p>This website is still very much a work-in-progress and it was last updated: 2 November 2024. I will be adding a <a href="blog.html">blog</a> at some point where I will be posting things mostly about computers, games and birds (<i>who’d’ve thunk?</i>).</p>
-=======
         <p>This website is still very much a work-in-progress and it was last updated: 1 November 2024. I also have a <a href="blog.html">blog</a> where I will be posting things mostly about computers, games and birds (<i>who’d’ve thunk?</i>).</p>
->>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
         
         <p>You can also find me on <a href="https://bateleur.org">bateleur.org</a>. At the moment, it is simply a mirror of hexaitos.com but hosted entirely at home. Additionally, you can find me on Gemini as well. Just go to <a href="gemini://terathopius.com">gemini://terathopius.com</a> or to <a href="https://terathopius.com">https://terathopius.com</a> for an HTTPS proxy of my Gemini capsule. I also have my own Gitea instance over on <a href="https://git.bateleur.org">git.bateleur.org</a>.</p>
     </div>

_site/sitemap.xml

@@ -4,11 +4,7 @@
   <url>
     <loc>https://hexaitos.com/art.html</loc>
     
-<<<<<<< HEAD
-      <lastmod>2024-11-02T19:10:38+01:00</lastmod>
-=======
       <lastmod>2024-11-01T10:58:24+01:00</lastmod>
->>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>
@@ -17,11 +13,7 @@
   <url>
     <loc>https://hexaitos.com/blog.html</loc>
     
-<<<<<<< HEAD
-      <lastmod>2024-11-02T19:10:38+01:00</lastmod>
-=======
       <lastmod>2024-11-01T10:58:24+01:00</lastmod>
->>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>
@@ -30,11 +22,7 @@
   <url>
     <loc>https://hexaitos.com/contact.html</loc>
     
-<<<<<<< HEAD
-      <lastmod>2024-11-02T19:10:38+01:00</lastmod>
-=======
       <lastmod>2024-11-01T10:58:24+01:00</lastmod>
->>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>
@@ -43,11 +31,7 @@
   <url>
     <loc>https://hexaitos.com/</loc>
     
-<<<<<<< HEAD
-      <lastmod>2024-11-02T19:10:38+01:00</lastmod>
-=======
       <lastmod>2024-11-01T10:58:24+01:00</lastmod>
->>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>
@@ -56,11 +40,7 @@
   <url>
     <loc>https://hexaitos.com/refsheet.html</loc>
     
-<<<<<<< HEAD
-      <lastmod>2024-11-02T19:10:38+01:00</lastmod>
-=======
       <lastmod>2024-11-01T10:58:24+01:00</lastmod>
->>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>
@@ -69,11 +49,7 @@
   <url>
     <loc>https://hexaitos.com/sitemap.xml</loc>
     
-<<<<<<< HEAD
-      <lastmod>2024-11-02T19:10:38+01:00</lastmod>
-=======
       <lastmod>2024-11-01T10:58:24+01:00</lastmod>
->>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>