servergreps: update logs

12 files changed, 54 insertions, 54 deletions

diff --git a/servergreps/hercules/00000000/clientpackets.txt b/servergreps/hercules/00000000/clientpackets.txt
index bf22869..f44202a 100644
--- a/servergreps/hercules/00000000/clientpackets.txt
+++ b/servergreps/hercules/00000000/clientpackets.txt
@@ -190,7 +190,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           ?
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        ?
 095d CMSG_PARTY_INVITE2                ?
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                ?
 0998 CMSG_PLAYER_EQUIP                 ?
 09a7 CMSG_BANK_DEPOSIT                 ?
@@ -202,8 +204,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d6 CMSG_NPC_MARKET_BUY               ?
 09d8 CMSG_NPC_MARKET_CLOSE             ?
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          ?
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
 ?    UNIMPLIMENTED                     clif->pActionRequest
 ?    UNIMPLIMENTED                     clif->pChangeDir
 ?    UNIMPLIMENTED                     clif->pCloseKafra
diff --git a/servergreps/hercules/00000007/clientpackets.txt b/servergreps/hercules/00000007/clientpackets.txt
index bf22869..f44202a 100644
--- a/servergreps/hercules/00000007/clientpackets.txt
+++ b/servergreps/hercules/00000007/clientpackets.txt
@@ -190,7 +190,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           ?
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        ?
 095d CMSG_PARTY_INVITE2                ?
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                ?
 0998 CMSG_PLAYER_EQUIP                 ?
 09a7 CMSG_BANK_DEPOSIT                 ?
@@ -202,8 +204,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d6 CMSG_NPC_MARKET_BUY               ?
 09d8 CMSG_NPC_MARKET_CLOSE             ?
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          ?
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
 ?    UNIMPLIMENTED                     clif->pActionRequest
 ?    UNIMPLIMENTED                     clif->pChangeDir
 ?    UNIMPLIMENTED                     clif->pCloseKafra
diff --git a/servergreps/hercules/20120700/clientpackets.txt b/servergreps/hercules/20120700/clientpackets.txt
index dc9881a..fded5b8 100644
--- a/servergreps/hercules/20120700/clientpackets.txt
+++ b/servergreps/hercules/20120700/clientpackets.txt
@@ -115,11 +115,14 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 020f CMSG_PVP_INFO                     clif->pPVPInfo
 0212 CMSG_ADMIN_MUTE_NAME              clif->pGMRc
 0213 CMSG_ADMIN_REQUEST_STATS          clif->pCheck
+0217 CMSG_BLACKSMITH_RANKS             clif->pBlacksmith
+0218 CMSG_ALCHEMIST_RANKS              clif->pAlchemist
 0222 CMSG_NPC_REFINE                   clif->pWeaponRefine
 0231 CMSG_HOMUNCULUS_SET_NAME          clif->pChangeHomunculusName
 0232 CMSG_HOMMERC_MOVE_TO              clif->pHomMoveTo
 0233 CMSG_HOMMERC_ATTACK               clif->pHomAttack
 0234 CMSG_HOMMERC_MOVE_TO_MASTER       clif->pHomMoveToMaster
+0237 CMSG_PK_RANKS                     clif->pRankingPk
 023f CMSG_MAIL_REFRESH_INBOX           clif->pMail_refreshinbox
 0241 CMSG_MAIL_READ_MESSAGE            clif->pMail_read
 0243 CMSG_MAIL_DELETE_MESSAGE          clif->pMail_delete
@@ -190,7 +193,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           ?
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        ?
 095d CMSG_PARTY_INVITE2                ?
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                ?
 0998 CMSG_PLAYER_EQUIP                 ?
 09a7 CMSG_BANK_DEPOSIT                 ?
@@ -202,11 +207,7 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d6 CMSG_NPC_MARKET_BUY               ?
 09d8 CMSG_NPC_MARKET_CLOSE             ?
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          ?
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
 ?    UNIMPLIMENTED                     clif->pActionRequest
