Merge branch 'dev' into dev

src/ts/storage/database.ts

@@ -353,6 +353,8 @@ export interface groupChat{
     name:string
     viewScreen: 'single'|'multiple'|'none'|'emp',
     characters:string[]
+    characterTalks:number[]
+    characterActive:boolean[]
     globalLore: loreBook[]
     autoMode: boolean
     useCharacterLore :boolean
@@ -367,6 +369,7 @@ export interface groupChat{
     supaMemory?:boolean
     ttsMode?:string
     suggestMessages?:string[]
+    orderByOrder?:boolean
 }
 
 export interface botPreset{
@@ -522,7 +525,7 @@ interface sdConfig{
     hr_upscaler:string
 }
 
-export type FormatingOrderItem = 'main'|'jailbreak'|'chats'|'lorebook'|'globalNote'|'authorNote'|'lastChat'|'description'
+export type FormatingOrderItem = 'main'|'jailbreak'|'chats'|'lorebook'|'globalNote'|'authorNote'|'lastChat'|'description'|'postEverything'
 
 export interface Chat{
     message: Message[]