Commit Graph

716 Commits

Author SHA1 Message Date
Poslovitch
251c2e92f2 Fixed conflicts. Removed "y" variable in Island as it is useless. 2017-05-21 10:20:07 +02:00
Poslovitch
6d0611f717 Added config.yml and Settings variables
This build won't run because of conflicts between the latest commit and
mine. I will fix it later.
2017-05-21 10:08:27 +02:00
tastybento
521e4b8b83 Changed checkPerm to hasPerm.
Cleaned up imports.
2017-05-21 00:17:20 -07:00
tastybento
ed114a4333 Merge remote-tracking branch 'origin/master'
Conflicts:
	src/main/java/us/tastybento/bskyblock/database/ASBDatabase.java
	src/main/java/us/tastybento/bskyblock/database/IslandsManager.java
	src/main/java/us/tastybento/bskyblock/database/PlayersManager.java
	src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java
	src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java
	src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java
2017-05-21 00:08:38 -07:00
tastybento
679b511178 Added methods to PlayerManager and IslandManager. 2017-05-20 23:53:03 -07:00
Poslovitch
ba9a59df16 Changed ASBCommand to BSBCommand 2017-05-21 08:06:26 +02:00
Poslovitch
3e381ec1f6 Changed ASB classes prefix to BSB 2017-05-21 08:03:17 +02:00
Ben
7e8ffea32b We can use the issues on this project because we are both collaborators. 2017-05-20 22:04:52 -07:00
Florian C
85044fdb09 Describe what is BSkyblock in comparison to ASkyBlock 2017-05-21 00:06:05 +02:00
tastybento
c74b6720e9 Renamed Player to APlayer to avoid conflict with bukkit Player class. 2017-05-20 14:57:36 -07:00
tastybento
4be12da452 Changed everything to BSkyBlock 2017-05-20 14:52:52 -07:00
tastybento
7ea88aa0e0 Added Build Status to readme.md 2017-05-20 14:40:11 -07:00
tastybento
f1e31c3c72 Added Travis CI 2017-05-20 14:33:53 -07:00
tastybento
712d2a179f Mavenized
Renamed to be BSkyBlock
2017-05-20 14:30:12 -07:00
tastybento
7500c7ad19 Initial commit from @Poslovitch 2017-05-20 14:09:53 -07:00
tastybento
e07ab74b22 Initial commit 2017-05-20 14:05:15 -07:00