0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,437 Commits 1 Branch 0 Tags 29 MiB
78dc0cfdf3
Commit Graph

519 Commits

Author SHA1 Message Date
Petr Mrázek
5110b58def NOISSUE update version and changelog 2019-07-11 00:35:44 +02:00
Petr Mrázek
c01d020afc GH-2723 disable deprecation warnings 
We are targeting version 5.4 of the Qt ABI.
Deprecations from 2019 are irrelevant.
 2019-07-03 01:11:18 +02:00
Petr Mrázek
c1ea42d3d9 Merge branch 'stable' of https://github.com/Scotsguy/MultiMC5 into develop 2019-01-17 00:51:54 +01:00
AppleTheGolden
437dec91f9
Update Copyright Year 2019-01-16 21:14:24 +01:00
Petr Mrázek
819503d530 NOISSUE bump version to 0.6.5 2019-01-06 22:56:05 +01:00
Petr Mrázek
6a21c043ce NOISSUE bump version to 0.6.4 and update changelog 2019-01-06 22:28:27 +01:00
Petr Mrázek
4cbd1a7692 Fix version number 2018-12-26 02:44:07 +01:00
Chris Lane
0572a1e4e6
NOISSUE use https more widely 2018-11-02 12:04:08 +00:00
Petr Mrázek
5f2d3f014a NOISSUE get rid of remaining tabs 2018-08-02 01:01:55 +02:00
Petr Mrázek
bbb3b3e6f6 NOISSUE tabs -> spaces 2018-07-15 14:51:05 +02:00
Petr Mrázek
8108c61745 NOISSUE fix unitialized data warning on Arch Linux 2018-07-06 19:46:28 +02:00
Petr Mrázek
7fe94ca7b4 NOISSUE fix all sorts of warnings, enable Werror and pedantic 2018-06-28 23:18:45 +02:00
Petr Mrázek
8ec36e2cb9 NOISSUE bump release version to 0.6.2 2018-04-08 21:22:07 +02:00
Petr Mrázek
ea151ca9d4 NOISSUE pre-fill analytics ID and paste.ee API key for all new builds 
This means custom builds now get the option of using analytics and
log upload without users having to fill in IDs.
 2018-03-13 08:02:11 +01:00
Petr Mrázek
f259e9f727 NOISSUE update copyright dates 2018-02-11 00:40:01 +01:00
Petr Mrázek
3843a4ddb9 NOISSUE change version to 0.6.1 and update the changelog 2018-01-29 23:56:03 +01:00
Petr Mrázek
418251bd86 NOISSUE use a variable for binary build definitions 2018-01-28 19:04:39 +01:00
Petr Mrázek
3277b820a7 NOISSUE fix the macOS bundle utilities problem 2018-01-27 23:53:10 +01:00
Petr Mrázek
d66ae206dd NOISSUE move bundle utilities magic back to the application folder 
This may fix macOS issues?
 2018-01-27 21:59:06 +01:00
Petr Mrázek
166e5a03d6 NOISSUE rearrange build system 
* Added install commands to the libraries instead of force installing files
* Most of the application cmake stuff moved to top level
* RPATH should now be set/cleared correctly
* Contains a fix for GH-1780
 2018-01-27 02:00:20 +01:00
Petr Mrázek
c51512f940 NOISSUE use classparser for importing Legacy instances with undecided Minecraft versions 2017-09-27 15:39:13 +02:00
Petr Mrázek
01058b1db1 NOISSUE all Qt5 libraries are REQUIRED 2017-05-08 23:34:23 +02:00
Petr Mrázek
15c829fd3c GH-1876 Fork and update quazip 
* It is added as a new submodule: https://github.com/MultiMC/quazip/tree/multimc-1
* Its build system has been entirely replaced to remove the existing issues with it
* It now has working unit tests
* No more patches needed
* It has a static linking exception in its license now, but we use it shared anyway
 2017-05-06 17:36:57 +02:00
