Merge branch '1.5.2' into 1.6.2

Conflicts:
	src/main/java/net/aetherteam/aether/Aether.java
	src/main/java/net/aetherteam/aether/AetherMoaColour.java
	src/main/java/net/aetherteam/aether/AetherNameGen.java
	src/main/java/net/aetherteam/aether/AetherRanks.java
	src/main/java/net/aetherteam/aether/FrostDamageSource.java
	src/main/java/net/aetherteam/aether/MenuBaseAetherII.java
	src/main/java/net/aetherteam/aether/blocks/BlockAercloud.java
	src/main/java/net/aetherteam/aether/blocks/BlockAetherBed.java
	src/main/java/net/aetherteam/aether/blocks/BlockBronzeDoor.java
	src/main/java/net/aetherteam/aether/blocks/BlockChristmasLeaves.java
	src/main/java/net/aetherteam/aether/blocks/BlockDungeon.java
	src/main/java/net/aetherteam/aether/blocks/BlockDungeonHolystone.java
	src/main/java/net/aetherteam/aether/blocks/BlockEntranceDoor.java
	src/main/java/net/aetherteam/aether/blocks/BlockHolystone.java
	src/main/java/net/aetherteam/aether/blocks/BlockTrap.java
	src/main/java/net/aetherteam/aether/client/gui/GuiAetherContainerCreative.java
	src/main/java/net/aetherteam/aether/client/gui/GuiInventoryAether.java
	src/main/java/net/aetherteam/aether/client/gui/donator/GuiDonatorCape.java
	src/main/java/net/aetherteam/aether/client/gui/donator/GuiDonatorMenu.java
	src/main/java/net/aetherteam/aether/client/gui/donator/GuiDonatorMoa.java
	src/main/java/net/aetherteam/aether/client/gui/dungeons/GuiCreateDungeonParty.java
	src/main/java/net/aetherteam/aether/client/gui/dungeons/GuiDungeonEntrance.java
	src/main/java/net/aetherteam/aether/client/gui/menu/GuiAetherIIButton.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiCreateParty.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiDungeonScreen.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiEditPartyName.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiJoinParty.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiManageMembers.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiManagePartyMember.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiMemberList.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiMenu.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiParty.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiPartyEdit.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiPartyList.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiPartyMenu.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiPartyRequest.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiPlayerList.java
	src/main/java/net/aetherteam/aether/client/gui/social/GuiPlayerSlot.java
	src/main/java/net/aetherteam/aether/client/gui/social/PartyView.java
	src/main/java/net/aetherteam/aether/client/gui/social/options/GuiOptions.java
	src/main/java/net/aetherteam/aether/client/gui/social/options/GuiOptionsCoinbar.java
	src/main/java/net/aetherteam/aether/client/gui/social/options/GuiOptionsNotification.java
	src/main/java/net/aetherteam/aether/client/gui/social/options/GuiOptionsParty.java
	src/main/java/net/aetherteam/aether/client/renders/RenderNPC.java
	src/main/java/net/aetherteam/aether/client/renders/RenderZephyroo.java
	src/main/java/net/aetherteam/aether/commands/CommandTeleport.java
	src/main/java/net/aetherteam/aether/dungeons/DungeonHandler.java
	src/main/java/net/aetherteam/aether/dungeons/DungeonType.java
	src/main/java/net/aetherteam/aether/dungeons/keys/EnumKeyType.java
	src/main/java/net/aetherteam/aether/entities/EntityColdLightningBolt.java
	src/main/java/net/aetherteam/aether/entities/EntityProjectileBase.java
	src/main/java/net/aetherteam/aether/entities/EntityValkyrie.java
	src/main/java/net/aetherteam/aether/entities/bosses/EntityLabyrinthEye.java
	src/main/java/net/aetherteam/aether/entities/bosses/EntitySentryGuardian.java
	src/main/java/net/aetherteam/aether/entities/bosses/EntitySlider.java
	src/main/java/net/aetherteam/aether/entities/bosses/EntitySliderHostMimic.java
	src/main/java/net/aetherteam/aether/items/AetherItems.java
	src/main/java/net/aetherteam/aether/items/ItemCloudParachute.java
	src/main/java/net/aetherteam/aether/items/ItemContinuum.java
	src/main/java/net/aetherteam/aether/items/ItemShardOfLife.java
	src/main/java/net/aetherteam/aether/items/ItemSkyrootBucket.java
	src/main/java/net/aetherteam/aether/notifications/Notification.java
	src/main/java/net/aetherteam/aether/notifications/NotificationHandler.java
	src/main/java/net/aetherteam/aether/notifications/actions/PartyRequestAction.java
	src/main/java/net/aetherteam/aether/notifications/client/GuiNotification.java
	src/main/java/net/aetherteam/aether/notifications/client/GuiNotificationList.java
	src/main/java/net/aetherteam/aether/notifications/client/GuiNotificationSlot.java
	src/main/java/net/aetherteam/aether/notifications/client/GuiPlayerRequestSlot.java
	src/main/java/net/aetherteam/aether/notifications/client/GuiRequestPlayer.java
	src/main/java/net/aetherteam/aether/notifications/client/GuiViewNotification.java
	src/main/java/net/aetherteam/aether/notifications/description/DungeonRequestContents.java
	src/main/java/net/aetherteam/aether/notifications/description/PartyRequestContents.java
	src/main/java/net/aetherteam/aether/oldcode/EntityFireMonster.java
	src/main/java/net/aetherteam/aether/oldcode/GuiSunAltar.java
	src/main/java/net/aetherteam/aether/oldcode/SpeakerLine.java
	src/main/java/net/aetherteam/aether/overlays/AetherOverlays.java
	src/main/java/net/aetherteam/aether/packets/PacketDungeonQueueChange.java
	src/main/java/net/aetherteam/aether/packets/PacketNotificationChange.java
	src/main/java/net/aetherteam/aether/party/PartyController.java
	src/main/java/net/aetherteam/aether/party/PartyType.java
	src/main/java/net/aetherteam/aether/tile_entities/TileEntityEntranceRenderer.java
	src/main/java/net/aetherteam/mainmenu_api/MenuBase.java
	src/main/java/net/aetherteam/mainmenu_api/MenuBaseConfig.java
	src/main/java/net/aetherteam/mainmenu_api/MenuBaseLoaderWithSlider.java
	src/main/java/net/aetherteam/mainmenu_api/MenuBaseMinecraft.java
	src/main/java/net/aetherteam/playercore_api/asm/PlayerCoreTransformer.java