Merge branch 'release-0.3' into develop
This commit is contained in:
commit
902dc50c87
@ -93,8 +93,8 @@ SET(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch
|
||||
|
||||
######## Set version numbers ########
|
||||
SET(MultiMC_VERSION_MAJOR 0)
|
||||
SET(MultiMC_VERSION_MINOR 2)
|
||||
SET(MultiMC_VERSION_HOTFIX 1)
|
||||
SET(MultiMC_VERSION_MINOR 3)
|
||||
SET(MultiMC_VERSION_HOTFIX 0)
|
||||
|
||||
# Build number
|
||||
SET(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
|
||||
|
@ -31,3 +31,23 @@
|
||||
- Update to the German translation.
|
||||
0.2.1:
|
||||
- Hotfix - move the native library extraction into the onesix launcher part.
|
||||
0.3:
|
||||
- Improved instance view
|
||||
- Overhauled 1.6+ version loading
|
||||
- There is no longer a single custom.json file that overrides version.json
|
||||
- Instead there are now "patch" files in <instance>/patches/, one for each main tweaker (forge, liteloader etc.)
|
||||
- These patches are applied after version.json in a customisable order,
|
||||
- A list of these files is shown in the left most tab in the Edit Mods dialog, where a list of libraries was shown before.
|
||||
- custom.json can still be used for overriding everything.
|
||||
- Offline mode can be used even when online
|
||||
- Show an "empty" message in version selector dialogs
|
||||
- Fix FTB paths on windows
|
||||
- Tooling support
|
||||
- JProfiler
|
||||
- JVisualVM
|
||||
- MCEdit
|
||||
- Don't assume forge in FTB instances and allow other libraries (liteloader, mcpatcher, etc.) in FTB instances
|
||||
- Screenshot uploading/managing
|
||||
- Instance badges
|
||||
- Some pre/post command stuff (remove the timeout, variable substitution)
|
||||
- Fix logging when the system language is not en_US
|
@ -186,6 +186,11 @@ void ConsoleWindow::toggleConsole()
|
||||
QScrollBar *bar = ui->text->verticalScrollBar();
|
||||
if (isVisible())
|
||||
{
|
||||
if(!isActiveWindow())
|
||||
{
|
||||
activateWindow();
|
||||
return;
|
||||
}
|
||||
int max_bar = bar->maximum();
|
||||
int val_bar = m_last_scroll_value = bar->value();
|
||||
m_scroll_active = (max_bar - val_bar) <= 1;
|
||||
@ -194,6 +199,7 @@ void ConsoleWindow::toggleConsole()
|
||||
else
|
||||
{
|
||||
show();
|
||||
isTopLevel();
|
||||
if (m_scroll_active)
|
||||
{
|
||||
bar->setValue(bar->maximum());
|
||||
|
Loading…
Reference in New Issue
Block a user