water animation optimizations
Camera Fix and Forge Debug
Better Way of Camera Fix
Crafting Expanded
water old
Crafting UI and Infrastructure working!
water animation optimizations
water coninued
old water solution
Crafting Continued
Merge remote-tracking branch 'origin/water-animation' into water-animation

Conflicts:
	src/com/cr/engine/input/Input.java
	src/com/cr/states/AmountState.java
	src/com/cr/world/TileMap.java
	src/com/cr/world/tile/WaterTile.java
vertex water wtf
Merge remote-tracking branch 'origin/water-animation' into water-animation

Conflicts:
	src/com/cr/engine/input/Input.java
	src/com/cr/states/AmountState.java
	src/com/cr/world/TileMap.java
	src/com/cr/world/tile/WaterTile.java
new water tile
Ripple Image
Water tests
cleaning
removed stones from bottomlayer
Merge remote-tracking branch 'origin/Crafting-2'

Conflicts:
	src/com/cr/world/TileLayer.java
	src/com/cr/world/TileMap.java
	src/com/cr/world/World.java
	src/com/cr/world/tile/WaterTile.java