Merge branch 'mc-1.9.4' of https://github.com/ForestryMC/ForestryMC into Greenhouse-Climate-Fix

This commit is contained in:
Nedelosk committed 2016-06-13 21:49:05 +02:00
commit fcd3ee6feb
75 files changed
+919 -767

No files matched your search

@@ -16,6 +16,10 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
<<<<<<< HEAD
=======
>>>>>>> 6ddc9f307918a66671aa307635bfce8f15b546d3
import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;