manual update of all master commits up to ca86fa8

This commit is contained in:
Progwml6 committed 2013-11-25 14:08:18 -05:00
1 parent 14d357ccf6
commit 983c91c2c9
48 files changed
+680 -158

No files matched your search

@@ -58,8 +58,8 @@ public class TClientEvents
/* Liquids */
Icon[] stillIcons = new Icon[1];
Icon[] flowIcons = new Icon[1];
Icon[] stillIcons = new Icon[2];
Icon[] flowIcons = new Icon[2];
@ForgeSubscribe
public void preStitch (TextureStitchEvent.Pre event)