Petr Mrázek
1fbe03f982 NOISSUE remove unused wonkoclient 2017-04-07 00:20:01 +02:00
Petr Mrázek
a666dc0a1a NOISSUE fix up translation selection in settings and add OS/sys arch reporting 2017-01-01 20:04:08 +01:00
Petr Mrázek
2344ee2dcd GH-1379 rename shared libraries to avoid collisions with system libraries 
It was unlikely, now it's impossible.
 2016-12-28 17:23:48 +01:00
Petr Mrázek
2ec15c32e4 NOISSUE import google analytics from third party 
See: https://github.com/HSAnet/qt-google-analytics

Sadly, the API and its internals are not acceptable and it needs changes
upstream likely wouldn't allow.
 2016-11-20 12:04:29 +01:00
Petr Mrázek
412855ae3d NOISSUE refactor window management and launch, make MultiMC a single instance application. 2016-10-30 02:37:38 +01:00
Petr Mrázek
b0bfffcd90 NOISSUE revert to dumping all build artifacts to the root 
This fixes unit tests on Windows... Windows has no mechanism to set library lookup path.
 2016-05-01 03:49:46 +02:00
Petr Mrázek
771dd6f9ab NOISSUE reorganize unit tests to be placed next to the code they test. Nuke more dead tests. 2016-05-01 00:02:15 +02:00
Petr Mrázek
1be7d57332 NOISSUE re/move some dead code and unused build system parts 2016-05-01 00:00:24 +02:00
Petr Mrázek
b6d455a02b NOISSUE reorganize and document libraries 2016-05-01 00:00:14 +02:00
Petr Mrázek
47e37635f5 NOISSUE split GUI stuff from logic library 2016-04-30 23:59:23 +02:00
Petr Mrázek
fcd4a482f7 NOISSUE tiny skeleton for a CLI wonko client 2016-04-30 23:59:23 +02:00
Petr Mrázek
f63d1bc99c NOISSUE revert attempt to use normal binary output locations 2016-03-26 17:05:27 +01:00
Petr Mrázek
02c1df2c3c NOISSUE continue version file format refactors 2016-03-26 17:05:27 +01:00
Alexia
1854e05e1b NOISSUE Fix building when embedded in another project 2016-03-26 17:01:20 +01:00
Petr Mrázek
5e737f42bf GH-1410 use libc++ on OSX 2016-02-19 00:57:46 +01:00
Petr Mrázek
1f0e76a3c1 GH-1397 add discord icon to MultiMC toolbar 2016-01-09 01:39:51 +01:00
Jan Dalheimer
34bf4ccdc7 NOISSUE Add more qt versions to travis 
5.0, 5.1 and 5.2 are currently marked as "allow failure". If they can be made
to pass they should be removed from this list, if not they should be removed
entirely.
 2016-01-06 10:33:47 +01:00
Petr Mrázek
d5aee5fd23 NOISSUE maybe less evil... 2015-10-11 20:06:46 +02:00
Petr Mrázek
457dd2e94e NOISSUE make the compiler more evil 2015-10-11 19:56:31 +02:00
Petr Mrázek
f93f867c3d NOISSUE dissolve util library 2015-10-05 01:47:27 +02:00
Petr Mrázek
260a2cea59 NOISSUE more cmake tweakery 2015-09-28 21:20:27 +02:00
Petr Mrázek
143e24fa04 NOISSUE clean up some old cmake messes 2015-09-28 20:53:46 +02:00
Petr Mrázek
0af04dc060 NOISSUE attempt to fix NBT lib options not applying 2015-09-26 01:22:37 +02:00
Petr Mrázek
5d5bee4992 GH-1238 re-integrate nbt library 2015-09-23 01:21:19 +02:00
Petr Mrázek
38693e1d6c GH-1047 parse world files and integrate MCEdit with world page 2015-09-06 23:35:58 +02:00
Petr Mrázek
23d0bd8edd NOISSUE make shared logic library ... shared 2015-09-05 18:46:57 +02:00
Petr Mrázek
6858f1dd62 GH-1197 add console log color adaptation 
rainbow library was part of KDE - KGuiAddons
 2015-08-19 23:52:53 +02:00