-?    UNIMPLIMENTED                     clif->pAlchemist
-?    UNIMPLIMENTED                     clif->pBlacksmith
 ?    UNIMPLIMENTED                     clif->pCashShopBuy
 ?    UNIMPLIMENTED                     clif->pDull
 ?    UNIMPLIMENTED                     clif->pEquipItem
@@ -227,7 +228,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 ?    UNIMPLIMENTED                     clif->pPartyRecruitRegisterReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitSearchReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitUpdateReq
-?    UNIMPLIMENTED                     clif->pRankingPk
 ?    UNIMPLIMENTED                     clif->pSearchStoreInfoListItemClick
 ?    UNIMPLIMENTED                     clif->pSkillSelectMenu
 ?    UNIMPLIMENTED                     clif->pStoragePassword
diff --git a/servergreps/hercules/20130000/clientpackets.txt b/servergreps/hercules/20130000/clientpackets.txt
index bda3e0f..869a833 100644
--- a/servergreps/hercules/20130000/clientpackets.txt
+++ b/servergreps/hercules/20130000/clientpackets.txt
@@ -115,11 +115,14 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 020f CMSG_PVP_INFO                     clif->pPVPInfo
 0212 CMSG_ADMIN_MUTE_NAME              clif->pGMRc
 0213 CMSG_ADMIN_REQUEST_STATS          clif->pCheck
+0217 CMSG_BLACKSMITH_RANKS             clif->pBlacksmith
+0218 CMSG_ALCHEMIST_RANKS              clif->pAlchemist
 0222 CMSG_NPC_REFINE                   clif->pWeaponRefine
 0231 CMSG_HOMUNCULUS_SET_NAME          clif->pChangeHomunculusName
 0232 CMSG_HOMMERC_MOVE_TO              clif->pHomMoveTo
 0233 CMSG_HOMMERC_ATTACK               clif->pHomAttack
 0234 CMSG_HOMMERC_MOVE_TO_MASTER       clif->pHomMoveToMaster
+0237 CMSG_PK_RANKS                     clif->pRankingPk
 023f CMSG_MAIL_REFRESH_INBOX           clif->pMail_refreshinbox
 0241 CMSG_MAIL_READ_MESSAGE            clif->pMail_read
 0243 CMSG_MAIL_DELETE_MESSAGE          clif->pMail_delete
@@ -190,7 +193,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           ?
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        clif->pReqTradeBuyingStore
 095d CMSG_PARTY_INVITE2                ?
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                ?
 0998 CMSG_PLAYER_EQUIP                 ?
 09a7 CMSG_BANK_DEPOSIT                 ?
@@ -202,11 +207,7 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d6 CMSG_NPC_MARKET_BUY               ?
 09d8 CMSG_NPC_MARKET_CLOSE             ?
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          ?
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
 ?    UNIMPLIMENTED                     clif->pActionRequest
-?    UNIMPLIMENTED                     clif->pAlchemist
-?    UNIMPLIMENTED                     clif->pBlacksmith
 ?    UNIMPLIMENTED                     clif->pCashShopBuy
 ?    UNIMPLIMENTED                     clif->pDull
 ?    UNIMPLIMENTED                     clif->pEquipItem
@@ -227,7 +228,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 ?    UNIMPLIMENTED                     clif->pPartyRecruitRegisterReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitSearchReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitUpdateReq
-?    UNIMPLIMENTED                     clif->pRankingPk
 ?    UNIMPLIMENTED                     clif->pSearchStoreInfoListItemClick
 ?    UNIMPLIMENTED                     clif->pSkillSelectMenu
 ?    UNIMPLIMENTED                     clif->pTaekwon
diff --git a/servergreps/hercules/20130221/clientpackets.txt b/servergreps/hercules/20130221/clientpackets.txt
index bda3e0f..869a833 100644
--- a/servergreps/hercules/20130221/clientpackets.txt
+++ b/servergreps/hercules/20130221/clientpackets.txt
@@ -115,11 +115,14 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 020f CMSG_PVP_INFO                     clif->pPVPInfo
 0212 CMSG_ADMIN_MUTE_NAME              clif->pGMRc
 0213 CMSG_ADMIN_REQUEST_STATS          clif->pCheck
