Merge branch 'SillyTavern:release' into release

teralomaniac · Nov 11, 2023 · 2f669ff · 2f669ff
2 parents bc7860a + 09ebbff
commit 2f669ff
Show file tree

Hide file tree

Showing 69 changed files with 6,224 additions and 2,847 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,4 @@ public/assets/
 access.log
 /vectors/
 /cache/
+public/css/user.css
diff --git a/default/settings.json b/default/settings.json
@@ -49,7 +49,6 @@
         "ban_eos_token": false,
         "skip_special_tokens": true,
         "streaming": false,
-        "streaming_url": "ws://127.0.0.1:5005/api/v1/stream",
         "mirostat_mode": 0,
         "mirostat_tau": 5,
         "mirostat_eta": 0.1,
@@ -164,6 +163,8 @@
         "custom_stopping_strings_macro": true,
         "fuzzy_search": true,
         "encode_tags": false,
+        "enableLabMode": false,
+        "enableZenSliders": false,
         "ui_mode": 1
     },
     "extension_settings": {

diff --git a/default/user.css b/default/user.css
@@ -0,0 +1 @@
+/* Put custom styles here. */
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,6 +38,9 @@
     "overrides": {
         "parse-bmfont-xml": {
             "xml2js": "^0.5.0"
+        },
+        "vectra": {
+            "openai": "^4.17.0"
         }
     },
     "name": "sillytavern",
@@ -47,7 +50,7 @@
         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.10.7",
+    "version": "1.10.8",
     "scripts": {
         "start": "node server.js",
         "start-multi": "node server.js --disableCsrf",

diff --git a/post-install.js b/post-install.js
@@ -13,6 +13,7 @@ function createDefaultFiles() {
         settings: './public/settings.json',
         bg_load: './public/css/bg_load.css',
         config: './config.conf',
+        user: './public/css/user.css',
     };
 
     for (const file of Object.values(files)) {