merge: resolve conflicts with upstream/main
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:
@@ -16,6 +16,7 @@ import {
|
||||
import { saveSettings, saveChatData } from '../../core/persistence.js';
|
||||
import { renderUserStats } from '../rendering/userStats.js';
|
||||
import { updateChatThoughts } from '../rendering/thoughts.js';
|
||||
import { renderQuests } from '../rendering/quests.js';
|
||||
import {
|
||||
rollDice as rollDiceCore,
|
||||
clearDiceRoll as clearDiceRollCore,
|
||||
@@ -409,6 +410,12 @@ export function setupSettingsPopup() {
|
||||
// Clear dice roll
|
||||
extensionSettings.lastDiceRoll = null;
|
||||
|
||||
// Clear quests
|
||||
extensionSettings.quests = {
|
||||
main: "None",
|
||||
optional: []
|
||||
};
|
||||
|
||||
// Save everything
|
||||
saveChatData();
|
||||
saveSettings();
|
||||
@@ -417,6 +424,7 @@ export function setupSettingsPopup() {
|
||||
renderUserStats();
|
||||
updateDiceDisplayCore();
|
||||
updateChatThoughts(); // Clear the thought bubble in chat
|
||||
renderQuests(); // Clear and re-render quests UI
|
||||
|
||||
// console.log('[RPG Companion] Chat cache cleared');
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user