More numeric to constant conversions..should be most of them... Please report any inventory abnormalities.
Test fix for charm in trader's satchel while trader..thanks demonstar and Derision! ** This may need to be tweaked..but, I was able to test without crashing the client.
Changed a few mis-labeled range starts..no functionality change.
Merge upstream
Merge upstream