manual merges of up to 9a578fc

This commit is contained in:
Progwml6 committed 2013-12-11 23:47:07 -05:00
1 parent 655780cc0c
commit 0c9c8100ad
21 files changed
+218 -56

No files matched your search

@@ -138,8 +138,8 @@ public class SlimeGrass extends MantleBlock
public int idDropped (int metadata, Random random, int fortune)
{
if (metadata == 1)
return TRepo.craftedSoil.blockID;
else
return Block.dirt.blockID;
else
return TRepo.craftedSoil.blockID;
}
}