Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2
Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2
Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2
Fixed typos in MatterCannon
added fix for main branch being built with the pull requests
fixed bug in call to teamcity
removed if statement that wasn't needed
Merge pull request #169 from FireBall1725/rv2

added fix for main branch being built with the pull requests
Removed missed ones
Merge pull request #172 from yueh/cleanup-forwarding-super

Removed methods with only call to super
Resolved some unchecked Types
Fixed crafting watchers not having the right type
Merge remote-tracking branch 'upstream/rv2' into rv2
Merge pull request #175 from thatsIch/TypeSafety

Type safety
Added some guidelines around how we will accept PRs.
fix formatting
Adding
Merge remote-tracking branch 'upstream/rv2' into rv2

Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java