Bernhard Bonigl 939bd8a0ae Merge branch 'master' into weaponry ...

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

2014-10-24 13:17:48 +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

client

Rework dagger into a projectileBase entity!

2014-10-22 23:42:08 +02:00

entity

Rework dagger into a projectileBase entity!

2014-10-22 23:42:08 +02:00

gui

Merge branch 'master' into weaponry

2014-10-24 13:17:48 +02:00

inventory

Remove tool crafting code that doesn't work and shouldn't exist from tinker table. Also fixes crashes with ITT repair in tinker tables.

2014-10-22 19:56:25 +02:00

itemblocks

The return of achievements

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

items

Merge branch 'master' into weaponry

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

logic

Fix CraftingStation exposing old nonexistant slots through ISided

2014-10-22 17:36:48 +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

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

2014-10-21 17:10:28 +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

Merge branch 'master' into weaponry

2014-10-24 13:17:48 +02:00

ToolProxyClient.java

Merge branch 'master' into weaponry

2014-10-24 13:17:48 +02:00

ToolProxyCommon.java

Made battlesigns have editable text

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