Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Beny 2019-05-23 23:57:32 +01:00
commit 9266338e6e
2 changed files with 6 additions and 8 deletions

View File

@ -11,13 +11,11 @@ TheGeneral's own words were "dont like it then dont use it". We did not like wha
Arcturus Morningstar is released under the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.txt). Arcturus Morningstar is released under the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.txt).
## Versions ## ## Versions ##
Stable Version: **Not Yet Reached** Stable Version: **2.0.0**
Compiled Download: **Unavailable** Compiled Download: https://git.krews.org/morningstar/Arcturus-Community/releases
Unstable Version: **2.0.0** UnStable Version: **2.1.0**
Unstable Compiled Download: https://arcturus.wf/downloads/dev.zip
Client build: **PRODUCTION-201611291003-338511768** Client build: **PRODUCTION-201611291003-338511768**

View File

@ -38,13 +38,13 @@ public final class Emulator
public final static int MAJOR = 2; public final static int MAJOR = 2;
public final static int MINOR = 0; public final static int MINOR = 1;
public final static int BUILD = 0; public final static int BUILD = 0;
public final static String PREVIEW = "RC-3"; public final static String PREVIEW = "RC-1";
public static final String version = "Arcturus Morningstar"+ " " + MAJOR + "." + MINOR + "." + BUILD + " " + PREVIEW; public static final String version = "Arcturus Morningstar"+ " " + MAJOR + "." + MINOR + "." + BUILD + " " + PREVIEW;
@ -164,7 +164,7 @@ public final class Emulator
@Override @Override
public void run() public void run()
{ {
Emulator.getLogging().logStart("Thankyou for downloading Arcturus Morningstar! This is a Release Candidate for 2.0.0, if you find any bugs please place them on our git repository."); Emulator.getLogging().logStart("Thankyou for downloading Arcturus Morningstar! This is a Release Candidate for 2.1.0, if you find any bugs please place them on our git repository.");
Emulator.getLogging().logStart("Please note, Arcturus Emulator is a project by TheGeneral, we take no credit for the original work, and only the work we have continued. If you'd like to support the project, join our discord at: "); Emulator.getLogging().logStart("Please note, Arcturus Emulator is a project by TheGeneral, we take no credit for the original work, and only the work we have continued. If you'd like to support the project, join our discord at: ");
Emulator.getLogging().logStart("https://discord.gg/syuqgN"); Emulator.getLogging().logStart("https://discord.gg/syuqgN");
System.out.println("Waiting for commands: "); System.out.println("Waiting for commands: ");