CuriousJorge 
							
						 
					 
					
						
						
							
						
						324ebab2d2 
					 
					
						
						
							
							Inventory.cs - GetItemQuantity() added  
						
						... 
						
						
						
						- AddItem functions to cast INV_ERROR to INT for LUA
             - Fixed unique item check.  It was checking for Rare flag, not EX
Scripts :
        Base
            - shop.lua  : Functions for buying/selling from a variety of shop scripts
        Commands
            - EmoteStandardCommand.lua fixed not being able to use emotes when sitting
            - DiceCommand.lua fixed.  No arguments sets default value of 100 as per the ingame description.
                                      Max value raised from 999 to 1000.
        GM Commands
            - speed.lua fixed when using single argument
            - nudge.lua fixed sanitizing.  Made arguments reversible to allow !nudge up 10 & !nudge 10 up
            - giveitem.lua added inv_error handling.  Need to do to rest of item commands at some point
            - givecurrency.lua changed to have you enter a regex'd name of item rather than item ID.
                               Eg. "!givecurrency fire_crystal 10". Added inv_error handling to it.
            - warpplayer.lua added.  Moves yourself to name of player, or moves first player to second player
            - warpid.lua added. For warping to the first instance of an actor's uniqueId the server comes across.
            - quest.lua added.  For adding/adjusting quests for debugging them.
        Class Scripts
            - PopulaceBlackMarketeer.lua updated to utilize shop.lua
            - PopulaceShopSalesman.lua updated to utilize shop.lua
            - PopulaceCompanyShop.lua updated to utilize shop.lua
            - PopulaceCompanyBuffer.lua added and documented along with menu layout.  Needs working status effect to finish.
            - PopulaceCompanyGLPublisher.lua added.  Mostly documented, barely functional.
            - PopulaceCompanyGuide.lua added. Documented, fully functional.
            - PopulaceCompanyOfficer.lua added. Documented.  Menus work.  Needs GC rank table at some point
                                                for documenting GC ranks/seal caps.
            - PopulaceCompanySupply.lua added and mostly documented.  Read-only basic menu flow, static LUA tables
                                         used to set it up, will need SQL tables at some point to replace them with.
                                         Some guesswork on what menus show since no video reference could be found.
            - PopulaceGuildShop.lua updated. Mostly documented.  Read-only shop menus. 
						
						
					 
					
						2017-10-09 23:40:38 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						59e3b2379a 
					 
					
						
						
							
							Implemented mode trade methods. Figured out the modifiers portion of the item packet and rewrote how they are stored.  
						
						
						
						
					 
					
						2017-10-08 12:26:22 -04:00 
						 
				 
			
				
					
						
							
							
								yogurt 
							
						 
					 
					
						
						
							
						
						116a573f85 
					 
					
						
						
							
							Save class/level parameter save info on level up  
						
						
						
						
					 
					
						2017-10-06 20:45:10 -05:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						441c1a6383 
					 
					
						
						
							
							Implemented countdowns.  
						
						
						
						
					 
					
						2017-10-01 12:39:46 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						58334a0e5f 
					 
					
						
						
							
							Implemented newly discovered packets (Dalamud, Countdown).  
						
						
						
						
					 
					
						2017-10-01 12:31:45 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						94491903f7 
					 
					
						
						
							
							More trade work.  
						
						
						
						
					 
					
						2017-10-01 12:23:54 -04:00 
						 
				 
			
				
					
						
							
							
								yogurt 
							
						 
					 
					
						
						
							
						
						f3a823af03 
					 
					
						
						
							
							Only send current class's exp on login. Exp now updates on class change  
						
						
						
						
					 
					
						2017-09-30 20:04:45 -05:00 
						 
				 
			
				
					
						
							
							
								yogurt 
							
						 
					 
					
						
						
							
						
						5dfbc0f249 
					 
					
						
						
							
							EXP and levels now get saved and loaded from database, changed battlecommand id dictionary to hold lists to account for archer and DoH/DoLs getting multiple abilities at certain levels. Level 1 abilities are now added to the hotbar on character creation.  
						
						
						
						
					 
					
						2017-09-30 07:28:08 -05:00 
						 
				 
			
				
					
						
							
							
								yogurt 
							
						 
					 
					
						
						
							
						
						ab98f3662f 
					 
					
						
						
							
							Removed old EquipAbility function from player.cs  
						
						
						
						
					 
					
						2017-09-27 18:12:02 -05:00 
						 
				 
			
				
					
						
							
							
								yogurt 
							
						 
					 
					
						
						
							
						
						33f8709d76 
					 
					
						
						
							
							Added exp and leveling functions, redid equip ability functions to allow adding abilities that aren't for the player's current class and made functions more clear, added dictionary of BattleCommand ids indexed by a tuple containing classId and level.  
						
						
						
						
					 
					
						2017-09-27 18:10:22 -05:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						9649d755a9 
					 
					
						
						
							
							Fixed a bug in inventories. If no null gap was found endOfListIndex would go to -1.  
						
						
						
						
					 
					
						2017-09-16 13:57:16 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						e581727625 
					 
					
						
						
							
							Added errors to AddItem so a script writer knows if the inventory was full or not.  
						
						
						
						
					 
					
						2017-09-16 13:28:37 -04:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						ce5030acd1 
					 
					
						
						
							
							added mob name colour update  
						
						... 
						
						
						
						- added mobmods (need to be loaded from db)
