Merge pull request #32 from KirinDave/master

Cutting v2.5.2-RR
Step one of 2.5.3 update.
Tweaks and fixes.
Removing BasicComponents.
Prepping for HEE update.
Adding raw hee.
Next century.
Fixing a silly copypasta bug.
Final fixes.
Fixing block id conflicts.
Final fixes.
Regenned configs.
Fixing one.
Adjustng to use a stable file.
Rolling back some stuff that is quite broken.
Merge tag 'tags/v2.5.4' into server