Merge branch 'main_upstream'

# Conflicts:
#	fooocus_version.py
#	update_log.md

.github/CODEOWNERS

@@ -1 +1 @@
-*       @mashb1t
+*       @lllyasviel

fooocus_version.py

@@ -1 +1 @@
-version = '2.6.4 (mashb1t)'
+version = '2.6.5 (mashb1t)'

launch.py

@@ -21,7 +21,6 @@
 from build_launcher import build_launcher
 from modules.launch_util import is_installed, run, python, run_pip, requirements_met, delete_folder_content
 from modules.model_loader import load_file_from_url
-from modules.util import get_file_from_folder_list
 
 REINSTALL_ALL = False
 TRY_INSTALL_XFORMERS = False
@@ -102,6 +101,8 @@ def ini_args():
 
 
 def download_models(default_model, previous_default_models, checkpoint_downloads, embeddings_downloads, lora_downloads, vae_downloads):
+    from modules.util import get_file_from_folder_list
+
     for file_name, url in vae_approx_filenames:
         load_file_from_url(url=url, model_dir=config.path_vae_approx, file_name=file_name)
 

readme.md

@@ -321,7 +321,7 @@ Windows: download the [7z file](#download), extract it and run `run.bat`. You ma
 
 ### Colab
 
-(Last tested - 2024 Mar 18 by [mashb1t](https://github.com/mashb1t))
+(Last tested - 2024 Aug 12 by [mashb1t](https://github.com/mashb1t))
 
 | Colab | Info
 | --- | --- |

update_log.md

@@ -1,3 +1,7 @@
+# [2.6.5](https://github.com/mashb1t/Fooocus/releases/tag/v2.6.5)
+
+* Fix colab inpaint issue by moving an import statement
+
 # [2.6.4](https://github.com/mashb1t/Fooocus/releases/tag/v2.6.4)
 
 * Fix validation for default_ip_image_* and default_inpaint_mask_sam_model