diff options
| author | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:25:42 +0000 |
|---|---|---|
| committer | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:25:42 +0000 |
| commit | 910bf8e2868318dc89f560295d29d1fbac75dd35 (patch) | |
| tree | e763c7e01bbfca15a1fa0adb35abafb6598eb1ff | |
| parent | e6ecafcb6dc2ae42d28c820fa81c49110bab2b5a (diff) | |
| parent | 5024f0d9fcc8426c7c48a7ce0b4cc86485921bd8 (diff) | |
Merge branch 'main' of github.com:radiohotline/softmachine.dev
| -rw-r--r-- | old/archive.html | 22 | ||||
| -rw-r--r-- | old/art.html | 12 | ||||
| -rw-r--r-- | old/books.html | 31 | ||||
| -rw-r--r-- | old/doodle.html | 170 | ||||
| -rw-r--r-- | old/house.html | 23 | ||||
| -rw-r--r-- | old/index.html | 20 | ||||
| -rw-r--r-- | old/links.html | 2 | ||||
| -rw-r--r-- | old/music.html | 56 | ||||
| -rw-r--r-- | old/projects.html | 4 | ||||
| -rw-r--r-- | old/sketch.html | 56 | ||||
| -rw-r--r-- | old/thoughts.html | 18 |
11 files changed, 31 insertions, 383 deletions
diff --git a/old/archive.html b/old/archive.html index e05e643..d79441f 100644 --- a/old/archive.html +++ b/old/archive.html @@ -31,7 +31,6 @@ <div class="art-container"> <h4>2025</h4> -<<<<<<< HEAD <img loading="lazy" src="../img/art/2025/jojomart.jpeg"> <img loading="lazy" src="../img/art/2025/bikeghost.jpg"> <h4>2024</h4> @@ -51,27 +50,6 @@ <img loading="lazy" src="../img/art/2021/IMG_20211225_210622.jpg"> <img loading="lazy" src="../img/art/2021/IMG_20211223_202541.jpg"> <img loading="lazy" src="../img/art/2021/IMG_20210311_170418.jpg"> -======= - <img loading="lazy" src="../img/art/2025/jojomart.jpeg"> - <img loading="lazy" src="../img/art/2025/bikeghost.jpg"> - <h4>2024</h4> - <img loading="lazy" src="../img/art/2024/aphrodite.jpg"> - <h4>2023</h4> - <img loading="lazy" src="../img/art/2023/mobpsychofinal2.png"> - <img loading="lazy" src="../img/art/2023/mart.jpg"> - <img loading="lazy" src="../img/art/2023/mind_parasite.png"> - <h4>2022</h4> - <img loading="lazy" src="../img/art/2022/IMG_20240718_224050.jpg"> - <img loading="lazy" src="../img/art/2022/seki.jpg"> - <img loading="lazy" src="../img/art/2022/link.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20220829_203310.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20220127_205955.jpg"> - <h4>2021</h4> - <img loading="lazy" src="../img/art/2021/2021satoru.jpg"> - <img loading="lazy" src="../img/art/2021/IMG_20211225_210622.jpg"> - <img loading="lazy" src="../img/art/2021/IMG_20211223_202541.jpg"> - <img loading="lazy" src="../img/art/2021/IMG_20210311_170418.jpg"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div> </body> </html> diff --git a/old/art.html b/old/art.html index 06bb939..5d951fd 100644 --- a/old/art.html +++ b/old/art.html @@ -61,31 +61,19 @@ <div> <p>Doodles</p> <a href="doodle.html"> -<<<<<<< HEAD <img src="../img/art/doodle.png" alt="Doodles"> -======= - <img src="../img/art/doodle.png" alt="Doodles"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </a> </div> <div> <p>Sketches</p> <a href="sketch.html"> -<<<<<<< HEAD - <img src="../img/art/sketch.jpg" alt="Sketches"> -======= <img src="../img/art/sketch.jpg" alt="Sketches"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </a> </div> <div> <p style="background-color: rgba(255, 255, 255, 0.5);">Completed</p> <a href="archive.html"> -<<<<<<< HEAD - <img src="../img/art/full.jpg" alt="Complete"> -======= <img src="../img/art/full.jpg" alt="Complete"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </a> </div> </div> diff --git a/old/books.html b/old/books.html index 2f8679d..968453c 100644 --- a/old/books.html +++ b/old/books.html @@ -72,7 +72,6 @@ <div style="padding-left: 30px;"> <h3>Favourite books<sup>2</sup></h3> <div class="flex"> -<<<<<<< HEAD <img src="../img/lib/hol.jpeg" alt="House of Leaves - Mark Z. Danielewski"> <img src="../img/lib/necro.jpg" alt="The Necrophiliac - Gabrielle Wittkop"> <img src="../img/lib/acwo.jpg" alt="A Clockwork Orange - Anthony Burgess"> @@ -89,39 +88,10 @@ <img src="../img/lib/girl.jpeg" alt="Girl on the Shore - Inio Asano"> <img src="../img/lib/child.jpg" alt="Child of God - Kyoudai Nishioka"> <img src="../img/lib/claudine.jpg" alt="Claudine - Ryoko Ikeda"> -======= - <img src="../img/lib/hol.jpeg" alt="House of Leaves - Mark Z. Danielewski"> - <img src="../img/lib/necro.jpg" alt="The Necrophiliac - Gabrielle Wittkop"> - <img src="../img/lib/acwo.jpg" alt="A Clockwork Orange - Anthony Burgess"> - <img src="../img/lib/naked.jpg" alt="Naked Lunch - William S. Burroughs"> - <img src="../img/lib/448.jpg" alt="4.48 Psychosis - Sarah Kane"> - <img src="../img/lib/baby.jpg" alt="Babyfucker - Urs Allemann"> - <img src="../img/lib/stranger.jpg" alt="The Stranger - Albert Camus"> - <img src="../img/lib/alice.jpg" alt="Alice's Adventures in Wonderland - Lewis Carroll"> - <img src="../img/lib/perfume.jpg" alt="Perfume: The Story of a Murderer - Patrick Süskind"> - <img src="../img/lib/snake.jpg" alt="The Man Who Spoke Snakish - Andrus Kivirähk"> - <img src="../img/lib/forgive.jpg" alt="Forgive Me, Leonard Peacock - Matthew Quick"> - <img src="../img/lib/trans.jpg" alt="Enlightened Transsexual Comix - Sam Szabo"> - <img src="../img/lib/punpun.jpg" alt="Oyasumi Punpun - Inio Asano"> - <img src="../img/lib/girl.jpeg" alt="Girl on the Shore - Inio Asano"> - <img src="../img/lib/child.jpg" alt="Child of God - Kyoudai Nishioka"> - <img src="../img/lib/claudine.jpg" alt="Claudine - Ryoko Ikeda"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div> <hr> <h3>Favourite films</h3> <div class="flex"> -<<<<<<< HEAD - <img src="../img/film/angel.jpg" alt="Angel's Egg (1985)"> - <img src="../img/film/clock.jpg" alt="A Clockwork Orange (1971)"> - <img src="../img/film/martin.jpg" alt="Martin (1977)"> - <img src="../img/film/dancer.jpg" alt="Dancer in the Dark (2000)"> - <img src="../img/film/if.jpg" alt="If.... (1968)"> - <img src="../img/film/maude.jpg" alt="Harold and Maude (1971)"> - <img src="../img/film/planet.jpg" alt="La Planet Sauvage (1973)"> - <img src="../img/film/little.jpg" alt="Little Miss Sunshine (2006)"> - <img src="../img/film/theblacktower.jpg" alt="The Black Tower (1987)"> -======= <img src="../img/film/angel.jpg" alt="Angel's Egg (1985)"> <img src="../img/film/clock.jpg" alt="A Clockwork Orange (1971)"> <img src="../img/film/martin.jpg" alt="Martin (1977)"> @@ -131,7 +101,6 @@ <img src="../img/film/planet.jpg" alt="La Planet Sauvage (1973)"> <img src="../img/film/little.jpg" alt="Little Miss Sunshine (2006)"> <img src="../img/film/theblacktower.jpg" alt="The Black Tower (1987)"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div> </div> </div> diff --git a/old/doodle.html b/old/doodle.html index a49d926..f71878a 100644 --- a/old/doodle.html +++ b/old/doodle.html @@ -31,7 +31,6 @@ <div class="art-container"> <h4>2025</h4> -<<<<<<< HEAD <img loading="lazy" src="../img/art/2025/s2.jpg"> <img loading="lazy" src="../img/art/2025/s3.jpg"> <img loading="lazy" src="../img/art/2025/s4.jpg"> @@ -199,175 +198,6 @@ <img loading="lazy" src="../img/art/2022/kaiba.jpg"> <h4>2021</h4> <img loading="lazy" src="../img/art/2021/Aubreyfull.jpg"> -======= - <img loading="lazy" src="../img/art/2025/s2.jpg"> - <img loading="lazy" src="../img/art/2025/s3.jpg"> - <img loading="lazy" src="../img/art/2025/s4.jpg"> - <img loading="lazy" src="../img/art/2025/h1.jpg"> - <img loading="lazy" src="../img/art/2025/h2.jpg"> - <img loading="lazy" src="../img/art/2025/h3.jpg"> - <img loading="lazy" src="../img/art/2025/h4.jpg"> - <img loading="lazy" src="../img/art/2025/h5.jpg"> - <img loading="lazy" src="../img/art/2025/gen.jpg"> - <img loading="lazy" src="../img/art/2025/gen2.jpg"> - <img loading="lazy" src="../img/art/2025/girl.jpg"> - <img loading="lazy" src="../img/art/2025/girls.jpg"> - <img loading="lazy" src="../img/art/2025/grenoille.jpg"> - <img loading="lazy" src="../img/art/2025/gren.jpg"> - <img loading="lazy" src="../img/art/2025/chan.jpg"> - <img loading="lazy" src="../img/art/2025/IMG_20250225_190837.jpg"> - <img loading="lazy" src="../img/art/2025/IMG_20250225_190555.jpg"> - <img loading="lazy" src="../img/art/2025/IMG_20250225_190527.jpg"> - <img loading="lazy" src="../img/art/2025/IMG_20250225_190516.jpg"> - <img loading="lazy" src="../img/art/2025/website.png"> - <h4>2024</h4> - <img loading="lazy" src="../img/art/2024/weenergender.png"> - <img loading="lazy" src="../img/art/2024/thething.png"> - <img loading="lazy" src="../img/art/2024/theprotag.png"> - <img loading="lazy" src="../img/art/2024/the experience.png"> - <img loading="lazy" src="../img/art/2024/stars.png"> - <img loading="lazy" src="../img/art/2024/skin.png"> - <img loading="lazy" src="../img/art/2024/skedaddleaway.png"> - <img loading="lazy" src="../img/art/2024/TIME.png"> - <img loading="lazy" src="../img/art/2024/poster texture cool.jpg"> - <img loading="lazy" src="../img/art/2024/my wires.png"> - <img loading="lazy" src="../img/art/2024/molochhelp.gif"> - <img loading="lazy" src="../img/art/2024/molochand me.gif"> - <img loading="lazy" src="../img/art/2024/moldoodles.png"> - <img loading="lazy" src="../img/art/2024/mithrundoodle.png"> - <img loading="lazy" src="../img/art/2024/mithrun3.jpg"> - <img loading="lazy" src="../img/art/2024/mithrun2.jpg"> - <img loading="lazy" src="../img/art/2024/mithrun.GIF"> - <img loading="lazy" src="../img/art/2024/lips.png"> - <img loading="lazy" src="../img/art/2024/laiosSHIRT.jpg"> - <img loading="lazy" src="../img/art/2024/jig.gif"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224938.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224932.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224926.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224814.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224815.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224914.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224904.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224835.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224828.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224758.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224657.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224638.jpg"> - <img loading="lazy" src="../img/art/2024/ill.png"> - <img loading="lazy" src="../img/art/2024/guts.png"> - <img loading="lazy" src="../img/art/2024/gregemup.png"> - <img loading="lazy" src="../img/art/2024/godot.png"> - <img loading="lazy" src="../img/art/2024/gamedoodles.png"> - <img loading="lazy" src="../img/art/2024/die.png"> - <img loading="lazy" src="../img/art/2024/d.png"> - <img loading="lazy" src="../img/art/2024/wegh.png"> - <img loading="lazy" src="../img/art/2024/cant.png"> - <img loading="lazy" src="../img/art/2024/and your relationships will fall apart c.png"> - <img loading="lazy" src="../img/art/2024/2024 - Jan 23.jpg"> - <img loading="lazy" src="../img/art/2024/2024 - Jan23 googles.png"> - <img loading="lazy" src="../img/art/2024/2024 - Feb2.jpg"> - <h4>2023</h4> - <img loading="lazy" src="../img/art/2023/whathehell.png"> - <img loading="lazy" src="../img/art/2023/whatami.png"> - <img loading="lazy" src="../img/art/2023/weird girl.png"> - <img loading="lazy" src="../img/art/2023/update.png"> - <img loading="lazy" src="../img/art/2023/typing.png"> - <img loading="lazy" src="../img/art/2023/thoughts.png"> - <img loading="lazy" src="../img/art/2023/the me tunrb 3.png"> - <img loading="lazy" src="../img/art/2023/spaghettblur2.png"> - <img loading="lazy" src="../img/art/2023/Sleep.png"> - <img loading="lazy" src="../img/art/2023/September18 3.jpg"> - <img loading="lazy" src="../img/art/2023/September18 2.jpg"> - <img loading="lazy" src="../img/art/2023/September18 1.jpg"> - <img loading="lazy" src="../img/art/2023/September18.jpg"> - <img loading="lazy" src="../img/art/2023/September 4.png"> - <img loading="lazy" src="../img/art/2023/scdumbrella.png"> - <img loading="lazy" src="../img/art/2023/philosophy.png"> - <img loading="lazy" src="../img/art/2023/person.png"> - <img loading="lazy" src="../img/art/2023/people.png"> - <img loading="lazy" src="../img/art/2023/November 2 2.jpg"> - <img loading="lazy" src="../img/art/2023/momsjacket2.png"> - <img loading="lazy" src="../img/art/2023/minmax.png"> - <img loading="lazy" src="../img/art/2023/meshakeart.gif"> - <img loading="lazy" src="../img/art/2023/me reference.png"> - <img loading="lazy" src="../img/art/2023/me1.png"> - <img loading="lazy" src="../img/art/2023/lighter.png"> - <img loading="lazy" src="../img/art/2023/klaabu.jpg"> - <img loading="lazy" src="../img/art/2023/June14 - dump2.jpg"> - <img loading="lazy" src="../img/art/2023/jan29.png"> - <img loading="lazy" src="../img/art/2023/inanna.png"> - <img loading="lazy" src="../img/art/2023/imtheworst.png"> - <img loading="lazy" src="../img/art/2023/IMG_20240718_224346.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20240718_224336.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20240718_224332.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20231214_095534_edit_61702316709854.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20240718_224150.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20240718_224151.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20230423_095740_edit_386787025095667.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20230224_082257_edit_195344615689983.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20230224_082251_edit_195280928687909.jpg"> - <img loading="lazy" src="../img/art/2023/hylics looking ass.png"> - <img loading="lazy" src="../img/art/2023/halftone.png"> - <img loading="lazy" src="../img/art/2023/hair.png"> - <img loading="lazy" src="../img/art/2023/gregsplat2.png"> - <img loading="lazy" src="../img/art/2023/gregdespair2.png"> - <img loading="lazy" src="../img/art/2023/goodday.png"> - <img loading="lazy" src="../img/art/2023/girly.png"> - <img loading="lazy" src="../img/art/2023/gegheff.png"> - <img loading="lazy" src="../img/art/2023/gah.png"> - <img loading="lazy" src="../img/art/2023/fursona.png"> - <img loading="lazy" src="../img/art/2023/funkyproportions.png"> - <img loading="lazy" src="../img/art/2023/fuckedup.png"> - <img loading="lazy" src="../img/art/2023/freak.png"> - <img loading="lazy" src="../img/art/2023/estshirt2.png"> - <img loading="lazy" src="../img/art/2023/estoniapride.png"> - <img loading="lazy" src="../img/art/2023/duckfull.png"> - <img loading="lazy" src="../img/art/2023/distraught.png"> - <img loading="lazy" src="../img/art/2023/departure.png"> - <img loading="lazy" src="../img/art/2023/December18.jpg"> - <h4>Stout .. Identity Start</h4> - <img loading="lazy" src="../img/art/2023/Dec 15.jpg"> - <img loading="lazy" src="../img/art/2023/Dec 15 - 1.jpg"> - <img loading="lazy" src="../img/art/2023/Dec 15 - 2.jpg"> - <img loading="lazy" src="../img/art/2023/Dec 15 - 3.jpg"> - <img loading="lazy" src="../img/art/2023/Dec 15 - 4.jpg"> - <img loading="lazy" src="../img/art/2023/Dec 15 - 5.jpg"> - <img loading="lazy" src="../img/art/2023/Dec 15 - 6.jpg"> - <img loading="lazy" src="../img/art/2023/Dec 15 - 7.jpg"> - <h4>Stout ... Identity End</h4> - <img loading="lazy" src="../img/art/2023/deal.png"> - <img loading="lazy" src="../img/art/2023/coolending.png"> - <img loading="lazy" src="../img/art/2023/compeeter.png"> - <img loading="lazy" src="../img/art/2023/circle.png"> - <img loading="lazy" src="../img/art/2023/catboyreigenfixed.png"> - <img loading="lazy" src="../img/art/2023/can't find it.png"> - <img loading="lazy" src="../img/art/2023/brutal.png"> - <img loading="lazy" src="../img/art/2023/break.png"> - <img loading="lazy" src="../img/art/2023/aoigarasudama.png"> - <img loading="lazy" src="../img/art/2023/anatomysketches.png"> - <h4>2022</h4> - <img loading="lazy" src="../img/art/2022/TabletTestCrop1.png"> - <img loading="lazy" src="../img/art/2022/signed.png"> - <img loading="lazy" src="../img/art/2022/IMG_20230703_204745.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20230703_204841.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_224600.jpg"> - <img loading="lazy" src="../img/art/2022/linkdoodle.jpg"> - <h5>Comic start</h5> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223338.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223342.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223347.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223352.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223357.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223400.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223403.jpg"> - <h5>Comic end</h5> - <img loading="lazy" src="../img/art/2022/IMG_20221019_220521_edit_150902434438431.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20220411_202438.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20220411_165337.jpg"> - <img loading="lazy" src="../img/art/2022/kaiba.jpg"> - <h4>2021</h4> - <img loading="lazy" src="../img/art/2021/Aubreyfull.jpg"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div> </body> </html> diff --git a/old/house.html b/old/house.html index ae950eb..c9eb24c 100644 --- a/old/house.html +++ b/old/house.html @@ -68,7 +68,6 @@ </div>
<div style="flex: 3; padding-left: 10px;">
<div class="blsq" style="padding: 5px;">
-<<<<<<< HEAD <img src="../img/buttons/apples.png" alt="">
<img src="../img/buttons/bestview.gif" alt="">
<img style="width:88px; height:31px;" src="../img/buttons/evil.gif" alt="">
@@ -89,28 +88,6 @@ <img style="width:88px; height:31px;" src="../img/buttons/furby.jpg" alt="">
<img style="width:88px; height:31px;" src="../img/buttons/templeos.png" alt="">
<img style="width:88px; height:31px;" src="../img/buttons/budgie.gif" alt="">
-======= - <img src="../img/buttons/apples.png" alt="">
- <img src="../img/buttons/bestview.gif" alt="">
- <img style="width:88px; height:31px;" src="../img/buttons/evil.gif" alt="">
- <a href="https://sitcomtheory.org/"><img style="width:88px; height:31px;" src="../img/buttons/sitcombutton.gif" alt="sitcomtheory.org"></a>
- <img src="../img/buttons/homestar.gif" alt="">
- <a href="https://wiredcollective.neocities.org/webring"><img src="https://wiredcollective.neocities.org/webringimages/wiredcollectivebutton.png" alt="WIRED COLLECTIVE WEBRING"></a>
- <img src="../img/buttons/sharewareplease.gif" alt="">
- <img src="../img/buttons/thirdimpact.png" alt="">
- <a href="https://publictransit.neocities.org/"><img src="../img/buttons/transit.gif" alt="publictransit.neocities.org"></a>
- <a href="https://dhmo.org/"><img style="width:88px; height:31px;" src="../img/buttons/dhmo.png" alt="dhmo.org"></a>
- <img style="width:88px; height:31px;" src="../img/buttons/void.gif" alt="">
- <img style="width:88px; height:31px;" src="../img/buttons/xenia.gif" alt="">
- <a href="https://theanarchistlibrary.org/special/index"><img style="width:88px; height:31px;" src="../img/buttons/anarchist_lib.png" alt="theanarchistlibrary.org"></a>
- <a href="https://archive.org"><img style="width:88px; height:31px;" src="../img/buttons/archive.gif" alt="archive.org"></a>
- <a href="https://zapatopi.net/treeoctopus/"><img style="width:88px; height:31px;" src="../img/buttons/treeoctopus.png" alt="zapatopi.net/treeoctopus"></a>
- <img style="width:88px; height:31px;" src="../img/buttons/urappin.png" alt="">
- <a href="https://crouton.net/"><img style="width:88px; height:31px;" src="../img/buttons/crouton.png" alt="crouton.net"></a>
- <img style="width:88px; height:31px;" src="../img/buttons/furby.jpg" alt="">
- <img style="width:88px; height:31px;" src="../img/buttons/templeos.png" alt="">
- <img style="width:88px; height:31px;" src="../img/buttons/budgie.gif" alt="">
->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div>
<p>
diff --git a/old/index.html b/old/index.html index 78ca9d8..e491e96 100644 --- a/old/index.html +++ b/old/index.html @@ -5,21 +5,13 @@ <meta name="description" content="The Weight of Comfort"> <meta name="keywords" content="Personal, Music, Poetry, Art, Radiohotline, Teethinvitro"> <meta name="author" content="Radiohotline"> -<<<<<<< HEAD - <meta http-equiv="refresh" content="0; url=https://softmachine.dev/" /> -======= ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff <style> html { min-height: 100%; box-shadow: inset 0 0 300px #000, inset 0 0 120px #000, inset 0 0 80px #000; } body { -<<<<<<< HEAD - background-image: url(img/bg/insert.png); -======= background-image: url(../img/bg/insert.png); ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff background-repeat: no-repeat; background-attachment: fixed; background-size: cover; @@ -38,26 +30,14 @@ 1px 1px #dbcdbe, -1px -1px #dbcdbe, 1px -1px #dbcdbe, -1px 1px #dbcdbe; } </style> -<<<<<<< HEAD -======= - <link href="crt index.css" rel="stylesheet"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff <title>Soft Machine</title> </head> <body> <br> -<<<<<<< HEAD - <p style="z-index: 1;">moved</p> - - <p style="color:grey; font-size: 14px;">Updated: 2026-02-16 20:36:22</p> - - <a href="https://softmachine.dev">>> redirect</a> -======= <p style="z-index: 1;">soft machine</p> <!-- <p style="color:grey; position: absolute; left: 30%; top: 19%; z-index: -1;">lorem ipsum dolor sit amet</p> --> <a href="house.html">>> proceed</a> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </body> </html> diff --git a/old/links.html b/old/links.html index dc7c321..ffe48cc 100644 --- a/old/links.html +++ b/old/links.html @@ -48,7 +48,7 @@ <h3>Webrings</h3> <div id='nixring' style="display: inline-block; padding-right: 5px;"> - <script defer src="https://teethinvitro.neocities.org/webring/linuxring/ring.js" data-icon="tux"> + <script defer src="https://teethinvitro.neocities.org/webring/linuxring/ring.js" data-icon="tux"></script> </div> <div style="display:inline-block;"> diff --git a/old/music.html b/old/music.html index 56be16b..429fd3b 100644 --- a/old/music.html +++ b/old/music.html @@ -11,11 +11,7 @@ body { display: flex; justify-content: center; -<<<<<<< HEAD - background-image: url(img/bg/Artifact\ 2.png); -======= background-image: url(../img/bg/Artifact\ 2.png); ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff background-attachment: fixed; background-position: center; } @@ -81,11 +77,7 @@ <a href="house.html">Go home?</a> <script src="https://juneish.neocities.org/ring/beepbox/ring.js" data-song="https://jummb.us/player/#song=j6N04Wishng43s0k0l00e19t1Ua5g19j0lr1O_U0000000000000000000000000000000000000000000000i0o3331333234333334T5v0xu05f032ve2ie13000qwB15110Wa0d2a0H_RBHBziiii9998h3E1c0b7T5v0nu05f0000qwB15110Oa0d2a0H_RBHBziiii9998h3E1c0b7T0v0pu00f153q8740Oa70d4a0w5h4E0c0T5v0su51f0000qwB17110Ba0d080H-IHyiih9999998h0E1c0b6T9v0pu1af010s500q040Oad030w2h0M00001111222233334444555566667777MMMMLLLLKKKKJJJJIIIIHHHHGGGGFFFFE0c0T7v0ru07f050p61770q72d42g300q8J021a90k7001600Vald060HT-SRJJJJIAAAAAh0IcE1c0c11T7v0wu07f150qoY021990l60025ba00506310ad010HT-SRJiirrAKTijh0IaE2c0c11c01T7v0wu07f150qoY021990l60025ba00707700ad010HT_____Qzriiii8h0IaE2c0c11c01T7v0vu07f050p61770q72d42g300q8J021a90k7005ba00600Dald060HT-SRJJJJIAAAAAh0IaE1c0c11T5v0tu05f180qgA010re0030Fad000HTZKSrih8g00000h0E1c0b7T1v0qu18f0000q040Oad230A0F0B0Q0000Pf600R0000E1c0617T7v0tu07f040p61770q72f500q8I00001500Oad060HT-SRJJJJIAAAAAh0IaE1c001T1v0yu83f0000q8D18120Oa70d030AbF6B2Q0572P9995R0000E2c0b273T1v0pu83f0000q8D18120Oa70d030AbF6B2Q0572P9995R0000E2c0b273T7v0ku07f150qoY021990l6003310000sad010HT-SRJJJJIAAAAAh2IaE1c0c11T5v0pu05f022792qe0112k6qgA010n50030Oad030HTZIzrih9004000h0E1c0b7T4v0vuf0f1a0q050Oa0z6666ji8k8k3jSBKSJJAArriiiiii07JCABrzrrrrrrr00YrkqHrsrrrrjr005zrAqzrjzrrqr1jRjrqGGrrzsrsA099ijrABJJJIAzrrtirqrqjqixzsrAjrqjiqaqqysttAJqjikikrizrHtBJJAzArzrIsRCITKSS099ijrAJS____Qg99habbCAYrDzh00E0c0T4v0uuf0f1a0q050Oa0z6666ji8k8k3jSBKSJJAArriiiiii07JCABrzrrrrrrr00YrkqHrsrrrrjr005zrAqzrjzrrqr1jRjrqGGrrzsrsA099ijrABJJJIAzrrtirqrqjqixzsrAjrqjiqaqqysttAJqjikikrizrHtBJJAzArzrIsRCITKSS099ijrAJS____Qg99habbCAYrDzh00E0c0T4v0puf0f1a0q050Oa0z6666ji8k8k3jSBKSJJAArriiiiii07JCABrzrrrrrrr00YrkqHrsrrrrjr005zrAqzrjzrrqr1jRjrqGGrrzsrsA099ijrABJJJIAzrrtirqrqjqixzsrAjrqjiqaqqysttAJqjikikrizrHtBJJAzArzrIsRCITKSS099ijrAJS____Qg99habbCAYrDzh00E0c0T4v0puf0f1a0q050Oa0z6666ji8k8k3jSBKSJJAArriiiiii07JCABrzrrrrrrr00YrkqHrsrrrrjr005zrAqzrjzrrqr1jRjrqGGrrzsrsA099ijrABJJJIAzrrtirqrqjqixzsrAjrqjiqaqqysttAJqjikikrizrHtBJJAzArzrIsRCITKSS099ijrAJS____Qg99habbCAYrDzh00E0c0Tav0pu00f0000q00d040E0c0Tav0pu00f0000q00d040E0c0Tav0pu00f0000q00d040E0c0b28p0Bct2lboQ8xA2kNQ9s-4g000000000000000000000000000000000000000000000000000000000000004gO1aoW4GmNE00000000000000000000000000w4c92CexaBI20gMAaVG4GmM0g264xj7gBiS000000000000000000000003S02YgO5ct2lboQbN38kNQ9kJzg1s8p2CexaBIq5MxAaoW4GmNEn26gFzEiFr6w000000000000000000000000020000000000000000000000000000000000000000000000000000000000001gh38kNQ9mNHDw00000000000000000000000000000000000000000000000000000000000004gO5ct2lIq0000000000000000000000000000000000000000000000000000gx248gx248gw0000000000000000000000000000000000000000000000000208oi5sR2lbo40xx8lPk9kJzU000000000000000000000000000000000000000000000028o000000002cFQ0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004gO5ct2lIqVY8w00000000000000000000000000000000000000000000028o6AaoW4GmO80000000000000000000000000000000000000000000000000000000000008ODg000000000000000000000000000000000000014cxj7gBr6w000000000000000000000000000xj7gBiSds-Jw0000000000000000000000000000000000000000000000000000000000000000000000000wgxa4gh524ohx24Eh14k8hx6o00000000000000000000000000000000000001248gx248gz848gx248gx2cxj000000000000000000000000000000000000048gx248gx248gx248gx248gy600000000000000000000000000000000000000000000000000000w200w20cw0000000000000000000000008xw8kNQ9kNo0dsY08h1aoa00000000000000aw000000000000000000000000000000000001400000000x20xx8kNQ9kNrnf00000000000000000000000000000000000000wy288wy288ww00000000000000p2NnFA-8gZ8ui7F3QxWg-A7F3QxWhLV4f8zOgZ8uAfi7QwYyfi7F6ACiq7a1W8ZcuAfg7j8Z2Njdvh7d9ACxwipbEBypfB1Wo-U7j2QkObjSdczQh7P8uwr-mFsy7GzQhW9zV23UyeTFo0CfGCKMO_kJlRklT-yZxBuLwzj7SGQbixbRijRxDFB-oolJB-PeKLJcLTfOLj9ZcrZINUlcvuV0fm7EzS1W8Z8v1xS6jX0r37OmQOvm7SJ1WJZG9Bx1-0P6uMO_pkYv-8OeJrYgfOK2CjUx3EA-Af93V8v93Qx-i3V8uAfid_y8v4hV8v93V8uAfOgt0DO8Z8v96ACiq7a1-8zQNYAfA1QOfgIkPnQhOW9fEkOj0AOnhbdk7j9Zcvc29xqap5FZhGUGb4uyj9Z8uwrWp7HkG9fExZGfAhYyoW97Es1QiD8zIWnw0CfGCKN0FNpiP42D5SHc4LR5r3bZ_ELopnHUcdcv1zO8ZujR1MWpvASVyFjHiFvzkOe8ZDsHw2OPNv4cAChhimmtfF8O6LOgkS3NxppN-Bw1gziOPLZaS33bZeDzu4Tzel49OlFDy-_HizIFim6u3WaUDYul2mkBdT09xD7Xu9NX0efQZ0apN-8hN-n77U8qWpvGsh77WiiQBn9am66LAulmttjRxN-AFqioJ9iQhNU2CubW8000ltzPrRYjkjGpM-LAgaCLA-x8CtfHFAuxjGpHXvAp5cPZvgECnWBxB-DcFCfI-N9cRZlcLQqp7F4PwZpqOfoZnqtzOf8EhzfPhPdjd7lRp9AuzmH6hWKNVTeLyaCsvB7gnluRkFNWpNYRlPKtnbZeXI5CCubV1Nw9CzxQRtiGCbGW4kOfgGpN-HGFKoul9NW9N-Ljf5N22F73W-CEkPxZv8wldv9Z2hcWvmj8Z2DoCq-TV56pypDW-xaH3bZmJcLQOCo-PX4mcp7GWKnWii4AO_jFAuEppMuOBhzmnWKNWKNV7ENgB6BxCLGTud9cjd7lRpOj8ZaRpPAuHIusjKLIEPTdloNCLGV7GWw24z3dviECnWRFD7W-LFCmsvH8bjnjeDMByVTeHB-MdZopN-wyAfmCubVnAHw1opULAQE000IIYnN399AkkBBDvWiczbbZiUnqxmofmCiSwSrEdWiaOPzZzlk7SlFDy-0WwGXakBxDy-yKY1axHaiCXw4MPzZL4UZx77X-X3f5N682pqp7wUmhjdvijbY3Ep5czRGl1cnhEXegX4Cu5x6Ct-5n0v95cFNleFD4EEEjef4WpTUCkOD57GCt26a8y-t-Cny5jaokg5WpByF6CnyKOFD7yGzHaljdubN8CsuaRcUYbMwbQOYiFDyUGFD7y2DdtcLQrdGTmcnlRsNt3IipvwQOf8QQPnQWKsvGVEXSqpvHQO0gDxQXZwB-6JopN8xgsHppULy6ij8EFbbe_QAp6mnWBMKR2IMuJ3rECIIU_jGExcO6ODZk-FI9_ccU_vM0mcqKHCTHUCm0IBkPxZv8wm6nWixjd7lSJ9B-AChU6BjHlcUDlSp69CvHW2CecuG8BcNZDRVccRZuD4LsP3e3SA5L8ZzRtFSf5Rt12cpXFCLGC9GVjFTGNtncLlSQpRj8Z6DmIzRtzPHtnlSqNHRjefQ33dvhWMO_mDjefRyNAuHGVHWBUGNGVSuHB-xiiMPzZ1lrmIcYnT61mczRtnbZB29cLRBtncnlM0d4RtDiCbGW4kOfgGpN-HJ94PhQ4O_kD7I4U_3VIcYn4oMjbj8YiMIyCq-ACnU7gOap7IkG2oKzhSsxS9cYb2dBD7F55dtDfhhEopNWYxpp7HOAppMqBKv6pOSIoka8SmubGdsbbefkUFC6suENVvsBzqZxDyWXJPiaiyDOteO3nSoW5BCKJQYeDH6bGWKoK808AO_1FAuhFFCLFRsU_lPhOqJcLMlcw49Us001dtcLNb8gs3mcnlRsNt34ipvwQOf8QQPnQWKsvGVEXiDGZcw49UslcUvnQR4y1kRYDQ94PFZpczQatjdvrYz8FCvHW54O_kQOCo-PWYlz8ZnlO_lgzILkOpMuKJpvGX7GX7Auigz6tcRZgCnWqCqeHGOWzpHehWKNVNeW-NCb0H6q-HAuHx48C6q-2FVnIcU_nOjefR5neVRsLQYKMhmYkPNv800apTUm9B-3U2MeFD4EEh9D7yvyrzljex354hve_jbN2FBca82ZcONkzjbZljaoniFD7yGzjefMr9lcRULQypNUHkPzML20LjbNaCubyE4XZxB-8AX3eD4dznFD7y8U_gkd0MOcmACnyKlCMOY8hD7RbcIz5qOGOBlDbplYS9Cm8kpN-h002CnyMRQPzN7AhuCkwclcON9xCm8hFBUAbQOAh5UBN2fygLEIcUYizjbMwj8Npj2i0gj54kMxixgOehOB2wCky52x2jax1xDw8N400ap6aydj0y8g8Rcs342dj2i0g8QOcg8Qycg8WpuadHhAaVNYX1cknj344z400002suCnyNHPzQOcgE6LefkOf54a2CbAowCky4Xewkw00082wa2wa80c8vg0f5Mvku_g0e_053NW01NUpG0Gw1yw1ywRBw28r4qWE0a06W3ko0ww0nw202dtk5EMMk1B04402Y0g5W0Vu0808Lg7ef041IhQW0VHw202dtg9e31rb0405o03n1jn09g0Qg100H80oEckxxu0ma06y0805g0d46el040M8Lg0e_0Q04suE06a3R80wc2w0qU0Gk1ic28M10sx6KE3ywFEw20S8RR00QgqOM10lhQW0RHw202d500Tgx100RM10177E3SK0830G05u3nvw201l0aY6Ik7ex0402w2ubxCg00A5Mb4066vzFQ1rb04N9l0350351Hb040S8RRg0k0dQ6EM1100L0404qWEbhxwE3a08805U0wbQ1OY0g0huw4su083ozFQ1Pn0404qWEds606a3iw202I01HwFHw4E0q80w0lE0ck6agML0b503b1pg100G01EwNOE0w615W01TUfw0zzR00NguF041wk03LM10c2w0ubxC01m00VI5513n2Vg100E2TyUbG0k03CM9ge400V80Ud_QczNs0k7NtgfK90VgbkE1iwpN8vw0E1DyVAyfyW1ZNU5yg2ef3Y00000"></script> </div> -<<<<<<< HEAD <img src="../img/nav/redplayer.png"> -======= - <img src="../img/nav/redplayer.png"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div> <div class="container"> @@ -93,7 +85,7 @@ <h2>Echo No Leaves Bide - June 19, 2025</h2> <p>I made this for a comp, but I ended up using another track (Opetanie) for it.</p> <audio loading="lazy" controls="true"> - <source src="music/echo.ogg"> + <source src="../music/echo.ogg"> </audio> <p><a href="https://sodomitesneurodivergentes.bandcamp.com/album/the-great-sodomite-ass-hyena-motherfucker">Here is the compilation</a>.</p> <p class="genre">(experimental, noise)</p> @@ -127,33 +119,33 @@ <p>(Some) music I made for Moloch that ended up being too fast and crowded. Whether or not I include them in the Bandcamp release depends on whether or not I can recover the tracks (Element, my VST3 host, got messed up in projects after I reinstalled my OS). For now, they'll be bonuses on my website (here!).</p> <h2>Cave</h2> (new version of blue crystal cave) <audio loading="lazy" controls="true"> - <source src="music/cave new.mp3"> + <source src="../music/cave new.mp3"> </audio> <h2>"Fell in Well"</h2> (untitled) <p>This one is actually an arrangement of a <a href="https://youtu.be/jKMNIB9sk18?si=SdpZsTv84OdCyqy5&t=59">piano warmup exercise</a> by Nahre Sol. For the piano, I only really composed the fourth variation in the pattern. I removed it from the soundtrack because it was too fast and because I don't want to take credit for the melody.</p> <audio loading="lazy" controls="true"> - <source src="music/fell in well uhhh.mp3"> + <source src="../music/fell in well uhhh.mp3"> </audio> <p>The following version was supposed to play first in the game. Upon finding something in the area, the rest of it will "unlock", and the above rendition will begin playing.</p> <audio loading="lazy" controls="true"> - <source src="music/fell in a well gemini.mp3"> + <source src="../music/fell in a well gemini.mp3"> </audio> <h2>Lab themes</h2> <p>These are likely to make it into the final game if I don't make anything better.</p> <audio loading="lazy" controls="true"> - <source src="music/lab question mark 192.mp3"> + <source src="../music/lab question mark 192.mp3"> </audio> <audio loading="lazy" controls="true"> - <source src="music/lab true 192.mp3"> + <source src="../music/lab true 192.mp3"> </audio> <audio loading="lazy" controls="true"> - <source src="music/sci fi bg low drift.mp3"> + <source src="../music/sci fi bg low drift.mp3"> </audio> <h2>Underground City</h2> (this is the oldest one among these) <audio loading="lazy" controls="true"> - <source src="music/underground city.mp3"> + <source src="../music/underground city.mp3"> </audio> <p class="genre">(soundtrack, ambient)</p> </div> @@ -161,7 +153,7 @@ <div class="shitpost"> <h2>Chickadee diss track - Dec 17th, 2023</h2> <video width="320" height="240" controls> - <source src="music/chickadee-diss-track.mp4" type="video/mp4"> + <source src="../music/chickadee-diss-track.mp4" type="video/mp4"> Your browser does not support the video tag. </video> <p class="genre">(shitpost)</p> @@ -171,7 +163,7 @@ <h2>Greg ending - Jul 2nd, 2023</h2> <p>Digital remake of menu reprise, with Murumart's ending theme appended to it, but my instrumentation of it. I also rewrote its bass.</p> <audio loading="lazy" controls="true"> - <source src="music/menu 2 reprise ending new export.ogg" type="audio/ogg"> + <source src="../music/menu 2 reprise ending new export.ogg" type="audio/ogg"> </audio> <p class="genre">(soundtrack)</p> </div> @@ -180,7 +172,7 @@ <h2>Sacred - Apr 28th, 2023</h2> <p>Version 2, where I added EQ and more volume control to bring out details that were drowned in the original mix, and I also added a vocal chop repeat somewhere in there. You'll know which one if you've heard version 1.</p> <audio loading="lazy" controls="true"> - <source src="music/sacred.ogg" type="audio/ogg"> + <source src="../music/sacred.ogg" type="audio/ogg"> </audio> <p class="genre">(dnb, breakcore, electronic)</p> </div> @@ -188,7 +180,7 @@ <div class="ost"> <h2>Blue Crystal Cave - Mar 28th, 2023</h2> <audio loading="lazy" controls="true" controlList="nowdownload"> - <source src="music/Radio - Reflection in a Blue Crystal new mix.ogg"> + <source src="../music/Radio - Reflection in a Blue Crystal new mix.ogg"> </audio> <p>This is a new mix of the song uploaded in my old blog.</p> <p class="genre">(soundtrack)</p> @@ -198,7 +190,7 @@ <h2>a smoke in the tropical paradise that is a fisherman's hut or hut waltz - Mar 19th, 2023</h2> <p>OST for Greg RPG.</p> <audio loading="lazy" controls="true" controlList="nowdownload"> - <source src="music/tropical.ogg" type="audio/ogg"> + <source src="../music/tropical.ogg" type="audio/ogg"> </audio> <p class="genre">(acoustic, soundtrack)</p> </div> @@ -208,7 +200,7 @@ <p>I say messy because the practice was very good, but what I ended up recording was not as great, but it was received well by friends. It was intended to be a continuation to menu 2, hence making it some epic-ish reprise, but it became its own song instead.</p> <p>Round and round and round...</p> <audio loading="lazy" controls="true" controlList="nowdownload"> - <source src="music/clocktower.ogg" type="audio/ogg"> + <source src="../music/clocktower.ogg" type="audio/ogg"> </audio> <p class="genre">(acoustic, soundtrack)</p> </div> @@ -217,7 +209,7 @@ <h2>Menu 2 - Reprise - Mar 19, 2023</h2> <p>Re-recording of menu_2, from my brainstorm.</p> <audio loading="lazy" controls="true" controlList="nowdownload"> - <source src="music/menu2reprise.ogg" type="audio/ogg"> + <source src="../music/menu2reprise.ogg" type="audio/ogg"> </audio> <p class="genre">(folk, acoustic, soundtrack)</p> </div> @@ -254,7 +246,7 @@ <h2>Untitled - Mar 24 2023</h2> <p>All sounds except for the fretless bass where made from samples of one song.</p> <audio loading="lazy" controls="true" controlList="nowdownload"> - <source src="music/untitled.ogg" type="audio/ogg"> + <source src="../music/untitled.ogg" type="audio/ogg"> </audio> <p class="genre">(electronic)</p> </div> @@ -263,7 +255,7 @@ <h2>Mail Mission Jazz - Mar 7th, 2023 (Jul 19th, 2023 export)</h2> <p>Jazz cover of a <a href="https://murumart.bandcamp.com/track/mail-mission">Greg OST track</a>. Incomplete.</p> <audio loading="lazy" controls="true"> - <source src="music/biking jazz wip.ogg" type="audio/ogg"> + <source src="../music/biking jazz wip.ogg" type="audio/ogg"> </audio> <p class="genre">(jazz)</p> </div> @@ -271,7 +263,7 @@ <div class="acoustic folk"> <h2>Bread - Feb 20th, 2023</h2> <audio loading="lazy" controls="true"> - <source src="music/bread.ogg" type="audio/ogg"> + <source src="../music/bread.ogg" type="audio/ogg"> </audio> <p>Grabbed my guitar. Played that. Played it again to record it. Loaded it into LMMS and figured out the BPM, then added the rest of it. After that I recorded that last section but it has bad clipping.</p> <p>This is a demo to lay the idea down (inspired by Clay Parton). I will remake this at some point into a finished song because I hate the distortion.</p> @@ -282,27 +274,21 @@ <h2>Olen Väsinud - Feb 4th, 2023</h2> <p>The file is called "this came to me in a vision at 8 am" because that's what this is.</p> <audio loading="lazy" controls="true"> - <source src="music/olenvasinud.ogg" type="audio/ogg" /> + <source src="../music/olenvasinud.ogg" type="audio/ogg" /> </audio> <p>My magnum opus.</p> <p class="genre">(electronic, ambient)</p> </div> -<<<<<<< HEAD - <div class="rock" style="background: linear-gradient(rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0.7)), url(img/gnome.jpg); background-size: cover;"> - <h2>Song of Storms - Jan 29th, 2023</h2> - <p>This is a "moss rock" remix of Song of Storms, based on <a href="../img/gnome.jpg">this image</a>. I went for prog.</p> -======= <div class="rock" style="background: linear-gradient(rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0.7)), url(../img/gnome.jpg); background-size: cover;"> <h2>Song of Storms - Jan 29th, 2023</h2> <p>This is a "moss rock" remix of Song of Storms, based on <a href="../img/gnome.jpg">this image</a>. I went for prog.</p> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff <audio loading="lazy" controls="true"> - <source src="music/songofstorms.ogg" type="audio/ogg" /> + <source src="../music/songofstorms.ogg" type="audio/ogg" /> </audio> <p>Scrapped 7/4 section (while the DAW was set to 7/4, the actual work wasn't in 7/4)</p> <audio loading="lazy" controls="true"> - <source src="music/songofshit.ogg" type="audio/ogg" /> + <source src="../music/songofshit.ogg" type="audio/ogg" /> </audio> <p class="genre">(progressive rock)</p> </div> diff --git a/old/projects.html b/old/projects.html index d93e658..9a42db0 100644 --- a/old/projects.html +++ b/old/projects.html @@ -63,11 +63,7 @@ <li>Troysort (joke)</li>
</ul>
-<<<<<<< HEAD <img src="../img/objects/duckgrass.gif"></img>
-======= - <img src="../img/objects/duckgrass.gif"></img>
->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </body>
</html>
diff --git a/old/sketch.html b/old/sketch.html index fbd4133..90614a3 100644 --- a/old/sketch.html +++ b/old/sketch.html @@ -31,7 +31,6 @@ <div class="art-container"> <h4>2025</h4> -<<<<<<< HEAD <img loading="lazy" src="../img/art/2025/s1.jpg"> <img loading="lazy" src="../img/art/2025/s5.jpg"> <img loading="lazy" src="../img/art/2025/i1.jpg"> @@ -85,61 +84,6 @@ <img loading="lazy" src="../img/art/2022/IMG_20220226_183246.jpg"> <h4>2021</h4> <img loading="lazy" src="../img/art/2021/IMG_20210721_115209.jpg"> -======= - <img loading="lazy" src="../img/art/2025/s1.jpg"> - <img loading="lazy" src="../img/art/2025/s5.jpg"> - <img loading="lazy" src="../img/art/2025/i1.jpg"> - <img loading="lazy" src="../img/art/2025/i2.jpg"> - <img loading="lazy" src="../img/art/2025/i3.jpg"> - <img loading="lazy" src="../img/art/2025/h6.jpg"> - <img loading="lazy" src="../img/art/2025/bikeghostsketch.jpeg"> - <img loading="lazy" src="../img/art/2025/jojosketches.jpeg"> - <img loading="lazy" src="../img/art/2025/IMG_20250225_190627.jpg"> - <img loading="lazy" src="../img/art/2025/IMG_20250225_190657.jpg"> - <img loading="lazy" src="../img/art/2025/IMG_20250225_190853.jpg"> - <h4>2024</h4> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224634.jpg"> - <img loading="lazy" src="../img/art/2024/2024 - April13 molochcats.png"> - <img loading="lazy" src="../img/art/2024/wigeon.png"> - <img loading="lazy" src="../img/art/2024/mithrun1.jpg"> - <img loading="lazy" src="../img/art/2024/gamescreenshot.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224748.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224728.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224718.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224652.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224646.jpg"> - <img loading="lazy" src="../img/art/2024/IMG_20240718_224629.jpg"> - <img loading="lazy" src="../img/art/2024/ardennaaaa.png"> - <img loading="lazy" src="../img/art/2024/2024 - February16 posterwip.png"> - <img loading="lazy" src="../img/art/2024/2024 - Februrary 2.jpg"> - <img loading="lazy" src="../img/art/2024/2024 - February.jpg"> - <h4>2023</h4> - <img loading="lazy" src="../img/art/2023/duck.png"> - <img loading="lazy" src="../img/art/2023/September28 - dino.png"> - <img loading="lazy" src="../img/art/2023/September10 - alien.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20240718_224241.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20230705_174343.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20230809_181215_edit_447859372544680.jpg"> - <img loading="lazy" src="../img/art/2023/July 19 - steampunkscd.png"> - <img loading="lazy" src="../img/art/2023/IMG_20240718_224121.jpg"> - <img loading="lazy" src="../img/art/2023/June 4 scd.png"> - <img loading="lazy" src="../img/art/2023/IMG_20240718_224255.jpg"> - <img loading="lazy" src="../img/art/2023/IMG_20240718_224248.jpg"> - <img loading="lazy" src="../img/art/2023/gregepicwip2.png"> - <h4>2022</h4> - <img loading="lazy" src="../img/art/2022/guy.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223643.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20241230_152950.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223943.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223809.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223752.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223745.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20240718_223733.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20230221_144951_edit_177165706492236.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20220226_183246.jpg"> - <h4>2021</h4> - <img loading="lazy" src="../img/art/2021/IMG_20210721_115209.jpg"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div> </body> </html> diff --git a/old/thoughts.html b/old/thoughts.html index bb59891..9fc6ce5 100644 --- a/old/thoughts.html +++ b/old/thoughts.html @@ -54,54 +54,54 @@ <article> <details> <summary>25/11/07 - Lemon Soda Lemonade</summary> - <embed src="txt/soda.txt"> + <embed src="../txt/soda.txt"> </details> </article> <article> <details> <summary>25/11/07 - Some Things We Do</summary> - <embed src="txt/core.txt"> + <embed src="../txt/core.txt"> </details> </article> <article> <details> <summary>25/01/09 - Outcomes of a Shower</summary> - <embed src="txt/shower.txt"> + <embed src="../txt/shower.txt"> </details> </article> <article> <details> <summary>23/04/22 - Wherein You Exist</summary> - <embed src="txt/where.txt"> + <embed src="../txt/where.txt"> </details> </article> <article> <details> <summary>23/02/22 - "Aliveness" as Imperfection and Uncertainty in Motion</summary> - <embed src="txt/alive.txt"> + <embed src="../txt/alive.txt"> </details> </article> <article> <details> <summary>23/01/26 - No Such Thing as an Imperfect Number (Updated 2025)</summary> - <embed src="txt/num.txt"> + <embed src="../txt/num.txt"> </details> </article> <article> <details> <summary>23/01/26 - Expression and the Primal Fear of Isolation</summary> - <embed src="txt/isolation.txt"> + <embed src="../txt/isolation.txt"> </details> </article> <article> <details> <summary>23/01/26 - What is this?</summary> - <embed src="txt/birth.txt"> + <embed src="../txt/birth.txt"> </details> </article> @@ -109,7 +109,7 @@ <article> <details> <summary></summary> - <embed src="txt/"> + <embed src="../txt/"> </details> </article> --> |