Merge branch '1.5.2-1' into 1.5.2

Conflicts:
	src/main/java/net/aetherteam/aether/sound/JukeboxData.java
	src/main/java/net/aetherteam/mainmenu_api/MenuBaseConfig.java
	src/main/java/net/aetherteam/mainmenu_api/MenuSoundLoader.java
old Fix