+0217 CMSG_BLACKSMITH_RANKS             clif->pBlacksmith
+0218 CMSG_ALCHEMIST_RANKS              clif->pAlchemist
 0222 CMSG_NPC_REFINE                   clif->pWeaponRefine
 0231 CMSG_HOMUNCULUS_SET_NAME          clif->pChangeHomunculusName
 0232 CMSG_HOMMERC_MOVE_TO              clif->pHomMoveTo
 0233 CMSG_HOMMERC_ATTACK               clif->pHomAttack
 0234 CMSG_HOMMERC_MOVE_TO_MASTER       clif->pHomMoveToMaster
+0237 CMSG_PK_RANKS                     clif->pRankingPk
 023f CMSG_MAIL_REFRESH_INBOX           clif->pMail_refreshinbox
 0241 CMSG_MAIL_READ_MESSAGE            clif->pMail_read
 0243 CMSG_MAIL_DELETE_MESSAGE          clif->pMail_delete
@@ -190,7 +193,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           ?
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        clif->pReqTradeBuyingStore
 095d CMSG_PARTY_INVITE2                ?
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                ?
 0998 CMSG_PLAYER_EQUIP                 ?
 09a7 CMSG_BANK_DEPOSIT                 ?
@@ -202,11 +207,7 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d6 CMSG_NPC_MARKET_BUY               ?
 09d8 CMSG_NPC_MARKET_CLOSE             ?
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          ?
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
 ?    UNIMPLIMENTED                     clif->pActionRequest
-?    UNIMPLIMENTED                     clif->pAlchemist
-?    UNIMPLIMENTED                     clif->pBlacksmith
 ?    UNIMPLIMENTED                     clif->pCashShopBuy
 ?    UNIMPLIMENTED                     clif->pDull
 ?    UNIMPLIMENTED                     clif->pEquipItem
@@ -227,7 +228,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 ?    UNIMPLIMENTED                     clif->pPartyRecruitRegisterReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitSearchReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitUpdateReq
-?    UNIMPLIMENTED                     clif->pRankingPk
 ?    UNIMPLIMENTED                     clif->pSearchStoreInfoListItemClick
 ?    UNIMPLIMENTED                     clif->pSkillSelectMenu
 ?    UNIMPLIMENTED                     clif->pTaekwon
diff --git a/servergreps/hercules/20140000/clientpackets.txt b/servergreps/hercules/20140000/clientpackets.txt
index b5f561a..d351665 100644
--- a/servergreps/hercules/20140000/clientpackets.txt
+++ b/servergreps/hercules/20140000/clientpackets.txt
@@ -115,11 +115,14 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 020f CMSG_PVP_INFO                     clif->pPVPInfo
 0212 CMSG_ADMIN_MUTE_NAME              clif->pGMRc
 0213 CMSG_ADMIN_REQUEST_STATS          clif->pCheck
+0217 CMSG_BLACKSMITH_RANKS             clif->pBlacksmith
+0218 CMSG_ALCHEMIST_RANKS              clif->pAlchemist
 0222 CMSG_NPC_REFINE                   clif->pWeaponRefine
 0231 CMSG_HOMUNCULUS_SET_NAME          clif->pChangeHomunculusName
 0232 CMSG_HOMMERC_MOVE_TO              clif->pHomMoveTo
 0233 CMSG_HOMMERC_ATTACK               clif->pHomAttack
 0234 CMSG_HOMMERC_MOVE_TO_MASTER       clif->pHomMoveToMaster
+0237 CMSG_PK_RANKS                     clif->pRankingPk
 023f CMSG_MAIL_REFRESH_INBOX           clif->pMail_refreshinbox
 0241 CMSG_MAIL_READ_MESSAGE            clif->pMail_read
 0243 CMSG_MAIL_DELETE_MESSAGE          clif->pMail_delete