Petr Mrázek
6d7bff2476 GH-1060 remove updater code 2015-06-07 21:10:18 +02:00
Petr Mrázek
678da0b639 GH-1052 switch over to C++14 everywhere 2015-06-06 19:56:51 +02:00
Petr Mrázek
50a4a1e19e NOISSUE use -fPIC builds when the system Qt is derpy 2015-05-26 22:38:01 +02:00
Petr Mrázek
ff715f7785 NOISSUE replace derpy merkdown thing with hoedown 2015-05-16 23:04:00 +02:00
Petr Mrázek
32f45578fd NOISSUE fix build issues 
Hopefully all
 2015-05-02 01:43:00 +02:00
Petr Mrázek
3d3725f088 SCRATCH small cmake tweaks 2015-04-12 20:57:18 +02:00
Petr Mrázek
d1ba972c59 SCRATCH move some cmake bits 2015-04-12 20:57:18 +02:00
Petr Mrázek
db877ba121 NOISSUE move everything. 2015-04-12 20:57:18 +02:00
Petr Mrázek
4730f54df7 SCRATCH separate the generic updater logic from the application 2015-04-12 20:57:17 +02:00
Petr Mrázek
4e94de413b SCRATCH no more gui includes in logic 2015-04-12 20:57:17 +02:00
Petr Mrázek
141e0a02a0 SCRATCH move things to the right places 2015-04-12 20:57:17 +02:00
Petr Mrázek
cd9d37aac4 SCRATCH nuke the overcomplicated logger, use a simple one. 2015-04-12 20:57:17 +02:00
Petr Mrázek
382ae78a0b Fix NagUtils and hack GroupView to work 2015-04-12 20:57:17 +02:00
Petr Mrázek
aa70ed2244 SCRATCH move icons over to Env, instance proxy model to gui 2015-04-12 20:57:16 +02:00
Petr Mrázek
154d19bb74 SCRATCH eliminate InstanceFactory 2015-04-12 20:57:16 +02:00
Petr Mrázek
8b4e22bbb8 NOISSUE Move FTB logic out of generic code 2015-04-04 15:46:15 +02:00
Petr Mrázek
865b200571 GH-856 add profile strategy for FTB packs 2015-04-03 11:55:16 +02:00
Petr Mrázek
5359f4499a NOISSUE remove obsolete EnabledItemFilter model 2015-04-02 20:22:52 +02:00
Petr Mrázek
04b45f3629 NOISSUE remove obsolete LWJGL selection dialog 2015-04-02 20:13:26 +02:00
Petr Mrázek
6f3aa65bd6 NOISSUE Split MultiMC app object into MultiMC and Env 2015-04-02 11:30:24 +02:00
Petr Mrázek
791221e923 NOISSUE Refactors and moving of things 2015-04-02 00:14:06 +02:00
Petr Mrázek
a27c341781 SCRATCH more 2015-03-16 22:33:41 +01:00
Petr Mrázek
405833bbbe NOISSUE eliminate qt5_use_modules from build 2015-03-16 08:43:00 +01:00
Petr Mrázek
8be865fb2a SCRATCH more experiments 2015-03-16 02:11:02 +01:00
Petr Mrázek
568a79e7b1 SCRATCH more quazip experiments 2015-03-16 01:53:19 +01:00
Petr Mrázek
ceec70e014 GH-796 Icon theme loading workaround 
Replacing the Qt machinery with other Qt machinery under our control
 2015-03-01 22:20:57 +01:00
