Merge branch 'DoorDev' into DoorDevUnstable
# Conflicts: # Doors.py # Main.py # RELEASENOTES.md
This commit is contained in:
@@ -108,6 +108,9 @@ These are now independent of retro mode and have three options: None, Random, an
|
|||||||
* Bonk Fairy (Dark)
|
* Bonk Fairy (Dark)
|
||||||
|
|
||||||
# Bug Fixes and Notes
|
# Bug Fixes and Notes
|
||||||
|
* 1.2.0.8-u
|
||||||
|
* Removed a Triforce text
|
||||||
|
* Fix for Desert Tiles 1 key door
|
||||||
* 1.2.0.7-u
|
* 1.2.0.7-u
|
||||||
* Fix for some misery mire key logic
|
* Fix for some misery mire key logic
|
||||||
* Minor standard generation fix
|
* Minor standard generation fix
|
||||||
|
|||||||
1
Text.py
1
Text.py
@@ -91,7 +91,6 @@ Triforce_texts = [
|
|||||||
'Who stole the fourth triangle?',
|
'Who stole the fourth triangle?',
|
||||||
'Trifource?\nMore Like Tritrice, am I right?'
|
'Trifource?\nMore Like Tritrice, am I right?'
|
||||||
'\n Well Done!',
|
'\n Well Done!',
|
||||||
'You just wasted 2 hours of your life.',
|
|
||||||
'This was meant to be a trapezoid',
|
'This was meant to be a trapezoid',
|
||||||
# these ones are from web randomizer
|
# these ones are from web randomizer
|
||||||
"\n G G",
|
"\n G G",
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
import importlib.util
|
import importlib.util
|
||||||
import webbrowser
|
|
||||||
from tkinter import Tk, Label, Button, Frame
|
|
||||||
|
|
||||||
|
|
||||||
def check_requirements(console=False):
|
def check_requirements(console=False):
|
||||||
@@ -26,6 +24,9 @@ def check_requirements(console=False):
|
|||||||
logger.error('See the step about "Installing Platform-specific dependencies":')
|
logger.error('See the step about "Installing Platform-specific dependencies":')
|
||||||
logger.error('https://github.com/aerinon/ALttPDoorRandomizer/blob/DoorDev/docs/BUILDING.md')
|
logger.error('https://github.com/aerinon/ALttPDoorRandomizer/blob/DoorDev/docs/BUILDING.md')
|
||||||
else:
|
else:
|
||||||
|
import webbrowser
|
||||||
|
from tkinter import Tk, Label, Button, Frame
|
||||||
|
|
||||||
master = Tk()
|
master = Tk()
|
||||||
master.title('Error')
|
master.title('Error')
|
||||||
frame = Frame(master)
|
frame = Frame(master)
|
||||||
|
|||||||
Reference in New Issue
Block a user