NewGarbo ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta ... Conflicts: Plugins/.idea/compiler.xml Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java Plugins/Libraries/craftbukkit.jar Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java		2015-11-11 19:35:44 +00:00
..
.idea	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-11 19:35:44 +00:00
BuildFiles	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-09 08:59:37 +00:00
Classpath.Dummy	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-11 19:35:44 +00:00
JedisTest
Libraries	Fix schedulers	2015-11-11 11:45:17 +13:00
Mineplex.Bungee.Mineplexer	Fix Bungee lobby balancer code.	2015-11-08 17:25:54 -06:00
Mineplex.BungeeRotator	Should include the file with the change commit.	2015-09-26 18:30:45 -04:00
Mineplex.ChestConverter	Added donorsOnline to MinecraftServer snapshot	2015-08-28 13:22:04 -07:00
Mineplex.Core	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-11 19:35:44 +00:00
Mineplex.Core.Common	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-11 19:35:44 +00:00
Mineplex.Database	Lots of bonus work, start adding Votifier plugin	2015-08-06 00:45:39 -05:00
Mineplex.DDoSProtectionSwitcher	Editing .classpath and a main testing method in UtilBlock	2015-06-19 21:10:10 -04:00
Mineplex.EnjinTranslator	Fixed up EnjinTranslator	2015-11-09 02:26:45 -06:00
Mineplex.Game.Clans	bunch of fixes reported by qa in tutorials.	2015-11-09 20:46:38 +00:00
Mineplex.Game.Clans.Core	More war fixes - still needs tweaking	2015-10-23 02:17:47 -04:00
Mineplex.Hub	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-11 19:35:44 +00:00
Mineplex.MapParser	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-11-03 14:57:25 +13:00
Mineplex.Minecraft.Game.ClassCombat	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-11 19:35:44 +00:00
Mineplex.Minecraft.Game.Core	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-11 19:35:44 +00:00
Mineplex.PlayerCache	Added LoginTime setting as RedisTime for use in calculating time on server.	2015-08-28 21:44:00 -07:00
Mineplex.Queue.Core	Modify RedisConfiguration deserialization options to allow for more dynamic distribution of redis server types and data handling. Servers are now defined individually with metadata representing server type (master/slave) and custom connection names for data redirection on server start up.	2015-06-29 19:27:05 -04:00
Mineplex.Queuer	Revert "Add IntelliJ IDE library files"	2015-07-06 17:06:29 -05:00
Mineplex.ServerData	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-09-29 18:09:52 -04:00
Mineplex.ServerMonitor	Added failsafe for ServerMonitor.	2015-10-12 22:26:24 -05:00
Mineplex.ServerProcesses	Modify RedisConfiguration deserialization options to allow for more dynamic distribution of redis server types and data handling. Servers are now defined individually with metadata representing server type (master/slave) and custom connection names for data redirection on server start up.	2015-06-29 19:27:05 -04:00
Mineplex.StaffServer	Updated StaffServer to 1.8	2015-11-10 02:01:39 -06:00
Mineplex.Votifier	Use login query to handle logins	2015-08-13 06:12:11 -05:00
Nautilus.Game.Arcade	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-11 19:35:44 +00:00
Nautilus.Game.MineKart	Started adding SkyWars game mechanics	2015-06-18 14:54:26 -04:00
Nautilus.Game.PvP	Merge master into clans	2015-07-13 20:42:10 -05:00