Remerge code from source repo

speedSpider3 made a commit that changed some item IDs and fixed texture errors. Merge these changes into my fork.