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

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

2014-10-14 23:20:38 +02:00

..

blocks

Prevent crash that sometimes happens when placing a tool/part/stencil whatever station block.

2014-10-01 21:13:27 +02:00

entity

Fixed arrow dupe, arrow loss, arrows taking up too many inventory slots.

2014-09-29 21:30:52 +02:00

gui

Redstone-Modifier for bows and similar!

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

inventory

There should be a framework for working with multiple areas in one GUI

2014-09-25 21:08:02 +02:00

itemblocks

The return of achievements

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

items

Merge branch 'master' into weaponry

2014-10-14 23:20:38 +02:00

logic

Fix internal inventory size of crafting stations.

2014-10-13 11:14:07 +02:00

model

Toolforges are not pattern chests.

2014-10-07 22:15:32 +02:00

BowRecipe.java

Reverted Tool Recipe changes, made colorizing use NBT

2014-09-21 11:43:53 +02:00

TActiveOmniMod.java

Fix autosmelt smelting even if the black can't be harvested with the tool #1053

2014-10-05 17:42:43 +02:00

TDispenserBehaviorArrow.java

The return of achievements

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

TinkerToolEvents.java

Merge branch 'master' into weaponry

2014-10-10 12:45:10 +02:00

TinkerTools.java

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

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

ToolProxyClient.java

Fix colors for fletchlings on arrows

2014-10-10 13:06:34 +02:00

ToolProxyCommon.java

Made battlesigns have editable text

2014-09-12 23:59:13 +10:00