Jan Dalheimer
ef34cafe17 Fix QuaZIP target dependency 2015-02-21 21:23:23 +01:00
Jan Dalheimer
a53f8d506e GH-366: Plain and simple modpack export/import/download 
Also removed the in-source QuaZIP in favour of upstream version
 2015-02-19 21:04:27 +01:00
Petr Mrázek
0886786bb5 GH-721 Redo internal NetJob implementation. 
NetJob is now using its own task queue and does not start more than 6 actions at the same time
 2015-01-11 22:04:31 +01:00
Petr Mrázek
a30a9559c7 NOISSUE Fix jar mods for OnesSix 2014-12-27 20:50:33 +01:00
Petr Mrázek
4ae0d8e0af NOISSUE Update changelog for version 0.4.5 2014-11-21 11:20:18 +01:00
Petr Mrázek
9f14b319df NOISSUE Remove obsolete ReleaseCandidate logic from the build system 2014-11-21 10:53:59 +01:00
Petr Mrázek
d3c2230a24 NOISSUE fix OSX version number and (C) year 2014-11-20 19:07:10 +01:00
Petr Mrázek
6a09fd2898 Set versions back to develop 2014-11-16 04:04:24 +01:00
Petr Mrázek
940f160091 Set version to 0.4.4 for release 2014-11-15 23:37:12 +01:00
Petr Mrázek
b7c4284019 Remove crash handler 2014-11-15 23:35:24 +01:00
Petr Mrázek
547f6f77d0 Add iOS and OSX icon themes by pe 2014-10-27 00:15:52 +01:00
Petr Mrázek
8f7aec032b Add dark, light, blue and colored theme from pe. 
Replaces the old dark and light themes
 2014-10-26 23:44:20 +01:00
robotbrain
bbdf5c1395 Translation downloading! 2014-09-30 16:22:39 -04:00
Petr Mrázek
b00e63dbe8 More sync from quickmods 
Also a small VersionSelectDialog refactor
 2014-09-06 21:01:23 +02:00
Petr Mrázek
36efcf8d3c Back to develop 2014-09-06 13:05:17 +02:00
Petr Mrázek
74f7bd9a1c Add changelog pieces, version 2014-08-16 11:33:01 +02:00
Petr Mrázek
d172daf3a9 Include QtXml, we use it. 
Fixes KDevelop semantic analysis magic.
 2014-08-15 00:01:55 +02:00
Petr Mrázek
d71697efb3 Do not deploy debug version of the svg icon lib in release builds. 2014-07-22 23:19:53 +02:00
Mrazek, Petr
e5b393318f Include the SVG icon engine. 2014-07-22 12:27:00 +02:00
Petr Mrázek
bc05ad30aa Rework the settings dialog. Rework all of it. Thoroughly. 
Also introduces the ColumnResizer from:
https://github.com/agateau/columnresizer/
 2014-07-20 23:47:46 +02:00
Jan Dalheimer
e178284172 Merge global settings and accounts into a pagedialog 
Also split external tools into it's own page
 2014-07-20 15:01:02 +02:00
Petr Mrázek
8a56ab6780 Implement gradle spec reader/writer 2014-07-16 02:03:52 +02:00
Petr Mrázek
222c26f9cf Bump dev version 2014-07-14 02:43:10 +02:00
Jan Dalheimer
5c43842359 Add a new page that can show all sorts of logs 2014-07-12 23:31:05 +02:00
Petr Mrázek
cc6968e9a3 Group view gets keyboard navigation back. 
And a bunch of fixes.
 2014-07-12 21:13:23 +02:00
Petr Mrázek
cc499488db Fix liteloader, some cleanups. 2014-07-06 11:15:15 +02:00
Petr Mrázek
18a342ef14 Move settings lib into the main code, fixing error logging in it. 2014-07-01 01:48:09 +02:00
Petr Mrázek
e241c3625c Merge branch 'feature_theme_support' into develop 
Conflicts:
	main.cpp
 2014-06-30 22:22:09 +02:00
