Commit Graph

776 Commits

Author SHA1 Message Date
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
Gabriele C
c0eb15ee49 Cleanup 2015-09-07 20:38:29 +02:00
Gabriele C.
b83d141758 Merge pull request #41 from DNx5/master
run task async, fix #200
2015-09-07 18:32:27 +02:00
DNx5
90c7187bab run task async, fix #200 2015-09-07 23:28:15 +07:00
Gabriele C.
8484ed3e02 Merge pull request #40 from DNx5/master
Stuff from DNx5
2015-09-07 16:18:20 +02:00
DNx5
5a9c6278b6 Merge branch 'master' of git://github.com/AuthMe-Team/AuthMeReloaded into AuthMe-Team-master
Conflicts:
	src/main/java/fr/xephi/authme/datasource/MySQL.java
2015-09-07 20:49:10 +07:00
Gabriele C.
7a82bb7ba8 Update team.txt 2015-09-07 15:41:22 +02:00
Gabriele C
65bb488f4c PBKDF2DJANGO Hash 2015-09-07 14:30:56 +02:00
Gabriele C
7d8ef95a22 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded 2015-09-07 14:06:29 +02:00
Gabriele C
84b5dcc625 Cleanup 2015-09-07 14:05:50 +02:00
Gabriele C.
0bab99b2fd Update README.md 2015-09-07 13:29:22 +02:00
Gabriele C.
8ec497a5e8 Update AuthMe.java 2015-09-07 13:25:40 +02:00
Gabriele C.
284909a215 Merge pull request #39 from Xephi/master
Up
2015-09-07 13:23:18 +02:00
Alexandre Vanhecke
1e9d7f879a Sponsor 2015-09-07 12:35:49 +02:00
Alexandre Vanhecke
395a514778 Update README.md 2015-09-07 12:33:24 +02:00
Gabriele C.
3032608f6a Merge pull request #38 from DmitryRendov/master
Hash update
2015-09-06 23:59:03 +02:00
DmitryRendov
7c2649abf5 Fix 2015-09-06 20:32:58 +00:00
DmitryRendov
495dd35b48 Updated PBKDF2 hasher to support Django 1.7+ 2015-09-06 20:28:25 +00:00
DNx5
200ff01cd9 never return null, just throw exception. 2015-09-06 22:24:23 +07:00