From 9460ef3abaff8f17d0c53c2f69567f7b1db868f7 Mon Sep 17 00:00:00 2001
From: Alex <KLS@peqtgc.com>
Date: Wed, 19 Jun 2013 16:54:40 -0700
Subject: [PATCH] Updated Lua Parser (markdown)

---
 Lua-Parser.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Lua-Parser.md b/Lua-Parser.md
index d150186..2ebf576 100644
--- a/Lua-Parser.md
+++ b/Lua-Parser.md
@@ -530,7 +530,27 @@ Note: Encounter scripts cannot properly catch EVENT_COMMAND or EVENT_TRADE unles
 > ```
 
 * event_combine_success
+> Triggered when a client successfully combines a tradeskill recipe.
+> Passes an event table as an argument:
+> ```
+> {
+> 	Client self;
+> 	Integer recipe_id;
+> 	String recipe_name;
+> }
+> ```
+
 * event_combine_failure
+> Triggered when a client fails to combine a tradeskill recipe.
+> Passes an event table as an argument:
+> ```
+> {
+> 	Client self;
+> 	Integer recipe_id;
+> 	String recipe_name;
+> }
+> ```
+
 * event_group_change
 * event_forage_success
 * event_forage_failure