@@ -190,7 +193,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           ?
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        clif->pFriendsListAdd
 095d CMSG_PARTY_INVITE2                ?
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                clif->pRanklist
 0998 CMSG_PLAYER_EQUIP                 clif->pEquipItem
 09a7 CMSG_BANK_DEPOSIT                 clif->pBankDeposit
@@ -202,10 +207,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d6 CMSG_NPC_MARKET_BUY               clif->pNPCMarketPurchase
 09d8 CMSG_NPC_MARKET_CLOSE             clif->pNPCMarketClosed
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          ?
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
-?    UNIMPLIMENTED                     clif->pAlchemist
-?    UNIMPLIMENTED                     clif->pBlacksmith
 ?    UNIMPLIMENTED                     clif->pCashShopBuy
 ?    UNIMPLIMENTED                     clif->pDull
 ?    UNIMPLIMENTED                     clif->pFeelSaveOk
@@ -226,7 +227,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 ?    UNIMPLIMENTED                     clif->pPartyRecruitRegisterReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitSearchReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitUpdateReq
-?    UNIMPLIMENTED                     clif->pRankingPk
 ?    UNIMPLIMENTED                     clif->pSearchStoreInfoListItemClick
 ?    UNIMPLIMENTED                     clif->pSkillSelectMenu
 ?    UNIMPLIMENTED                     clif->pStoragePassword
diff --git a/servergreps/hercules/20140403/clientpackets.txt b/servergreps/hercules/20140403/clientpackets.txt
index 1a9b085..5076df0 100644
--- a/servergreps/hercules/20140403/clientpackets.txt
+++ b/servergreps/hercules/20140403/clientpackets.txt
@@ -115,11 +115,14 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 020f CMSG_PVP_INFO                     clif->pPVPInfo
 0212 CMSG_ADMIN_MUTE_NAME              clif->pGMRc
 0213 CMSG_ADMIN_REQUEST_STATS          clif->pCheck
+0217 CMSG_BLACKSMITH_RANKS             clif->pBlacksmith
+0218 CMSG_ALCHEMIST_RANKS              clif->pAlchemist
 0222 CMSG_NPC_REFINE                   clif->pWeaponRefine
 0231 CMSG_HOMUNCULUS_SET_NAME          clif->pChangeHomunculusName
 0232 CMSG_HOMMERC_MOVE_TO              clif->pHomMoveTo
 0233 CMSG_HOMMERC_ATTACK               clif->pHomAttack
 0234 CMSG_HOMMERC_MOVE_TO_MASTER       clif->pHomMoveToMaster
+0237 CMSG_PK_RANKS                     clif->pRankingPk
 023f CMSG_MAIL_REFRESH_INBOX           clif->pMail_refreshinbox
 0241 CMSG_MAIL_READ_MESSAGE            clif->pMail_read
 0243 CMSG_MAIL_DELETE_MESSAGE          clif->pMail_delete
@@ -190,7 +193,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           ?
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        clif->pTakeItem
 095d CMSG_PARTY_INVITE2                clif->pPartyInvite2
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                clif->pRanklist
 0998 CMSG_PLAYER_EQUIP                 clif->pEquipItem
 09a7 CMSG_BANK_DEPOSIT                 clif->pBankDeposit
@@ -202,10 +207,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d6 CMSG_NPC_MARKET_BUY               clif->pNPCMarketPurchase
 09d8 CMSG_NPC_MARKET_CLOSE             clif->pNPCMarketClosed
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          ?
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
-?    UNIMPLIMENTED                     clif->pAlchemist
-?    UNIMPLIMENTED                     clif->pBlacksmith
 ?    UNIMPLIMENTED                     clif->pCashShopBuy
 ?    UNIMPLIMENTED                     clif->pDull
 ?    UNIMPLIMENTED                     clif->pFeelSaveOk
