Commit Graph

16 Commits

Author SHA1 Message Date
Shaun Bennett
8911617a0c Remove BungeeSigns again? 2015-10-01 14:01:36 -04:00
Shaun Bennett
b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
Shaun Bennett
4cad99eb76 Lots of bonus work, start adding Votifier plugin 2015-08-06 00:45:39 -05:00
William Burns
0c5cc25634 Stuff 2015-08-03 12:48:17 +01:00
Shaun Bennett
bd9d222cff Fix IntellIJ Files 2015-08-03 05:50:02 -05:00
Shaun Bennett
11e49b9678 Some updates 2015-08-02 04:28:57 -05:00
William Burns
5deb699b02 Added rejected games and whitelist to MPS. 2015-07-23 18:24:41 +01:00
Shaun Bennett
50c38dc467 April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA 2015-03-31 17:22:50 -04:00
Shaun Bennett
befc2cff7c messing with jedis subpub 2014-12-22 22:49:28 -06:00
Shaun Bennett
1260e875fd Add clans to intellij. Update button 2014-12-17 18:38:35 -06:00
Shaun Bennett
30a7eea628 Motd stuff for xmas update 2014-12-12 00:28:29 -06:00
CoderTim
91a2266a04 Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking 2014-09-05 04:00:51 -04:00
CoderTim
aae46bdeda Removed unused intellij module 2014-09-03 16:58:53 -04:00
Shaun Bennett
ef6871491d Add MapParser IntellIj configurations 2014-08-16 12:12:59 -05:00
CoderTim
19222c6815 Updated IntelliJ environment to be compatible with latest changes 2014-08-15 15:51:29 -04:00
CoderTim
aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00