diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-20 01:32:38 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-20 01:32:38 +0100 |
| commit | 222d3c0dc5a8b8a9e93b9368e964cda7becc7f02 (patch) | |
| tree | 9ab4538f2e80847874a7c9a5c7c2dbc099cb8cae | |
| parent | 48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0 (diff) | |
| parent | 3a3c9ac9515447941d383f2c4fe4b0225fdd8252 (diff) | |
| download | PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.gz PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.bz2 PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.zip | |
Merge branch 'release-0.2'
| -rw-r--r-- | .gitignore | 14 | ||||
| -rw-r--r-- | CMakeLists.txt | 38 | ||||
| -rw-r--r-- | MultiMC.cpp | 37 | ||||
| -rw-r--r-- | MultiMC.h | 7 | ||||
| -rw-r--r-- | changelog.yaml | 14 | ||||
| -rw-r--r-- | depends/javacheck/.gitignore | 6 | ||||
| -rw-r--r-- | depends/launcher/.gitignore | 6 | ||||
| -rw-r--r-- | depends/launcher/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | depends/launcher/MultiMCLauncher.java | 331 | ||||
| -rw-r--r-- | depends/launcher/net/minecraft/Launcher.java | 44 | ||||
| -rw-r--r-- | depends/launcher/org/multimc/EntryPoint.java | 135 | ||||
| -rw-r--r-- | depends/launcher/org/multimc/IconLoader.java | 132 | ||||
| -rw-r--r-- | depends/launcher/org/multimc/Launcher.java | 22 | ||||
| -rw-r--r-- | depends/launcher/org/multimc/NotFoundException.java | 21 | ||||
| -rw-r--r-- | depends/launcher/org/multimc/ParamBucket.java | 86 | ||||
| -rw-r--r-- | depends/launcher/org/multimc/ParseException.java | 22 | ||||
| -rw-r--r-- | depends/launcher/org/multimc/Utils.java | 179 | ||||
| -rw-r--r-- | depends/launcher/org/multimc/legacy/LegacyFrame.java (renamed from depends/launcher/MCFrame.java) | 58 | ||||
| -rw-r--r-- | depends/launcher/org/multimc/legacy/LegacyLauncher.java | 178 | ||||
| -rw-r--r-- | depends/launcher/org/multimc/onesix/OneSixLauncher.java | 210 | ||||
| -rw-r--r-- | generated.qrc.in | 8 | ||||
| -rw-r--r-- | graphics.qrc | 51 | ||||
| -rw-r--r-- | gui/ConsoleWindow.cpp | 7 | ||||
| -rw-r--r-- | gui/MainWindow.cpp | 98 | ||||
| -rw-r--r-- | gui/MainWindow.h | 11 | ||||
| -rw-r--r-- | gui/MainWindow.ui | 43 | ||||
| -rw-r--r-- | gui/dialogs/AboutDialog.cpp | 2 | ||||
| -rw-r--r-- | gui/dialogs/AboutDialog.ui | 55 | ||||
| -rw-r--r-- | gui/dialogs/InstanceSettings.ui | 18 | ||||
| -rw-r--r-- | gui/dialogs/ModEditDialogCommon.cpp | 4 | ||||
| -rw-r--r-- | gui/dialogs/SettingsDialog.cpp | 20 | ||||
| -rw-r--r-- | gui/dialogs/SettingsDialog.ui | 504 | ||||
| -rw-r--r-- | logic/BaseInstance.cpp | 13 | ||||
| -rw-r--r-- | logic/BaseInstance.h | 7 | ||||
| -rw-r--r-- | logic/BaseVersion.h | 9 | ||||
| -rw-r--r-- | logic/JavaChecker.cpp | 13 | ||||
| -rw-r--r-- | logic/LegacyFTBInstance.cpp | 5 | ||||
| -rw-r--r-- | logic/LegacyFTBInstance.h | 1 | ||||
| -rw-r--r-- | logic/LegacyInstance.cpp | 57 | ||||
| -rw-r--r-- | logic/MinecraftProcess.cpp | 256 | ||||
| -rw-r--r-- | logic/MinecraftProcess.h | 32 | ||||
| -rw-r--r-- | logic/NagUtils.cpp | 18 | ||||
| -rw-r--r-- | logic/OneSixFTBInstance.cpp | 5 | ||||
| -rw-r--r-- | logic/OneSixFTBInstance.h | 2 | ||||
| -rw-r--r-- | logic/OneSixInstance.cpp | 121 | ||||
| -rw-r--r-- | logic/OneSixLibrary.cpp | 87 | ||||
| -rw-r--r-- | logic/OneSixLibrary.h | 3 | ||||
| -rw-r--r-- | logic/OneSixUpdate.cpp | 151 | ||||
| -rw-r--r-- | logic/OneSixUpdate.h | 8 | ||||
| -rw-r--r-- | logic/SkinUtils.h | 2 | ||||
| -rw-r--r-- | logic/auth/MojangAccount.cpp | 6 | ||||
| -rw-r--r-- | logic/icons/IconList.cpp | 17 | ||||
| -rw-r--r-- | logic/icons/IconList.h | 1 | ||||
| -rw-r--r-- | logic/lists/ForgeVersionList.cpp | 12 | ||||
| -rw-r--r-- | logic/lists/ForgeVersionList.h | 21 | ||||
| -rw-r--r-- | logic/lists/InstanceList.cpp | 73 | ||||
| -rw-r--r-- | logic/net/CacheDownload.cpp | 125 | ||||
| -rw-r--r-- | logic/net/CacheDownload.h | 15 | ||||
| -rw-r--r-- | logic/net/URLConstants.h | 2 | ||||
| -rw-r--r-- | logic/status/StatusChecker.cpp | 137 | ||||
| -rw-r--r-- | logic/status/StatusChecker.h | 57 | ||||
| -rw-r--r-- | logic/updater/NotificationChecker.cpp | 2 | ||||
| -rw-r--r-- | logic/updater/UpdateChecker.cpp | 1 | ||||
| -rw-r--r-- | logic/updater/UpdateChecker.h | 2 | ||||
| -rw-r--r-- | main.cpp | 6 | ||||
| -rw-r--r-- | resources/MultiMC.icns (renamed from MultiMC.icns) | bin | 177400 -> 177400 bytes | |||
| -rw-r--r-- | resources/MultiMC.ico (renamed from resources/icons/MultiMC.ico) | bin | 76126 -> 76126 bytes | |||
| -rw-r--r-- | resources/MultiMC.manifest (renamed from MultiMC.manifest) | 0 | ||||
| -rw-r--r-- | resources/XdgIcon.theme | 12 | ||||
| -rw-r--r-- | resources/backgrounds/backgrounds.qrc | 6 | ||||
| -rw-r--r-- | resources/backgrounds/catbgrnd2.png (renamed from resources/catbgrnd2.png) | bin | 78285 -> 78285 bytes | |||
| -rw-r--r-- | resources/icons/toolbar/Cat.png | bin | 811 -> 0 bytes | |||
| -rw-r--r-- | resources/icons/toolbar/InstCopy.png | bin | 297 -> 0 bytes | |||
| -rw-r--r-- | resources/icons/toolbar/refresh.png | bin | 1843 -> 0 bytes | |||
| -rw-r--r-- | resources/instances/brick.png (renamed from resources/icons/instances/brick.png) | bin | 713 -> 713 bytes | |||
| -rw-r--r-- | resources/instances/chicken.png (renamed from resources/icons/instances/chicken.png) | bin | 1181 -> 1181 bytes | |||
| -rw-r--r-- | resources/instances/chicken128.png (renamed from resources/icons/instances/chicken128.png) | bin | 6369 -> 6369 bytes | |||
| -rw-r--r-- | resources/instances/creeper.png (renamed from resources/icons/instances/creeper.png) | bin | 1524 -> 1524 bytes | |||
| -rw-r--r-- | resources/instances/creeper128.png (renamed from resources/icons/instances/creeper128.png) | bin | 9046 -> 9046 bytes | |||
| -rw-r--r-- | resources/instances/derp.png (renamed from resources/icons/instances/derp.png) | bin | 5225 -> 5225 bytes | |||
| -rw-r--r-- | resources/instances/diamond.png (renamed from resources/icons/instances/diamond.png) | bin | 708 -> 708 bytes | |||
| -rw-r--r-- | resources/instances/dirt.png (renamed from resources/icons/instances/dirt.png) | bin | 482 -> 482 bytes | |||
| -rw-r--r-- | resources/instances/enderman.png (renamed from resources/icons/instances/enderman.png) | bin | 2429 -> 2429 bytes | |||
| -rw-r--r-- | resources/instances/enderpearl.png (renamed from resources/icons/instances/enderpearl.png) | bin | 2120 -> 2120 bytes | |||
| -rw-r--r-- | resources/instances/enderpearl128.png (renamed from resources/icons/instances/enderpearl128.png) | bin | 21425 -> 21425 bytes | |||
| -rw-r--r-- | resources/instances/ftb_glow.png (renamed from resources/icons/instances/ftb_glow.png) | bin | 1747 -> 1747 bytes | |||
| -rw-r--r-- | resources/instances/ftb_glow128.png (renamed from resources/icons/instances/ftb_glow128.png) | bin | 12708 -> 12708 bytes | |||
| -rw-r--r-- | resources/instances/ftb_logo.png (renamed from resources/icons/instances/ftb_logo.png) | bin | 1607 -> 1607 bytes | |||
| -rw-r--r-- | resources/instances/ftb_logo128.png (renamed from resources/icons/instances/ftb_logo128.png) | bin | 7883 -> 7883 bytes | |||
| -rw-r--r-- | resources/instances/gear.png (renamed from resources/icons/instances/gear.png) | bin | 2414 -> 2414 bytes | |||
| -rw-r--r-- | resources/instances/gear128.png (renamed from resources/icons/instances/gear128.png) | bin | 18321 -> 18321 bytes | |||
| -rw-r--r-- | resources/instances/gold.png (renamed from resources/icons/instances/gold.png) | bin | 978 -> 978 bytes | |||
| -rw-r--r-- | resources/instances/grass.png (renamed from resources/icons/instances/grass.png) | bin | 618 -> 618 bytes | |||
| -rw-r--r-- | resources/instances/herobrine.png (renamed from resources/icons/instances/herobrine.png) | bin | 1034 -> 1034 bytes | |||
| -rw-r--r-- | resources/instances/herobrine128.png (renamed from resources/icons/instances/herobrine128.png) | bin | 4937 -> 4937 bytes | |||
| -rw-r--r-- | resources/instances/infinity.png (renamed from resources/icons/instances/infinity.png) | bin | 1714 -> 1714 bytes | |||
| -rw-r--r-- | resources/instances/infinity128.png (renamed from resources/icons/instances/infinity128.png) | bin | 9237 -> 9237 bytes | |||
| -rw-r--r-- | resources/instances/instances.qrc | 35 | ||||
| -rw-r--r-- | resources/instances/iron.png (renamed from resources/icons/instances/iron.png) | bin | 532 -> 532 bytes | |||
| -rw-r--r-- | resources/instances/magitech.png (renamed from resources/icons/instances/magitech.png) | bin | 2646 -> 2646 bytes | |||
| -rw-r--r-- | resources/instances/magitech128.png (renamed from resources/icons/instances/magitech128.png) | bin | 23097 -> 23097 bytes | |||
| -rw-r--r-- | resources/instances/meat.png (renamed from resources/icons/instances/meat.png) | bin | 1514 -> 1514 bytes | |||
| -rw-r--r-- | resources/instances/meat128.png (renamed from resources/icons/instances/meat128.png) | bin | 10583 -> 10583 bytes | |||
| -rw-r--r-- | resources/instances/netherstar.png (renamed from resources/icons/instances/netherstar.png) | bin | 1942 -> 1942 bytes | |||
| -rw-r--r-- | resources/instances/netherstar128.png (renamed from resources/icons/instances/netherstar128.png) | bin | 14062 -> 14062 bytes | |||
| -rw-r--r-- | resources/instances/planks.png (renamed from resources/icons/instances/planks.png) | bin | 461 -> 461 bytes | |||
| -rw-r--r-- | resources/instances/skeleton.png (renamed from resources/icons/instances/skeleton.png) | bin | 696 -> 696 bytes | |||
| -rw-r--r-- | resources/instances/skeleton128.png (renamed from resources/icons/instances/skeleton128.png) | bin | 3673 -> 3673 bytes | |||
| -rw-r--r-- | resources/instances/squarecreeper.png (renamed from resources/icons/instances/squarecreeper.png) | bin | 1623 -> 1623 bytes | |||
| -rw-r--r-- | resources/instances/squarecreeper128.png (renamed from resources/icons/instances/squarecreeper128.png) | bin | 9136 -> 9136 bytes | |||
| -rw-r--r-- | resources/instances/steve.png (renamed from resources/icons/instances/steve.png) | bin | 969 -> 969 bytes | |||
| -rw-r--r-- | resources/instances/steve128.png (renamed from resources/icons/instances/steve128.png) | bin | 4312 -> 4312 bytes | |||
| -rw-r--r-- | resources/instances/stone.png (renamed from resources/icons/instances/stone.png) | bin | 438 -> 438 bytes | |||
| -rw-r--r-- | resources/instances/tnt.png (renamed from resources/icons/instances/tnt.png) | bin | 378 -> 378 bytes | |||
| -rw-r--r-- | resources/multimc.rc (renamed from multimc.rc) | 2 | ||||
| -rw-r--r-- | resources/multimc/16x16/about.png | bin | 0 -> 1270 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/bug.png | bin | 0 -> 734 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/cat.png | bin | 0 -> 736 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/centralmods.png | bin | 0 -> 1145 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/checkupdate.png | bin | 0 -> 1212 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/copy.png | bin | 0 -> 957 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/help.png | bin | 0 -> 1297 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/new.png | bin | 0 -> 1175 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/news.png | bin | 0 -> 727 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/noaccount.png | bin | 0 -> 334 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/refresh.png | bin | 0 -> 931 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/settings.png | bin | 0 -> 1410 bytes | |||
| -rw-r--r-- | resources/multimc/16x16/viewfolder.png | bin | 0 -> 852 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/about.png (renamed from resources/icons/toolbar/about.png) | bin | 1693 -> 1693 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/bug.png (renamed from resources/icons/toolbar/ReportBug.png) | bin | 1180 -> 1180 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/cat.png | bin | 0 -> 1034 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/centralmods.png (renamed from resources/icons/toolbar/centralmods.png) | bin | 1561 -> 1561 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/checkupdate.png (renamed from resources/icons/toolbar/checkupdate.png) | bin | 1635 -> 1635 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/copy.png | bin | 0 -> 1004 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/help.png (renamed from resources/icons/toolbar/help.png) | bin | 1735 -> 1735 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/new.png (renamed from resources/icons/toolbar/new.png) | bin | 1440 -> 1440 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/news.png (renamed from resources/icons/toolbar/NewsIcon.png) | bin | 1173 -> 1173 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/refresh.png | bin | 0 -> 1283 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/settings.png (renamed from resources/icons/toolbar/settings.png) | bin | 1964 -> 1964 bytes | |||
| -rw-r--r-- | resources/multimc/22x22/viewfolder.png (renamed from resources/icons/toolbar/viewfolder.png) | bin | 1006 -> 1006 bytes | |||
| -rw-r--r-- | resources/multimc/24x24/cat.png | bin | 0 -> 1252 bytes | |||
| -rw-r--r-- | resources/multimc/24x24/noaccount.png | bin | 0 -> 344 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/about.png | bin | 0 -> 2658 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/bug.png | bin | 0 -> 1772 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/cat.png | bin | 0 -> 1678 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/centralmods.png | bin | 0 -> 2119 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/checkupdate.png | bin | 0 -> 2480 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/copy.png | bin | 0 -> 1401 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/help.png | bin | 0 -> 2720 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/new.png | bin | 0 -> 1769 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/news.png | bin | 0 -> 1752 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/noaccount.png | bin | 0 -> 363 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/refresh.png | bin | 0 -> 2182 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/settings.png | bin | 0 -> 2983 bytes | |||
| -rw-r--r-- | resources/multimc/32x32/viewfolder.png | bin | 0 -> 1518 bytes | |||
| -rw-r--r-- | resources/multimc/48x48/about.png | bin | 0 -> 3995 bytes | |||
| -rw-r--r-- | resources/multimc/48x48/bug.png | bin | 0 -> 3124 bytes | |||
| -rw-r--r-- | resources/multimc/48x48/cat.png | bin | 0 -> 2733 bytes | |||
| -rw-r--r-- | resources/multimc/48x48/centralmods.png | bin | 0 -> 3201 bytes | |||
| -rw-r--r-- | resources/multimc/48x48/checkupdate.png | bin | 0 -> 4196 bytes | |||
| -rw-r--r-- | resources/multimc/48x48/copy.png | bin | 0 -> 1952 bytes | |||
| -rw-r--r-- | resources/multimc/48x48/help.png | bin | 0 -> 4170 bytes | |||
| -rw-r--r-- | resources/multimc/48x48/new.png | bin | 0 -> 2870 bytes | |||
| -rw-r--r-- | resources/multimc/48x48/news.png | bin | 0 -> 3333 bytes | |||
| -rw-r--r-- | resources/multimc/48x48/noaccount.png | bin | 0 -> 387 bytes | |||
| -rw-r--r-- | resources/multimc/48x48/refresh.png | bin | 0 -> 3743 bytes | |||
