TadahTech bca19788db Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java # Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java		2016-08-24 21:28:36 -05:00
..
src	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update	2016-08-24 21:28:36 -05:00
ascii.png	Fix ascii.png duplication.	2016-01-21 17:47:21 +11:00
pom.xml	Remove googles http api (no longer needed) and add apache http to core.common	2016-05-24 17:23:17 +10:00