Merge branch 'master' into 'dev'

# Conflicts:
#   src/main/java/com/eu/habbo/Emulator.java
This commit is contained in:
Harmonic 2020-04-01 06:21:03 -04:00
commit d4d6da7506
2 changed files with 6 additions and 5 deletions

View File

@ -12,7 +12,7 @@ Arcturus Morningstar is released under the [GNU General Public License v3](https
## Versions ##
![image](https://img.shields.io/badge/VERSION-2.3.0-success.svg?style=for-the-badge&logo=appveyor)
![image](https://img.shields.io/badge/STATUS-UNSTABLE-red.svg?style=for-the-badge&logo=appveyor)
![image](https://img.shields.io/badge/STATUS-STABLE-green.svg?style=for-the-badge&logo=appveyor)
Compiled Download: https://git.krews.org/morningstar/Arcturus-Community/releases
@ -33,6 +33,7 @@ When making an bug report or a feature request use the template we provide so th
- Quadral (Pathfinder)
- Skeletor
- z
- ArpyAge
## Discord ##
Join us on Discord at https://discord.gg/BzfFsTp
@ -68,8 +69,8 @@ Sale of a special edition of a *source code* will not be permitted. You may use
If we ever are to make paid features or plugins, we will not prevent or discourage developers from creating alternative options for users.
## Plugins - ArcturusExtended ##
ArcturusExtended is a pack with a collection of constantly updated plugins which add custom features to Arcturus Morningstar.
## Plugins - Official Plugins ##
You can find official plugins to add custom features to Arcturus Morningstar at the following URL:
[View the respository here.](https://git.krews.org/morningstar/arcturus-extended/)
[View the respository here.](https://git.krews.org/official-plugins)

View File

@ -42,7 +42,7 @@ public final class Emulator {
public final static String PREVIEW = "RC-3";
public static final String version = "Arcturus Morningstar" + " " + MAJOR + "." + MINOR + "." + BUILD + " ";
public static final String version = "Arcturus Morningstar" + " " + MAJOR + "." + MINOR + "." + BUILD;
private static final String logo =
"\n" +
"███╗ ███╗ ██████╗ ██████╗ ███╗ ██╗██╗███╗ ██╗ ██████╗ ███████╗████████╗ █████╗ ██████╗ \n" +