Ralty 31b2f5bcb9 Merge branch 'furo-charter-bookmarks' into new-editors-conductor ...

# Conflicts:
#	source/funkin/backend/utils/CoolUtil.hx
#	source/funkin/editors/charter/Charter.hx

2025-07-20 00:24:17 +07:00

..

Chart.hx

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

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

ChartData.hx

Merge branch 'furo-charter-bookmarks' into new-editors-conductor

2025-07-20 00:24:17 +07:00

EventsData.hx

Merge branch 'Time-Signature-Changes' into new-conductor

2025-07-16 19:27:05 +07:00

FNFLegacyParser.hx

Merge branch 'Time-Signature-Changes' into new-conductor

2025-07-16 19:27:05 +07:00

PsychParser.hx

Added some more documentation

2024-12-16 04:37:18 +01:00

VSliceParser.hx

some more stuff SOMEONE HAVE TO TEST THESE 2 COMM

2025-07-06 04:44:46 +02:00