[quote='Holocore CU','https://bitbucket.org/projectswg/holocore-cu/commits/adbd9bfb54f1']
Merge changes
- Forwarder.jar
- README.md
- nge.backup
- pom.xml
- res/webserver/authenticated.html
- res/webserver/charinfo.html
- res/webserver/css/auth.css
- res/webserver/css/style.css
- res/webserver/images/small_logo.png
- res/webserver/log.html
- res/webserver/memory.html
- res/webserver/online.html
- res/webserver/playercount.html
- scripts/commands/generic/cmdBroadcast.js
- scripts/commands/generic/cmdBroadcastArea.js
- scripts/commands/generic/cmdBroadcastGalaxy.js
- scripts/commands/generic/cmdBroadcastPlanet.js
- scripts/commands/generic/cmdGroupDisband.js
- scripts/commands/generic/cmdGroupJoin.js
- scripts/commands/generic/cmdPVP.js
- scripts/commands/generic/groupInvite.js
- scripts/commands/generic/purchaseTicket.js
- scripts/commands/generic/transferItemMisc.js
- scripts/radial/terminal/ticket.js
- scripts/radial/terminal/ticket_collector.js
- scripts/radial/terminal/travel.js
- serverdata/admin/holocore_admin_datatable.sdb
- serverdata/buildout/areas.sdb
- serverdata/buildout/objects.sdb
- serverdata/creatures/creatures.sdb
- serverdata/faction/holocore_faction_datatable.sdb
- serverdata/housing/holocore_housing_datatable.sdb
- serverdata/items/holocore_item_datatable.sdb
- serverdata/radial/radials.sdb
- serverdata/spawn/static.sdb
- serverdata/static/travel.sdb
- src/intents/GalacticIntent.java
- src/intents/GroupEventIntent.java
- src/intents/PlayerEventIntent.java
- src/intents/RequestZoneInIntent.java
- src/intents/network/CloseConnectionIntent.java
- src/intents/network/ConnectionClosedIntent.java
- src/intents/network/ConnectionOpenedIntent.java
- src/intents/network/ForceDisconnectIntent.java
- src/intents/network/GalacticPacketIntent.java
- src/intents/network/InboundPacketIntent.java
- src/intents/object/ObjectIdRequestIntent.java
- src/intents/object/ObjectIdResponseIntent.java
- src/intents/object/UpdateObjectAwareness.java
- src/intents/radial/ObjectClickedIntent.java
- src/intents/travel/TicketPurchaseIntent.java
- src/intents/travel/TicketUseIntent.java
- src/intents/travel/TravelPointSelectionIntent.java
- src/main/ProjectSWG.java
- src/network/FragmentedHandler.java
- src/network/InboundNetworkHandler.java
- src/network/NetworkClient.java
- src/network/NetworkProtocol.java
- src/network/OutboundNetworkHandler.java
- src/network/OutboundPacketService.java
- src/network/PacketSender.java
- src/network/PacketType.java
- src/network/encryption/Compression.java
- src/network/packets/Packet.java
- src/network/packets/soe/Acknowledge.java
- src/network/packets/soe/ClientNetworkStatusUpdate.java
- src/network/packets/soe/DataChannelA.java
- src/network/packets/soe/Disconnect.java
- src/network/packets/soe/Fragmented.java
- src/network/packets/soe/MultiPacket.java
- src/network/packets/soe/OutOfOrder.java
- src/network/packets/soe/ServerNetworkStatusUpdate.java
- src/network/packets/soe/SessionRequest.java
- src/network/packets/soe/SessionResponse.java
- src/network/packets/swg/login/EnumerateCharacterId.java
- src/network/packets/swg/login/LoginClusterStatus.java
- src/network/packets/swg/login/OfflineServersMessage.java
- src/network/packets/swg/zone/EnterTicketPurchaseModeMessage.java
- src/network/packets/swg/zone/PlanetTravelPointListRequest.java
- src/network/packets/swg/zone/PlanetTravelPointListResponse.java
- src/network/packets/swg/zone/SceneCreateObjectByCrc.java
- src/network/packets/swg/zone/baselines/Baseline.java
- src/network/packets/swg/zone/insertion/CmdStartScene.java
- src/network/packets/swg/zone/object_controller/Animation.java
- src/network/packets/swg/zone/object_controller/IntendedTarget.java
- src/network/packets/swg/zone/object_controller/ObjectController.java
- src/network/packets/swg/zone/spatial/AttributeListMessage.java
- src/resources/Galaxy.java
- src/resources/Location.java
- src/resources/SortedLinkedList.java
- src/resources/TravelPoint.java
- src/resources/buildout/BuildoutArea.java
- src/resources/chat/ChatAvatar.java
- src/resources/client_info/ClientFactory.java
- src/resources/client_info/IffNode.java
- src/resources/client_info/SWGFile.java
- src/resources/client_info/visitors/CrcStringTableData.java
- src/resources/client_info/visitors/DatatableData.java
- src/resources/client_info/visitors/ObjectData.java
- src/resources/client_info/visitors/WorldSnapshotData.java
- src/resources/collections/SWGBitSet.java
- src/resources/collections/SWGList.java
- src/resources/commands/callbacks/QaToolCmdCallback.java
- src/resources/commands/callbacks/ServerCmdCallback.java
- src/resources/common/BCrypt.java
- src/resources/common/CRC.java
- src/resources/control/IntentManager.java
- src/resources/control/Service.java
- src/resources/encodables/ProsePackage.java
- src/resources/encodables/player/Equipment.java
- src/resources/network/DeltaBuilder.java
- src/resources/network/DisconnectReason.java
- src/resources/network/TCPServer.java
- src/resources/objects/SWGObject.java
- src/resources/objects/building/BuildingObject.java
- src/resources/objects/buildouts/BuildoutArea.java
- src/resources/objects/buildouts/BuildoutLoader.java
- src/resources/objects/buildouts/TerrainBuildoutLoader.java
- src/resources/objects/buildouts/TerrainSnapshotLoader.java
- src/resources/objects/cell/CellObject.java
- src/resources/objects/creature/CreatureObject.java
- src/resources/objects/factory/FactoryObject.java
- src/resources/objects/group/GroupObject.java
- src/resources/objects/installation/InstallationObject.java
- src/resources/objects/player/PlayerObject.java
- src/resources/objects/quadtree/QuadTree.java
- src/resources/objects/resource/ResourceContainerObject.java
- src/resources/objects/sound/SoundObject.java
- src/resources/objects/staticobject/StaticObject.java
- src/resources/objects/weapon/WeaponObject.java
- src/resources/player/Player.java
- src/resources/player/PlayerEvent.java
- src/resources/player/PlayerState.java
- src/resources/server_info/CachedObjectDatabase.java
- src/resources/server_info/ConfigData.java
- src/resources/server_info/ConfigWatcher.java
- src/resources/server_info/DataManager.java
- src/resources/server_info/Log.java
- src/resources/server_info/ObjectDatabase.java
- src/resources/server_info/RelationalDatabase.java
- src/resources/server_info/RelationalServerData.java
- src/resources/sui/SuiBaseWindow.java
- src/resources/sui/SuiComponent.java
- src/resources/zone/NameFilter.java
- src/services/CoreManager.java
- src/services/EngineManager.java
- src/services/ShutdownService.java
- src/services/admin/OnlineInterfaceService.java
- src/services/admin/WebserverHandler.java
- src/services/chat/ChatMailService.java
- src/services/chat/ChatManager.java
- src/services/chat/ChatRoomService.java
- src/services/commands/CommandService.java
- src/services/faction/FactionService.java
- src/services/galaxy/ConnectionService.java
- src/services/galaxy/EnvironmentService.java
- src/services/galaxy/GalacticManager.java
- src/services/galaxy/GameManager.java
- src/services/galaxy/WeatherService.java
- src/services/galaxy/terminals/TerminalService.java
- src/services/galaxy/travel/TravelGroup.java
- src/services/galaxy/travel/TravelService.java
- src/services/group/GroupInviterData.java
- src/services/group/GroupService.java
- src/services/map/CityService.java
- src/services/map/MapManager.java
- src/services/network/NetworkClientManager.java
- src/services/network/NetworkListenerService.java
- src/services/network/NetworkManager.java
- src/services/objects/ClientBuildoutService.java
- src/services/objects/ObjectAwareness.java
- src/services/objects/ObjectCreator.java
- src/services/objects/ObjectManager.java
- src/services/objects/RadialService.java
- src/services/player/CharacterCreationService.java
- src/services/player/LoginService.java
- src/services/player/PlayerManager.java
- src/services/player/ZoneManager.java
- src/services/spawn/SpawnerService.java
- src/services/spawn/StaticService.java
- src/services/sui/SuiService.java
- src/utilities/BuildoutGenerator.java
- src/utilities/ByteUtilities.java
- src/utilities/DebugUtilities.java
- src/utilities/IntentFactory.java
- src/utilities/Scripts.java
- src/utilities/SdbGenerator.java
- src/utilities/namegen/SWGNameGenerator.java
- test/main/TestAll.java
- test/network/encryption/TestCompression.java
- test/network/encryption/TestEncryption.java
- test/network/encryption/TestFragmented.java
- test/resources/TestResources.java
- test/resources/TestSortedLinkedList.java
- test/resources/control/TestIntentQueue.java
- test/resources/server_info/TestObjectDatabase.java
