Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2025-01-03 22:37:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2019-12-08 17:38:49 -05:00
commit afb43c27a6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables:
name: "SongodaCore"
path: "/builds/$CI_PROJECT_PATH"
version: "2.2.11"
version: "2.2.12"
build:
stage: build

4
Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
View File

@ -348,7 +348,7 @@ public enum CompatibleMaterial {
END_PORTAL_FRAME("ENDER_PORTAL_FRAME"),
END_ROD,
END_STONE("ENDER_STONE"),
END_STONE_BRICKS,
END_STONE_BRICKS("END_BRICKS"),
END_STONE_BRICK_SLAB(),
END_STONE_BRICK_STAIRS,
END_STONE_BRICK_WALL,
@ -617,7 +617,7 @@ public enum CompatibleMaterial {
NETHERRACK,
NETHER_BRICK("NETHER_BRICK_ITEM"),
NETHER_BRICKS("NETHER_BRICK"),
NETHER_BRICK_FENCE(),
NETHER_BRICK_FENCE("NETHER_FENCE"),
NETHER_BRICK_SLAB("STEP", (byte) 6),
NETHER_BRICK_STAIRS,
NETHER_BRICK_WALL,