Commit Graph

707 Commits

Author SHA1 Message Date
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
Maxetto
925e78e860 Merge pull request #6 from sgdc3/master
Resolved Conflicts ;)
2015-07-10 22:33:34 +02:00
Gabriele C
370d37de97 Merge branch 'Maxetto-master' 2015-07-10 22:29:04 +02:00
Gabriele C
b87768478d fixed conflict 2015-07-10 22:28:43 +02:00
Gabriele C.
926ec808f5 Merge pull request #12 from Xephi/master
Up
2015-07-10 21:21:38 +02:00
Alexandre Vanhecke
cc13c01351 Merge pull request #113 from sgdc3/master
Fixed slow citizens repo
2015-07-10 18:20:11 +02:00
Gabriele C.
145e43ffd9 Update .travis.yml 2015-07-10 17:50:11 +02:00
Gabriele C.
86aa8f7cce Update .travis.yml 2015-07-10 17:43:40 +02:00
Gabriele C.
ce78d08be9 Update .travis.yml 2015-07-10 17:37:12 +02:00
Maxetto
ffab80188f Remember to sync before pushing! 2015-07-10 17:06:13 +02:00
Maxetto
aa871e2dcf Remember to sync before pushing! 2015-07-10 17:04:03 +02:00
Maxetto
91a4afb41f Remember to sync before pushing! 2015-07-10 17:02:57 +02:00
Maxetto
d52e242c53 Remember to sync before pushing! 2015-07-10 16:56:58 +02:00
Maxetto
6c4668ecec Remember to sync before pushing! 2015-07-10 16:53:34 +02:00
Maxetto
11ab01c45d Remember to sync before pushing! 2015-07-10 16:51:34 +02:00
Maxetto
8758e563bf Remember to sync before pushing! 2015-07-10 16:47:06 +02:00
Maxetto
3a7fd005b3 Sometimes I'm sleeping 2015-07-10 16:36:03 +02:00
Maxetto
58d3d5362b Sometimes I'm sleeping 2015-07-10 16:35:16 +02:00
Maxetto
cf8d179eab Sometimes I'm sleeping 2015-07-10 16:34:52 +02:00
Maxetto
91d95e45fa Sometimes I'm sleeping 2015-07-10 16:34:22 +02:00
Maxetto
5cdd2e1189 Sometimes I'm sleeping 2015-07-10 16:33:55 +02:00
Maxetto
bb9f81f335 Sometimes I'm sleeping 2015-07-10 16:33:07 +02:00
Maxetto
f3f4a23098 Sometimes I'm sleeping 2015-07-10 16:32:26 +02:00
Maxetto
07c884ce66 192.168.0.1! 2015-07-10 16:28:29 +02:00
Maxetto
843385419d 192.168.0.1! 2015-07-10 16:28:04 +02:00
Maxetto
cead835440 192.168.0.1! 2015-07-10 16:27:21 +02:00
Maxetto
ae1b074725 192.168.0.1! 2015-07-10 16:26:04 +02:00
Maxetto
e469c74ef0 192.168.0.1! 2015-07-10 16:25:20 +02:00
Maxetto
9e153bc663 192.168.0.1! 2015-07-10 16:24:33 +02:00
Maxetto
63497269f2 Admin Commands rework
//TODO: Still needs to block output if doesn't have the permission for "Usage:" messages.
//TODO: Add a way to replicate the "/authme" command when "/authme args[0]" is not in the list.
2015-07-10 16:23:09 +02:00
Gabriele C.
a72c206a6c Update pom.xml 2015-07-10 16:22:39 +02:00
Gabriele C.
0496d2049c Update pom.xml 2015-07-10 16:19:13 +02:00
Maxetto
11785c6547 Easing out code 2015-07-10 16:16:42 +02:00
Maxetto
e63764e585 Moved password checks with the others 2015-07-10 16:15:12 +02:00
Gabriele C.
7857e322a5 Update pom.xml 2015-07-10 16:07:02 +02:00
Xephi59
d6a392ec98 Merge branch 'master' of https://github.com/Xephi/AuthMeReloaded 2015-07-10 14:49:26 +02:00