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:
@@ -52,6 +52,11 @@
|
||||
<div id="rpg-inventory" class="rpg-section rpg-inventory-section">
|
||||
<!-- Content will be populated by JavaScript -->
|
||||
</div>
|
||||
|
||||
<!-- Quests Section -->
|
||||
<div id="rpg-quests" class="rpg-section rpg-quests-section">
|
||||
<!-- Content will be populated by JavaScript -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Manual Update Button -->
|
||||
@@ -214,6 +219,12 @@
|
||||
<small>Number of recent messages to include (Separate mode only)</small>
|
||||
</div>
|
||||
|
||||
<div class="rpg-setting-row">
|
||||
<label for="rpg-memory-messages">Memory Batch Size:</label>
|
||||
<input type="number" id="rpg-memory-messages" min="4" max="50" value="16" class="rpg-input" />
|
||||
<small>Number of messages to process per batch in Memory Recollection</small>
|
||||
</div>
|
||||
|
||||
<label class="checkbox_label">
|
||||
<input type="checkbox" id="rpg-use-separate-preset" />
|
||||
<span>Use model connected to RPG Companion Trackers preset</span>
|
||||
|
||||
Reference in New Issue
Block a user