xGamingDudex b7099088a9 Merge remote-tracking branch 'origin/develop' into project-cosmetics ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java		2016-04-23 00:55:48 +02:00
..
Mineplex.Bungee.Mineplexer	Fix merge-related errors	2016-04-07 16:40:30 -04:00
Mineplex.BungeeRotator	Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS	2016-02-19 19:54:06 -06:00
Mineplex.Cache	Fix merge-related errors	2016-04-07 16:40:30 -04:00
Mineplex.ChestConverter/src/mineplex/chestConverter	Use Maven for Compilation	2016-01-20 11:20:58 +11:00
Mineplex.Core	Merge remote-tracking branch 'origin/develop' into project-cosmetics	2016-04-23 00:55:48 +02:00
Mineplex.Core.Common	Merge remote-tracking branch 'origin/develop' into project-cosmetics	2016-04-23 00:55:48 +02:00
Mineplex.Database	remove more eclipse files	2016-02-19 07:22:54 +00:00
Mineplex.DDoSProtectionSwitcher	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 branch 'features/elo' into develop	2016-04-22 04:34:35 -05:00
Mineplex.Game.Clans.Core	Fix merge-related errors	2016-04-07 16:40:30 -04:00
Mineplex.Hub	Merge remote-tracking branch 'origin/develop' into project-cosmetics	2016-04-23 00:55:48 +02:00
Mineplex.MapParser	Fix lore being null.	2016-02-25 15:39:18 +00:00
Mineplex.Minecraft.Game.ClassCombat	Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-14 21:38:48 +10:00
Mineplex.Minecraft.Game.Core	Merge remote-tracking branch 'origin/develop' into project-cosmetics	2016-04-23 00:55:48 +02:00
Mineplex.Queuer/src/mineplex/queuer	Use Maven for Compilation	2016-01-20 11:20:58 +11:00
Mineplex.ServerData	Update to Redis 2.8.1 and clean up repositories (#26)	2016-04-16 22:51:20 -05:00
Mineplex.ServerMonitor	Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS	2016-02-19 19:54:06 -06:00
Mineplex.StaffServer	Disable incognito for staff in hub invisibility, and vice-versa	2016-04-08 20:18:56 +01:00
Mineplex.Votifier	Update to Redis 2.8.1 and clean up repositories (#26)	2016-04-16 22:51:20 -05:00
Nautilus.Game.Arcade	Merge remote-tracking branch 'origin/develop' into project-cosmetics	2016-04-23 00:55:48 +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	Update to Redis 2.8.1 and clean up repositories (#26)	2016-04-16 22:51:20 -05:00
settings.xml	Add example maven settings.xml	2016-01-31 09:44:46 +11:00