merge onflict

This commit is contained in:
Martin Robertz committed 2026-03-19 21:27:18 +01:00
1 parent 1b0c1bb3f3
commit 28989257fd
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];
}
}
}
}