merge: resolve conflicts with upstream/main

Browse Source

Merged upstream/main into feat/v2-widget-dashboard-system branch.

Key conflict resolutions:
- index.js: Added renderQuests() to Dashboard v2 fallback rendering
- state.js: Combined memoryMessagesToProcess with Dashboard v2 config
- apiClient.js: Combined refreshDashboard() and renderQuests() calls
- style.css: Kept Dashboard v2 mobile refresh button styles

New features from upstream:
- Quest tracking system (renderQuests, quests.js)
- Memory recollection system
- Lorebook limiter feature
- Various parser and prompt builder improvements

...

This commit is contained in:

Lucas 'Paperboy' Rose-Winters

2025-10-30 08:26:19 +11:00

parent e5e3e43aa1 87cfcb6946

commit ad2efa55f0

21 changed files with 3050 additions and 483 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

style.css

+1004 -251

File diff suppressed because it is too large Load Diff