Add protection to TNT (by @tenplus1)
Better ingot textures
Alias string to cotton

Cotton plants used to drop strings, now they drop farming:cotton. Some mods (namely, throwing) still use farming:string, therefore we need farming:string to be equal farming:cotton.
Merge remote-tracking branch 'upstream/master'