Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Matt Parnell
2014-08-24 00:38:37 -05:00
22 changed files with 838 additions and 648 deletions
+4
View File
@@ -665,8 +665,12 @@ public class NGECore {
staticService.spawnStatics();
equipmentService.loadBonusSets();
playerCityService.loadCityRankCaps();
playerCityService.loadCities();
questService.loadEvents();
retroService.run();
browserService = new BrowserService(this);