Merge branch 'main_upstream'

# Conflicts:
#	launch.py
#	ldm_patched/modules/args_parser.py
#	modules/config.py
#	presets/anime.json
#	presets/default.json
#	presets/lcm.json
#	presets/realistic.json
This commit is contained in:
Manuel Schmid
2024-01-27 21:09:08 +01:00
60 changed files with 2049 additions and 275 deletions
+2 -1
View File
@@ -44,5 +44,6 @@
"embeddings_downloads": {},
"lora_downloads": {
"sd_xl_offset_example-lora_1.0.safetensors": "https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_offset_example-lora_1.0.safetensors"
}
},
"previous_default_models": []
}