Fix for GetTradeRecipe results variable overload instead of reuse
updated one of the duplicate 6361's to be 6360 (Broom of Trilon) which was missing.
Merge pull request #251 from bwilliams1/petbroom_fix

updated one of the duplicate 6361's to be 6360 (Broom of Trilon) which w...
Fixed a client crash created by a merge from EQEmu.

Merchants will no longer give you a price for NoDrop items.
Merge branch 'master' of https://github.com/cavedude00/Server
Netcode overhaul. Break all the things!

If this works you can thank Shards of Dalaya for being generous enough to allow me to use some of their old networking code for the new framework. Generally, it's the same though.
Merge branch 'master' of https://github.com/cavedude00/Server
linux fix?
why does windows even allow this? :/
Merge pull request #12 from cavedude00/master

merge from cavedude00:master