mirror of
https://github.com/funkemunky/AntiVPN.git
synced 2026-05-31 09:31:54 +00:00
funkemunky
58395bb705
# Conflicts: # Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java # Bukkit/pom.xml # Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java # Bungee/pom.xml # Common/Source/src/main/java/dev/brighten/antivpn/database/Database.java # Common/Source/src/main/java/dev/brighten/antivpn/database/VPNDatabase.java # Common/Source/src/main/java/dev/brighten/antivpn/database/local/H2VPN.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongo/MongoVPN.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongodb/MongoDatabase.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongodb/records/AlertsUser.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongodb/records/CidrWhitelist.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongodb/records/UserIpResponse.java # Common/Source/src/main/java/dev/brighten/antivpn/database/mongodb/records/UserWhitelist.java # Common/Source/src/main/java/dev/brighten/antivpn/database/postgres/PostgresDatabase.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/ExecutableStatement.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/NonClosableConnection.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/Query.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/ResultSetIterator.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sqllite/LiteDatabase.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sqllite/version/Version.java # Common/Source/src/main/java/dev/brighten/antivpn/database/sqllite/version/impl/First.java # Common/Source/src/main/java/dev/brighten/antivpn/utils/CIDRUtils.java # Common/Source/src/main/java/dev/brighten/antivpn/utils/IpUtils.java # Common/pom.xml # Sponge/pom.xml # Universal/pom.xml # Velocity/VelocityPlugin/src/main/java/dev/brighten/antivpn/velocity/VelocityListener.java # Velocity/VelocityPlugin/src/main/java/dev/brighten/antivpn/velocity/VelocityPlugin.java # Velocity/pom.xml # pom.xml