Bump version to 2.4 for develop branch (release target 2.5)
Merge branch 'master' into develop
hotfix to release branch
Merge branch 'master' into develop
Merge branch 'master' into develop
added support for optirun on Linux
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Implemented a non-platform specific option where a user can specify a program to run the JRE within.
If rename to temp folder fails, do copy and delete.
VoxelMap added to hard whitelist.
Removal of optional jar mods should now trigger a jar rebuild.
Added NoOverwrite to XML spec
Read/write NoOverwrite element
Handle NoOverwrite during update.
Switch ConsoleArea to JTextPane
Enable JUL Handler for ConsoleArea