Files
Chisel/src/main/java/com/cricketcraft/chisel/init
tterrag1098 4a8963a80b 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
2015-02-19 19:11:16 -05:00
..
2015-02-19 17:13:16 -05:00