Merge branch 'development' into patch-1

This commit is contained in:
Jak
2018-11-11 09:20:31 +00:00
committed by GitHub
28 changed files with 512 additions and 268 deletions
+6 -2
View File
@@ -17,10 +17,10 @@ import java.io.File;
import java.io.IOException;
/**
* Parabot v2.6
* Parabot v2.7
*
* @author Everel, JKetelaar, Matt, Dane
* @version 2.6
* @version 2.7
* @see <a href="http://www.parabot.org">Homepage</a>
*/
public final class Landing {
@@ -81,6 +81,7 @@ public final class Landing {
System.exit(0);
break;
case "-debug":
case "-offlinemode":
Core.setDebug(true);
break;
case "-v":
@@ -143,6 +144,9 @@ public final class Landing {
case "-no_validation":
Core.disableValidation();
break;
case "-uuid":
Core.setQuickLaunchByUuid(Integer.parseInt(args[++i]));
break;
}
}
}