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

src/main/resources/assets/betterend/sounds.json

@@ -99,6 +99,31 @@
 			}
 		]
 	},
+	"betterend.music.caves": {
+		"category": "music",
+		"sounds": [
+			{
+				"name": "betterend:music/godmode-future_rennaisance",
+				"volume": 0.1,
+				"stream": false
+			},
+			{
+				"name": "betterend:music/futuremono-moonrise",
+				"volume": 0.1,
+				"stream": false
+			},
+			{
+				"name": "betterend:music/emmit_fenn-wander",
+				"volume": 0.1,
+				"stream": false
+			},
+			{
+				"name": "betterend:music/corbyn_kites-orbit",
+				"volume": 0.1,
+				"stream": false
+			}
+		]
+	},
 	
 	"betterend.ambient.foggy_mushroomland": {
 		"category": "ambient",
@@ -184,6 +209,16 @@
 			}
 		]
 	},
+	"betterend.ambient.caves": {
+		"category": "ambient",
+		"sounds": [
+			{
+				"name": "betterend:ambient/caves",
+				"volume": 0.5,
+				"stream": false
+			}
+		]
+	},
 	
 	"betterend.entity.dragonfly": {
 		"category": "entity",

src/main/resources/betterend.mixins.common.json

@@ -34,6 +34,7 @@
 		"AnvilMenuMixin",
 		"TagLoaderMixin",
 		"EnderManMixin",
+		"EndSpikeMixin",
 		"MonsterMixin",
 		"EntityMixin",
 		"PlayerMixin",