Merge pull request #34 from kirderf1/master

Various fixes.
Fixed crash with making new worlds
Implemented new Salamander Model
Merge branch 'master' of github.com:mraof/Minestuck
Added a bunch of combination recipes
Added Salamander Model, cleaned up imports, made spawn location in lands where you entered
Silly git
Fixed top layer generating under oceans, as it can be non solid and cause lag
Added some Minestuck combo recipes
Add some grist conversions too
more recipes
Added WIP images
Merge pull request #36 from mraof/combo-recipes

Combo recipes
Moved the texture to a more accessible branch.
Increased creative exploring compability.
More quick fixes.
Merge pull request #37 from kirderf1/master

Pogo slime texture
Merge remote-tracking branch 'upstream/master' into Server-edit-attempt