Merge 1.14

This commit is contained in:
Vincent Lee committed 2020-03-03 10:34:38 -06:00
commit f91dd3873f
110 files changed
+1981 -1939

No files matched your search

@@ -321,7 +321,7 @@ public final class ModFluffBlocks {
base = r.getValue(prefix(LibBlockNames.ELF_GLASS));
register(r, new BlockModPane(Block.Properties.from(base)), LibBlockNames.ELF_GLASS + "_pane");
base = r.getValue(prefix(LibBlockNames.BIFROST));
base = r.getValue(prefix(LibBlockNames.BIFROST_PERM));
register(r, new BlockModPane(Block.Properties.from(base)), LibBlockNames.BIFROST + "_pane");
}