Petr Mrázek
5650a28fc6
Hopefully fix OSX icon file
2014-01-08 21:06:31 +01:00
Forkk
87b12a63a1
Make CMake output version type info
2014-01-07 19:30:08 -06:00
Forkk
d7564a51ce
Bump minor version number and update changelog.
2014-01-07 19:21:42 -06:00
Forkk
9bf4d08770
Add changelog.
2014-01-07 19:00:42 -06:00
Forkk
8dfc1028ee
Merge branch 'new-version-system' into develop
2014-01-07 18:47:06 -06:00
Forkk
3629f9b999
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-system
2014-01-07 18:31:49 -06:00
Forkk
a14eeab2d6
Add information to the about dialog.
2014-01-07 18:31:31 -06:00
Petr Mrázek
fb83299e59
Deploy jars instead of extracting them at runtime, remove non-working nvidia fix
2014-01-08 01:28:33 +01:00
Forkk
3202b972f8
Rework version numbering system.
...
Again...
2014-01-07 18:09:05 -06:00
Sky
28cb66e85c
Merge pull request #35 from 02JanDal/fix_keep_selection
...
Fix instances getting deselected after FTB instances are loaded (or when ever the model is reset, like on a reload)
2014-01-07 05:02:35 -08:00
Sky
7773e77150
Don't include debugging messages :(
2014-01-07 03:18:26 +00:00
Sky
5fe0ed7e8f
Return a properly sorted list of checked javas
2014-01-07 03:16:47 +00:00
Petr Mrázek
012b007e56
Do not log each and every possible update. Only the latest one.
2014-01-07 02:43:25 +01:00
Petr Mrázek
28c35ea0db
Fix proxy settings radio buttons not triggering updates of the proxy settings.
2014-01-07 02:19:26 +01:00
Petr Mrázek
267f18ca81
Add hack for Nvidia
2014-01-06 22:05:45 +01:00
Forkk
0a312d3b08
Implement proxy settings
2014-01-06 15:02:58 -06:00
Jan Dalheimer
093143cfef
Fix instances getting deselected after FTB instances are loaded (or whenever the model is reset)
2014-01-06 10:01:40 +01:00
Petr Mrázek
fcb8612c10
Implement console window tray icon, console window hiding, better scrolling
2014-01-06 02:52:51 +01:00
Petr Mrázek
ddb961fad5
Scroll console window for <= lines above the bottom instead of the very bottom.
2014-01-06 00:33:16 +01:00
Jan Dalheimer
7d76fd57e9
Get rid of some obsolete functions
2014-01-05 23:24:19 +01:00
Jan Dalheimer
6961525faa
Unbreak and reactivate the some UpdateChecker tests
2014-01-05 23:24:05 +01:00
Forkk
51817962aa
Attempt to fix including libxcb on debian.
...
Debian puts libxcb in some weird path...
2014-01-05 13:45:10 -06:00
Petr Mrázek
becaebd60d
Remove the $PWD hack and tests that depended on it.
2014-01-05 19:54:05 +01:00
Petr Mrázek
9417544ca6
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-05 19:41:32 +01:00
Forkk
4a0946ce03
Include xcb libraries in distributed packages
...
Unfortunately, this has become necessary due to Arch Linux's libxcb packages breaking ABI...
2014-01-05 12:37:23 -06:00
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