@@ -225,7 +226,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 ?    UNIMPLIMENTED                     clif->pPartyRecruitRegisterReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitSearchReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitUpdateReq
-?    UNIMPLIMENTED                     clif->pRankingPk
 ?    UNIMPLIMENTED                     clif->pReqClickBuyingStore
 ?    UNIMPLIMENTED                     clif->pSearchStoreInfoListItemClick
 ?    UNIMPLIMENTED                     clif->pSkillSelectMenu
diff --git a/servergreps/hercules/20141016/clientpackets.txt b/servergreps/hercules/20141016/clientpackets.txt
index 49311ce..a99fe3f 100644
--- a/servergreps/hercules/20141016/clientpackets.txt
+++ b/servergreps/hercules/20141016/clientpackets.txt
@@ -115,11 +115,14 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 020f CMSG_PVP_INFO                     clif->pPVPInfo
 0212 CMSG_ADMIN_MUTE_NAME              clif->pGMRc
 0213 CMSG_ADMIN_REQUEST_STATS          clif->pCheck
+0217 CMSG_BLACKSMITH_RANKS             clif->pBlacksmith
+0218 CMSG_ALCHEMIST_RANKS              clif->pAlchemist
 0222 CMSG_NPC_REFINE                   clif->pWeaponRefine
 0231 CMSG_HOMUNCULUS_SET_NAME          clif->pChangeHomunculusName
 0232 CMSG_HOMMERC_MOVE_TO              clif->pHomMoveTo
 0233 CMSG_HOMMERC_ATTACK               clif->pHomAttack
 0234 CMSG_HOMMERC_MOVE_TO_MASTER       clif->pHomMoveToMaster
+0237 CMSG_PK_RANKS                     clif->pRankingPk
 023f CMSG_MAIL_REFRESH_INBOX           clif->pMail_refreshinbox
 0241 CMSG_MAIL_READ_MESSAGE            clif->pMail_read
 0243 CMSG_MAIL_DELETE_MESSAGE          clif->pMail_delete
@@ -190,7 +193,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           ?
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        clif->pTakeItem
 095d CMSG_PARTY_INVITE2                clif->pPartyInvite2
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                clif->pRanklist
 0998 CMSG_PLAYER_EQUIP                 clif->pEquipItem
 09a7 CMSG_BANK_DEPOSIT                 clif->pBankDeposit
@@ -202,10 +207,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d6 CMSG_NPC_MARKET_BUY               clif->pNPCMarketPurchase
 09d8 CMSG_NPC_MARKET_CLOSE             clif->pNPCMarketClosed
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          ?
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
-?    UNIMPLIMENTED                     clif->pAlchemist
-?    UNIMPLIMENTED                     clif->pBlacksmith
 ?    UNIMPLIMENTED                     clif->pCashShopBuy
 ?    UNIMPLIMENTED                     clif->pDull
 ?    UNIMPLIMENTED                     clif->pFeelSaveOk
@@ -224,7 +225,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 ?    UNIMPLIMENTED                     clif->pPartyRecruitRegisterReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitSearchReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitUpdateReq
-?    UNIMPLIMENTED                     clif->pRankingPk
 ?    UNIMPLIMENTED                     clif->pRouletteClose
 ?    UNIMPLIMENTED                     clif->pRouletteGenerate
 ?    UNIMPLIMENTED                     clif->pRouletteInfo
diff --git a/servergreps/hercules/20141022/clientpackets.txt b/servergreps/hercules/20141022/clientpackets.txt
index c910220..7394c27 100644
--- a/servergreps/hercules/20141022/clientpackets.txt
+++ b/servergreps/hercules/20141022/clientpackets.txt
@@ -115,11 +115,14 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 020f CMSG_PVP_INFO                     clif->pPVPInfo
 0212 CMSG_ADMIN_MUTE_NAME              clif->pGMRc
 0213 CMSG_ADMIN_REQUEST_STATS          clif->pCheck
