Bernhard Bonigl f31e41447c Merge branch 'master' into weaponry ...

Conflicts:
	src/main/java/tconstruct/items/tools/Arrow.java
	src/main/java/tconstruct/tools/TinkerTools.java

2014-10-19 14:12:50 +02:00

..

Bowstring.java

The return of achievements

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

CreativeModifier.java

Fixed target lock of creative modifiers not being localized

2014-09-20 06:08:19 -07:00

Fletching.java

Spontanously added slimeleaf fletchling

2014-10-05 22:52:12 +02:00

Manual.java

The return of achievements

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

ManualInfo.java

The return of achievements

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

MaterialItem.java

The return of achievements

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

Pattern.java

The return of achievements

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

TitleIcon.java

The return of achievements

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

ToolPart.java

Remove last usage of ToolPart and fix possible crash with displaying parts

2014-10-12 12:24:41 +02:00

ToolPartHidden.java

Remove the need for ToolPartHidden.

2014-09-22 14:36:50 +02:00

ToolShard.java

Give ToolShards the DynamicToolPart treatment

2014-10-18 17:02:43 +02:00