Merge remote-tracking branch 'origin/Cricket' into dev

Conflicts:
	src/main/java/com/cricketcraft/chisel/Chisel.java
	src/main/java/com/cricketcraft/chisel/Features.java
	src/main/java/com/cricketcraft/chisel/config/Configurations.java
	src/main/resources/assets/chisel/textures/items/chisel_obsidian.png
This commit is contained in:
tterrag1098 committed 2015-02-19 19:11:16 -05:00
commit bf4ce506e5
11 files changed
+282 -389

No files matched your search

File diff suppressed because it is too large. Load diff