Petr Mrázek
421a46e3d3 Redo the console window. Log is now a page. Console window has relevant pages. 
Dirty fix for screenshot thumbnail generation. Needs more QTimer.
 2014-06-30 02:02:57 +02:00
Petr Mrázek
5179aed3a0 Separate page dialog into a page container and a dialog. 2014-06-29 19:59:08 +02:00
Petr Mrázek
e8731c5d01 Turn screenshot management into a page. 2014-06-28 17:07:08 +02:00
Petr Mrázek
d6e5c472b5 Update changelog and bump version to 0.4.0 (no tag yet, not final) 2014-06-26 21:49:05 +02:00
Petr Mrázek
d911c9908c Replace notes dialog with a page. 2014-06-18 01:15:01 +02:00
Petr Mrázek
171325d427 Instance settings moved to a page. 2014-06-09 01:38:31 +02:00
Petr Mrázek
bf7b070508 Show texture/resource packs when appropriate. 2014-06-09 01:38:31 +02:00
Petr Mrázek
84ae67fff5 Page dialog for legacy instances. 2014-06-09 01:38:31 +02:00
Petr Mrázek
f485885757 Add and implement pages and page dialog. 2014-06-09 01:38:31 +02:00
Petr Mrázek
e118b1f990 Implement adding jar mods, break saving library order. 2014-06-09 01:38:31 +02:00
Petr Mrázek
439e17b149 Add back legacy mod edit, add checksums for all legacy jars 2014-06-09 01:38:30 +02:00
Petr Mrázek
69c3e7111f Make 1.6+ work with new instance format. 2014-06-09 01:38:30 +02:00
Petr Mrázek
92abe4c603 All of the broken legacy things work. 2014-06-09 01:38:30 +02:00
Petr Mrázek
9860d5ee12 Introducing VersionPatch base class for version files and minecraft versions 2014-06-09 01:38:30 +02:00
Petr Mrázek
8a3a0f5a52 Reorganize logic code. 2014-06-09 01:38:30 +02:00
Petr Mrázek
69a9ca39ad Add builtin Minecraft versions for legacy 2014-06-09 01:38:29 +02:00
Petr Mrázek
4c3bd416c6 Much change, very jarmod. 2014-06-09 01:38:29 +02:00
Petr Mrázek
aade36860c Begin the transformation! 
Nuke all the things.
 2014-06-09 01:38:29 +02:00
Petr Mrázek
3a0cdf2d3d Tagging 0.3.6 2014-06-03 01:44:19 +02:00
Petr Mrázek
d2b2d55aa9 New flat icon themes from pexner 
Squash and rework of commits from robotbrain
 2014-05-25 04:01:38 +02:00
Petr Mrázek
eb9661370b Enable SVG icons 2014-05-25 03:38:45 +02:00
Jan Dalheimer
fc3c0b0971 Merge branch 'feature_crashreport' into develop 2014-05-21 15:57:34 +02:00
Petr Mrázek
8a8c4193e6 Finish status pills. 2014-05-17 16:23:48 +02:00
Petr Mrázek
a6a5241e12 Bump version to 0.3.5 2014-05-15 22:48:00 +02:00
Andrew
5099964c67 Implement backtraces on Windows. 
Much !!FUN!! was had
 2014-05-10 14:16:27 -05:00
Andrew
9e80ddb040 Implement crash report system on Windows. 2014-05-09 20:08:07 -05:00
Forkk
93ae21abfc Implement crash handling on Linux 
This will allow us to generate crash dumps and have users report
crashes.
 2014-05-09 17:33:32 -05:00
Forkk
cba22f7ee0 Bump version and update changelog. 2014-05-01 13:10:46 -05:00
Petr Mrázek
9d724e0fe4 Merge remote-tracking branch 'origin/feature_cmake_style' into develop 
Conflicts:
	CMakeLists.txt
 2014-04-21 23:33:00 +02:00