+0217 CMSG_BLACKSMITH_RANKS             clif->pBlacksmith
+0218 CMSG_ALCHEMIST_RANKS              clif->pAlchemist
 0222 CMSG_NPC_REFINE                   clif->pWeaponRefine
 0231 CMSG_HOMUNCULUS_SET_NAME          clif->pChangeHomunculusName
 0232 CMSG_HOMMERC_MOVE_TO              clif->pHomMoveTo
 0233 CMSG_HOMMERC_ATTACK               clif->pHomAttack
 0234 CMSG_HOMMERC_MOVE_TO_MASTER       clif->pHomMoveToMaster
+0237 CMSG_PK_RANKS                     clif->pRankingPk
 023f CMSG_MAIL_REFRESH_INBOX           clif->pMail_refreshinbox
 0241 CMSG_MAIL_READ_MESSAGE            clif->pMail_read
 0243 CMSG_MAIL_DELETE_MESSAGE          clif->pMail_delete
@@ -190,7 +193,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           clif->pFriendsListAdd
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        clif->pSearchStoreInfoNextPage
 095d CMSG_PARTY_INVITE2                clif->pPartyInvite2
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                clif->pRanklist
 0998 CMSG_PLAYER_EQUIP                 clif->pEquipItem
 09a7 CMSG_BANK_DEPOSIT                 clif->pBankDeposit
@@ -202,10 +207,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d6 CMSG_NPC_MARKET_BUY               clif->pNPCMarketPurchase
 09d8 CMSG_NPC_MARKET_CLOSE             clif->pNPCMarketClosed
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          clif->pHotkeyRowShift
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
-?    UNIMPLIMENTED                     clif->pAlchemist
-?    UNIMPLIMENTED                     clif->pBlacksmith
 ?    UNIMPLIMENTED                     clif->pCashShopBuy
 ?    UNIMPLIMENTED                     clif->pDull
 ?    UNIMPLIMENTED                     clif->pFeelSaveOk
@@ -223,7 +224,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 ?    UNIMPLIMENTED                     clif->pPartyRecruitRegisterReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitSearchReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitUpdateReq
-?    UNIMPLIMENTED                     clif->pRankingPk
 ?    UNIMPLIMENTED                     clif->pRouletteClose
 ?    UNIMPLIMENTED                     clif->pRouletteGenerate
 ?    UNIMPLIMENTED                     clif->pRouletteInfo
diff --git a/servergreps/hercules/20150226/clientpackets.txt b/servergreps/hercules/20150226/clientpackets.txt
index c910220..7394c27 100644
--- a/servergreps/hercules/20150226/clientpackets.txt
+++ b/servergreps/hercules/20150226/clientpackets.txt
@@ -115,11 +115,14 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 020f CMSG_PVP_INFO                     clif->pPVPInfo
 0212 CMSG_ADMIN_MUTE_NAME              clif->pGMRc
 0213 CMSG_ADMIN_REQUEST_STATS          clif->pCheck
+0217 CMSG_BLACKSMITH_RANKS             clif->pBlacksmith
+0218 CMSG_ALCHEMIST_RANKS              clif->pAlchemist
 0222 CMSG_NPC_REFINE                   clif->pWeaponRefine
 0231 CMSG_HOMUNCULUS_SET_NAME          clif->pChangeHomunculusName
 0232 CMSG_HOMMERC_MOVE_TO              clif->pHomMoveTo
 0233 CMSG_HOMMERC_ATTACK               clif->pHomAttack
 0234 CMSG_HOMMERC_MOVE_TO_MASTER       clif->pHomMoveToMaster
+0237 CMSG_PK_RANKS                     clif->pRankingPk
 023f CMSG_MAIL_REFRESH_INBOX           clif->pMail_refreshinbox
 0241 CMSG_MAIL_READ_MESSAGE            clif->pMail_read
 0243 CMSG_MAIL_DELETE_MESSAGE          clif->pMail_delete
@@ -190,7 +193,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           clif->pFriendsListAdd
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        clif->pSearchStoreInfoNextPage
 095d CMSG_PARTY_INVITE2                clif->pPartyInvite2
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                clif->pRanklist
 0998 CMSG_PLAYER_EQUIP                 clif->pEquipItem
 09a7 CMSG_BANK_DEPOSIT                 clif->pBankDeposit
