From 5024f0d9fcc8426c7c48a7ce0b4cc86485921bd8 Mon Sep 17 00:00:00 2001 From: radiohotline Date: Tue, 17 Feb 2026 15:23:50 +0300 Subject: merge --- old/archive.html | 22 ------- old/art.html | 12 ---- old/books.html | 31 ---------- old/doodle.html | 170 ------------------------------------------------------ old/house.html | 23 -------- old/index.html | 20 ------- old/links.html | 2 +- old/music.html | 56 +++++++----------- old/projects.html | 4 -- old/sketch.html | 56 ------------------ 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 @@

2025

-<<<<<<< HEAD

2024

@@ -51,27 +50,6 @@ -======= - - -

2024

- -

2023

- - - -

2022

- - - - - -

2021

- - - - ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
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 @@

Doodles

-<<<<<<< HEAD Doodles -======= - Doodles ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff

Sketches

-<<<<<<< HEAD - Sketches -======= Sketches ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff

Completed

-<<<<<<< HEAD - Complete -======= Complete ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
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 @@

Favourite books2

-<<<<<<< HEAD House of Leaves - Mark Z. Danielewski The Necrophiliac - Gabrielle Wittkop A Clockwork Orange - Anthony Burgess @@ -89,39 +88,10 @@ Girl on the Shore - Inio Asano Child of God - Kyoudai Nishioka Claudine - Ryoko Ikeda -======= - House of Leaves - Mark Z. Danielewski - The Necrophiliac - Gabrielle Wittkop - A Clockwork Orange - Anthony Burgess - Naked Lunch - William S. Burroughs - 4.48 Psychosis - Sarah Kane - Babyfucker - Urs Allemann - The Stranger - Albert Camus - Alice's Adventures in Wonderland - Lewis Carroll - Perfume: The Story of a Murderer - Patrick Süskind - The Man Who Spoke Snakish - Andrus Kivirähk - Forgive Me, Leonard Peacock - Matthew Quick - Enlightened Transsexual Comix - Sam Szabo - Oyasumi Punpun - Inio Asano - Girl on the Shore - Inio Asano - Child of God - Kyoudai Nishioka - Claudine - Ryoko Ikeda ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff

Favourite films

-<<<<<<< HEAD - Angel's Egg (1985) - A Clockwork Orange (1971) - Martin (1977) - Dancer in the Dark (2000) - If.... (1968) - Harold and Maude (1971) - La Planet Sauvage (1973) - Little Miss Sunshine (2006) - The Black Tower (1987) -======= Angel's Egg (1985) A Clockwork Orange (1971) Martin (1977) @@ -131,7 +101,6 @@ La Planet Sauvage (1973) Little Miss Sunshine (2006) The Black Tower (1987) ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
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 @@

2025

-<<<<<<< HEAD @@ -199,175 +198,6 @@

2021

-======= - - - - - - - - - - - - - - - - - - - - -

2024

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2023

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Stout .. Identity Start

- - - - - - - - -

Stout ... Identity End

- - - - - - - - - - -

2022

- - - - - - -
Comic start
- - - - - - - -
Comic end
- - - - -

2021

- ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
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 @@
-<<<<<<< HEAD @@ -89,28 +88,6 @@ -======= - - - - sitcomtheory.org - - WIRED COLLECTIVE WEBRING - - - publictransit.neocities.org - dhmo.org - - - theanarchistlibrary.org - archive.org - zapatopi.net/treeoctopus - - crouton.net - - - ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff

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 @@ -<<<<<<< HEAD - -======= ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff -<<<<<<< HEAD -======= - ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff Soft Machine
-<<<<<<< HEAD -

moved

- -

Updated: 2026-02-16 20:36:22

- - >> redirect -=======

soft machine

>> proceed ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff 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 @@

Webrings

-
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 @@ Go home?
-<<<<<<< HEAD -======= - ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
@@ -93,7 +85,7 @@

Echo No Leaves Bide - June 19, 2025

I made this for a comp, but I ended up using another track (Opetanie) for it.

Here is the compilation.

(experimental, noise)

@@ -127,33 +119,33 @@

(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!).

Cave

(new version of blue crystal cave)

"Fell in Well"

(untitled)

This one is actually an arrangement of a piano warmup exercise 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.

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.

Lab themes

These are likely to make it into the final game if I don't make anything better.

Underground City

(this is the oldest one among these)

(soundtrack, ambient)

@@ -161,7 +153,7 @@

Chickadee diss track - Dec 17th, 2023

(shitpost)

@@ -171,7 +163,7 @@

Greg ending - Jul 2nd, 2023

Digital remake of menu reprise, with Murumart's ending theme appended to it, but my instrumentation of it. I also rewrote its bass.

(soundtrack)

@@ -180,7 +172,7 @@

Sacred - Apr 28th, 2023

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.

(dnb, breakcore, electronic)

@@ -188,7 +180,7 @@

Blue Crystal Cave - Mar 28th, 2023

This is a new mix of the song uploaded in my old blog.

(soundtrack)

@@ -198,7 +190,7 @@

a smoke in the tropical paradise that is a fisherman's hut or hut waltz - Mar 19th, 2023

OST for Greg RPG.

(acoustic, soundtrack)

@@ -208,7 +200,7 @@

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.

Round and round and round...

(acoustic, soundtrack)

@@ -217,7 +209,7 @@

Menu 2 - Reprise - Mar 19, 2023

Re-recording of menu_2, from my brainstorm.

(folk, acoustic, soundtrack)

@@ -254,7 +246,7 @@

Untitled - Mar 24 2023

All sounds except for the fretless bass where made from samples of one song.

(electronic)

@@ -263,7 +255,7 @@

Mail Mission Jazz - Mar 7th, 2023 (Jul 19th, 2023 export)

Jazz cover of a Greg OST track. Incomplete.

(jazz)

@@ -271,7 +263,7 @@

Bread - Feb 20th, 2023

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.

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.

@@ -282,27 +274,21 @@

Olen Väsinud - Feb 4th, 2023

The file is called "this came to me in a vision at 8 am" because that's what this is.

My magnum opus.

(electronic, ambient)

-<<<<<<< HEAD -
-

Song of Storms - Jan 29th, 2023

-

This is a "moss rock" remix of Song of Storms, based on this image. I went for prog.

-=======

Song of Storms - Jan 29th, 2023

This is a "moss rock" remix of Song of Storms, based on this image. I went for prog.

->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff

Scrapped 7/4 section (while the DAW was set to 7/4, the actual work wasn't in 7/4)

(progressive rock)

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 @@
  • Troysort (joke)
  • -<<<<<<< HEAD -======= - ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff 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 @@

    2025

    -<<<<<<< HEAD @@ -85,61 +84,6 @@

    2021

    -======= - - - - - - - - - - - -

    2024

    - - - - - - - - - - - - - - - -

    2023

    - - - - - - - - - - - - -

    2022

    - - - - - - - - - - -

    2021

    - ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
    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 @@
    25/11/07 - Lemon Soda Lemonade - +
    25/11/07 - Some Things We Do - +
    25/01/09 - Outcomes of a Shower - +
    23/04/22 - Wherein You Exist - +
    23/02/22 - "Aliveness" as Imperfection and Uncertainty in Motion - +
    23/01/26 - No Such Thing as an Imperfect Number (Updated 2025) - +
    23/01/26 - Expression and the Primal Fear of Isolation - +
    23/01/26 - What is this? - +
    @@ -109,7 +109,7 @@
    - +
    --> -- cgit v1.3