Merge branch 'master' into flattening_test

This commit is contained in:
Vincent Lee committed 2017-12-16 12:45:00 -06:00
commit 02fbb7f957
51 files changed
+168 -184

No files matched your search

@@ -60,12 +60,13 @@ import vazkii.botania.common.item.block.ItemBlockModSlab;
import vazkii.botania.common.item.block.ItemBlockSpecialQuartz;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@Mod.EventBusSubscriber
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
public final class ModFluffBlocks {
public static List<Block> slabsToRegister = new ArrayList<>();