mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-04-02 19:42:05 -04:00
# Conflicts: # FFXIVClassic Lobby Server/Database.cs # FFXIVClassic Map Server/Database.cs # FFXIVClassic Map Server/FFXIVClassic Map Server.csproj # FFXIVClassic Map Server/actors/chara/player/Inventory.cs # FFXIVClassic Map Server/actors/chara/player/Player.cs # FFXIVClassic Map Server/dataobjects/Session.cs # FFXIVClassic World Server/Server.cs |
||
---|---|---|
.. | ||
AetheryteParent | ||
DoorStandard | ||
MapObjShipPort | ||
PopulaceShopSalesman | ||
PopulaceStandard | ||
PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard |