Merge branch 'main' into breaking_changes

# Conflicts: # MultiClient.py # Utils.py # worlds/alttp/ItemPool.py # worlds/alttp/Main.py # worlds/alttp/Shops.py
2021-02-19 13:45:50 +01:00
parent 25bbfb2f3e b1cf1a80e6
commit 122e360ec8
46 changed files with 10942 additions and 6539 deletions
--- a/Utils.py
+++ b/Utils.py
@@ -12,7 +12,7 @@ class Version(typing.NamedTuple):
    minor: int
    micro: int

-__version__ = "0.1.0"
+__version__ = "0.0.1"
 _version_tuple = tuplize_version(__version__)

 import builtins