Projects >> MinecraftForge >>7147cdb1c13900ca621f25c691a0f44bd28dfd73

Chunk
Conflicting content
        TEXT,
        HEALTHMOUNT,
        JUMPBAR,
<<<<<<< HEAD
        PLAYER_LIST
=======
        CHAT
>>>>>>> cba1de122aec07d62d2bf62d71b98296e53b9983
    }

    public final float partialTicks;
Solution content
    }
        JUMPBAR,
        TEXT,
        HEALTHMOUNT,
        CHAT,
        PLAYER_LIST

    public final float partialTicks;
File
RenderGameOverlayEvent.java
Developer's decision
Manual
Kind of conflict
Enum value