Merge branch 'main' into mlss

jamesbrq · Apr 22, 2024 · a02cdb8 · a02cdb8
2 parents 72ad9ea + daccb30
commit a02cdb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
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'