mirror of
				https://bitbucket.org/Ioncannon/project-meteor-server.git
				synced 2025-05-20 08:26:59 -04:00 
			
		
		
		
	Merge branch 'develop'
# Conflicts: # FFXIVClassic Map Server/FFXIVClassic Map Server.csproj # FFXIVClassic Map Server/Server.cs # data/scripts/player.lua # scripts/zones/193/npcs/pplStd_11@0C100.lua
This commit is contained in:
		| @@ -7,7 +7,3 @@ function onEventStarted(player, actor, questId) | ||||
| 	player:sendRequestedInfo("requestedData", "activegl", 7, nil, nil, nil, nil, nil, nil, nil); | ||||
| --	player:sendRequestedInfo("requestedData", "glHist", 10, 0x1D4F2, 1009, 12464, 11727, 12485, 12526); | ||||
| end | ||||
|  | ||||
| function onEventUpdate(player, actor, triggerName, step, arg1) | ||||
|  | ||||
| end | ||||
		Reference in New Issue
	
	Block a user