JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2ef32a14df
Mineplex2018-withcommit/Plugins
History
Morten 2ef32a14df Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
#	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java
2015-11-10 17:15:23 +01:00
..
.idea Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-07 21:36:36 +13: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 Fix a craftbukkit bug 2015-11-11 00:25:20 +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 Ignore this 2015-09-25 18:03:10 +02:00
Mineplex.Core Merge with 1.8 Branch 2015-11-10 01:48:33 -05:00
Mineplex.Core.Common Add info on note particle 2015-11-07 21:35:26 +13:00
Mineplex.Database Ignore this 2015-09-25 18:03:10 +02: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 Ignore this 2015-09-25 18:03:10 +02:00
Mineplex.Hub Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-11-10 17:15:23 +01: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 http://184.154.0.242:7990/scm/min/mineplex 2015-11-10 17:15:23 +01:00
Mineplex.Minecraft.Game.Core Update to master 2015-11-03 15:05:56 +13:00
Mineplex.PlayerCache Ignore this 2015-09-25 18:03:10 +02: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 Ignore this 2015-09-25 18:03:10 +02: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 Ignore this 2015-09-25 18:03:10 +02:00
Nautilus.Game.Arcade Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-11-10 17:15:23 +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