@@ -202,10 +207,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d6 CMSG_NPC_MARKET_BUY               clif->pNPCMarketPurchase
 09d8 CMSG_NPC_MARKET_CLOSE             clif->pNPCMarketClosed
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          clif->pHotkeyRowShift
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
-?    UNIMPLIMENTED                     clif->pAlchemist
-?    UNIMPLIMENTED                     clif->pBlacksmith
 ?    UNIMPLIMENTED                     clif->pCashShopBuy
 ?    UNIMPLIMENTED                     clif->pDull
 ?    UNIMPLIMENTED                     clif->pFeelSaveOk
@@ -223,7 +224,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 ?    UNIMPLIMENTED                     clif->pPartyRecruitRegisterReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitSearchReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitUpdateReq
-?    UNIMPLIMENTED                     clif->pRankingPk
 ?    UNIMPLIMENTED                     clif->pRouletteClose
 ?    UNIMPLIMENTED                     clif->pRouletteGenerate
 ?    UNIMPLIMENTED                     clif->pRouletteInfo
diff --git a/servergreps/hercules/20150513/clientpackets.txt b/servergreps/hercules/20150513/clientpackets.txt
index 9783db3..ea2ebb1 100644
--- a/servergreps/hercules/20150513/clientpackets.txt
+++ b/servergreps/hercules/20150513/clientpackets.txt
@@ -115,12 +115,15 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 020f CMSG_PVP_INFO                     clif->pPVPInfo
 0212 CMSG_ADMIN_MUTE_NAME              clif->pGMRc
 0213 CMSG_ADMIN_REQUEST_STATS          clif->pCheck
+0217 CMSG_BLACKSMITH_RANKS             clif->pBlacksmith
+0218 CMSG_ALCHEMIST_RANKS              clif->pAlchemist
 0222 CMSG_NPC_REFINE                   clif->pWeaponRefine
 022d CMSG_BUYINGSTORE_CLOSE            clif->pReqCloseBuyingStore
 0231 CMSG_HOMUNCULUS_SET_NAME          clif->pChangeHomunculusName
 0232 CMSG_HOMMERC_MOVE_TO              clif->pHomMoveTo
 0233 CMSG_HOMMERC_ATTACK               clif->pHomAttack
 0234 CMSG_HOMMERC_MOVE_TO_MASTER       clif->pHomMoveToMaster
+0237 CMSG_PK_RANKS                     clif->pRankingPk
 023f CMSG_MAIL_REFRESH_INBOX           clif->pMail_refreshinbox
 0241 CMSG_MAIL_READ_MESSAGE            clif->pMail_read
 0243 CMSG_MAIL_DELETE_MESSAGE          clif->pMail_delete
@@ -192,7 +195,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           clif->pFriendsListAdd
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        clif->pSearchStoreInfoNextPage
 095d CMSG_PARTY_INVITE2                clif->pPartyInvite2
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                clif->pRanklist
 0998 CMSG_PLAYER_EQUIP                 clif->pEquipItem
 09a7 CMSG_BANK_DEPOSIT                 clif->pBankDeposit
@@ -205,10 +210,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d8 CMSG_NPC_MARKET_CLOSE             clif->pNPCMarketClosed
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          clif->pHotkeyRowShift
 0a35 CMSG_QUICK_IDENTIFY_ITEM          clif->pOneClick_ItemIdentify
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
-?    UNIMPLIMENTED                     clif->pAlchemist
-?    UNIMPLIMENTED                     clif->pBlacksmith
 ?    UNIMPLIMENTED                     clif->pCashShopBuy
 ?    UNIMPLIMENTED                     clif->pDull
 ?    UNIMPLIMENTED                     clif->pFeelSaveOk
@@ -226,7 +227,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 ?    UNIMPLIMENTED                     clif->pPartyRecruitRegisterReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitSearchReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitUpdateReq
-?    UNIMPLIMENTED                     clif->pRankingPk
 ?    UNIMPLIMENTED                     clif->pRouletteClose
 ?    UNIMPLIMENTED                     clif->pRouletteGenerate
 ?    UNIMPLIMENTED                     clif->pRouletteInfo