- added Zone.GetBattleNpcById
- added missing IsValidTarget check in AttackState 
						
						
					 
					
						2017-09-10 03:44:12 +01:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						a309e651da 
					 
					
						
						
							
							Fixed issues Jorge found.  
						
						
						
						
					 
					
						2017-09-09 16:30:29 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						64006d2351 
					 
					
						
						
							
							Added retainer inventory code. Renamed CURRENCY inv type to CURRENCY_CRYSTALS so I don't forget.  
						
						
						
						
					 
					
						2017-09-09 14:11:35 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						52c707d66e 
					 
					
						
						
							
							More cleanup.  
						
						
						
						
					 
					
						2017-09-09 12:42:00 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						9174801fdb 
					 
					
						
						
							
							Moved all DB update code into it's own method.  
						
						
						
						
					 
					
						2017-09-09 12:37:24 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						8755ca4f33 
					 
					
						
						
							
							Fixed a bunch of SQL errors. Added checks for quality so a remove command didn't take out items regardless of quality. Fixed errors.  
						
						
						
						
					 
					
						2017-09-09 12:21:37 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						bc95c139de 
					 
					
						
						
							
							Implement DB updates for player. Cleaned up DB calls. No longer track slot, it's ordered by index id (no concept of slots anyway in client).  
						
						
						
						
					 
					
						2017-09-09 11:25:58 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						76f073d85f 
					 
					
						
						
							
							Got retainer meeting group working and cleaned up retainer instancing. Added a RemoveItemAtSlot with quantity.  
						
						
						
						
					 
					
						2017-09-09 10:54:40 -04:00 
						 
				 
			
				
					
						
							
							
								yogurt 
							
						 
					 
					
						
						
							
						
						9077c60b96 
					 
					
						
						
							
							Merged in skeletonhorn/ffxiv-classic-server-ai-fork/ai-open (pull request  #4 )  
						
						... 
						
						
						
						Minor changes to fix equipability bugs 
						
						
					 
					
						2017-09-08 14:22:41 +00:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						68a2d5f0b9 
					 
					
						
						
							
							stubbed item use state (needs to actually look up the item and get its reuse stuff)  
						
						... 
						
						
						
						- added tables to load mobs from (probably dont import besides server_battlenpc_genus.sql)
- added field to server_battle_commands for commands usable by both monsters and players (probably arent any really) 
						
						
					 
					
						2017-09-05 21:03:38 +01:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						5bec522c8e 
					 
					
						
						
							
							Fixed bugs in the new inventory code.  
						
						
						
						
					 
					
						2017-09-05 15:35:33 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						81d82cd7a8 
					 
					
						
						
							
							Rewrote the inventory code, splitting the packet updates from the list updates.  
						
						
						
						
					 
					
						2017-09-05 14:44:06 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						f437b36f5a 
					 
					
						
						
							
							Started implementing retainers. Added a instanced retainer spawn. Documented retainer scripts.  
						
						
						
						
					 
					
						2017-09-05 12:37:23 -04:00 
						 
				 
			
				
					
						
							
							
								yogurt 
							
						 
					 
					
						
						
							
						
						50b4f517f2 
					 
					
						
						
							
							Fix FindFirstCommandSlotById to be able to find empty slots again  
						
						
						
						
					 
					
						2017-09-03 11:18:35 -05:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						4978813c27 
					 
					
						
						
							
							fixed death/despawning kinda (need to figure out why hp wont tick down after respawning)  
						
						
						
						
					 
					
						2017-09-03 01:01:19 +01:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						c5cc7c2f00 
					 
					
						
						
							
							fixed auto attack messing up cast anim  
						
						... 
						
						
						
						- fixed auto attack anim for mobs (<3 u ion)
- added hotbar timer updates (<3 u azia)
- fixed actor block bug
- cleaned up substate retardation
- fixed some targetfind issues
- added despawn state
- added messages for in progress commands
- added fields for aoe target, range, battleAnimation to server_battle_commands table 
						
						
					 
					
						2017-08-31 06:01:26 +01:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						4c7928da78 
					 
					
						
						
							
							Fixed screwed up cast animation.  
						
						
						
						
					 
					
						2017-08-29 22:27:32 -04:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						517bdc0638 
					 
					
						
						
							
							fixed cast interrupt  
						
						... 
						
						
						
						- dont allow targeting of mob moving back to spawn 
						
						
					 
					
						2017-08-30 00:14:14 +01:00 
						 
				 
			
				
					
						
							
							
								yogurt 
							
						 
					 
					
						
						
							
						
						c3fd8f917e 
					 
					
						
						
							
							Added UnequipAbility function, made EquipAbility work with zero indexed hotbar database, added new checks to EquipAbilityCommand.lua  
						
						
						
						
					 
					
						2017-08-29 09:00:09 -05:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						7ad40f625a 
					 
					
						
						
							
							Refactored Demo's battle action code and cleaned things up.  
						
						
						
						
					 
					
						2017-08-28 21:45:01 -04:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						f4016e1a12 
					 
					
						
						
							
							renamed tables for consistency  
						
						... 
						
						
						
						- added magic.lua (todo: enumerate modifiers and stuff)
- moved aggro handling to session position update
- some cleanup 
						
						
					 
					
						2017-08-29 01:15:12 +01:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						6c74222b68 
					 
					
						
						
							
							renamed ability to battlecommand  
						
						... 
						
						
						
						- moved spells to scripts/commands/
- added aoe range field to battle_commands.sql
- changed AttackState to use character's onAttack 
						
						
					 
					
						2017-08-28 05:20:00 +01:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						e5a9658b5a 
					 
					
						
						
							
							Added Parley code to experiment with.  
						
						
						
						
					 
					
						2017-08-26 16:59:15 -04:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						6f5a480cbd 
					 
					
						
						
							
							Merge branch 'develop' of  https://bitbucket.org/Ioncannon/ffxiv-classic-server  into ai  
						
						... 
						
						
						
						# Conflicts:
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs 
						
						
					 
					
						2017-08-26 20:17:16 +01:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						52da0a671f 
					 
					
						
						
							
							Updated method names of "RemoveItem" as Lua hates overloads.  
						
						
						
						
					 
					
						2017-08-26 14:21:54 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						74ce5a2fe1 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						... 
						
						
						
						# Conflicts:
#	FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/PacketProcessor.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/Actor.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/lua/LuaPlayer.cs
#	data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua
#	data/scripts/commands/gm/speed.lua
#	data/scripts/commands/gm/warp.lua
#	data/scripts/global.lua
#	data/scripts/player.lua
#	data/scripts/unique/fst0Town01a/PopulaceStandard/khuma_moshroca.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua
#	data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua
#	sql/server_zones_spawnlocations.sql 
						
						
					 
					
						2017-08-26 13:53:23 -04:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						922f3ccd1e 
					 
					
						
						
							
							Merge branch 'develop' of  https://bitbucket.org/Ioncannon/ffxiv-classic-server  into ai  
						
						... 
						
						
						
						# Conflicts:
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs 
						
						
					 
					
						2017-08-26 18:04:31 +01:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						ff93dc41ef 
					 
					
						
						
							
							Added casting bar functions.  
						
						
						
						
					 
					
						2017-08-26 12:33:37 -04:00 
						 
				 
			
				
					
						
							
							
								Filip Maj 
							
						 
					 
					
						
						
							
						
						546908acde 
					 
					
						
						
							
							Some fixes and missing scripts.  
						
						
						
						
					 
					
						2017-08-26 10:23:13 -04:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						9024f3fad6 
					 
					
						
						
							
							cleaned up magicstate and weaponskillstate  
						
						... 
						
						
						
						- todo: fix IsFacing
- added thunder spell (todo: figure out why battleactionx10 crashes client on sending shit) 
						
						
					 
					
						2017-08-26 04:08:26 +01:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						11bbb023d9 
					 
					
						
						
							
							abilities now use correct animation id (<3 azia)  
						
						... 
						
						
						
						- did stuff with magicstate/attackstate
- fixed status effect tick
- added regen status (todo: actually populate the table and use that name instead of enum's)
- added baseStats to char (todo: add bonuses and stuff on top of those, set charaWork values to the calculated ones + bonus) 
						
						
					 
					
						2017-08-25 03:52:43 +01:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						9bb298b2f3 
					 
					
						
						
							
							added modifier class  
						
						... 
						
						
						
						- added auto attack animation (<3 showmoltti)
- added thing to send battle packet from lua 
						
						
					 
					
						2017-08-24 05:12:30 +01:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						54af893570 
					 
					
						
						
							
							add some more locks, fixed typo in AddHP, add missing ability  
						
						
						
						
					 
					
						2017-08-23 03:22:17 +01:00 
						 
				 
			
				
					
						
							
							
								yogurt 
							
						 
					 
					
						
						
							
						
						35f9251056 
					 
					
						
						
							
							Split update hotbar function into seperate command and recast functions, fixed recast packet spam, recast timers now reset when commands are added to the hotbar and when changing classes, and are now saved in the databse correctly and sent on login. Merged demo's changes.  
						
						
						
						
					 
					
						2017-08-22 14:50:53 -05:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						68657e1edc 
					 
					
						
						
							
							stubbed some more states  
						
						... 
						
						
						
						- stubbed some ability stuff
- moved packet things to loop instead of session only
- added mob roaming and aggro
- todo: fix target find/detection/pathfinding speed/line of sight/line aoe length etc
- todo: see "// todo:" in code 
						
						
					 
					
						2017-08-02 23:09:04 +01:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						8bebba64b3 
					 
					
						
						
							
							fixed some timers  
						
						... 
						
						
						
						- status icons now display (<3 u ion)
- todo: populate status tables, figure out why effect wont tick down for me 
						
						
					 
					
						2017-07-27 03:58:42 +01:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						53207a9ff0 
					 
					
						
						
							
							added status effect saving  
						
						... 
						
						
						
						- added some of the packets to add/remove effects (todo: battle packet too) 
						
						
					 
					
						2017-07-18 00:55:03 +01:00 
						 
				 
			
				
					
						
							
							
								Tahir Akhlaq 
							
						 
					 
					
						
						
							
						
						13af16ec0e 
					 
					
						
						
							
							Merge branch 'ai-open' of  https://bitbucket.org/takhlaq/ffxiv-classic-server  into ai  
						
						... 
						
						
						
						shitty line ending conflicts
# Conflicts:
#	FFXIVClassic Map Server/lua/LuaEngine.cs 
						
						
					 
					
						2017-07-12 18:48:44 +01:00