icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.16

Browse Source 
# Conflicts:
#	src/main/java/carpet/utils/BlockInfo.java
This commit is contained in:
gnembon committed 2020-05-20 10:41:04 -03:00
2 parents b51078e427 864c9450f7
commit 838211edba
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/utils/BlockInfo.java
+2 -2
View File
@@ -130,14 +130,14 @@ public class BlockInfo
put(Material.CARPET , "carpet" );
put(Material.PLANT , "plant" );
put(Material.UNDERWATER_PLANT, "water_plant" );
put(Material.REPLACEABLE_PLANT, "vine" );
put(Material.REPLACEABLE_PLANT, "vegetation" );
put(Material.REPLACEABLE_UNDERWATER_PLANT , "sea_grass" );
put(Material.WATER , "water" );
put(Material.BUBBLE_COLUMN , "bubble_column");
put(Material.LAVA , "lava" );
put(Material.SNOW_LAYER , "snow_layer" );
put(Material.FIRE , "fire" );
put(Material.SUPPORTED , "redstone_bits");
put(Material.SUPPORTED , "decoration" );
put(Material.COBWEB , "cobweb" );
put(Material.REDSTONE_LAMP , "redstone_lamp");
put(Material.ORGANIC_PRODUCT , "clay" );