Bernhard Bonigl 947da8f9df Merge branch 'master' into weaponry ...

Conflicts:
	src/main/java/tconstruct/tools/ToolProxyClient.java

2014-10-26 17:10:09 +01:00

..

assets/tinker

Merge branch 'master' into weaponry

2014-10-26 17:10:09 +01:00

META-INF

Slimy trait now has a small chance to summon a small slime when breaking blocks :3

2014-10-21 17:10:28 +02:00

mcmod.info

Update mcmod.info (remove coremod)

2014-09-18 14:35:47 +02:00

pack.mcmeta

restore te3 recipe plugin

2014-05-10 17:28:30 -04:00