morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into docs_consolidation

Browse Source 
# Conflicts:
#	WebHostLib/static/assets/tutorial/archipelago/advanced_settings_en.md
#	WebHostLib/static/assets/tutorial/archipelago/plando_en.md
#	WebHostLib/static/assets/tutorial/archipelago/triggers_en.md
#	WebHostLib/static/assets/tutorial/timespinner/setup_en.md
This commit is contained in:
Hussein Farran
2022-01-17 15:37:03 -05:00
parent 3ca8164326 e74333cbd3
commit 9599f54b06
25 changed files with 692 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
WebHostLib/static/assets/tutorial/tutorials.json
View File

@@ -54,7 +54,8 @@
"filename": "archipelago/advanced_settings_en.md",
"link": "archipelago/advanced_settings/en",
"authors": [
"alwaysintreble"
"alwaysintreble",
"Alchav"
]
}
]
@@ -291,6 +292,16 @@
"authors": [
"Jarno"
]
},
{
"language": "German",
"filename": "timespinner/setup_de.md",
"link": "timespinner/setup/de",
"authors": [
"Grrmo",
"Fynxes",
"Blaze0168"
]
}
]
}