aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7217 from mezotaken/masterAUTOMATIC11112023-01-281-6/+23
|\ | | | | Ask user to clarify conditions
| * Ask user to clarify conditionsVladimir Repin2023-01-251-6/+23
| |
* | Merge pull request #7240 from Unstackd/masterAUTOMATIC11112023-01-281-5/+12
|\ \ | | | | | | Allow users to convert models to Instruct-pix2pix models by supporting merging Instruct-pix2pix models with regular ones in the merge tab
| * | Changed filename addition from "instrpix2pix" to the more readable ↵ULTRANOX\Chris2023-01-261-1/+1
| | | | | | | | | | | | ".instruct-pix2pix" for newly generated instruct pix2pix models.
| * | Changed all references to "pix2pix" to the more precise name "instruct ↵ULTRANOX\Chris2023-01-261-5/+5
| | | | | | | | | | | | pix2pix". Also changed extension to instrpix2pix at least for now.
| * | Added error check for the rare case a user merges a pix2pix model with a ↵ULTRANOX\Chris2023-01-261-1/+2
| | | | | | | | | | | | normal model using weighted sum. Also removed bad print message that interfered with merging progress bar.
| * | Allow checkpoint merger to merge pix2pix models in the same way that it ↵ULTRANOX\Chris2023-01-261-5/+11
| |/ | | | | | | currently supports inpainting models.
* | Merge pull request #7303 from szhublox/pathshelpAUTOMATIC11112023-01-281-1/+1
|\ \ | | | | | | don't replace regular --help with new paths.py parser help
| * | don't replace regular --help with new paths.py parser helpMackerel2023-01-281-1/+1
| | |
* | | some more changes for python version warning; add a commandline flag to disableAUTOMATIC2023-01-281-6/+19
|/ /
* | remove waiting for input on version mismatch warning, change supported versionsAUTOMATIC2023-01-282-24/+12
| |
* | Merge pull request #7200 from Spaceginner/masterAUTOMATIC11112023-01-282-0/+34
|\ \ | | | | | | Add a Python version check
| * \ Merge remote-tracking branch 'origin/master'Spaceginner2023-01-2722-186/+518
| |\ \
| | * \ Merge branch 'AUTOMATIC1111:master' into masterIvan2023-01-2722-186/+518
| | |\ \
| * | | | Made it only a warningSpaceginner2023-01-272-11/+29
| | | | |
| * | | | Only Linux will have max 3.11Spaceginner2023-01-261-3/+3
| |/ / /
| * | | Fixed typoSpaceginner2023-01-251-2/+2
| | | |
| * | | even more clarifications(?)Spaceginner2023-01-251-1/+1
| | | | | | | | | | | | | | | | i have no idea what commit message should be
| * | | some clarificationSpaceginner2023-01-251-1/+2
| | | |
| * | | Merge branch 'AUTOMATIC1111:master' into masterIvan2023-01-251-2/+5
| |\ \ \
| * | | | Remove a stacktrace from an assertion to not scare peopleSpaceginner2023-01-251-1/+4
| | | | |
| * | | | Merge branch 'AUTOMATIC1111:master' into masterIvan2023-01-251-2/+7
| |\ \ \ \
| * | | | | Added Python version checkSpaceginner2023-01-251-0/+12
| | | | | |
* | | | | | Merge pull request #7199 from maxaudron/feature/configurable-data-dirAUTOMATIC11112023-01-2817-39/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add flag to store user data sepperate from source code
| * | | | | | create user extensions directory if not existsMax Audron2023-01-271-0/+2
| | | | | | |
| * | | | | | clean up unused script_path importsMax Audron2023-01-273-3/+2
| | | | | | |
| * | | | | | use python importlib to load and execute extension modulesMax Audron2023-01-271-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously module attributes like __file__ where not set correctly, leading to scripts getting the directory of the stable-diffusion repo location instead of their own script. This causes problem when loading user data from an external location using the --data-dir flag, as extensions would look for their own code in the stable-diffusion repo location instead of the data dir location. Using pythons importlib functions sets the modules specs correctly and executes them. But this will break extensions if they build paths based on the previously incorrect __file__ attribute.
| * | | | | | add data-dir flag and set all user data directories based on itMax Audron2023-01-2714-31/+39
| | |_|_|/ / | |/| | | |
* | | | | | simplify #7284AUTOMATIC2023-01-281-8/+3
| | | | | |
* | | | | | Merge pull request #7284 from Gazzoo-byte/patch-1AUTOMATIC11112023-01-281-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add button to switch width and height
| * | | | | | Add button to switch width and heightGazzoo-byte2023-01-271-0/+11
| |/ / / / / | | | | | | | | | | | | Adds a button to switch width and height, allowing quick and easy switching between landscape and portrait.
* | | | | | Merge pull request #7285 from EllangoK/xyz-fixesAUTOMATIC11112023-01-283-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allows for multiple Styles axii in X/Y/Z Plot
| * | | | | | changes remaining text from X/Y -> X/Y/ZEllangoK2023-01-273-3/+3
| | | | | | |
| * | | | | | deepcopy pc.styles, allows for multiple style axisEllangoK2023-01-271-1/+2
| |/ / / / /
* | | | | | make the detection for -v models less broadAUTOMATIC2023-01-281-1/+1
| | | | | |
* | | | | | Merge pull request #7294 from MrCheeze/model-detectionAUTOMATIC11112023-01-281-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | add v2-inpainting model detection, and broaden v-model detection to include anything with 768 in the name
| * | | | | | add v2-inpainting model detection, and broaden v-model detection to include ↵MrCheeze2023-01-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | anything with 768 in the name
* | | | | | | Merge pull request #7295 from askaliuk/askaliuk-inpaint-batch-supportAUTOMATIC11112023-01-282-4/+25
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Basic inpainting batch support
| * | | | | | Basic inpainting batch supportAndrii Skaliuk2023-01-282-4/+25
|/ / / / / / | | | | | | | | | | | | | | | | | | Modifies batch UI to add optional inpainting support
* / / / / / fix broken calls to find_checkpoint_configAUTOMATIC2023-01-272-4/+4
|/ / / / /
* | | | | clarify the option to disable NaN check.AUTOMATIC2023-01-271-0/+2
| | | | |
* | | | | support detecting midas modelAUTOMATIC2023-01-273-8/+11
| | | | | | | | | | | | | | | | | | | | fix broken api for checkpoint list
* | | | | remove the need to place configs near modelsAUTOMATIC2023-01-2710-151/+360
| | | | |
* | | | | add an option to enable sections from extras tab in txt2img/img2imgAUTOMATIC2023-01-269-23/+133
| | | | | | | | | | | | | | | | | | | | fix some style inconsistenices
* | | | | Merge pull request #7234 from brkirch/fix-full-previewsAUTOMATIC11112023-01-262-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix full previews and--no-half-vae to work correctly with --upcast-sampling
| * | | | Fix full previews, --no-half-vaebrkirch2023-01-262-5/+5
|/ / / /
* | | | fix prompt editing break after first batch in img2imgAUTOMATIC2023-01-251-1/+1
| | | |
* | | | add edit_image_conditioning from my earlier edits in case there's an attempt ↵AUTOMATIC2023-01-251-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | to inegrate pix2pix properly this allows to use pix2pix model in img2img though it won't work well this way
* | | | Merge pull request #7197 from mcmonkey4eva/fix-ti-symlinksAUTOMATIC11112023-01-251-1/+1
|\ \ \ \ | | | | | | | | | | allow symlinks in the textual inversion embeddings folder
| * | | | allow symlinks in the textual inversion embeddings folderAlex "mcmonkey" Goodwin2023-01-251-1/+1
| |/ / /