diff --git a/.gitignore b/.gitignore index ae298ad..2bbe714 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,10 @@ !.idea/modules.xml build +!build/libraries/* +!build/dictionary.pro +!build/proguard.jar buildnumber Launcher.jar -LauncherAuthlib.jar LaunchServer.jar diff --git a/LaunchServer/LaunchServer.iml b/LaunchServer/LaunchServer.iml index e9b0ba4..da32c08 100644 --- a/LaunchServer/LaunchServer.iml +++ b/LaunchServer/LaunchServer.iml @@ -1,5 +1,15 @@ + + + + + SPIGOT + BUNGEECORD + + + + diff --git a/LaunchServer/source/auth/MySQLSourceConfig.java b/LaunchServer/source/auth/MySQLSourceConfig.java index e662212..5aecc52 100644 --- a/LaunchServer/source/auth/MySQLSourceConfig.java +++ b/LaunchServer/source/auth/MySQLSourceConfig.java @@ -4,7 +4,7 @@ import java.sql.SQLException; import javax.sql.DataSource; -import com.mysql.cj.jdbc.MysqlDataSource; +import com.mysql.jdbc.jdbc2.optional.MysqlDataSource; import com.zaxxer.hikari.HikariDataSource; import launcher.LauncherAPI; import launcher.helper.LogHelper; diff --git a/Launcher/runtime/config.js b/Launcher/runtime/config.js index fda05b2..91e6105 100644 --- a/Launcher/runtime/config.js +++ b/Launcher/runtime/config.js @@ -1,13 +1,13 @@ // ====== LAUNCHER CONFIG ====== // var config = { - dir: "launcher", // Launcher directory - title: "sashok724's Launcher", // Window title + dir: "kj-launcher", // Launcher directory + title: "sashko724's Launcher", // Window title icons: [ "favicon.png" ], // Window icon paths // Auth config - newsURL: "https://launcher.sashok724.net/", // News WebView URL - linkText: "Бесплатные окна", // Text for link under "Auth" button - linkURL: new java.net.URL("http://bit.ly/1SP0Rl8"), // URL for link under "Auth" button + newsURL: "https://launcher-sashok724.keeperjerry.ru/", // News WebView URL + linkText: "Забыли пароль?", // Text for link under "Auth" button + linkURL: new java.net.URL("https://keeperjerry.ru/"), // URL for link under "Auth" button // Settings defaults settingsMagic: 0xC0DE5, // Ancient magic, don't touch