Merge branch 'DoorDev' into DoorDevUnstable

# Conflicts:
#	Doors.py
#	Main.py
#	RELEASENOTES.md
This commit is contained in:
aerinon
2023-02-15 14:27:26 -07:00
3 changed files with 6 additions and 3 deletions

View File

@@ -91,7 +91,6 @@ Triforce_texts = [
'Who stole the fourth triangle?',
'Trifource?\nMore Like Tritrice, am I right?'
'\n Well Done!',
'You just wasted 2 hours of your life.',
'This was meant to be a trapezoid',
# these ones are from web randomizer
"\n G G",