Commit Graph

15 Commits

Author SHA1 Message Date
Shaun Bennett
16bad71dcc 1.8 Updates 2015-07-27 20:26:37 -05:00
Shaun Bennett
da3500cc32 Merge remote-tracking branch 'remotes/origin/master' into MC_1.8
# Conflicts:
#	Plugins/Libraries/craftbukkit.jar
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
#	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseLiving.java
#	Plugins/Mineplex.Core/src/mineplex/core/map/BlockMap.java
#	Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java
#	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
#	Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
#	Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
2015-07-27 19:39:18 -05:00
Shaun Bennett
cc1219fd38 [Spigot] Spigot class change for Ty 2015-05-28 15:24:10 -05:00
Shaun Bennett
73719e0df3 Fix world particles issues 2015-05-03 15:30:58 -05:00
Shaun Bennett
ff6da92fb7 Some Build world, support for far rendered particles 2015-05-03 14:41:09 -05:00
Shaun Bennett
cf4353bedf Delete some classpath dummy changes, jsonmessage fixed 2015-04-22 16:37:45 -04: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
336ba50f59 Rename some enum values for treasures, update my packet change 2015-02-09 23:24:43 -05:00
Shaun Bennett
2f64b5f401 1.8 tablist fix - spigot needs to be updated! 2015-02-05 23:09:20 -05:00
Shaun Bennett
5b9b7347c6 Add tab complete processing for commands 2014-11-10 23:49:35 -06:00
Shaun Bennett
62d4804aa6 Update Craftbukkit.jar for new chat features 2014-10-15 11:10:28 -05:00
CoderTim
3ba748f2de Merge branch 'feature/currency-log' 2014-10-13 23:13:44 -04:00
Shaun Bennett
2a2191f23b Saving some changes to craftbukkit -> adds 1.8 nametag visibility option for teams 2014-10-05 21:16:40 -05:00
CoderTim
f6f484c134 Refactored /npc commands 2014-10-02 22:08:00 -04:00
CoderTim
91a2266a04 Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking 2014-09-05 04:00:51 -04:00