Merge pull request #1 from Vadis365/master

Update EntityWasp.java
Stuffs I guess
Fixy fixy:3
Initia formatting
settings thingy
Delete org.eclipse.jdt.core.prefs
Clean up for ModBlocks class
Cleany cleany
Merge pull request #1 from ganymedes02/master

Mergey, Merge, Merge