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

assets/data/config/modpack.ini

@@ -1,25 +0,0 @@
-[Common]
-Name="baconeggandcheese"
-Description="who gaf"
-APIVersion="uhmmmm probs like 2"
-DownloadedFrom="https://yourmom.org"
-Dependencies=[
-	"linkA",
-	"linkB",
-	"linkC"
-]
-Icon64="path/to/icon64.png"
-Icon32="path/to/icon32.png"
-Icon16="path/to/icon16.png"
-Icon="path/to/icon.ico"
-
-[Flags]
-UseNoteRendererV2=false
-UseAway3D=false
-UseDiscordRPCIntegration=true
-UseLocalization=false
-UseLegacyFlixelAnimateHitbox=false
-
-[Discord]
-ClientID="1027994136193810442",
-LogoKey="icon"