Updated FML:
MinecraftForge/FML@23b070c7d02a8da44bf04c2f9ba2b485a44ad967 Alternative @SidedProxy setter for Scala.
MinecraftForge/FML@2cca7aa759b4b6c3a128ce43bbd924e4762c43c2 Some more Scala @SidedProxy adjustments. Now properly supporting pure singletons, i.e. object C {   @SidedProxy(...)   var proxy: P = null } Removed fallback, as all such singletons are properly handled by the new code now, and class implementations fall back to the code also used for plain Java mods.
MinecraftForge/FML@8517a824e5251c409e05999d42fc6d70497609f5 Merge declaration and initialization of a variable.
MinecraftForge/FML@a3a920437f3ede6841ae2c449a38975b02b28088 Merge pull request #230 from fnuecke/master
Add in a very simple stencil bit registry to try and arbitrate between mods wanting to use stencil bits in rendering
Fix blending on the hotbar. Closes #574
Remember x & z passed to getTopSolidOrLiquidBlock and use it for foliage tests. Fixes #575
Add hitInfo field to MovingObjectPosition for when an int doesn't suffice
Fix another NPE when Items are in Block range with custom renderers, Modders keep your items out of the block range! Closes #581
Fixed render count for stacks of blocks 40+ and distrabution of items based on scale. Closes #579
Merge pull request #584 from Chicken-Bones/hitinfo

Add hitInfo field to MovingObjectPosition for when an int doesn't suffice
Fixed some typos and added ability to launch MC in any folder