From 8ebb1c54c22f0865b07ce9266fb8f99f6027b56e Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Mon, 30 Jan 2023 09:59:52 -0500
Subject: [PATCH] post-merge

---
 automatic.sh                                    | 14 +++++++-------
 config.json                                     |  4 ++--
 extensions-builtin/sd-extension-steps-animation |  2 +-
 requirements_versions.txt                       |  2 +-
 ui-config.json                                  |  4 +++-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/automatic.sh b/automatic.sh
index e09941572..ea0875e4a 100755
--- a/automatic.sh
+++ b/automatic.sh
@@ -14,7 +14,7 @@ if [ "$PYTHON" == "" ]; then
   PYTHON=`which python`
 fi
 
-ARGS="launch.py --api --xformers --disable-console-progressbars --gradio-queue"
+CMD="launch.py --api --xformers --disable-console-progressbars --gradio-queue --skip-version-check"
 # --opt-channelslast
 MODE=optimized
 
@@ -38,7 +38,7 @@ for i in "$@"; do
       MODE=env
       ;;
     *)
-      ARGS="$ARGS $i"
+      CMD="$CMD $i"
       ;;
   esac
   shift
@@ -68,17 +68,17 @@ if [ $MODE == env ]; then
 fi
 
 if [ $MODE == clean ]; then
-  ARGS="--disable-opt-split-attention --disable-console-progressbars --api"
-  $PYTHON launch.py $ARGS
+  CMD="--disable-opt-split-attention --disable-console-progressbars --api"
+  $PYTHON launch.py $CMD
   exit 0
 fi
 
 if [ $MODE == public ]; then
-  ARGS="$ARGS --port 7860 --gradio-auth admin:pwd --listen --enable-insecure-extension-access"
+  CMD="$CMD --port 7860 --gradio-auth admin:pwd --listen --enable-insecure-extension-access"
 fi
 
 if [ $MODE == optimized ]; then
-  ARGS="$ARGS"
+  CMD="$CMD"
 fi
 
-exec accelerate launch --no_python --num_cpu_threads_per_process=6 $PYTHON $ARGS
+exec accelerate launch --no_python --num_cpu_threads_per_process=6 $PYTHON $CMD
diff --git a/config.json b/config.json
index 12f68a58e..ff1d6b5a3 100644
--- a/config.json
+++ b/config.json
@@ -111,7 +111,7 @@
     "localization": "None",
     "live_previews_enable": true,
     "show_progress_grid": true,
-    "show_progress_every_n_steps": 10,
+    "show_progress_every_n_steps": 1,
     "show_progress_type": "Full",
     "live_preview_content": "Prompt",
     "hide_samplers": [
@@ -144,7 +144,7 @@
         "sdweb-merge-board",
         "ScuNET"
     ],
-    "sd_checkpoint_hash": "9e2c6ceff3f6d6f65c6fb0e10d8e69d772871813be647fd2ea5d06e00db33c1f",
+    "sd_checkpoint_hash": "cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516",
     "ldsr_steps": 100,
     "ldsr_cached": false,
     "SWIN_tile": 192,
diff --git a/extensions-builtin/sd-extension-steps-animation b/extensions-builtin/sd-extension-steps-animation
index 4325abb42..522d193ea 160000
--- a/extensions-builtin/sd-extension-steps-animation
+++ b/extensions-builtin/sd-extension-steps-animation
@@ -1 +1 @@
-Subproject commit 4325abb42b6ad25f9e8816b4787cb71307e2994c
+Subproject commit 522d193ea7f1a6c464991c52970f98b09efe7289
diff --git a/requirements_versions.txt b/requirements_versions.txt
index f429a3940..8603c4d04 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -4,7 +4,7 @@ blendmodes==2022
 clean-fid==0.1.35
 einops==0.4.1
 gfpgan==1.3.8
-GitPython==3.1.30
+GitPython==3.1.27
 gradio==3.16.2
 inflection==0.5.1
 jsonmerge==1.9.0
diff --git a/ui-config.json b/ui-config.json
index dc6d346ba..3c8539c24 100644
--- a/ui-config.json
+++ b/ui-config.json
@@ -844,5 +844,7 @@
     "customscript/xyz_grid.py/img2img/Keep -1 for seeds/visible": true,
     "customscript/xyz_grid.py/img2img/Keep -1 for seeds/value": false,
     "img2img/Inpaint batch mask directory (required for inpaint batch processing only)/visible": true,
-    "img2img/Inpaint batch mask directory (required for inpaint batch processing only)/value": ""
+    "img2img/Inpaint batch mask directory (required for inpaint batch processing only)/value": "",
+    "txt2img/Override settings/value": null,
+    "img2img/Override settings/value": null
 }
\ No newline at end of file