Revert "Merge pull request #294 from cmdr2/main"

This reverts commit 1e3b4f9969, reversing
changes made to e0c0935d3a.

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.gitignore

@@ -2,4 +2,10 @@ __pycache__
 installer
 installer.tar
 dist
+
+# built code for the front end
+!/ui/frontend/dist
+ui/frontend/.idea/*
+ui/frontend/build_src/.idea/*
+
 .idea/*

README.md

@@ -8,7 +8,7 @@
 
 [![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support, and development discussion) | [Troubleshooting guide for common problems](Troubleshooting.md)
 
-️‍🔥🎉 **New!** Live Preview, More Samplers, In-Painting, Face Correction (GFPGAN) and Upscaling (RealESRGAN) have been added!
+️‍🔥🎉 **New!** Task Queue, Negative Prompt, Live Preview, More Samplers, In-Painting, Face Correction (GFPGAN) and Upscaling (RealESRGAN) have been added!
 
 This distribution currently uses Stable Diffusion 1.4. Once the model for 1.5 becomes publicly available, the model in this distribution will be updated.
 
@@ -17,6 +17,8 @@ This distribution currently uses Stable Diffusion 1.4. Once the model for 1.5 be
 - **Face Correction (GFPGAN) and Upscaling (RealESRGAN)**
 - **In-Painting**
 - **Live Preview**: See the image as the AI is drawing it
+- **Task Queue**: Queue up all your ideas, without waiting for the current task to finish
+- **Negative Prompt**: Specify aspects of the image to *remove*.
 - **Lots of Samplers:** ddim, plms, heun, euler, euler_a, dpm2, dpm2_a, lms
 - **Image Modifiers**: A library of *modifier tags* like *"Realistic"*, *"Pencil Sketch"*, *"ArtStation"* etc. Experiment with various styles quickly.
 - **New UI**: with cleaner design

Troubleshooting.md

@@ -9,6 +9,11 @@ Additionally, a common reason for this error is that you're using an initial ima
 
 Also try generating smaller sized images.
 
+## basicsr module not found
+For Windows: Please download and extract basicsr from [here](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/basicsr-win64.zip), and place the `basicsr` folder inside the `stable-diffusion-ui\stable-diffusion\env\lib\site-packages` folder. Then run the `Start Stable Diffusion UI.cmd` file again.
+
+For Linux: Please contact on the [discord server](https://discord.com/invite/u9yhsFmEkB).
+
 ## No ldm found, or antlr4 or any other missing module, or ClobberError: This transaction has incompatible packages due to a shared path
 On Windows, please ensure that you had placed the `stable-diffusion-ui` folder after unzipping to the root of C: or D: (or any drive). For e.g. `C:\stable-diffusion-ui`. **Note:** This has to be done **before** you start the installation process. If you have already installed (and are facing this error), please delete the installed folder, and start fresh by unzipping and placing the folder at the top of your drive.
 
@@ -44,3 +49,27 @@ After this, you can access the server at `http://localhost:1337` (where 1337 is
 Please ensure that you have an NVIDIA GPU and the latest [NVIDIA driver](http://www.nvidia.com/Download/index.aspx), and that you've installed [nvidia-container-toolkit](https://stackoverflow.com/a/58432877).
 
 Also, if you are using WSL (Windows), please ensure you have the latest WSL kernel by running `wsl --shutdown` and then `wsl --update`. (Thanks [AndrWeisR](https://github.com/AndrWeisR))
+
+# For support queries
+## Entering a conda environment in an existing installation
+This will give you an activated conda environment in the terminal, so you can run commands and force-install any packages, if required.
+
+Users don't need to have the Anaconda Prompt installed to do this anymore, since the installer bundles a portable version of conda inside it. Just follow these steps.
+
+**Windows:**
+1. Open the terminal: Press Win+R, type "cmd", and press "Run"
+2. Type `cd C:\stable-diffusion-ui` and press enter (or wherever you've installed it)
+3. Type `installer\Scripts\activate.bat` and press enter
+4. Type `cd stable-diffusion` and press enter
+5. Type `conda activate .\env` and press enter
+6. Type `python --version` and press enter. You should see 3.8.5.
+
+**Windows:**
+1. Open the terminal
+2. Type `cd /path/to/stable-diffusion-ui` and press enter
+3. Type `installer/bin/activate` and press enter
+4. Type `cd stable-diffusion` and press enter
+5. Type `conda activate ./env` and press enter
+6. Type `python --version` and press enter. You should see 3.8.5.
+
+This will give you an activated conda environment. To confirm, type `python --version` and press enter. You should see 3.8.5.