Taeyeon Mori
4674aad125 Create a new login dialog 2014-04-16 16:19:12 +02:00
Jan Dalheimer
a00fb1e8da Only use tabs for intendention 2014-04-09 15:41:49 +02:00
Jan Dalheimer
3cd2b898e5 Merge remote-tracking branch 'origin/develop' into feature_cmake_style 
Conflicts:
	CMakeLists.txt
 2014-04-07 17:44:52 +02:00
Petr Mrázek
17d4947b30 Merge remote-tracking branch 'origin/feature_dotcmake' into develop 2014-04-06 20:56:40 +02:00
Jan Dalheimer
dd7b6642a3 Use the same style of CMake files everywhere 2014-04-06 19:43:09 +02:00
Jan Dalheimer
eb246c4fa7 .cmake files to reduce "code" duplicate 2014-04-06 18:12:48 +02:00
Jan Dalheimer
6ef38d0873 Coverity build and upload target. Also GitFunctions. 2014-04-06 18:02:28 +02:00
Petr Mrázek
482ad250a4 Workaround for dirty build folders. 
My disgust just turned into barely contained rage :<
 2014-04-06 03:59:37 +02:00
Petr Mrázek
f9169654c5 Build fixage for the changed build config 2014-04-06 03:48:59 +02:00
Petr Mrázek
42e305bb9d Get rid of long rebuilds because of minor cmake config changes 2014-04-06 00:33:33 +02:00
Petr Mrázek
ad9d082f57 Do not spam logs too much, bump version and add to changelog. 2014-04-01 23:03:04 +02:00
Petr Mrázek
29b00eab31 Fix FTB-related issues 2014-03-31 00:19:43 +02:00
Petr Mrázek
b60fbf87ab Bump version to 0.3.0 2014-03-23 23:25:55 +01:00
Petr Mrázek
4a24ea6c38 Make some more error messages translateable. 2014-03-23 19:07:13 +01:00
Jan Dalheimer
4f452d5815 Add a timer for clicking away the notification dialog 2014-03-15 14:18:29 +01:00
Petr Mrázek
28ad9befdc Remove a lot of error code and error handling madness. 2014-03-02 19:12:04 +01:00
Petr Mrázek
7c24bcc834 Reorganize the version-related code. 2014-03-01 23:06:47 +01:00
Jan Dalheimer
00f4f533aa Fix to the way translations are handled. Also updated the german translation with the new strings. 2014-02-25 18:46:50 +01:00
Petr Mrázek
acff155624 Merge branch 'feature_screenshots' into integration_json_and_tools 
Conflicts:
	logic/net/URLConstants.h

Resolve issues with multiple definitions of URL constants by moving them to their own object file.
 2014-02-25 01:52:58 +01:00
Petr Mrázek
9d4e840a6e Screenshots: Optimize image loading and memory use, fix list and button layout. 2014-02-25 01:23:33 +01:00
Petr Mrázek
cb5cfe7242 Reorganize all the screenshot files 2014-02-25 00:51:24 +01:00
Jan Dalheimer
da33fa4090 Imgur album creation 2014-02-24 11:30:27 +01:00
Petr Mrázek
f7c97efcf3 Merge branch 'feature_profiling' into integration_json_and_tools 2014-02-24 00:29:13 +01:00
robotbrain
4a77524b05 Initial stuff. It doesnt work. 2014-02-23 16:14:24 -05:00
Jan Dalheimer
7146724607 New, better, liteloader support 2014-02-19 22:34:17 +01:00
Jan Dalheimer
9c87bc6c4b Restructure 2014-02-16 12:52:35 +01:00
Jan Dalheimer
616c372690 Fix more stuff. Detached tools, only MCEdit for now. 2014-02-16 10:46:14 +01:00
Jan Dalheimer
efa8e26a3f Profiler support. Currently JProfiler and JVisualVM are implemented. 2014-02-15 14:19:35 +01:00
Petr Mrázek
af33b96684 Merge branch 'feature_groupview' into integration_derpstances_groupview 2014-02-08 22:18:32 +01:00
Petr Mrázek
7839c4ecc0 Pave. 2014-02-04 01:40:51 +01:00
Petr Mrázek
1936bd181f Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances 
Conflicts:
	gui/dialogs/OneSixModEditDialog.cpp
	logic/OneSixUpdate.cpp
 2014-02-01 19:37:16 +01:00
