mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 12:42:53 +00:00
merge onflict
This commit is contained in:
3 files changed
+6
-2
No files matched your search
@@ -207,7 +207,11 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
|
||||
VerticalBrick("verticalbrick", "verticalCeramicBricks"),
|
||||
VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"),
|
||||
VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks");
|
||||
|
||||
|
||||
/**
|
||||
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
|
||||
*/
|
||||
|
||||
private static final TileType[] VALUES = values();
|
||||
private final String id;
|
||||
private final String name;
|
||||
@@ -544,4 +548,4 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
|
||||
return type.icons[layer];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user