Filip Maj bcb609e4f6 Merge branch 'inventory_refactor' into develop ... # Conflicts: # FFXIVClassic Map Server/Database.cs # FFXIVClassic Map Server/FFXIVClassic Map Server.csproj # FFXIVClassic Map Server/WorldManager.cs # FFXIVClassic Map Server/actors/area/Area.cs # FFXIVClassic Map Server/actors/area/Zone.cs # FFXIVClassic Map Server/actors/chara/Character.cs # FFXIVClassic Map Server/actors/chara/npc/Npc.cs # FFXIVClassic Map Server/actors/chara/player/Inventory.cs # FFXIVClassic Map Server/actors/chara/player/Player.cs # FFXIVClassic Map Server/dataobjects/ZoneConnection.cs # FFXIVClassic Map Server/lua/LuaEngine.cs # FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs # FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs # FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/CommandResultX00Packet.cs # FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs # FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs # data/scripts/commands/gm/giveitem.lua		2019-05-06 15:59:09 -04:00
..
database	Removed old db stuff.	2016-01-10 03:05:22 -05:00
GuildleveData.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
InventoryItem.cs	Fixed the refresh not sending inv change packets.	2018-04-07 13:45:05 -04:00
ItemData.cs	Merge branch 'ai-open' into develop	2019-05-04 20:13:29 -04:00
RecruitmentDetails.cs	servers now log (almost) everything to file	2016-06-09 19:48:06 +01:00
SeamlessBoundry.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
SearchEntry.cs	mass replaced all methods to pascal case	2016-06-14 21:29:10 +01:00
Session.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
TradeTransaction.cs	Cleanup the messy imports.	2019-05-06 13:39:24 -04:00
ZoneConnection.cs	Merge branch 'inventory_refactor' into develop	2019-05-06 15:59:09 -04:00