LIghtJUNction 944afc4b33 Merge remote-tracking branch 'origin' into dev ...

# Conflicts:
#	astrbot/builtin_stars/astrbot/main.py
#	astrbot/cli/__main__.py
#	astrbot/cli/commands/__init__.py
#	astrbot/core/provider/sources/openai_source.py

2026-05-22 15:19:54 +08:00

..

commands

Merge remote-tracking branch 'origin' into dev

2026-05-22 15:19:54 +08:00

utils

refactor: miscellaneous updates across modules

2026-05-21 19:10:02 +08:00

__init__.py

fix: resolve merge follow-ups (typing, imports, frontend tests)

2026-05-19 21:16:25 +08:00

__main__.py

Merge remote-tracking branch 'origin' into dev

2026-05-22 15:19:54 +08:00

banner.py

fix: resolve merge conflicts from upstream and fix tool conflict resolution

2026-04-15 20:45:11 +08:00

i18n.py

ruff check --fix --select ALL

2026-04-10 19:57:02 +08:00