0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,007 Commits 1 Branch 0 Tags 29 MiB
7f2a16917e
Commit Graph

1007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Petr Mrázek
3fabb11f4c Marginally improve OneSix offline mode launch 
While reconstructing assets, skip files that don't exist.
Report missing OneSix native libraries.
 2014-01-18 22:11:33 +01:00
Petr Mrázek
8650aa81f0 Fix settings dialog when offline 2014-01-18 10:31:34 +01:00
Petr Mrázek
ecc80bd763 Change the native extraction/loading logic. 2014-01-18 03:33:04 +01:00
Orochimarufan
188d0d5886 Improve Console window output. 
-> Log Pre- and Post-Launch command happenings
-> Enable the java part to specify the level

TODO: fix logging with mc 1.7's log4j logging infrastructure

Signed-off-by: Orochimarufan <orochimarufan.x3@gmail.com>
 2014-01-17 22:55:10 +01:00
Petr Mrázek
7b96d74d3b Sort forge versions right. Do not spam the multimc log with mc server status stuff. 2014-01-16 23:06:07 +01:00
Petr Mrázek
d85e820a07 Fix FTB. 
Add support of private packs.
Fix instance ID problems related to FTB instances.
 2014-01-15 22:49:37 +01:00
Petr Mrázek
555cbe00ce Do not use the java checker during instance update 2014-01-14 01:13:35 +01:00
Petr Mrázek
4744ea07a8 Small fix for stale files getting stuck in the cache 2014-01-13 02:19:20 +01:00
Petr Mrázek
85ff1657fd Merge branch 'feature_better_launch' into develop 2014-01-12 23:56:19 +01:00
Petr Mrázek
afd1778fd7 Fix window title problem on OSX. 2014-01-12 23:38:12 +01:00
Petr Mrázek
54a9ee5eb0 Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 into develop 
Conflicts:
	gui/dialogs/SettingsDialog.cpp
	gui/dialogs/SettingsDialog.ui
 2014-01-12 23:04:05 +01:00
Petr Mrázek
f552366e03 Merge branch 'feature_mojang_status' into develop 2014-01-12 22:34:53 +01:00
Petr Mrázek
b589a12d17 Merge branch 'feature_better_launch' into develop 2014-01-12 22:17:14 +01:00
Petr Mrázek
fca4441229 Replace old launcher part with a shiny new one. No more garbage on the command line. 2014-01-12 21:57:34 +01:00
Sky
398167e8b0 More space between status items 2014-01-12 18:44:54 +00:00
Sky
500581d095 More comments removal 2014-01-12 18:42:02 +00:00
Sky
c51090dcff Remove wrong comments 2014-01-12 18:34:43 +00:00
Sky
a774b3d248 Show Mojang service statuses in status bar 2014-01-12 18:28:42 +00:00
Petr Mrázek
498520446f Merge https://github.com/Drayshak/MultiMC5 into develop 2014-01-11 02:21:26 +01:00
Petr Mrázek
d52079e734 No more generated resources. 2014-01-11 02:17:51 +01:00
Petr Mrázek
43a39a3bfb Harden CacheDownload. 
It's now super hard. SRSLY.
 2014-01-11 02:06:22 +01:00
Sky
c00946c855 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-11 00:22:21 +00:00
Sky
088ad07a80 Show active account skin whilst it's checked for updates 2014-01-11 00:22:08 +00:00
Petr Mrázek
8e286c2b5c Make CacheDownload use QSaveFile 2014-01-10 22:08:00 +01:00
Sky
9ddf2aec31 Add tooltips to Java memory spinboxes 2014-01-10 13:16:31 +00:00
Sky
3c189a6553 Hide user properties in the console too 2014-01-10 12:52:14 +00:00
Sky
86b6cdfcb3 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-09 15:42:44 +00:00
Sky
e6201f9ff7 Add "MB" as a suffix to memory spinboxes 2014-01-09 15:30:21 +00:00
Forkk
52c9cd5497 Make the GitHub link in the about dialog clickable 
Fixes #38
 2014-01-08 23:38:34 -06:00
Forkk
0e22e4b399 Merge branch 'master' into develop 2014-01-08 22:52:49 -06:00
Forkk
48b587e7b6 Merge branch 'hotfix-0.1.1' 
This is a quick hotfix to correct the issue tracker URL. Forgot to do
so in the last release.
 2014-01-08 22:51:57 -06:00
Forkk
7d74c9bc25 Change the issue tracker URL to GitHub issues 
Bump hotfix version number and add an entry in the changelog.
 2014-01-08 22:51:21 -06:00
Forkk
0b1e0221f0 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-08 21:50:58 -06:00
Forkk
06b5fa5dcc Merge branch 'release-0.1' 
Release MultiMC version 0.1.
 2014-01-08 21:45:13 -06:00
Petr Mrázek
c51a993ff7 Add logging calls to the java checker. 2014-01-09 01:20:24 +01:00
Forkk
b767d4b134 Fix the window title 
The window title now says
"MultiMC 5 - Version <version> [on <platform>]"
 2014-01-08 18:02:15 -06:00
Forkk
b4fcbab513 Word wrap the update channel description label 
Previously, channel descriptions that were too long would mess up the
dialog.
 2014-01-08 17:56:38 -06:00
Forkk
7ace682260 Remove lies from the changelog 
There wasn't really an Optimus fix. LIES! ALL LIES!
 2014-01-08 17:54:23 -06:00
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