diff --git a/pom.xml b/pom.xml index fe6a40c..8747c3b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.diddiz logblock - 1.11-SNAPSHOT + 1.12-SNAPSHOT jar LogBlock @@ -42,7 +42,7 @@ org.bukkit bukkit - 1.11-R0.1-SNAPSHOT + 1.12-R0.1-SNAPSHOT provided diff --git a/src/main/java/de/diddiz/util/BukkitUtils.java b/src/main/java/de/diddiz/util/BukkitUtils.java index 02f4b73..4fedab3 100644 --- a/src/main/java/de/diddiz/util/BukkitUtils.java +++ b/src/main/java/de/diddiz/util/BukkitUtils.java @@ -95,6 +95,7 @@ public class BukkitUtils { relativeTopFallables.add(Material.GRAVEL); relativeTopFallables.add(Material.DRAGON_EGG); relativeTopFallables.add(Material.ANVIL); + relativeTopFallables.add(Material.CONCRETE_POWDER); // Blocks that break falling entities fallingEntityKillers = new HashSet(32); diff --git a/src/main/java/de/diddiz/util/MaterialName.java b/src/main/java/de/diddiz/util/MaterialName.java index 9c763bd..b85ce91 100644 --- a/src/main/java/de/diddiz/util/MaterialName.java +++ b/src/main/java/de/diddiz/util/MaterialName.java @@ -178,10 +178,12 @@ public class MaterialName { for (byte i = 0; i < 16; i++) { cfg.set("351." + i, toReadable(Material.INK_SACK.getNewData(i))); cfg.set("35." + i, COLORS[i] + " wool"); - cfg.set("159." + i, COLORS[i] + " stained clay"); + cfg.set("159." + i, COLORS[i] + " stained terracotta"); cfg.set("95." + i, COLORS[i] + " stained glass"); cfg.set("160." + i, COLORS[i] + " stained glass pane"); cfg.set("171." + i, COLORS[i] + " carpet"); + cfg.set("251." + i, COLORS[i] + " concrete"); + cfg.set("252." + i, COLORS[i] + " concrete powder"); } for (byte i = 0; i < 6; i++) { cfg.set("125." + i, toReadable(Material.WOOD_DOUBLE_STEP.getNewData(i))); @@ -194,7 +196,7 @@ public class MaterialName { getLogger().log(Level.WARNING, "Unable to save material.yml: ", ex); } } - if (cfg.getString("263.1") == null) { + if (cfg.getString("252.1") == null) { getLogger().info("[Logblock-names] Logblock's default materials.yml file has been updated with more names"); getLogger().info("[Logblock-names] Consider deleting your current materials.yml file to allow it to be recreated"); }