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
..
.externalToolBuilders	Fix slashes (this won't affect windows users, right?)	2015-06-26 10:14:37 -07:00
.settings	Map Parser	2014-06-15 10:12:08 +10:00
src/mineplex/mapparser	Merge remote-tracking branch 'remotes/origin/master' into MC_1.8	2015-07-27 19:39:18 -05:00
.classpath	Treasure changes :O	2015-02-09 20:24:20 +13:00
.project	Map Parser	2014-06-15 10:12:08 +10:00
Mineplex.MapParser.iml	Treasure fixes	2015-02-10 21:15:44 -05:00
plugin.yml	Fixed CME	2014-06-15 15:10:19 +10:00