diff --git a/ANDROID-DEV.md b/ANDROID-DEV.md
index bfdcfc6c7..bae65dbb7 100644
--- a/ANDROID-DEV.md
+++ b/ANDROID-DEV.md
@@ -377,6 +377,12 @@ For some systems you will need to explictly set the _Start_ and _Select_ buttons
There are a few more things that you may need to configure for some systems, but that's beyond the scope of this document and should be covered by the MAME emulator documentation.
+### Mandarine
+
+This emulator which is forked from Citra can be downloaded from their GitHub site.
+
+https://github.com/mandarine3ds/mandarine/releases
+
### MasterGear
This emulator can be installed from the Play store as a paid app.
@@ -765,7 +771,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| naomi | Sega NAOMI | Flycast | Flycast **(Standalone)** | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |
| naomi2 | Sega NAOMI 2 | Flycast | Flycast **(Standalone)** | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |
| naomigd | Sega NAOMI GD-ROM | Flycast | Flycast **(Standalone)** | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |
-| n3ds | Nintendo 3DS | Citra | Citra **(Standalone)**,
Citra Canary **(Standalone)**,
Citra MMJ **(Standalone)**,
Lime3DS **(Standalone)**,
Panda3DS **(Standalone)** | No | Single ROM file |
+| n3ds | Nintendo 3DS | Citra | Citra **(Standalone)**,
Citra Canary **(Standalone)**,
Citra MMJ **(Standalone)**,
Mandarine **(Standalone)**,
Lime3DS **(Standalone)**,
Panda3DS **(Standalone)** | No | Single ROM file |
| n64 | Nintendo 64 | Mupen64Plus-Next | M64Plus FZ **(Standalone)**,
Mupen64Plus AE **(Standalone)**,
ParaLLEl N64 | No | Single archive or ROM file |
| n64dd | Nintendo 64DD | Mupen64Plus-Next | M64Plus FZ **(Standalone)**,
Mupen64Plus AE **(Standalone)**,
ParaLLEl N64 | Yes | |
| nds | Nintendo DS | melonDS DS | melonDS,
melonDS **(Standalone)**,
melonDS Nightly **(Standalone)**,
DeSmuME,
DeSmuME 2015,
DraStic **(Standalone)**,
NooDS **(Standalone)** | No | Single archive or ROM file |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7e7f09e2..e914d08c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,8 +16,10 @@
* Added translations for Korean (ko_KR)
* Decreased the memory footprint under some circumstances by completely freeing up video player resources after finishing view transitions
* The Git index stat cache is now refreshed for all themes when starting the theme downloader (this speeds up the inventory under some circumstances)
+* Added Mandarine standalone as an alternative emulator for the n3ds system
* (Android) Added experimental support for the Nintendo Wii U (wiiu) game system
* (Android) Changed Flycast standalone to use %ROMSAF% instead of %ROM% as the latter caused game launching to fail on some devices
+* (Android) Adjusted the layout for the onboarding configurator to look better on screens with wider aspect ratios
* (Android) Improved the experience when running in multi-window mode
* (Android) Added exception handling to the onboarding configurator for broken devices where the SAF directory picker is missing
* (Android) Added a temporary workaround to avoid crashes on non-character keyboard input when editing text (caused by a bug in the SDL library)
@@ -29,6 +31,7 @@
### Bug fixes
* Pressing the "Clear" button in the text editor and then entering some value in the input field crashed the application
+* Placing a directory with no access permissions inside a system folder crashed the application on startup
* (Android) Switching from ES-DE to another app and back again while the "no ROMs" dialog was shown crashed the application
* (Android) Switching from ES-DE to the home app and back again while the onboarding configurator was running crashed the application
* There was a regression where filesystem case-sensitivity was not considered when looking for media files for the screensaver
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index 61fd8232e..a4b699240 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -702,6 +702,7 @@ The following emulators are supported in AppImage format when using the bundled
| macintosh | SheepShaver | SheepShaver*.AppImage |
| n3ds | Citra | citra-qt*.AppImage |
| n3ds | Lime3DS | lime3ds.AppImage |
+| n3ds | Mandarine | mandarine-qt.AppImage |
| n3ds | Panda3DS | Alber-*.AppImage |
| n64/n64dd | Rosalie's Mupen GUI | RMG*.AppImage |
| ngage/symbian | EKA2L1 | EKA2L1*.AppImage |
@@ -4181,7 +4182,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| msxturbor | MSX Turbo R | blueMSX | openMSX **(Standalone)**,
openMSX No Machine **(Standalone)** | Yes | |
| mugen | M.U.G.E.N Game Engine | Ikemen GO **(Standalone)** | | No | See the specific _M.U.G.E.N Game Engine_ section elsewhere in this guide |
| multivision | Othello Multivision | Gearsystem | Mesen **(Standalone)** [LW] | No | Single archive or ROM file |
-| n3ds | Nintendo 3DS | Citra [LW],
Citra **(Standalone)** [M] | Citra 2018 [LW],
Citra **(Standalone)** [LW],
Lime3DS **(Standalone)**,
Panda3DS **(Standalone)** | No | Single ROM file |
+| n3ds | Nintendo 3DS | Citra [LW],
Citra **(Standalone)** [M] | Citra 2018 [LW],
Citra **(Standalone)** [LW]
Mandarine **(Standalone)**,
Lime3DS **(Standalone)**,
Panda3DS **(Standalone)** | No | Single ROM file |
| n64 | Nintendo 64 | Mupen64Plus-Next | Mupen64Plus **(Standalone)**,
ParaLLEl N64,
simple64 **(Standalone)** [LW],
Rosalie's Mupen GUI **(Standalone)** [LW],
Project64 **(Standalone)** [W],
ares **(Standalone)**,
sixtyforce **(Standalone)** [M] | No | Single archive or ROM file |
| n64dd | Nintendo 64DD | ParaLLEl N64 [LW],
Mupen64Plus-Next [M] | Mupen64Plus-Next [LW],
ParaLLEl N64 [M],
Rosalie's Mupen GUI **(Standalone)** [LW],
ares **(Standalone)** | Yes | See the specific _Nintendo 64DD_ section elsewhere in this guide |
| naomi | Sega NAOMI | Flycast | Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Demul **(Standalone)** [W] | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |