Merge branch 'ArchipelagoMW:main' into mmx

TheLX5 · Apr 23, 2024 · 16a1639 · 16a1639
2 parents 575c586 + cca9778
commit 16a1639
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/Utils.py b/Utils.py
@@ -619,6 +619,8 @@ def get_fuzzy_ratio(word1: str, word2: str) -> float:
 
 def open_filename(title: str, filetypes: typing.Sequence[typing.Tuple[str, typing.Sequence[str]]], suggest: str = "") \
         -> typing.Optional[str]:
+    logging.info(f"Opening file input dialog for {title}.")
+
     def run(*args: str):
         return subprocess.run(args, capture_output=True, text=True).stdout.split("\n", 1)[0] or None
 

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
 
 # This is a bit jank. We need cx-Freeze to be able to run anything from this script, so install it
 try:
-    requirement = 'cx-Freeze>=6.15.10'
+    requirement = 'cx-Freeze>=6.15.16,<7'
     import pkg_resources
     try:
         pkg_resources.require(requirement)

diff --git a/worlds/factorio/requirements.txt b/worlds/factorio/requirements.txt
@@ -1 +1,2 @@
-factorio-rcon-py>=2.0.1
+factorio-rcon-py>=2.1.1; python_version >= '3.9'
+factorio-rcon-py==2.0.1; python_version <= '3.8'
diff --git a/worlds/sc2wol/Regions.py b/worlds/sc2wol/Regions.py