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

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

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

..

ItemModTypeFilter.java

The return of achievements

2014-09-09 18:30:15 +10:00

ModAntiSpider.java

The return of achievements

2014-09-09 18:30:15 +10:00

ModAttack.java

The return of achievements

2014-09-09 18:30:15 +10:00

ModAutoSmelt.java

Update modifiers, start travellers gear

2014-06-30 22:26:00 -08:00

ModBlaze.java

The return of achievements

2014-09-09 18:30:15 +10:00

ModBoolean.java

Update modifiers, start travellers gear

2014-06-30 22:26:00 -08:00

ModButtertouch.java

The return of achievements

2014-09-09 18:30:15 +10:00

ModCreativeToolModifier.java

Update modifiers, start travellers gear

2014-06-30 22:26:00 -08:00

ModDurability.java

Update modifiers, start travellers gear

2014-06-30 22:26:00 -08:00

ModExtraModifier.java

The return of achievements

2014-09-09 18:30:15 +10:00

ModFlux.java

Merge branch 'master' into weaponry

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

ModInteger.java

Update modifiers, start travellers gear

2014-06-30 22:26:00 -08:00

ModLapis.java

The return of achievements

2014-09-09 18:30:15 +10:00

ModPiston.java

The return of achievements

2014-09-09 18:30:15 +10:00

ModPotion.java

Update modifiers, start travellers gear

2014-06-30 22:26:00 -08:00

ModRedstone.java

Redstone-Modifier for bows and similar!

2014-10-09 17:35:49 +02:00

ModReinforced.java

Update modifiers, start travellers gear

2014-06-30 22:26:00 -08:00

ModRepair.java

The return of achievements

2014-09-09 18:30:15 +10:00

ModSmite.java

The return of achievements

2014-09-09 18:30:15 +10:00

ModToolRepair.java

Make modifiers only applicable to their valid types. Fix some inconsistencies with that. Might possibly contain bugs still.

2014-09-24 00:47:06 +02:00

ModWindup.java

Redstone-Modifier for bows and similar!

2014-10-09 17:35:49 +02:00