Progwml6 07062a59d1 fix merge derps

2013-11-27 17:14:47 -05:00

..

armor

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

block

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

entity

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

event

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

gui

update to 1.5.1 RC2 c2cdb7

2013-11-25 19:40:43 -05:00

pages

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

tabs

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

CustomBowRenderer.java

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

CustomFont.java

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

RenderItemCopy.java

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

StepSoundSlime.java

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

SuperSoakerRender.java

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

TClientEvents.java

manual update of all master commits up to ca86fa8

2013-11-25 14:08:18 -05:00

TClientTickHandler.java

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

TControls.java

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

TKeyHandler.java

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

ToolCoreRenderer.java

Initial test of Gradle (not working yet)

2013-11-21 16:13:51 +00:00

TProxyClient.java

fix merge derps

2013-11-27 17:14:47 -05:00

TProxyClient.java.orig

Merge 1.7 prep into master.

2013-11-27 17:46:07 +00:00