Skip to content

Commit

Permalink
Rebrand links and minor stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Gamer64ytb committed Jul 27, 2024
1 parent f773bbd commit 680aa75
Show file tree
Hide file tree
Showing 12 changed files with 77 additions and 63 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These are supported funding model platforms

patreon: citraemu
paypal: TLOZP
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ body:
id: log
attributes:
label: Log File
description: A log file will help our developers to better diagnose and fix the issue. Instructions can be found [here](https://community.citra-emu.org/t/how-to-upload-the-log-file/296).
description: A log file will help our developers to better diagnose and fix the issue.
validations:
required: true
- type: textarea
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Mandarine Discord
url: https://citra-emu.org/discord/
url: https://discord.gg/8xjMHWEuf6
about: If you are experiencing an issue with Mandarine, and you need tech support, or if you have a general question, try asking in the official Mandarine Discord linked here. Piracy is not allowed.
- name: Community forums
url: https://community.citra-emu.org
- name: GitHub Issues
url: https://github.com/mandarine3ds/mandarine/issues
about: This is an alternative place for tech support, however helpers there are not as active.
20 changes: 0 additions & 20 deletions .github/workflows/transifex.yml

This file was deleted.

78 changes: 68 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,76 @@
## Citra Enhanced is being rebranded to "Mandarin" and completely being rebuilt from scratch
<h1 align="center">
<img src="https://github.com/mandarine3ds/mandarine/blob/2fb4b5e4f3f3c7bcb06c1eac97181f845fe72b57/branding/Citra-Enhanced-256.png" alt="citra" width="188"/>
</p>
<p align="center" style="font-size:144px;">
<strong>Mandarine</strong>
</h1>

**We were not happy with the current state of the project and recent events made us completely rethink the way we approach this fork of Citra**
<p align="center">
<strong>This fork is just Citra with tweaks/additions which should result in better performance than the original Citra</strong>
</strong>Feel free to download this build and test it, if you run into any bugs please open an issue on GitHub or contact me on the Discord / Telegram</strong>
</p>

A couple of points we want to change
<p align="center">
<img src="https://img.shields.io/github/downloads/mandarine3ds/mandarine/total" alt="GitHub all releases"/>
<a href="https://github.com/mandarine3ds/mandarine/releases/latest">
<img src="https://img.shields.io/badge/Download-Latest_Release-2ea44f?logo=github&logoColor=white" alt="Download - Latest Release"/>
</a>
<br>
<a href="https://discord.gg/8xjMHWEuf6">
<img src="https://dcbadge.limes.pink/api/server/8xjMHWEuf6" alt="Discord"/>
</a>
<a href="https://t.me/+lTkg6yC6pQAxNzM0">
<img src="https://patrolavia.github.io/telegram-badge/chat.png" alt="Telegram"/>
</a>
</p>

- We will still focus on performance hacks which are considered "too unstable"
# Recommended specs

But they will usually be togglable and will not mess with the stability of the emulator anymore for users who don't wanna use them
## 🖥️ Desktop

- Focus on proper code review/authoring
```
Operating System: Windows 10 (64-bit), MacOS Ventura, or modern 64-bit Linux
CPU: x86-64 (64-bit) CPU. Single core performance higher than 1,800 on Passmark
GPU: OpenGL 4.3 or Vulkan 1.1 support
Memory: 2GB of RAM. 4GB is recommended
```

We don't want a repeat of past actions, and others as well. We will be extra careful with code authoring in particular (One of our members is known to have issues around that aspect so we'll try our best. If you have any problems with a license-breaking commit, please contact us on the `issues` page immediately)

## 📱 Android

