CORE: another small fix to merit packet
Fixed typo causing crash in Bhaflau_Thickets/npcs/Daswil.lua
The rest of June 2004 stackable items update.

Missing:
	cehuetzi_claw
	cehuetzi_ice_shard
	cehuetzi_pelt
	dullahan_armor
	goblin_dice
	maliyakaleya_coral
	rakaznar_visage_i
	rakaznar_visage_ii
	rakaznar_visage_iii
	rakaznar_visage_iv
	rakaznar_visage_v
	sifs_lock
	sifs_macrame
	waktza_rostrum
	yggdreant_bole

Deliberately omitted:
	Riverfin_Soup
Checked in polutils as seeing a 3hr food made stackable was suspicious. Polutils says stack size is 1, so I assume SE made a mistake in their post on the official SE forums when they included Riverfin soup.
June update to stackable items part 1, ores and logs. Working on the rest in diff branch right now.
Merge pull request #360 from TeoTwawki/misc

Fixed typo causing crash in Bhaflau_Thickets/npcs/Daswil.lua
Merge pull request #361 from TeoTwawki/stackable-item-updates-1-(ore,-logs)

June update to stackable items part 1, ores and logs.
Merge branch 'master' of https://github.com/DarkstarProject/darkstar into stackable-item-updates-2-(everything-else)

Resolved Conflicts:
	sql/item_basic.sql
Merge pull request #362 from TeoTwawki/stackable-item-updates-2-(everything-else)

The rest of June 2004 stackable items update.
Restrict stack purchases to actual stack size set in database so that in the future when SE changes stack sizes we won't have players losing money trying to buy stacks before we make the stack adjustments.
Corrected a lot of fugly formatting issues: line-breaks mid statement, tabs and extra spacing before, after, and smack in middle of statements. Not talking about blank lines between sql statements. This looked more like somebody was copying and pasting in and out of notepad with the word wrap on. Thats a paddlin. Also, lowercase "insert".
CORE: search server crash fix
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
Remove accidental commit of custom setting.
Remove duplicate ID entry.
Merge pull request #363 from TeoTwawki/misc

Restrict stack purchases to actual stack size set in database ...
Merge pull request #364 from TeoTwawki/mob-fixes

Corrected a lot of fugly formatting issues in mob list.
Implemented Bedrock Barry, Tococo, Qu'Vho Deathhurler, Aminita, Slumbering Samwell, and Duke Focalor.
All as retail accurate as possible with data available on the web, including special behavior. Wiki reports for mob tp "spam" are inconsistent, mobs may in fact have very high storeTP instead of regain, or simply be coded to use the same move multiple times when they "go" but I cannot verify this.

Added Requiem to list of things mobs can be made immune to.

Increased MAX_DROPID.

Added duplicate spawn points to Calcabrina to eliminate an error, because somebody decided everything MUST have 50 spawn points even when they don't have that many in retail.

Fixed a naming issue with Selh'teus in SQL. Convention has always been to remove punctuation, having it there silently (no error message) broke an import for me. Made sure script renamed to match and used the other older existing entries for the NPC as a guide.
Merge branch 'master' of https://github.com/DarkstarProject/darkstar into mob-fixes
Undo rename of "Selh\'teus". I dunno how the heck you managed to have a name not be client side like that Kj.
Merge pull request #368 from TeoTwawki/mob-fixes

Implemented Bedrock Barry, Tococo, Qu'Vho Deathhurler, Aminita, Slumbering Samwell, and Duke Focalor.