Sarah bff9a065d9 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java # Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java		2015-11-18 18:08:51 +01:00
..
.idea	Update motdmanager and compiler.xml	2015-11-16 16:39:34 -05:00
BuildFiles	Fixed up EnjinTranslator	2015-11-09 02:26:45 -06:00
Classpath.Dummy	1.8 Updates	2015-07-27 20:26:37 -05:00
JedisTest	messing with jedis subpub	2014-12-22 22:49:28 -06:00
Libraries	Fixed wrong CB	2015-11-16 12:48:26 +13:00
Mineplex.Bungee.Mineplexer	Update motdmanager and compiler.xml	2015-11-16 16:39:34 -05: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 http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-18 18:08:51 +01:00
Mineplex.Core.Common	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-12 02:44:54 -05: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	- Fixed class edit in lobbies	2015-11-10 06:17:25 -05:00
Mineplex.Hub	hub skytext	2015-11-14 13:05:11 +11:00
Mineplex.MapParser	READY 2 GO	2015-11-14 12:52:14 +11:00
Mineplex.Minecraft.Game.ClassCombat	Fixed getTargetBlock being 0 when its infinite	2015-11-17 10:18:42 +13:00
Mineplex.Minecraft.Game.Core	READY 2 GO	2015-11-14 12:52:14 +11: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	Added duplicate login kick for network.	2015-08-30 00:12:54 -07: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 http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-18 18:08:51 +01:00
Nautilus.Game.MineKart	Started adding SkyWars game mechanics	2015-06-18 14:54:26 -04:00
Nautilus.Game.PvP	Started adding SkyWars game mechanics	2015-06-18 14:54:26 -04:00