Skip to content
This repository was archived by the owner on Oct 28, 2022. It is now read-only.

Commit d2d4aed

Browse files
authored
Merge branch 'master' into development
2 parents 1256b55 + db45389 commit d2d4aed

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,5 @@ node_modules/
6767

6868
.data
6969
/*.zip
70+
#ide files
71+
*.wpr

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The application is supported on everdrive. To ensure everdrive compatibility, pl
3636
Also auto extends ROM to work with the randomizer. If this fails, extend your ROM manually and use either [sm64extender](https://www.smwcentral.net/?p=viewthread&t=77343) or [Super Mario 64 ROM Extender](http://qubedstudios.rustedlogic.net/Mario64Tools.htm).
3737

3838
# Web
39-
For extremely simple usage, simply use our existing web generator, found here: https://andre-meyer.github.io/sm64-randomizer/
39+
For extremely simple usage, simply use our existing web generator, found here: https://andrelikesdogs.github.io/sm64-randomizer/
4040

4141
![SM64 Randomizer Generator Web Edition](https://i.imgur.com/78OiLPZ.png)
4242

requirements-dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ navigator-updater==0.2.1
9898
nbconvert==5.4.1
9999
nbformat==4.4.0
100100
networkx==2.2
101-
nltk==3.4
101+
nltk==3.4.5
102102
nose==1.3.7
103103
notebook==5.7.8
104104
numba==0.43.1
@@ -119,7 +119,7 @@ pefile==2019.4.18
119119
pep8==1.7.1
120120
pexpect==4.6.0
121121
pickleshare==0.7.5
122-
Pillow==5.4.1
122+
Pillow==6.2.0
123123
pkginfo==1.5.0.1
124124
plotly==3.10.0
125125
pluggy==0.9.0
@@ -199,7 +199,7 @@ unicodecsv==0.14.1
199199
urllib3==1.24.1
200200
wcwidth==0.1.7
201201
webencodings==0.5.1
202-
Werkzeug==0.14.1
202+
Werkzeug==0.15.3
203203
widgetsnbextension==3.4.2
204204
wrapt==1.11.1
205205
wurlitzer==1.0.2

web/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)