first commit
added bishops, and a bunch more stuff
Added Prospitian and Dersite bishops, created abstract class EntityCarapacian to be used as a base for the Skaian mobs, created EntityAIAttackByDistance which is an ai that does a melee attack if a mob is close enough, but otherwise does the ranged attack
Finished the grist itself, set up different types of imps, removed some debugging messages
Cleaned up code, fixed errors when trying to run as a server, added more types of Imps, added Ogres, made EntityUnderling class
Added Cruxite Ore and Raw Cruxite

Feel free to change ore spawn count, etc.
Added basics of Cache GUI

No actual Grist images/numbers yet...
Merge pull request #1 from iconmaster5326/cache-gui

Added Grist Cache Gui
Added WIP textures, including GUIs
Made grist persistent, added Giclopes, added rust ogres, gave ogres a less overpowered range, set up the keyhandler for GuiGristCache being a GuiScreen
Merge branch 'master' of git://github.com/iconmaster5326/Minestuck into iconmaster5326-master

Conflicts:
	com/mraof/minestuck/Minestuck.java
	com/mraof/minestuck/client/gui/GuiGristCache.java
	com/mraof/minestuck/client/settings/MinestuckKeyHandler.java
Tweaked Cruxtruder GUI template
Changed code to work with forge 773
Merge pull request #3 from iconmaster5326/master

Added Alchemy Machines
Merge pull request #4 from iconmaster5326/master

Punched cards now display item name
Merge pull request #5 from iconmaster5326/master

A bunch of stuff
Merge pull request #1 from mraof/master

yep
Merge pull request #6 from iconmaster5326/master

Fixed GUIs, some work on Alchemiter, etc.
Merge pull request #9 from iconmaster5326/master

Working Alchemiter, Classpects, Texture fixes
Fixed weapon damage