Petr Mrázek
b4b6091372 Add 'empty text' to all the version selection dialogs. 
Customize it for the Forge one so people finally shut up about 1.7.4
 2014-01-29 01:20:19 +01:00
Petr Mrázek
ffbc5bb62c Offline mode can be used even when online. 
Allow the user to pick a player name for offline mode.
Big auth refactor. Now using session objects instead of the accounts themselves.
Sessions only last for one instance start and hold all the auth and player data.
 2014-01-27 03:00:49 +01:00
Jan Dalheimer
966f9d1206 Merge branch 'develop' into feature_derpstances 2014-01-24 22:00:34 +01:00
Jan Dalheimer
7d5787025a Change naming from Derp -> OneSix until the new instance type supports legacy 2014-01-24 18:12:02 +01:00
Jan Dalheimer
156bc8f276 Forge works now too, and so does forge+liteloader 2014-01-23 21:31:41 +01:00
Petr Mrázek
d7113de3bd Hotfix 0.2.1 for twitch. 
Add to the changelog and tweak the version number.
 2014-01-22 22:40:17 +01:00
Jan Dalheimer
a1a06cc89f Derpstances. Everything renamed. Launching does not yet work. 2014-01-22 07:33:32 +01:00
Petr Mrázek
3a3c9ac951 Update the changelog, version, scale the instance icon 2014-01-20 01:14:11 +01:00
Petr Mrázek
2fe033c4a0 Move a bunch of resources into the resources folder. 
Also, cat is no longer mysterious. It's just FLUFFY!
 2014-01-19 05:21:09 +01:00
Petr Mrázek
d8413fa5ec Use icon theme so we can have more than one icon size per icon 2014-01-19 04:52:34 +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
Sky
a774b3d248 Show Mojang service statuses in status bar 2014-01-12 18:28:42 +00: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
Forkk
0e22e4b399 Merge branch 'master' into develop 2014-01-08 22:52:49 -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
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
3629f9b999 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-system 2014-01-07 18:31:49 -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
Petr Mrázek
267f18ca81 Add hack for Nvidia 2014-01-06 22:05:45 +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
a64eebf8eb Add an option to force using local updater binary (for updater development) 2014-01-05 14:24:33 +01:00
Forkk
ebc14a9d9d Prepend a 5 to version strings. 2014-01-04 21:44:18 -06:00
Petr Mrázek
b49fa9d2a9 Mess with the updater again. 2014-01-05 00:06:55 +01:00
Jan Dalheimer
3b97e3c363 Fix a few things related to the translations 2014-01-04 11:49:06 +01:00
Jan Dalheimer
b3dd1eba21 Notifications system. Mainly to be used in case the updater breaks. 2014-01-03 19:19:27 +01: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
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
Noah Mayr
1bdac97af5 Fixed buttons on osx by adding the accessible plugin. 2014-01-02 15:22:57 +01:00
Petr Mrázek
0e78d34d4c ThreadTask for all your ThreadNeeds 
Use only when absolutely required.
 2014-01-01 19:21:58 +01:00
Sky
821fb5e0ae Move assets migration to a task. Needs threading. 2014-01-01 14:56:26 +00:00
Petr Mrázek
3a4ecb57d0 Enable high DPI support on OSX 2013-12-31 02:34:00 +01:00