Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffle

2021-04-12 13:32:14 -05:00
parent ade6dfc416 960b8de237
commit 160f0732dd
62 changed files with 2829 additions and 380 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,9 @@ weights/
 /MultiMystery/
 /Players/
 /QUsb2Snes/
+/output/
+
+base2current.json

 resources/user/*
 !resources/user/.gitkeep
@@ -35,3 +38,4 @@ get-pip.py
 venv
 test
 *.code-workspace
+*.zspr