**You can still access the old code of "Citra-Enhanced" using the legacy branch (I don't know why you would want to though) and the old releases will still be available to download for now**
```
Operating System: Android 9.0+
CPU: Snapdragon 835 SoC or better
GPU: OpenGL ES 3.2 or Vulkan 1.1 support
Memory: 2GB of RAM. 4GB is recommended
```

We should be back and running in a few days. Thank you for your patience (especially the devs)
# Installation

### Stable builds

|Platform|Link|
|--------|--------|
| 🪟 Windows|[MSVC](https://github.com/mandarine3ds/mandarine/releases/latest/download/windows-msvc.zip)|
| 📱 Android|[APK](https://github.com/mandarine3ds/mandarine/releases/latest/download/Android-APK.zip)|
| 🐧 Linux|[AppImage](https://github.com/mandarine3ds/mandarine/releases/latest/download/linux-appimage.zip)|
| 🍎 Mac OS|[Universal](https://github.com/mandarine3ds/mandarine/releases/latest/download/macos-universal.zip)|

## ⚠️ Dev Builds (Pre-release software, may be buggy)

|Platform|Status|Download|
|--------|------------|--------|
| 🪟 Windows|[![Qt Build](https://github.com/mandarine3ds/mandarine/actions/workflows/build.yml/badge.svg)](https://github.com/mandarine3ds/mandarine/actions/workflows/Qt_Build.yml)|[Windows MSVC](https://nightly.link/mandarine3ds/mandarine/workflows/build/master/windows-msvc.zip)|
| 📱 Android|[![Qt Build](https://github.com/mandarine3ds/mandarine/actions/workflows/build.yml/badge.svg)](https://github.com/mandarine3ds/mandarine/actions/workflows/Qt_Build.yml)|[Android-APK](https://nightly.link/mandarine3ds/mandarine/workflows/build/master/Android-APK.zip)|
| 🐧 Linux|[![Qt Build](https://github.com/mandarine3ds/mandarine/actions/workflows/build.yml/badge.svg)](https://github.com/mandarine3ds/mandarine/actions/workflows/Qt_Build.yml)|[Linux AppImage](https://nightly.link/mandarine3ds/mandarine/workflows/build/master/linux-appimage.zip)|
| 🍎 Mac OS|[![Qt Build](https://github.com/mandarine3ds/mandarine/actions/workflows/build.yml/badge.svg)](https://github.com/mandarine3ds/mandarine/actions/workflows/Qt_Build.yml)|[Mac OS Universal](https://nightly.link/mandarine3ds/mandarine/workflows/build/master/macos-universal.zip)|

# Contribution

We are looking for more devs to join the team but we especially need more testers. Please contact us on Discord / Telegram if you interested in the role

As for PR's, we usually will accept them if they work well and aren't "nuke the world" Pr's which change too much for no reason
If you need assistance with clang-format contact us on Discord, we'll be more than happy to help

# Support

In case you want to support my work and motivate me more with the project, feel free to check my [paypal](https://paypal.me/TLOZP).
4 changes: 0 additions & 4 deletions src/android/app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,9 @@
<string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
<string name="contributors">Mitwirkende</string>
<string name="contributors_description">Gemacht mit \u2764 vom Mandarine-Team</string>
<string name="contributors_link">https://github.com/mandarine3ds/mandarine/graphs/contributors</string>
<string name="licenses_description">Projekte, die Mandarine für Android ermöglichen</string>
<string name="build">Build</string>
<string name="licenses">Lizenzen</string>
<string name="support_link">https://discord.gg/FAXfZV9</string>
<string name="website_link">https://citra-emu.org/</string>
<string name="github_link">https://github.com/mandarine3ds</string>

<!-- Setup strings -->
<string name="welcome">Willkommen!</string>
Expand Down
4 changes: 0 additions & 4 deletions src/android/app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,9 @@
<string name="copied_to_clipboard">Copiado al portapapeles</string>
<string name="contributors">Contribuidores</string>
<string name="contributors_description">Hecho con \u2764 por parte del equipo de Mandarine</string>
<string name="contributors_link">https://github.com/mandarine3ds/mandarine/graphs/contributors</string>
<string name="licenses_description">Proyectos que han hecho que Mandarine para Android sea una realidad</string>
<string name="build">Compilación</string>
<string name="licenses">Licencias</string>
<string name="support_link">https://discord.gg/FAXfZV9</string>
<string name="website_link">https://citra-emu.org/</string>
<string name="github_link">https://github.com/mandarine3ds</string>

<!-- Setup strings -->
<string name="welcome">¡Bienvenido/a!</string>
Expand Down
4 changes: 0 additions & 4 deletions src/android/app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,9 @@
<string name="copied_to_clipboard">Copié dans le presse-papiers</string>
<string name="contributors">Contributeurs</string>
<string name="contributors_description">Fait avec \u2764 de l\'équipe yuzu</string>
<string name="contributors_link">https://github.com/mandarine3ds/mandarine/graphs/contributors</string>
<string name="licenses_description">Projets qui rendent Mandarine pour Android possible</string>
<string name="build">Build</string>
<string name="licenses">Licences</string>
<string name="support_link">https://discord.gg/FAXfZV9</string>
<string name="website_link">https://citra-emu.org/</string>
<string name="github_link">https://github.com/mandarine3ds</string>

<!-- Setup strings -->
<string name="welcome">Bienvenue !</string>
Expand Down
4 changes: 0 additions & 4 deletions src/android/app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,9 @@
<string name="copied_to_clipboard">Copiado para a área de transferência</string>
<string name="contributors">Colaboradores</string>
<string name="contributors_description">Feito por \u2764 dá equipe Mandarine</string>
<string name="contributors_link">https://github.com/mandarine3ds/mandarine/graphs/contributors</string>
<string name="licenses_description">Projetos que tornam o Mandarine para Android possível</string>
<string name="build">Compilação</string>
<string name="licenses">Licenças</string>
<string name="support_link">https://discord.gg/FAXfZV9</string>
<string name="website_link">https://citra-emu.org/</string>
<string name="github_link">https://github.com/mandarine3ds</string>

<!-- Setup strings -->
<string name="welcome">Bem-vindo</string>
Expand Down
4 changes: 0 additions & 4 deletions src/android/app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,9 @@
<string name="copied_to_clipboard">Скопировано в буфер обмена</string>
<string name="contributors">Участники</string>
<string name="contributors_description">Создано с \u2764 от команды Mandarine</string>
<string name="contributors_link">https://github.com/mandarine3ds/mandarine/graphs/contributors</string>
<string name="licenses_description">Проекты, которые сделали возможным Mandarine для Android</string>
<string name="build">Сборка</string>
<string name="licenses">Лицензии</string>
<string name="support_link">https://discord.gg/FAXfZV9</string>
<string name="website_link">https://citra-emu.org/</string>
<string name="github_link">https://github.com/mandarine3ds</string>

<!-- Setup strings -->
<string name="welcome">Добро пожаловать!</string>
Expand Down
4 changes: 0 additions & 4 deletions src/android/app/src/main/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,9 @@
<string name="copied_to_clipboard">已复制到剪贴板</string>
<string name="contributors">贡献者</string>
<string name="contributors_description">Mandarine 团队的用 \u2764 打造</string>
<string name="contributors_link">https://github.com/mandarine3ds/mandarine/graphs/contributors</string>
<string name="licenses_description">Mandarine 安卓版的诞生离不开这些项目</string>
<string name="build">构建版本</string>
<string name="licenses">许可证</string>
<string name="support_link">https://discord.gg/FAXfZV9</string>
<string name="website_link">https://citra-emu.org/</string>
<string name="github_link">https://github.com/mandarine3ds</string>

<!-- Setup strings -->
<string name="welcome">欢迎!</string>
Expand Down
8 changes: 4 additions & 4 deletions src/android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
<string name="copied_to_clipboard">Copied to clipboard</string>
<string name="contributors">Contributors</string>
<string name="contributors_description">Made with \u2764 from the Mandarine team</string>
<string name="contributors_link">https://github.com/mandarine3ds/mandarine/graphs/contributors</string>
<string name="contributors_link" translatable="false">https://github.com/mandarine3ds/mandarine/graphs/contributors</string>
<string name="licenses_description">Projects that make Mandarine for Android possible</string>
<string name="build">Build</string>
<string name="licenses">Licenses</string>
<string name="support_link">https://discord.gg/FAXfZV9</string>
<string name="website_link">https://citra-emu.org/</string>
<string name="github_link">https://github.com/mandarine3ds</string>
<string name="support_link" translatable="false">https://discord.gg/8xjMHWEuf6</string>
<string name="website_link" translatable="false">https://citra-emu.org/</string>
<string name="github_link" translatable="false">https://github.com/mandarine3ds</string>

<!-- Setup strings -->
<string name="welcome">Welcome!</string>
Expand Down

0 comments on commit 680aa75

Please sign in to comment.