Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/ru/betterend/item/ArmoredElytra.java
#	src/main/java/ru/betterend/registry/EndItems.java
#	src/main/resources/fabric.mod.json
This commit is contained in:
Aleksey 2021-05-04 10:40:19 +03:00
commit f7076457d2
23 changed files with 171 additions and 36 deletions

View file

@ -10,6 +10,7 @@ public class EndSounds {
public static final SoundEvent MUSIC_WATER = register("music", "water");
public static final SoundEvent MUSIC_DARK = register("music", "dark");
public static final SoundEvent MUSIC_OPENSPACE = register("music", "openspace");
public static final SoundEvent MUSIC_CAVES = register("music", "caves");
// Ambient
public static final SoundEvent AMBIENT_FOGGY_MUSHROOMLAND = register("ambient", "foggy_mushroomland");
@ -21,6 +22,7 @@ public class EndSounds {
public static final SoundEvent AMBIENT_SULPHUR_SPRINGS = register("ambient", "sulphur_springs");
public static final SoundEvent AMBIENT_UMBRELLA_JUNGLE = register("ambient", "umbrella_jungle");
public static final SoundEvent AMBIENT_GLOWING_GRASSLANDS = register("ambient", "glowing_grasslands");
public static final SoundEvent AMBIENT_CAVES = register("ambient", "caves");
// Entity
public static final SoundEvent ENTITY_DRAGONFLY = register("entity", "dragonfly");