Christian 300f471c57 Merge branch 'mithionchanges' of github.com:Mithion/MinecraftForge into mithionchanges ... Fix up code for minecraftforge style. Clean up patches. Conflicts: common/forge_at.cfg patches/minecraft/net/minecraft/block/Block.java.patch		2013-03-23 16:56:01 -04:00
..
net/minecraft	Merge branch 'mithionchanges' of github.com:Mithion/MinecraftForge into mithionchanges	2013-03-23 16:56:01 -04:00