diff --git a/servergreps/hercules/20150805/clientpackets.txt b/servergreps/hercules/20150805/clientpackets.txt
index 0e2288d..7f99967 100644
--- a/servergreps/hercules/20150805/clientpackets.txt
+++ b/servergreps/hercules/20150805/clientpackets.txt
@@ -115,12 +115,15 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 020f CMSG_PVP_INFO                     clif->pPVPInfo
 0212 CMSG_ADMIN_MUTE_NAME              clif->pGMRc
 0213 CMSG_ADMIN_REQUEST_STATS          clif->pCheck
+0217 CMSG_BLACKSMITH_RANKS             clif->pBlacksmith
+0218 CMSG_ALCHEMIST_RANKS              clif->pAlchemist
 0222 CMSG_NPC_REFINE                   clif->pWeaponRefine
 022d CMSG_BUYINGSTORE_CLOSE            clif->pReqCloseBuyingStore
 0231 CMSG_HOMUNCULUS_SET_NAME          clif->pChangeHomunculusName
 0232 CMSG_HOMMERC_MOVE_TO              clif->pHomMoveTo
 0233 CMSG_HOMMERC_ATTACK               clif->pHomAttack
 0234 CMSG_HOMMERC_MOVE_TO_MASTER       clif->pHomMoveToMaster
+0237 CMSG_PK_RANKS                     clif->pRankingPk
 023f CMSG_MAIL_REFRESH_INBOX           clif->pMail_refreshinbox
 0241 CMSG_MAIL_READ_MESSAGE            clif->pMail_read
 0243 CMSG_MAIL_DELETE_MESSAGE          clif->pMail_delete
@@ -192,7 +195,9 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 091a CMSG_FRIENDS_ADD_PLAYER           clif->pFriendsListAdd
 0940 CMSG_SEARCHSTORE_NEXT_PAGE        clif->pSearchStoreInfoNextPage
 095d CMSG_PARTY_INVITE2                clif->pPartyInvite2
+096e CMSG_MERGE_ITEM_ACK               clif->ackmergeitems
 0970 CMSG_CHAR_CREATE                  ?
+0974 CMSG_MERGE_ITEM_CANCEL            clif->cancelmergeitem
 097c CMSG_REQUEST_RANKS                clif->pRanklist
 0980 CMSG_SELECT_CART                  clif->pSelectCart
 0998 CMSG_PLAYER_EQUIP                 clif->pEquipItem
@@ -206,10 +211,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 09d8 CMSG_NPC_MARKET_CLOSE             clif->pNPCMarketClosed
 0a01 CMSG_SHORTCUTS_ROW_SHIFT          clif->pHotkeyRowShift
 0a35 CMSG_QUICK_IDENTIFY_ITEM          clif->pOneClick_ItemIdentify
-?    UNIMPLIMENTED                     clif->ackmergeitems
-?    UNIMPLIMENTED                     clif->cancelmergeitem
-?    UNIMPLIMENTED                     clif->pAlchemist
-?    UNIMPLIMENTED                     clif->pBlacksmith
 ?    UNIMPLIMENTED                     clif->pCashShopBuy
 ?    UNIMPLIMENTED                     clif->pDull
 ?    UNIMPLIMENTED                     clif->pFeelSaveOk
@@ -227,7 +228,6 @@ PSESENT BUT UNIMPLIMENTED CMSG_PARTY_INVITED
 ?    UNIMPLIMENTED                     clif->pPartyRecruitRegisterReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitSearchReq
 ?    UNIMPLIMENTED                     clif->pPartyRecruitUpdateReq
-?    UNIMPLIMENTED                     clif->pRankingPk
 ?    UNIMPLIMENTED                     clif->pRouletteClose
 ?    UNIMPLIMENTED                     clif->pRouletteGenerate
 ?    UNIMPLIMENTED                     clif->pRouletteInfo