Petr Mrázek
10b3ddd1ae
Meh.
2014-01-05 18:11:43 +01:00
Petr Mrázek
427a1774a6
Fix tests for master
2014-01-05 17:41:39 +01:00
Petr Mrázek
6bf5c362ba
Merge branch 'updater-tweak' into develop
2014-01-05 16:54:03 +01:00
Petr Mrázek
ced640f68c
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-05 16:53:51 +01:00
Petr Mrázek
0dcf694c87
More updater fixage
...
Preserve --dir parameter after updating
Allow more than one copy of a command line parameter in MultiMC
Linux runner script no longer changes current directory, which allows '--dir .'
Fixed unit tests, removed the obsolete one (for some legacy updater command line params that were also removed)
[fixes 63127704]
2014-01-05 16:47:12 +01:00
Petr Mrázek
a64eebf8eb
Add an option to force using local updater binary (for updater development)
2014-01-05 14:24:33 +01:00
Petr Mrázek
613c01dab5
Some more updater fixes
...
Paths were wrong - still used work directory instead of root
2014-01-05 13:17:42 +01:00
Forkk
ebc14a9d9d
Prepend a 5 to version strings.
2014-01-04 21:44:18 -06:00
Forkk
ee02eecfdc
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-04 19:47:28 -06:00
Forkk
d30962bf00
Implement changing update channels
...
Allow the user to select which update channel they would like to
download updates from.
2014-01-04 19:46:47 -06:00
Petr Mrázek
76f58eb42c
Fix logging string derp on OSX
2014-01-05 02:43:25 +01:00
Sky
ffacaba1aa
Fix settings dialog tab ordering again
2014-01-05 01:00:29 +00:00
Sky
7d5fb1e99b
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-05 00:14:10 +00:00
Sky
79158144df
Implement the beloved right click context menu. Just a copy of the instance toolbar
2014-01-05 00:06:59 +00:00
Petr Mrázek
b49fa9d2a9
Mess with the updater again.
2014-01-05 00:06:55 +01:00
Petr Mrázek
e558584af0
Fix library column stretching
2014-01-04 23:45:20 +01:00
Petr Mrázek
8fa69307d2
Fix mod list checkboxes
2014-01-04 23:45:20 +01:00
Jan Dalheimer
8950953d91
Hopefully fix Qt 5.1 compilation
2014-01-04 19:20:20 +01:00
Jan Dalheimer
7f6b344b49
Clean up/update translation code and made language selectable in the settings dialog
2014-01-04 16:13:28 +01:00
Jan Dalheimer
9bbbb05060
Add xnrand to the translation credits
2014-01-04 13:35:15 +01:00
xnrand
0885668292
Update mmc_de.ts
...
Fixed grammar, improved wording.
It's not perfect but definitely better.
2014-01-04 13:02:07 +01:00
Jan Dalheimer
0f1a3329e4
Du/Sie consistency
2014-01-04 12:58:47 +01:00
Jan Dalheimer
998a14c95d
Update the german translation
2014-01-04 11:54:51 +01:00
Jan Dalheimer
3b97e3c363
Fix a few things related to the translations
2014-01-04 11:49:06 +01:00
Jan Dalheimer
116a6458b5
Explicitly set the close button to be the default button
2014-01-03 21:11:33 +01:00
Jan Dalheimer
df1186e021
Add the option to disable a certain message
2014-01-03 21:05:03 +01:00
Jan Dalheimer
71e1410b9f
Don't try to check for notifications if we don't have a URL for it
2014-01-03 20:39:21 +01:00
Jan Dalheimer
df9f9a34ef
Fix for pre-Qt5.2
2014-01-03 20:12:37 +01:00
Jan Dalheimer
b3dd1eba21
Notifications system. Mainly to be used in case the updater breaks.
2014-01-03 19:19:27 +01:00
Petr Mrázek
c35012f1a5
DEBUG: Add some logging for instance loading.
2014-01-03 02:42:32 +01:00
Petr Mrázek
f399207ae0
Log version, work paths
2014-01-03 02:29:05 +01:00
Petr Mrázek
1455f051e4
Force cached updater binary to always resolve as stale
2014-01-02 23:58:53 +01:00
Sky
52bbf07fe5
Clean out old assets stuff, fix button hitbox regression
2014-01-02 22:10:21 +00:00
Sky
66ee0d4955
Tweak "More..." to "More news..."
2014-01-02 20:59:45 +00:00
Forkk
394360a5fc
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
2014-01-02 14:39:54 -06:00
Forkk
431cfbc60a
Implement the news button
...
Make the news button open the latest news post in the user's web
browser.
Also remove the webkit dependency. I was planning on using it to
display the news in a custom window, but we'll just use the user's
browser for now.
2014-01-02 14:37:56 -06:00
Sky
f08c0e3141
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-02 19:49:12 +00:00
Sky
47d577b766
Don't show extra space in status bar, tweak "none selected" message
2014-01-02 19:47:34 +00:00
Forkk
17f1864a71
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
...
Conflicts:
CMakeLists.txt
gui/MainWindow.h
2014-01-02 13:38:20 -06:00
Forkk
4495e20cd7
Add news checking system and news toolbar
2014-01-02 13:25:38 -06:00
Sky
aa5f2c8120
Merge pull request #32 from 02JanDal/feature_ico_icons
...
Make .ico files usable (the plugin is already included)
2014-01-02 10:16:25 -08:00
Jan Dalheimer
c0b6fd0647
Make .ico files usable (the plugin is already included)
2014-01-02 18:51:40 +01:00
Petr Mrázek
c85789e249
Merge pull request #31 from max96at/feature_osx_polish
...
Improved java detection on OSX.
2014-01-02 08:09:57 -08:00
max96at
092b15fc87
Removed incomplete osx java detection log message
2014-01-02 17:07:47 +01:00
Noah Mayr
cdebeff179
Improved java detection on OSX.
2014-01-02 17:01:26 +01:00
Petr Mrázek
aed3ddda29
Merge pull request #30 from max96at/feature_osx_polish
...
Fixed buttons on osx and added .DS_Store to the gitignore file.
2014-01-02 06:28:13 -08:00
Noah Mayr
1bdac97af5
Fixed buttons on osx by adding the accessible plugin.
2014-01-02 15:22:57 +01:00
Noah Mayr
4af5bef66f
Added .DS_Store to .gitignore.
2014-01-02 14:15:44 +01:00
Sky
eb4e7d3f67
Save/restore settings dialog (and instance specific settings) window geometry
2014-01-02 02:20:34 +00:00
Sky
7f89da2043
More credits tweaking
2014-01-01 22:35:59 +00:00
