Merge pull request #1 from BrassGoggledCoders/nightly

Update my Fork
Whoops, missed a merge conflict
Applied the new textures
Applied the new textures II
Added a Equipment tab

for tools and armour.
Drill now mines anything pick + shovel can.
Lots of config options for World Generation

Power to the End User!
ID Rearrangment
Added Machines Tab
Merge pull request #50 from warlordjones/master

New Textures + Tabs