Commit Graph

15 Commits

Author SHA1 Message Date
Ty Sayers b4c9bfbb57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
2015-09-29 18:09:52 -04:00
Ty Sayers aad5942242 Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server. 2015-08-29 14:46:18 -07:00
Jonathan Williams e9b33668bc Added donorsOnline to MinecraftServer snapshot
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
libraryaddict bfb0c157a2 Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths 2015-02-25 13:56:32 +13:00
Mini-Chiss 26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
Jonathan Williams ea034812b9 Fixed path finder crap in UtilEnt
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
2014-12-10 03:32:35 -08:00
Jonathan Williams a4871b5509 Updated to latest spigot with 1.8 support.
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
2014-09-03 03:46:24 -07:00
Ty 6a9255e97b Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes. 2014-08-01 17:56:29 -04:00
Jonathan Williams bedabd84cc Added silence to kits (UtilEnt.silence)
Cleaned up a ton of unused code....
2014-04-08 23:31:32 -07:00
Jonathan Williams f24f81b7c3 Finished conversion. 2014-03-19 04:09:40 -07:00
Jonathan Williams f51a6747fd Moved files into Mineplex.core
Removed references to Core project.
2014-03-09 00:50:13 -08:00
Chiss bfd76474e8 Dragon particles 2013-12-21 20:44:56 +11:00
Chiss 1977572ced Added Halloween Minigame
Updated gadgets and other minor things.
2013-10-22 15:46:31 +11:00
Jonathan Williams d6bd962768 Added in dynamic servermanager updating.
Added updating of bungeeServers/servers list.
Combined all bungee plugins to Mineplexer

Fixed arcade bug on player quit.
Fixed ServersUI page errors.
2013-09-11 13:53:24 -07:00
Jonathan Williams 3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00