JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/inventory/ui/page/Menu.java
This commit is contained in:
Jonathan Williams 2014-08-08 20:49:27 -05:00
commit 26c4045bc3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -91,7 +91,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
private ConditionManager _conditionManager;
private DonationManager _donationManager;
private DisguiseManager _disguiseManager;
private PartyManager _partyManager;
private PartyManager _partyManager;
private ForcefieldManager _forcefieldManager;
private Portal _portal;
private StatsManager _statsManager;
@ -101,7 +101,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
private TutorialManager _tutorialManager;
private TextManager _textCreator;
private ParkourManager _parkour;
private PreferencesManager _preferences;
private PreferencesManager _preferences;
private InventoryManager _inventoryManager;
private NewsManager _news;