Fix pickup combining over the maximum stack size.
Better combining.
Optimize combining.
Merge branch 'master' into Pickups
Fixed a comment and changed CombineCount to short.
Merged branch 'howaner/Pickups'.