Ralty 2843d8a3a3 Merge branch 'main' into new-editors-conductor ...

# Conflicts:
#	source/funkin/backend/utils/CoolUtil.hx
#	source/funkin/backend/utils/IniUtil.hx
#	source/funkin/editors/character/CharacterEditor.hx
#	source/funkin/editors/ui/UIWarningSubstate.hx

2025-07-19 23:51:52 +07:00

..

data

Merge branch 'main' into new-editors-conductor

2025-07-19 23:51:52 +07:00

fonts

bye april fools😭

2024-04-02 23:50:59 +02:00

images

what

2025-07-19 19:18:06 +07:00

music

hell, here we are again

2024-08-27 17:46:44 +02:00

shaders

rainbow waveforms i think

2025-03-26 12:16:32 -07:00

songs

Merge remote-tracking branch 'upstream/main' into new-editors-main

2025-07-19 00:57:08 +07:00

sounds

sfx todo list before i forget

2025-04-07 15:40:27 +01:00

videos

why are these even here, BEGONE❗❗

2024-08-27 03:33:49 +02:00