Commit Graph

592 Commits

Author SHA1 Message Date
Maxetto
9787fbb105 Merge pull request #1 from Xephi/master
Syncing
2015-07-14 20:29:03 +02:00
Maxetto
27bfc1e979 Revert "test" 2015-07-14 20:28:23 +02:00
Maxetto
7769217629 test 2015-07-14 20:27:42 +02:00
Alexandre Vanhecke
def272428b Merge pull request #122 from sgdc3/master
Little config clean up + Translation fixes
2015-07-14 20:27:37 +02:00
Gabriele C.
da5248c547 Update messages_zhtw.yml 2015-07-14 14:11:26 +02:00
Gabriele C.
cd3dbb5a2a Update config.yml 2015-07-14 14:06:42 +02:00
Gabriele C.
b9d648f97a Incrase default security level 2015-07-14 11:46:43 +02:00
Gabriele C.
9de8c95fd0 Update messages_en.yml 2015-07-14 11:33:46 +02:00
Gabriele C
052731fbd3 Fixed format type 2015-07-14 09:19:19 +02:00
Gabriele C
9c4b1cd699 Updated zhtw translation 2015-07-14 09:14:57 +02:00
Gabriele C.
bc824d1a1e Merge pull request #21 from Xephi/master
Up
2015-07-14 09:09:56 +02:00
Xephi59
963e47b3dd Revert also 2015-07-14 05:28:21 +02:00
Xephi59
66af5a4ff8 Push beta3 2015-07-14 05:28:00 +02:00
Xephi59
3fe1c4edae Fix NPE 2015-07-14 05:05:16 +02:00
Xephi59
7f7b713e67 Send mail as html 2015-07-14 04:34:31 +02:00
Alexandre Vanhecke
16f5e1f91e Merge pull request #117 from sgdc3/master
Fixed duplicated mail api in the shaded jar
2015-07-14 04:29:52 +02:00
Xephi59
83b1055df0 Try to restore inventory after register 2015-07-14 04:17:21 +02:00
Gabriele C.
4efd31605a Update pom.xml 2015-07-13 22:11:51 +02:00
Gabriele C.
956d70fb32 Update pom.xml 2015-07-13 22:07:39 +02:00
Gabriele C.
4dc5d8f146 Default JDK version = 1.7 instead of 1.6 2015-07-13 20:46:04 +02:00
Gabriele C.
97841863fa Merge pull request #20 from Xephi/master
Up
2015-07-13 20:45:13 +02:00
Xephi59
c3f314c491 Compilation issues 2015-07-13 18:54:45 +02:00
Gabriele C.
a537ad7543 Merge pull request #18 from Xephi/master
Up
2015-07-13 12:40:32 +02:00
Xephi59
e7264934a4 Return to Snapshot, to avoid some confusion with dev builds 2015-07-13 06:09:12 +02:00
Xephi59
cd37b18ff6 beta2 for API 2015-07-13 06:08:27 +02:00
Xephi59
869b89adac Re-Add old API to prevent some plugin break 2015-07-13 06:07:48 +02:00
Xephi59
5f77d50aae Return to SNAPSHOT for dev 2015-07-13 01:19:21 +02:00
Xephi59
2c2b0f14a1 RELEASE 5.0-BETA1 2015-07-13 01:17:38 +02:00
Xephi59
5660ccc300 Fix FileCache ... Sleeping is stupid x) 2015-07-13 01:15:18 +02:00
Xephi59
08292b8ac1 Change to StringList 2015-07-12 23:14:21 +02:00
Gabriele C.
1db0e5552c Merge pull request #17 from Xephi/master
up
2015-07-12 23:02:24 +02:00
Xephi59
0ce07ad4b4 NPE ? :O 2015-07-12 22:39:14 +02:00
Xephi59
0bf9e9fc2d Remove these useless packages 2015-07-12 22:31:05 +02:00
Xephi59
f41b18c66f Fix Compilation issue 2015-07-12 22:22:49 +02:00
Gabriele C.
f290670004 Merge pull request #16 from Xephi/master
Up
2015-07-12 22:20:48 +02:00
Xephi59
e3dd98a03f Fix Pom for ChestShop 2015-07-12 22:17:08 +02:00
Alexandre Vanhecke
bd118e2363 Merge pull request #114 from sgdc3/master
ChestShop as maven dependency + Config Prototype
2015-07-12 22:12:25 +02:00
Gabriele C.
16284d2aa5 Update pom.xml 2015-07-12 21:11:17 +02:00
Gabriele C
31c8afb98a Unused stuff! 2015-07-12 21:01:48 +02:00
Gabriele C.
26d32de6bf Update pom.xml 2015-07-12 20:46:39 +02:00
Gabriele C.
db601a0899 Delete ChestShop.jar 2015-07-12 20:42:33 +02:00
Alexandre Vanhecke
16ffb76746 Merge pull request #112 from Maxetto/master
Language updates, Admin Command rework and typo fixes
2015-07-12 17:25:25 +02:00
Gabriele C
fd28286ced Unused stuff? 2015-07-12 15:42:40 +02:00
Gabriele C
9417c4e879 Added new configuration style prototype 2015-07-12 13:32:36 +02:00
Gabriele C
0248700a99 Little circle CI fix 2015-07-11 23:50:18 +02:00
Gabriele C.
c54ee31c9c Merge pull request #15 from Maxetto/master
Up
2015-07-11 17:09:31 +02:00
Maxetto
d4c37b2fc2 Coding without Eclipse is hard!
But that should do the trick.
2015-07-10 23:03:09 +02:00
Maxetto
e8a6ce6e75 Compilation Fixes 2015-07-10 22:59:01 +02:00
Gabriele C.
c2932b3f5d Merge pull request #14 from Maxetto/master
Up
2015-07-10 22:50:16 +02:00
Maxetto
34c15a5746 Revert sgdc3 fix here. 2015-07-10 22:44:14 +02:00