projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	src/services/bazaar/BazaarService.java
This commit is contained in:
Light2
2014-04-15 01:12:44 +02:00
parent bd0a30aa96 53491a1072
commit 0ec275cf7b
53 changed files with 1317 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/bazaar/BazaarService.java
-2
View File
@@ -51,7 +51,6 @@ import resources.objects.creature.CreatureObject;
import resources.objects.intangible.IntangibleObject;
import resources.objects.manufacture.ManufactureSchematicObject;
import resources.objects.tangible.TangibleObject;
import protocol.swg.ClientIdMsg;
import protocol.swg.auctionManagerClientListener.AuctionQueryHeadersMessage;
import protocol.swg.auctionManagerClientListener.AuctionQueryHeadersResponseMessage;
import protocol.swg.auctionManagerClientListener.BidAuctionMessage;
@@ -59,7 +58,6 @@ import protocol.swg.auctionManagerClientListener.BidAuctionResponseMessage;
import protocol.swg.auctionManagerClientListener.CancelLiveAuctionMessage;
import protocol.swg.auctionManagerClientListener.CancelLiveAuctionResponseMessage;
import protocol.swg.auctionManagerClientListener.CommoditiesItemTypeListResponse;
import protocol.swg.auctionManagerClientListener.CommoditiesResourceTypeListResponse;
import protocol.swg.auctionManagerClientListener.CreateAuctionMessage;
import protocol.swg.auctionManagerClientListener.GetAuctionDetails;
import protocol.swg.auctionManagerClientListener.GetAuctionDetailsResponse;