Mineplex2018-withcommit/Plugins
Keir Nellyer 99150db2d7 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2016-02-22 19:02:54 +00:00
..
.idea Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-27 21:44:04 +00:00
Mineplex.Bungee.Mineplexer Merge remote-tracking branch 'origin/develop' into develop 2016-02-19 19:33:52 -06:00
Mineplex.BungeeRotator Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS 2016-02-19 19:54:06 -06:00
Mineplex.Cache Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS 2016-02-19 19:54:06 -06:00
Mineplex.ChestConverter/src/mineplex/chestConverter Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Mineplex.Core Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-02-22 19:02:54 +00:00
Mineplex.Core.Common Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-02-22 19:02:54 +00:00
Mineplex.DDoSProtectionSwitcher remove more eclipse files 2016-02-19 07:22:54 +00:00
Mineplex.Database remove more eclipse files 2016-02-19 07:22:54 +00:00
Mineplex.EnjinTranslator remove more eclipse files 2016-02-19 07:22:54 +00:00
Mineplex.Game.Clans Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-02-22 19:02:54 +00:00
Mineplex.Game.Clans.Core remove more eclipse files 2016-02-19 07:22:54 +00:00
Mineplex.Hub Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-02-22 19:02:54 +00:00
Mineplex.MapParser remove more eclipse files 2016-02-19 07:22:54 +00:00
Mineplex.Minecraft.Game.ClassCombat remove more eclipse files 2016-02-19 07:22:54 +00:00
Mineplex.Minecraft.Game.Core remove more eclipse files 2016-02-19 07:22:54 +00:00
Mineplex.Queuer/src/mineplex/queuer Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Mineplex.ReportServer ReportServer: update package name and configure Maven to generate a META-INF file with the main class name included. 2016-02-02 22:28:18 +00:00
Mineplex.ServerData Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-02-22 19:02:54 +00:00
Mineplex.ServerMonitor Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS 2016-02-19 19:54:06 -06:00
Mineplex.StaffServer remove more eclipse files 2016-02-19 07:22:54 +00:00
Mineplex.Votifier remove more eclipse files 2016-02-19 07:22:54 +00:00
Nautilus.Game.Arcade Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-02-22 19:02:54 +00: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 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-02-22 19:02:54 +00:00
settings.xml Add example maven settings.xml 2016-01-31 09:44:46 +11:00