Commit Graph

895 Commits

Author SHA1 Message Date
DNx5
3620b712b7 improve DatabaseCalls, 2015-09-15 14:38:55 +07:00
DNx5
91d6ead466 update ConsoleLogger 2015-09-15 14:34:07 +07:00
DNx5
e1b2a1852c update ConsoleLogger 2015-09-15 14:33:23 +07:00
DNx5
e406a7b21c Merge remote-tracking branch 'origin/master' 2015-09-15 13:44:21 +07:00
DNx5
232f332be2 revert, bad file encoding. 2015-09-15 13:43:39 +07:00
Gabriele C.
b458547a17 Update pom.xml 2015-09-15 00:21:04 +02:00
DNx5
7add63869e no need to rewrite language file. fix #206 2015-09-15 00:02:52 +07:00
DNx5
e9cf5de663 added ID messages translation. 2015-09-14 23:39:53 +07:00
DNx5
b8abe71584 remove message 'bad_database_email' 2015-09-14 23:35:31 +07:00
DNx5
0b23074770 changed settings load method. 2015-09-14 20:46:56 +07:00
DNx5
7c56dec476 change all usage of getOnlinePlayers 2015-09-14 19:50:32 +07:00
DNx5
8701733b30 Merge remote-tracking branch 'origin/master' 2015-09-14 19:01:12 +07:00
DNx5
0768642e85 cleanup Settings 2015-09-14 18:58:37 +07:00
Gabriele C
9cb6dce613 pom enhancements 2015-09-14 13:40:57 +02:00
Gabriele C
550cffcc42 cleanup 2015-09-14 12:34:52 +02:00
DNx5
981da0a0f3 extract language if available. 2015-09-14 09:26:52 +07:00
DNx5
670caaea4b fix resource extracting. 2015-09-14 08:23:02 +07:00
DNx5
9736e4c207 init instance at the top, to avoid problems. 2015-09-14 04:32:12 +07:00
DNx5
2fe9e735a1 init playerBackup field on enable. 2015-09-14 04:21:38 +07:00
DNx5
a4fd60a6f6 fix cache, still not add null check. 2015-09-14 03:45:09 +07:00
DNx5
b4124bc46d cleanup Listeners. 2015-09-14 01:42:31 +07:00
DNx5
f60604c86c run admin register task async. 2015-09-14 01:22:23 +07:00
Gabriele C
e11a1e9b09 damn 2015-09-13 20:03:28 +02:00
Gabriele C
c0e75dbbd2 fix tabulation 2015-09-13 20:01:55 +02:00
Gabriele C
b1b441fac2 cleanup 2015-09-13 19:58:54 +02:00
DNx5
355c04c361 prevent eating food 2015-09-14 00:19:37 +07:00
DNx5
7458224ada Enhance mainclass 2015-09-13 23:41:28 +07:00
DNx5
e85d8acc24 refactor, 2015-09-13 22:40:19 +07:00
DNx5
b0fc123229 replace cache with Json 2015-09-13 22:10:41 +07:00
DNx5
cb59f44b9b Merge remote-tracking branch 'origin/master'
Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
2015-09-13 22:09:12 +07:00
DNx5
576ff59fcd replace cache with Json 2015-09-13 22:08:18 +07:00
Gabriele C
f297609818 cleanup 2015-09-13 17:07:07 +02:00
DNx5
851eab2fd0 cleanup Utils.java 2015-09-13 21:57:36 +07:00
Gabriele C
680717dbca Fix 2015-09-13 16:28:47 +02:00
Gabriele C.
1994683e47 Update team.txt 2015-09-13 15:30:40 +02:00
Gabriele C
3cbc7ab18f should fix item usage issue 2015-09-13 15:18:22 +02:00
Gabriele C
76b4f62e79 cleanup 2015-09-13 15:01:22 +02:00
Gabriele C
d8c2a25116 Working sqlitehikari! ;D 2015-09-13 12:25:12 +02:00
Gabriele C.
b2234b1e0d Merge pull request #44 from DmitryRendov/team
Fixed PBKDF2DJANGO hash map
2015-09-13 12:12:51 +02:00
DmitryRendov
023e64c8d5 Fixed PBKDF2DJANGO hash map 2015-09-13 09:59:30 +00:00
Gabriele C.
c485a58036 Update MySQL.java 2015-09-12 11:53:30 +02:00
Gabriele C
d4cf739081 Fix hikari 2015-09-10 19:56:33 +02:00
Gabriele C.
639a0482c2 Merge pull request #43 from DNx5/master
improve inventory cache method  (EXPERIMENTAL)
2015-09-10 12:11:10 +02:00
DNx5
08d72785b4 improve inventory cache method 2015-09-10 13:29:11 +07:00
Gabriele C
08c77b6483 Cleanup 2015-09-09 20:21:45 +02:00
Gabriele C.
0180b2210c Merge pull request #42 from DNx5/master
cleanup & improvements
2015-09-08 20:49:29 +02:00
DNx5
afeb359b73 cleanup & improvements 2015-09-09 01:28:27 +07:00
Gabriele C
46002b95e3 Cleanup 2015-09-08 18:12:31 +02:00
Gabriele C
c1d56d5ee5 Fix hikari for mysql and sqlite 2015-09-08 17:33:52 +02:00
Gabriele C.
e2b3c51cab Update MySQL.java 2015-09-08 16:49:47 +02:00