Update POM for Forge 600 - no longer on 1.5.1 branch
Update Forge 7.7.0.600 common
Update resources for Forge 7.7.0.600
Merge Forge Block
Merge in Forge base edits, part 1
Fix several merge errors

405
Merge in FML base edits
Remove obsolete CraftPoweredMinecart, CraftStorageMinecart
Re-add erroneously deleted FMLLogJLineBreakProxy
More progress merging base edits

172
Merge in MCPC+ edits to OBC

142
Many integration fixes, though still incomplete

Continuing to make progress, but this does not yet compile.
75