Mineplex2018-withcommit/Plugins
Thanos paravantis 854ebf70c4 Merge branch 'master' into thanos-mineware
Conflicts:
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs
	Plugins/Nautilus.Game.Arcade/.classpath
	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
2016-02-02 17:11:22 +02:00
..
Libraries Update CB.jar 2016-01-29 17:01:48 +13:00
Mineplex.Bungee.Mineplexer Merge branch 'master' into thanos-mineware 2016-02-02 17:11:22 +02:00
Mineplex.BungeeRotator Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Mineplex.Cache Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Mineplex.ChestConverter/src/mineplex/chestConverter Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Mineplex.Core Merge branch 'master' into thanos-mineware 2016-02-02 17:11:22 +02:00
Mineplex.Core.Common mac fix 2016-02-02 09:25:46 +11:00
Mineplex.DDoSProtectionSwitcher Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Mineplex.Database Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Mineplex.EnjinTranslator Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Mineplex.Game.Clans Merge with develop 2016-01-30 02:44:24 -05:00
Mineplex.Game.Clans.Core merge with develop 2016-01-29 03:44:04 -05:00
Mineplex.Hub Merge branch 'master' into thanos-mineware 2016-02-02 17:11:22 +02:00
Mineplex.MapParser Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop 2016-01-28 21:02:23 -06:00
Mineplex.Minecraft.Game.ClassCombat Merge branch 'master' into thanos-mineware 2016-02-02 17:11:22 +02:00
Mineplex.Minecraft.Game.Core merge with develop 2016-01-29 03:44:04 -05:00
Mineplex.Queuer Merge branch 'master' into thanos-mineware 2016-02-02 17:11:22 +02:00
Mineplex.ServerData Remove setTestOnBorrow 2016-01-30 16:10:30 -05:00
Mineplex.ServerMonitor Merge pull request #130 in MIN/mineplex from md_5/servermonitor/leak to develop 2016-01-20 12:24:33 -06:00
Mineplex.StaffServer Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Mineplex.Votifier Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Nautilus.Game.Arcade Merge branch 'master' into thanos-mineware 2016-02-02 17:11:22 +02:00
Nautilus.Game.MineKart Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Nautilus.Game.PvP Use Maven for Compilation 2016-01-20 11:20:58 +11:00
app.xml Fix wrong group id for spigot excludes 2016-01-20 15:07:39 -05:00
plugin.xml Commons codec is not included in BungeeCord. 2016-02-01 18:18:23 +11:00
pom.xml Pooling with later jedis versions doesn't work on Bungee. 2016-02-01 18:13:50 +11:00
settings.xml Add example maven settings.xml 2016-01-31 09:44:46 +11:00