Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Gotta commit to update.
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon

Conflicts:
	minecraft/pixelmon/client/ClientProxy.java
	minecraft/pixelmon/config/PixelmonItems.java
Fixed rods up so they are only 1 class.

I had repeated code for the rods. Made it all into 1.
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Finished with rods. Had to remove a chat output line.
Made sure none of the stuff I was working on showed up.
GlobalStatuses completed, Rain effect only member so far
Fixed multiple error lines from global statuses, added Clear weather
FINAL FINAL Rods. The rods now read the Water pokemon spawn list, and are not manual.
Merge pull request #1101 from Xwaffle1/master

Final Fishing Rods
Clear areas for structures
Removed debug code.
Merge pull request #1106 from Xwaffle1/master

Removed debug code.
Merge pull request #1105 from Rhonim/master

Clear areas for structures
added lickitung
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Inventory fix

Fix to displaying the inventory correctly.
Merge pull request #1107 from Rhonim/master

Inventory fix