Travis build: take negative test results as build errors
Add some logging to places where version updates might not trigger.
Fix version file problems, fix console window not being destroyed
Update changelog

Conflicts:
	changelog.md
Back to develop
Squashed commit of the following:

commit fa9fedbaa80e2d4c23f6d28757accf74160992b1
Author: Petr Mrázek <peterix@gmail.com>
Date:   Tue Aug 26 02:01:47 2014 +0200

    Nuke. Things.

commit 9a2b99360806189561c5bee387e8508831b9b94d
Merge: 54a019e 68acdd8
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Sep 4 15:54:57 2014 +0200

    Merge branch 'feature_spec_update' into develop

    Conflicts:
    	tests/TestUtil.h

commit 54a019e2dbaea5da9777c1fe513165665f30f651
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Sep 3 16:25:35 2014 +0200

    Make QuickModIndexList a real model and finalize splitting it

commit 68acdd8ab6041953b5e4cd70b02058dd577bf9eb
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Sep 3 20:50:32 2014 +0200

    Update to the latest version of the spec

commit 3506ba87db6bde2fccd3d4bd3d38f59c1ff0cc32
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Aug 25 23:09:12 2014 +0200

    Refactor QuickMods, split QuickModsList and give QuickModRef a separate file

commit 13103ecb0edaf7887fb21f8db163259bb514cc9f
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Aug 23 16:59:09 2014 +0200

    [QuickMods] Follow icon/logo redirects

commit 2ceca32767b7d17d8edab21468ea11c1f9a7321c
Author: Petr Mrázek <peterix@gmail.com>
Date:   Mon Aug 25 08:43:34 2014 +0200

    Fix build issues (Qt version discrepancy)

commit 839132d4992d2d9c2c3d296f92b27d558aa138f7
Author: Petr Mrázek <peterix@gmail.com>
Date:   Mon Aug 25 08:21:50 2014 +0200

    Fix line 79 in QuickModDependencyResolver.cpp

commit b7d0a950b336faf4a1ad3f84120b707d34b7a1a2
Author: Petr Mrázek <peterix@gmail.com>
Date:   Mon Aug 25 08:21:37 2014 +0200

    Rename version_string to versionString

commit 43da5107cf066d5096982bcc2ad6c67184f8ec42
Author: Petr Mrázek <peterix@gmail.com>
Date:   Sat Aug 23 15:22:40 2014 +0200

    Fix performance problem in QuickModVersionList

commit eed3e0346f83223a9842eb88bc08edb7553b9611
Author: Petr Mrázek <peterix@gmail.com>
Date:   Sat Aug 23 14:20:11 2014 +0200

    Rearrange, remove clutter, rename

    No real changes, only churn here

commit 24b70b376ba77174ffaa8c5855b5a67104395f2b
Author: Petr Mrázek <peterix@gmail.com>
Date:   Fri Aug 22 00:01:11 2014 +0200

    Fix progress bars for SequentialTask

    Nothing like fixing bugs by removing code, right?

    ... right.

commit e32b69c47d5f2b080905b096a962a68951299b13
Author: Petr Mrázek <peterix@gmail.com>
Date:   Thu Aug 21 00:36:16 2014 +0200

    Update changelog

commit fae2fdfa0d2f3ec859745c4f930437947e3422e5
Author: Petr Mrázek <peterix@gmail.com>
Date:   Thu Aug 21 00:23:20 2014 +0200

    Fix version file problems, fix console window not being destroyed

commit 6fdb2199ed48e9404aee3b6d2495fac4d9b16a76
Author: Petr Mrázek <peterix@gmail.com>
Date:   Wed Aug 20 21:17:42 2014 +0200

    Add some logging to places where version updates might not trigger.

commit 45f80a6d82499ce6ef4731e484e82405e58aa696
Author: Mrazek, Petr <petr.mrazek@acision.com>
Date:   Wed Aug 20 12:40:08 2014 +0200

    Travis build: take negative test results as build errors

commit 36ea342dc31a1d2fcfda198eca5479c8558bb786
Author: Petr Mrázek <peterix@gmail.com>
Date:   Tue Aug 19 22:44:57 2014 +0200

    Fix segfaulting quickmod unit test.

    Needed a minecraft version that actually exists.

commit 013af7e43e60ce353fbfe1db76e23628d285f9bf
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Aug 19 21:09:50 2014 +0200

    Fix derp

commit 70854c49915d369ffb6e1acb3524931746e5d4ac
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Aug 19 20:59:29 2014 +0200

    Fix #464 and #460: Re-enable d&d into the modlist and fix phantom rows

commit 649247055fa265a32a7d33a49d2a6683bf4ff7f4
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Aug 19 17:46:57 2014 +0200

    Work on #466: Performance optimizations in QuickMods, mainly different parsing steps

commit 86e6a79471b51240099240df9405b7e2c799dc06
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Aug 17 17:17:25 2014 +0200

    Small bugfix

commit 1b2b66f8009501bb03737a695b4006f2205cc753
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Aug 17 16:14:37 2014 +0200

    Fix #452: Correctly set the right MC version filter

commit cdce483ca867bc8822fb19b5242aac907abe80b4
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Aug 17 15:28:55 2014 +0200

    Fix #451: Removing of QuickMod files.

    Also add a CMake option to enable a QWebInspector

commit d5e89715795a493d8825797a5f30c7089a358a3b
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Aug 16 21:08:10 2014 +0200

    Nuke the 'Install' button

commit a8e871ec107f7484f1fcaf9be276303f705bdc24
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Aug 16 17:07:08 2014 +0200

    Fix #447: Re-enable the Browse QuickMods button

commit d95a9b91bc61e11118015a4bacb1f2d06a01f30f
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Aug 16 16:53:37 2014 +0200

    QuickMods page in global settings and remove MC Version box in instance page

commit e825ee6cebf36d635a3ee1fa78c17215c25e3f0d
Merge: d48c82e 6eb1ee1
Author: Petr Mrázek <peterix@gmail.com>
Date:   Sat Aug 16 11:49:46 2014 +0200

    Merge branch 'feature_quickmod' into develop

commit d48c82e714fde8cf6d6ba1bbf2cdc4c5d247337e
Author: Petr Mrázek <peterix@gmail.com>
Date:   Sat Aug 16 11:40:39 2014 +0200

    Derp!

commit 0fd18dc2b18e9114aeb0e47567957ee9247968b1
Author: Petr Mrázek <peterix@gmail.com>
Date:   Sat Aug 16 11:39:16 2014 +0200

    Back to develop...

commit 6eb1ee1b5e65c76363af2ec2a4a95b784ed5f8f0
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Aug 15 23:05:57 2014 +0200

    Fixes to function pointers for LogicalGui

commit 41d646ae48bc04bf4d3b2395b6bf9bdff75d84cc
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Aug 4 23:27:51 2014 +0200

    Function pointers for LogicalGui

commit ea930f75d56d208e3c3c4dfef146b3a6269c2df1
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Aug 4 21:27:18 2014 +0200

    Save the updateUrl in the instance for sharing instances

commit 09455411105495d740a8c1b8ccc1330f3ada2ff8
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Aug 4 20:19:37 2014 +0200

    Clean up the code using QuickMod(Version)Ref

commit 14dff9ac4a0976f0b37271e60b00a6747259438e
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Aug 4 09:02:16 2014 +0200

    Several bugfixes

commit 5c6797c0b038f4c6ed5c915b5b82dd1072fcf5da
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Aug 3 23:32:27 2014 +0200

    Add QuickModVersionID wrapper, add support for 'version'

    Fixes #420

commit 777c03b45b91cd19ec97b9cf7a165e33cfa6f0f7
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Jul 30 23:37:36 2014 +0200

    Some code cleanup and hardening against Legacy instances

commit eac9e6826255daeef634138108493cb35eaa844f
Author: xxmicloxx <xxmicloxx@googlemail.com>
Date:   Wed Jul 30 16:00:43 2014 +0200

    Simple provides functionally added...

commit 4775a7438d05acc4b4c562528c37431f17e2bab4
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Jul 30 21:26:37 2014 +0200

    Reverse recursive removal of QuickMods

commit 378fa7e8df7c21dbe5886376fdae95618eab9e32
Merge: f94d188 98b9e1d
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Jul 29 23:47:43 2014 +0200

    Merge remote-tracking branch 'xxmicloxx/feature_quickmod' into feature_quickmod

    Conflicts:
    	logic/quickmod/QuickModInstanceModList.cpp

commit f94d188a37d9e704c027b3e95d4745336c82f4bc
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Jul 29 23:43:30 2014 +0200

    Show a message on orphaned quickmods and several bugfixes

commit 98b9e1d5b5fb4dc44d5d5ccce3c1507c91e16071
Author: xxmicloxx <xxmicloxx@googlemail.com>
Date:   Tue Jul 29 22:54:03 2014 +0200

    Fixes QuickModInstanceModList's row accept filter

commit fe35a6722882d8f3e0e67da9021352c6cb4abf96
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Jul 29 20:53:16 2014 +0200

    Bulk removing/updating of mods

commit 68b7e50f3075d67ad6a4d9f55fd22fb4f1f59198
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Jul 29 11:16:28 2014 +0200

    Add a way to create an instance from a QuickMod modpack

commit 26324e5f8ab531960de840c230b3d836108335ba
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Jul 29 08:29:39 2014 +0200

    Setting and dialog for selecting download links

commit 2f3e18af163f79ee5c5450358f4a9ad8d050f6ba
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Jul 29 00:00:41 2014 +0200

    Show modder donation links in the install progress list

commit f21786d5c40da550fcefa0206756b41dcc185212
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Jul 28 23:39:35 2014 +0200

    Remove a few TODO markers

commit e6e774d338e00a55a6414f904049627311b32761
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Jul 28 22:21:13 2014 +0200

    Soft dependency support

commit a74e50c5d74890bfd37c5520b8d63b2fd60f11d4
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Jul 28 21:23:34 2014 +0200

    Litemod support for QuickMods

commit 8407770ab0b02e035d87468bbfcbee790eab1515
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Jul 28 13:17:27 2014 +0200

    Create a QuickMod file from an instance

commit ef5768088ae83d0391b3738550ad25eb7dbd4974
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jul 27 17:19:47 2014 +0200

    Remember if a QuickMod is manually installed or installed as a dependency

commit 2881a24efff24b35ca631a154e96088715ac27f9
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jul 27 15:51:51 2014 +0200

    Add the QuickMods browse page to the global settings dialog

commit 5d7f62e0a746ce8c64185610627266f95a71c447
Merge: c909a67 03b13b0
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jul 27 15:01:00 2014 +0200

    Merge remote-tracking branch 'origin/develop' into feature_quickmod

    Conflicts:
    	CMakeLists.txt
    	gui/dialogs/SettingsDialog.cpp
    	gui/dialogs/SettingsDialog.ui
    	gui/pages/ModFolderPage.ui
    	gui/pages/global/MultiMCPage.h
    	logic/minecraft/OneSixLibrary.cpp
    	logic/minecraft/OneSixLibrary.h

commit c909a67870f990dba4d7b1d224c7e168827c6170
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jul 27 14:36:08 2014 +0200

    Merge LoaderModFolderPage into ModFolderPage

commit f5a2e6aee258b6647c09c8140a57c85c5d312db6
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jul 27 14:07:50 2014 +0200

    Add LogicalGui to MultiMC, and use it to get rid of all GUI code for QuickMod related logic

commit 028da1bb2eb5022661febdeabe4dbda2b8da22df
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Jul 17 16:02:45 2014 +0200

    Remember added repository indices and refresh them on update

    Fixes #264

commit 7329804a8b83767c4b6d8a0d61fa5f5fde5ebf5a
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Jul 17 00:26:09 2014 +0200

    Fix a crash on reloading the instance model

commit 21de9f886a59e44eade880fc2db6e6c44ae3760b
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Jul 16 23:11:04 2014 +0200

    Fix #306: Make the Name column ResizeToContents in the QuickMod Repo dialog

commit 38af8c23ff42f83cb92aa4b51e4f02812487fc51
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Jul 16 23:05:56 2014 +0200

    Fix #266: Add a Close button to the QuickMod Repositories dialog

commit 34ae738d4c9e7b68ec281528edf82fc1c2915970
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Jul 15 22:54:48 2014 +0200

    Add a QuickMods page to the instance dialog

commit c1c3b28d81457a9f675fbf497916cdcf83ae60f4
Merge: 734aaef 71575a5
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Jul 15 22:13:13 2014 +0200

    Merge branch 'develop' into feature_quickmod

    Conflicts:
    	CMakeLists.txt
    	MultiMC.cpp
    	MultiMC.h
    	depends/launcher/org/multimc/onesix/OneSixLauncher.java
    	gui/MainWindow.cpp
    	gui/MainWindow.ui
    	gui/dialogs/OneSixModEditDialog.cpp
    	gui/dialogs/OneSixModEditDialog.ui
    	gui/groupview/InstanceDelegate.cpp
    	gui/pages/VersionPage.h
    	logic/BaseInstance.h
    	logic/BaseInstance_p.h
    	logic/LegacyInstance.cpp
    	logic/LegacyInstance.h
    	logic/MMCJson.cpp
    	logic/NostalgiaInstance.cpp
    	logic/OneSixInstance.cpp
    	logic/OneSixInstance.h
    	logic/OneSixUpdate.cpp
    	logic/OneSixUpdate.h
    	logic/OneSixVersionBuilder.cpp
    	logic/VersionFile.h
    	logic/VersionFinal.cpp
    	logic/minecraft/InstanceVersion.h
    	logic/minecraft/VersionFile.cpp

commit 734aaefebf72e1cc01bacb1de6adf531d2dc9fbb
Merge: 253ad37 3a0cdf2
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Jun 6 11:55:19 2014 +0200

    Merge remote-tracking branch 'origin/develop' into feature_quickmod

    Conflicts:
    	MultiMC.cpp

commit 253ad37d09fe188f1ce1985b3a79303641716539
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Jun 6 11:42:33 2014 +0200

    More/better maven support. Rather untested currently. Also change from md5 -> sha1

commit 97c7095536cd9353d0875b355d19086c50cd195a
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Jun 3 22:31:59 2014 +0200

    Fix some crashes. Updates and update notifications work again now. Fixes #281.

commit 70b4685008ebf7849268b99c7916e4bab4c682f3
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jun 1 16:11:24 2014 +0200

    New URLs format for versions

commit c5677ebf15a8f6ba1cb312ac03c0a2ec24f2d177
Merge: 80c70bf fc3c0b0
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed May 21 16:10:03 2014 +0200

    Merge branch 'develop' into feature_quickmod

    Conflicts:
    	gui/MainWindow.h
    	logic/OneSixInstance.h

commit 80c70bf5d89a9921cc93cda21ac1beeacb4efd8b
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue May 20 20:57:20 2014 +0200

    Bugfixes

commit 6c72e76e4851d6a17abc78a7e26f5c3c2ad4f517
Author: robotbrain <robotbrainify@gmail.com>
Date:   Tue May 20 08:36:08 2014 -0400

    Kill versionsUrl part 3

commit 9c203811a8eb2a32a49e9e74f7f19fe767948307
Author: robotbrain <robotbrainify@gmail.com>
Date:   Tue May 20 08:35:50 2014 -0400

    Kill versionsUrl part 2

commit 52b35918f814f875234fde233abac1a57e19fa8b
Author: robotbrain <robotbrainify@gmail.com>
Date:   Tue May 20 08:35:21 2014 -0400

    Kill versionsUrl part 1

commit ef96285bf814dd99c95af218b9d281ed503f6c6e
Merge: f538e38 8a8c419
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun May 18 07:39:45 2014 +0200

    Merge remote-tracking branch 'origin/develop' into feature_quickmod

    Conflicts:
    	CMakeLists.txt
    	gui/dialogs/VersionSelectDialog.cpp

commit f538e38a61a938d23b2d5fc6af8f96112a44355c
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon May 12 17:24:06 2014 +0200

    Fix sandbox bug

commit 3f1c63c6f95490453a2ba2dbf4932c510f91b31d
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat May 10 17:56:34 2014 +0200

    Introduce the sandbox

commit 2529bd1398de287dc9792d732c32beafa5c98bab
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat May 10 17:06:20 2014 +0200

    Remove verification stuff and add a repositories dialog

commit bc549d224961dc6aacd658549cd68d3af921f8e1
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri May 9 20:54:14 2014 +0200

    formatVersion

commit 3082da63068be9ae2c173c3a7ec6fed053a9c6f4
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri May 9 17:27:33 2014 +0200

    Update urls spec

commit 755038d6ac62ddd32b8ddf9e4e1bfcdb9ff22220
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed May 7 16:34:58 2014 +0200

    Small bugs

commit 08e4b86f841b1e7e24f58aeb70d4f9f8dc61de3f
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon May 5 21:34:07 2014 +0200

    'urls' and 'license'. Still needs to be added to the GUI.

commit 7dee538f40a5e7a8e86419d49e0b913012e46df1
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon May 5 21:24:43 2014 +0200

    Some bug fixes

commit 94d055c92839704a1f9bc4f423db6c77275288ed
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon May 5 19:56:11 2014 +0200

    Add curse:%1 QuickMod URL. Contributed by @Nektro.

    Closes #234 and #235.

commit 6f41565ee7bd34b63ab7057c6ac77e0a047c7bac
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat May 3 21:26:56 2014 +0200

    Fix some bugs

commit afde7bf45cb37c928819421316621636b2c9c668
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri May 2 22:07:06 2014 +0200

    Small but fatal bug in version sorting

commit 2fb4e70887a445cb36428a1691429dc2936b6be6
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri May 2 22:02:24 2014 +0200

    Formatting and update licenses

commit 8b264648f7292ff41e924bae37439ece0d6bd311
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri May 2 21:46:23 2014 +0200

    Remove qDebugs and use for(:) instead of foreach

commit 824e11388fbe229df1ba0fbc9a0f3e6937fe624e
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri May 2 19:19:37 2014 +0200

    Auto-completition in the QuickModAddFileDialog

commit 4235672f057dabf84ce932354644739f03cee2a6
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri May 2 19:09:24 2014 +0200

    Fix unit tests

commit 6458129928905d390cce48769a79196a11472ac0
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri May 2 18:00:08 2014 +0200

    Introduce the QuickModUid class, and repositories

commit d4dce93f620ef361c51918fef9f41d3b051a44a7
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri May 2 09:48:03 2014 +0200

    Maybe fix 5.1.1 building

commit 5d654c6f097a271f64c9d4230132e8d53deadd62
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri May 2 09:25:44 2014 +0200

    Attempt to fix 5.1 compilation

commit 91701df0679ddfce93ec13b9b52359bd007e9d9f
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri May 2 01:29:49 2014 +0200

    Remove some dead code

commit 9dc09f3fe4205b2f44b027e093643221441b79bf
Merge: e081a23 b3f717c
Author: Forkk <forkk@forkk.net>
Date:   Thu May 1 13:49:12 2014 -0500

    Merge branch 'develop' into feature_quickmod

commit e081a238235f8fc5f7f6a0a2a3f5fed7e499131d
Author: Forkk <forkk@forkk.net>
Date:   Thu May 1 13:40:19 2014 -0500

    Distribue with libicu shared libs on Linux

    R.I.P. bandwidth

commit 703f9756e73f94b05130ca99934ac2605805ae31
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu May 1 20:25:21 2014 +0200

    Maven library dependency support

commit 42c2345f12caf15ce4d58603e338f5f86e1acfa0
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu May 1 18:58:55 2014 +0200

    Adapt tests to the merged metadata and versions

commit b0da57267de0d7a965023654a5220e9f0817f9aa
Author: Forkk <forkk@forkk.net>
Date:   Wed Apr 30 12:02:58 2014 -0500

    Rework the QuickMod install dialog's progress list

commit 4ff1598f75d1565f9b1804315c971c5ead254f2f
Author: Forkk <forkk@forkk.net>
Date:   Wed Apr 30 10:35:07 2014 -0500

    Reorganize QuickModInstallDialog

    Add code folding points and reorganize code

commit b277382fa0478e2824bf38d99d33dfe9ba36f12d
Author: Forkk <forkk@forkk.net>
Date:   Wed Apr 30 10:23:59 2014 -0500

    Tweak behavior of the web downloads progress bar

    It now only shows how many mod webpages the user has completed, rather
    than how many have been started.

commit 0076f956f0c67a09cdbfbe917ad71e5a46d1ce8f
Author: Forkk <forkk@forkk.net>
Date:   Wed Apr 30 10:22:18 2014 -0500

    Fix crash on QuickModInstaller throwing an error

commit 05600f7ee411129c1dccfc1a89bd837810c20dce
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Apr 29 22:11:33 2014 +0200

    Version types

commit 8d0c1c52faf98cbe899014a1d0d18af7cc18b689
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Apr 29 21:47:18 2014 +0200

    Merge versions and metadata

commit 8465c24b410c15c59b661486dc5b409cb2e3a4af
Author: Forkk <forkk@forkk.net>
Date:   Tue Apr 29 14:13:53 2014 -0500

    Add a browse QuickMods button to the main window

    Currently, it has the same icon as the central mods folder button. We
    (peterix) should make a different icon for it.

commit 19cb8338245119e73f6d42666ec9ca50d4c156b1
Author: Forkk <forkk@forkk.net>
Date:   Tue Apr 29 13:44:50 2014 -0500

    Reorganize code in QuickModBrowseDialog.cpp

    Code folding should make things much nicer for Vim users ;)

commit 9d5d4756b7cd01045644f8af839efebfe1dababf
Author: Forkk <forkk@forkk.net>
Date:   Tue Apr 29 13:36:11 2014 -0500

    Rename QuickMod's ChooseModDialog to BrowseDialog

commit 05f50b2a1fd59a1c15bfdc3a082d1b2170c02861
Author: Forkk <forkk@forkk.net>
Date:   Tue Apr 29 13:19:58 2014 -0500

    Add a MC versions row to QuickMod descriptions

commit de623f546bf7f6b59e37d6eef4455b89df4ea919
Author: Forkk <forkk@forkk.net>
Date:   Tue Apr 29 13:09:03 2014 -0500

    Allow filtering the QuickMod list by MC Version

commit 4c69a78f71b4706010a207a677141f53054d9b98
Author: Forkk <forkk@forkk.net>
Date:   Tue Apr 29 12:28:07 2014 -0500

    Rework the QuickMod browse dialog

commit 6a1cd805d268ce3718ffe18b058ac5468538d5f3
Author: Forkk <forkk@forkk.net>
Date:   Mon Apr 28 16:12:14 2014 -0500

    Show mod version and name in web view tabs

commit a2c83d55480b98b7a4d816112fc326d368678580
Author: Forkk <forkk@forkk.net>
Date:   Mon Apr 28 13:11:05 2014 -0500

    Fix QuickMods list not being cleared on reload

commit 787291ef929828418163a9c491d9320f02a0995e
Author: Forkk <forkk@forkk.net>
Date:   Mon Apr 28 12:24:04 2014 -0500

    Make QuickMod file downloads follow redirects

commit 6a3a95df1c76339febb5c7998764c9241508b506
Author: Forkk <forkk@forkk.net>
Date:   Mon Apr 28 12:22:02 2014 -0500

    Implement redirect following for network actions

    This is a pretty rough implementation. We really should factor out some
    of the common parts of these network action classes.

commit 6637bcecf8d044961291061c6f9987c42d66b1dc
Author: Forkk <forkk@forkk.net>
Date:   Mon Apr 28 11:10:29 2014 -0500

    Refactor and rework the QuickMod install dialog

commit 69a5b10ef276b1d2e25a958e2fe422a90a0cedeb
Author: Forkk <forkk@forkk.net>
Date:   Mon Apr 28 11:07:53 2014 -0500

    Add a button to manually run QuickMod install task

commit f5650273103dd0039ffbfc1c77306cf4ec5f4155
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Apr 25 01:08:27 2014 +0200

    Update translations

commit d1a66f326f1da0882cfa16fe5aa135d45fbbf804
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Apr 25 01:01:28 2014 +0200

    And even more shared pointers

commit 93fcf694304b4baeabe1f33b1efe46535a7d1a19
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Apr 25 00:36:20 2014 +0200

    More shared pointers

commit 6b8d0feba640d98580526357660cba08a7952ebc
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Apr 24 23:15:55 2014 +0200

    Get rid of the stub concept

commit 68979db24b75e2ecc6f6f9bb551767a30254b10e
Author: Forkk <forkk@forkk.net>
Date:   Thu Apr 24 15:23:27 2014 -0500

    Run QuickMod installs when they are selected

    QuickMods that are in user.json but not installed will still be
    installed automatically on launch. This change just also tries to
    install them when the user clicks the install button.

commit e480ea3f21de1599870c790e1fe29c90fc47582d
Author: Forkk <forkk@forkk.net>
Date:   Thu Apr 24 14:29:15 2014 -0500

    Fix another stupid shared_ptr causing segfaults

commit 1ccf5e194a7bd57f311aaef3036ce5239d9f7be8
Merge: fbef5bd bdb2afd
Author: Forkk <forkk@forkk.net>
Date:   Thu Apr 24 12:18:55 2014 -0500

    Merge branch 'feature_quickmod' of github.com:MultiMC/MultiMC5 into feature_quickmod

commit fbef5bdfba6f7b82c08827c770badf58fbb7f63f
Author: Forkk <forkk@forkk.net>
Date:   Thu Apr 24 12:16:23 2014 -0500

    Use shared_ptr for passing QuickMods around

    Also fix some segfaults

commit bdb2afd761a3bdec6c4dedd75a1391eb51700b98
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Apr 24 16:29:45 2014 +0200

    Derp

commit 4e0d242bc2587a657b4dbd71635a7206232bc6e9
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Apr 24 15:19:47 2014 +0200

    QuickModAlwaysLatestVersion setting and moving code

commit 9480ef8d7cc9811b3d122299d88681b8eaa7c3e4
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Apr 24 14:37:48 2014 +0200

    QuickModAddFileDialog fixes/changes

commit dc2ee5b253f6a2f3a721dbd46a12dae3a02b02ef
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Apr 24 12:16:53 2014 +0200

    Fix compilation because I'm a derp

commit 56d97990ff3b3a695d291870a1322b487ea140f8
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Apr 24 11:33:28 2014 +0200

    Merge commit 'adbc0d147017a942c8e888efbddc103808e87389' into quickmod

    Conflicts:
    	CMakeLists.txt
    	MultiMC.cpp
    	MultiMC.h
    	depends/settings/inifile.h
    	depends/util/include/modutils.h
    	depends/util/src/modutils.cpp
    	gui/dialogs/OneSixModEditDialog.cpp
    	gui/dialogs/VersionSelectDialog.cpp
    	gui/dialogs/quickmod/QuickModChooseModDialog.cpp
    	gui/dialogs/quickmod/QuickModChooseModDialog.h
    	logic/net/NetJob.h
    	logic/quickmod/QuickModDependencyResolver.cpp
    	logic/quickmod/QuickModVersion.cpp
    	logic/quickmod/QuickModsList.cpp
    	logic/quickmod/QuickModsList.h
    	tests/tst_QuickModsList.cpp

commit d284cd339972ae85fc8c0b902820975ee861774e
Merge: 5c5ceb7 5fa36f6
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Apr 24 11:03:17 2014 +0200

    Merge remote-tracking branch 'origin/develop' into quickmod

    Conflicts:
    	.travis.yml
    	CMakeLists.txt
    	gui/dialogs/VersionSelectDialog.cpp

commit 5c5ceb713d6ef5506ceed6b4562fa91d052606ff
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Apr 13 16:36:55 2014 +0200

    Small bugfix

commit 715f6ca47a22b0629b70fdacf6c66abe03e3a2dc
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Apr 13 16:32:09 2014 +0200

    Update notification on launch

commit fa3d06337bdc16a24f176faa0d19b603cb659466
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Apr 13 16:09:22 2014 +0200

    Updating of QuickMods, as well as buggy removal

commit ae85c75495f898f36089e52494157fcc241151c3
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Apr 12 21:29:05 2014 +0200

    Show quickmods in the edit mods list

commit 07faa41934bd52f95b0bcfb53424c27d1f3a7fc8
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Apr 12 17:52:00 2014 +0200

    webkit for travis

commit 1b91460b3dcc39acaaae833c50f57fe2530ee481
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Apr 12 17:47:37 2014 +0200

    Always use the latest version of a mod, do not prompt

commit 66383d4841a62ca8a472c34d1c74a399aaec8336
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Apr 12 17:47:23 2014 +0200

    Bugfixes. Coremods. Fixes.

commit 8331c5cf653530bc47ef37c737a12eea65a5e596
Merge: cc653a5 50d18a0
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Apr 11 18:22:01 2014 +0200

    Merge remote-tracking branch 'origin/develop' into quickmod

    Conflicts:
    	logic/ForgeInstaller.cpp
    	logic/net/NetJob.h
    	tests/CMakeLists.txt

commit cc653a51942227d071d024aaa2b4655aafdcd32d
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Mar 30 13:37:11 2014 +0200

    Loads of changes, fix unit tests, coremods attempts

commit b4c1248e6f529f032aa56ef911652ff7403a619e
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Mar 23 21:57:59 2014 +0100

    A few test changes

commit a5fa804a2bd90c67548d4d3a9d62d98dd0d3a551
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Mar 16 19:13:05 2014 +0100

    Update the references parsing code

commit 52fe14e86d1181a1a5ce424ed64c1fb73838cfec
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Mar 14 17:46:53 2014 +0100

    Redo how local paths are calculated and some formatting

commit 2d95c6a0c43aabbac416355eaeacabac26035f73
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Mar 14 17:29:37 2014 +0100

    Allow installing multiple mods at once

commit 72a4cd05f714efa2631e3d3d9816490bb4af71eb
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Mar 14 16:28:20 2014 +0100

    Auto-install forge for quickmod instances that need it

    Also move more install logic to the BaseInstaller subclasses

commit 00aa3e89e451e37952e0c09424a6c658310573ae
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Mar 13 16:19:10 2014 +0100

    Stuff. It actually works right now.

commit 5439575fa5529671af2d6f65df3105766a6c2bc1
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Mar 12 18:21:26 2014 +0100

    Smaller fixes for reducing diff stats

commit e59975dabcbe6af58355ba61200e53865c39f0a9
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Mar 12 17:32:48 2014 +0100

    Refactor, first part

    Rename and move several QuickMod related files.
    Remove the doxygen stuff

commit 79ce7bb55e2619a5e5a6444bfeede7c9caac39af
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Mar 11 21:18:39 2014 +0100

    Make the index parser use exceptions

commit 00cb6420e52e5ac799ebc65a6899669ed5d8d960
Merge: 7c4b07f de2eb3f
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Mar 10 22:13:20 2014 +0100

    Merge branch 'develop' into quickmod

commit 7c4b07fe6910b76456690587062db07773d84618
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Mar 10 22:12:54 2014 +0100

    Use the new json exception stuff for parsing

commit c543842d959acca2927a512648f8a8e390621ce3
Merge: d3548a6 d11f10e
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Mar 10 20:22:28 2014 +0100

    Merge branch 'develop' into quickmod

    Conflicts:
    	logic/OneSixInstance.cpp
    	logic/OneSixVersionBuilder.cpp

commit d3548a67a685d087d44cebe799a34bd6b18acb7e
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Mar 6 14:59:09 2014 +0100

    Updates for the current spec

commit 179807a5e41d80aa7e0677fbbf17efaca4cd32bb
Merge: 3619554 211a72e
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Mar 6 14:02:40 2014 +0100

    Merge branch 'develop' into quickmod

    Conflicts:
    	MultiMC.cpp
    	MultiMC.h
    	gui/dialogs/VersionSelectDialog.cpp
    	logic/OneSixVersionBuilder.cpp

commit 36195548a1142aaf6b9ba2f68184afaa09cc142c
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Feb 14 17:18:00 2014 +0100

    Work on loading quickmods using the classpath. Works :D

commit cbfbdab69eae1c0f322cc39642fdc4c6fabd3e7e
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Feb 11 22:26:42 2014 +0100

    More work towards integration with derpstances. Not tested, but compiles.

commit 9aac25443a521c1cd257ac6e71d41558300798fb
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Feb 10 20:51:43 2014 +0100

    Add mods to user.json instead of direct install

commit 907009caeb7c73c8e8ec2d5a6aec0e9b851440b5
Merge: 09cebfa 1f218bb
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Feb 9 22:03:07 2014 +0100

    Merge remote-tracking branch 'origin/develop' into quickmod

    Conflicts:
    	CMakeLists.txt
    	depends/util/include/modutils.h
    	depends/util/src/modutils.cpp

commit 09cebfa868022b2eadc9c197db0d452e8a7bfff2
Merge: defd0ab f8df07c
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Feb 8 22:17:25 2014 +0100

    Merge branch 'develop' into quickmod

commit defd0abc0dd0fd4580d0e57ca88eed0d166178b6
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jan 19 20:25:06 2014 +0100

    Use the mimedb instead of file endings

commit b89b6a0a80342d2b6ac5fb377f5e178cb84c9c4c
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jan 19 18:59:11 2014 +0100

    Create a dedicated installer class. ZIP extraction works

commit 0fddc27e271b8b081cda451f8c7dc3d51571e30c
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jan 19 12:49:10 2014 +0100

    Fix a ModList bug

commit 608856cc7cbc7a1d641a03a64ef8c807734f7228
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jan 19 11:44:59 2014 +0100

    Working depres! Hurray!

commit 27fbda9de7d8104f0dfb74adbab5c5e2d3d62e50
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jan 19 10:07:23 2014 +0100

    Revert "Hopefully get depres to work. Not tested yet"

    This reverts commit 210fe80c640e97bb43b9cc7ab16ebb132a1c19f0.

commit 210fe80c640e97bb43b9cc7ab16ebb132a1c19f0
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Jan 18 23:45:57 2014 +0100

    Hopefully get depres to work. Not tested yet

commit 376d89ef7a7f01a9f37ce0cdcc49a8a80b70daf9
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Jan 18 18:24:57 2014 +0100

    Yay, annoying bugfix!

commit 15fdac7c69e4a5dc18a3047752b4495cead80d93
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Jan 18 17:13:55 2014 +0100

    Some cleanup in the dep resolver

commit 1b560f00da38fade987416f0408a3d58723e23de
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Jan 18 16:28:25 2014 +0100

    More bugfixes

commit b8e0cd9ef40e1c47d1f049efa058d55dae6ebfb8
Merge: f8a29f8 8650aa8
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Jan 18 11:31:44 2014 +0100

    Merge branch 'develop' into quickmod

    Conflicts:
    	logic/BaseInstance.cpp

commit f8a29f8005c44c3433cefd34c009b61f999aa55d
Merge: 10479aa 7b96d74
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Jan 17 18:41:34 2014 +0100

    Merge branch 'develop' into quickmod

commit 10479aa7e7572cb526ee1219b16652dbf79adcb0
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Jan 17 16:01:26 2014 +0100

    Fix more unit tests

commit 4207772842c68bef890179a8659dd7a4682f4380
Merge: 3301547 d85e820
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Jan 16 21:58:28 2014 +0100

    Merge branch 'develop' into quickmod

commit 3301547143bffc23a4b3bf8a110a4c3a29290adf
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Jan 16 21:57:18 2014 +0100

    Continue working towards following our own spec. Should be mostly done now

commit b2a62f635589db28f5e691b72b22bb79d617e306
Merge: 549591b 4985204
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jan 12 18:33:22 2014 +0100

    Merge branch 'develop' into quickmod

    Conflicts:
    	CMakeLists.txt
    	gui/MainWindow.cpp

commit 549591be13588c5bbc75f4473f1397accf88b155
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Jan 12 18:27:12 2014 +0100

    There start to come quite a few utility functions related to quickmod. Put them in libUtil

commit a3a302d13425745efbf5078bcbe99ae68c2c2e38
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Jan 11 09:27:41 2014 +0100

    Give the ModList access to some data from the QuickModsList

commit 7e130683b9810aa29f1381febbb44d19a17983bd
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Jan 11 08:59:25 2014 +0100

    Alot of small fixes. Add support for the 'type' field.

commit 64d85a6f6d78ce0edbd1dfb87f55a29e595856e9
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Jan 10 16:27:57 2014 +0100

    Fix images getting downloaded multiple times

commit 2c66b2488be2cfa43a5a313281bfb3e9cbea6c7c
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Jan 10 16:17:53 2014 +0100

    Work on dependency resolution and downloading

    Downloads are done one by one for now, as adfly doesn't like multiple downloads at once

commit 949ac3e567d5e3054df50eee09139f55263949be
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Jan 9 20:44:26 2014 +0100

    Another refactor commit

    Move dependency resolution and verification out of the download dialog

commit 2961647484d28c823153737d3eb569fe464fd6d3
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Jan 8 22:37:44 2014 +0100

    Update for the new static index

commit 1be4119815b86464ff93a69258f646a9f884f993
Merge: fe0952f 28cb66e
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Jan 7 18:06:48 2014 +0100

    Merge branch 'develop' into quickmod

    Conflicts:
    	gui/MainWindow.h

commit fe0952f0550cb385245a1fbdb90e664648e8817a
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Jan 7 17:59:07 2014 +0100

    Big refactor. Split version information from other metadata. Move stuff. Nuke stuff.

commit c939f55946d444131e91b8129636b607b620f32c
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Jan 6 20:47:44 2014 +0100

    Fix another small thing

commit 033d10cb475bcde53bed529f097bd0d881166743
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Jan 6 17:26:04 2014 +0100

    Several kinds of fixes, almost loads the DW20 pack now

commit 7027e0edf301a8a0537ec5b0cb0fe016411e651e
Merge: bf2a96d fcb8612
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Jan 6 13:25:59 2014 +0100

    Merge branch 'develop' into quickmod

    Conflicts:
    	MultiMC.cpp
    	MultiMC.h
    	gui/MainWindow.cpp

commit bf2a96d3f3528036f70b37413083404e3b5bd460
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Jan 2 23:01:42 2014 +0100

    Fixes and stuff

commit a2d3ce78ad724575cd45bd377f5f9c0c91760eb3
Merge: 3c76cfe c85789e
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Jan 2 17:35:39 2014 +0100

    Merge branch 'develop' into quickmod

    Conflicts:
    	.gitignore
    	CMakeLists.txt
    	MultiMC.h
    	depends/settings/include/keyring.h
    	depends/settings/setting.h
    	gui/MainWindow.cpp
    	logic/BaseInstance.cpp

commit 3c76cfe58830395b6951568c6be487c3aa771f07
Merge: c4cc04f 654f444
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Dec 29 18:40:29 2013 +0100

    Merge branch 'develop' into quickmod

    Conflicts:
    	MultiMC.cpp
    	logic/ModList.cpp
    	logic/ModList.h

commit c4cc04fb16eb1a496d5d6788514a9a2a131c3922
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Dec 23 13:01:50 2013 +0100

    Reformat with clang-format

commit 15e6f2a4eeac946faed5b417e29b3e82da7ec9af
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Dec 23 11:42:12 2013 +0100

    Verification

commit 31f9a67990f6dd1bdbf29a1c67a2cdff3de62e95
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Dec 23 11:42:03 2013 +0100

    Some additions to groups

commit 1ab9c865469db8bd37950fdb6d61e535a598c6e1
Merge: af1bf98 8628419
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Dec 23 10:36:47 2013 +0100

    Merge remote-tracking branch 'upstream/develop' into quickmod

commit af1bf98021f4b36e702213f58e8def9bda989849
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Dec 18 17:31:52 2013 +0100

    Fix unit tests

commit eba5fa42a1ffd37a64933f63ec9f77748a284c70
Merge: 179c551 7a07ed7
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Dec 22 13:13:06 2013 +0100

    Merge branch 'develop' into quickmod

    Conflicts:
    	CMakeLists.txt
    	MultiMC.cpp
    	MultiMC.h
    	depends/settings/CMakeLists.txt
    	depends/util/CMakeLists.txt
    	logic/lists/InstanceList.cpp
    	logic/lists/InstanceList.h
    	main.cpp
    	tests/CMakeLists.txt

commit 179c5519e85f5ab287410bb0d1c3f13cedc7f02a
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Dec 14 14:33:42 2013 +0100

    More work and stuff

commit fc1d3c381e02c449ac4018a880dd879d7b89800d
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Dec 14 11:32:49 2013 +0100

    Fix a bug there we would go into an infinit loop

commit df1f558954e4f70ef2723927b2ebabeaec349f99
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Dec 14 11:25:51 2013 +0100

    Add index files

    Index files should have a content-type of "application/x-quickmod-index,
    and contain a json object mapping name -> url

commit 07ec3aed594d3cbc16630208945f4d5d52a80fcf
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Dec 14 11:24:58 2013 +0100

    Several bugfixes

commit 8482cc9aa5ec4717f4da08edaf26cfe67d0d92cb
Merge: 045b830 1e96a0c
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Dec 13 21:14:05 2013 +0100

    Merge remote-tracking branch 'upstream/develop' into quickmod

    Conflicts:
    	CMakeLists.txt
    	MultiMC.cpp
    	MultiMC.h
    	gui/MainWindow.cpp

commit 045b83083f9d8307ee49fbf8a3ed0b65aceccb96
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Dec 2 21:35:17 2013 +0100

    Dialog titles

commit 2191120efca4fa7ec4b78bbe0673fbc6671c5061
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Dec 2 21:29:24 2013 +0100

    Let the quickmod file author choose the checksum algorithm

commit 5e7d0b1da68aab1dc59f3b40a2fd846a1cb340a9
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Dec 2 20:46:50 2013 +0100

    Fix several bugs and annoyances

commit 0731807628f6b5c7ac8d8042a38feaf96a251311
Merge: 81679c0 613699b
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Dec 2 19:59:56 2013 +0100

    Merge remote-tracking branch 'upstream/develop' into quickmod

    Conflicts:
    	.gitignore
    	CMakeLists.txt
    	MultiMC.cpp
    	gui/MainWindow.cpp
    	gui/MainWindow.h
    	gui/MainWindow.ui
    	logic/BaseInstance.h
    	logic/LegacyInstance.h
    	logic/OneSixInstance.h

commit 81679c0930e928b745e2ac25a24eed556839c669
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 30 23:24:06 2013 +0100

    Bring the tests up-to-date with the forge compat stuff

commit 7e84d062f55e8ba61d5582f703d79816b4673057
Merge: d007443 1d7b466
Author: 02JanDal <jan@dalheimer.de>
Date:   Sat Nov 30 13:28:51 2013 -0800

    Merge pull request #3 from robotbrain/quickmod

    Fix Interval notation

commit 1d7b466c6ae3e32d967e3e6bedb67f54956f72b1
Author: robotbrainify <robotbrainify@gmail.com>
Date:   Sat Nov 30 16:24:49 2013 -0500

    Fix Interval notation

    parentheses = exclusive and bracket = inclusive
    and infinity is always parentheses.

commit d007443dc28734d722c174f53f797d96bdd962f6
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 30 21:20:36 2013 +0100

    Provide the compatible forge version

commit 5f4aff5bfd11a3a383a8d79b55a831d5fa5d8da5
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 30 21:14:18 2013 +0100

    More tweaks to the quickmod format. Keyword "references".

commit 1a96ff99f555beb215499df64b1d3fca831de053
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 30 18:45:05 2013 +0100

    More tweaks to the quickmod format

commit cba93f92910bde8f807ac27c6e0457698c189b5c
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 30 16:20:53 2013 +0100

    New way of specifying version ranges and tests for it

commit be9f9583aad9dc83bc2f6d94c5c188f57f115190
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Nov 29 22:24:12 2013 +0100

    Actually don't show the installation dialog on early exit

commit 3e804312e092dc318651b62b6f66786d0e5c19e1
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Nov 29 19:20:35 2013 +0100

    Add checking of checksum for downloaded files

commit c980a4aa6f2f86ce47a2e77c9a010aacfa3c5981
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Nov 26 22:01:26 2013 +0100

    Two small fixes

commit 5c0775a6100a37267993837293da07f76a81de7f
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Nov 25 21:38:23 2013 +0100

    Add command line registering of quickmods

commit 835e52d15924705f1b0235b9e89ada4acdbee120
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Nov 25 21:05:35 2013 +0100

    Fix more test stuff. Now includes depends/settings and depends/util.

commit 1dc5a81d4fd16d124a6a60d217dbfc93cc295828
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Nov 25 17:05:23 2013 +0100

    More work on tests

commit 2d0c9410a7fcabd6eded2db3612c85cda25118fb
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Nov 24 22:45:13 2013 +0100

    One more test. Fixing stuff found by the tests. Fixing tests. 4.9% coverage.

commit 1dbd5da7d7d661491b84ddd0b8a90bb8e28db9c8
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Nov 24 15:38:55 2013 +0100

    Doxygen documentation

commit 5d2bf2598130a077fdf1f382e75e98dc10268a21
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Nov 24 14:40:03 2013 +0100

    Code coverage generation

commit cdf54f5549cadc7547374452c938b58367bc0154
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 23 23:34:43 2013 +0100

    Unit tests. Currently only for parsing QuickMod files. More to come.

commit e25653f740e7bddb98818c703e47efcbd30c5e67
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 23 23:33:48 2013 +0100

    Remove files from the old system

commit 31d2b02fe0d83cc2cc70cac7e4d3f09b52aa0ffa
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 23 19:50:07 2013 +0100

    Disable the finish button if we are still waiting on dependencies

commit d017184396ecc6deb6df52cd3774bed28c7cd152
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 23 19:37:43 2013 +0100

    Even more stuff. Installing works. Recursive dependency resolving works.

commit 1adb1a1eba00009c617fe4f0e9abf3e30a944bb2
Merge: f754324 4124faf
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 23 15:37:14 2013 +0100

    Merge remote-tracking branch 'upstream/develop' into quickmod

    Conflicts:
    	gui/MainWindow.cpp

commit f7543240cbf7573b7959b7d7718baaf4858c69ad
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 23 15:28:02 2013 +0100

    Stuff, stuff and stuff. Basic functionality works. Still needs testing.

commit 88fa71cff8c3d0047efbd47451b12789f01676f7
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Nov 21 22:11:41 2013 +0100

    More work and stuff. Web nav and downloading partially works.

commit 3fc011fff8605e9e08133e69d7cf408965c8cdb9
Merge: 204891d ab6f41d
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Nov 21 18:50:10 2013 +0100

    Merge branch 'quickmod' of https://github.com/robotbrain/MultiMC5 into robotbrain-quickmod

    Conflicts:
    	CMakeLists.txt
    	gui/dialogs/ChooseInstallModDialog.cpp
    	gui/dialogs/ChooseInstallModDialog.h
    	logic/QuickModFilesUpdater.cpp

commit 204891de67156402d4a01b08eeb84c698a2c38fe
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Nov 21 18:08:34 2013 +0100

    Some stuff, commited to be able to merge some stuff

commit ab6f41d269660249f8d2f75ae3e911ec4e478b61
Author: robotbrainify <robotbrainify@gmail.com>
Date:   Wed Nov 20 10:45:44 2013 -0500

    Formatting...
    used clang-format

commit 5a10f29608c1f4a82154010a3413e47b82633057
Author: robotbrainify <robotbrainify@gmail.com>
Date:   Tue Nov 19 22:19:04 2013 -0500

    Formatting
    I blame qt creator.

commit efdb2ea2886e4b2a9eadab47c0be066e5e17dd05
Author: robotbrainify <robotbrainify@gmail.com>
Date:   Tue Nov 19 21:13:17 2013 -0500

    Fixes fixes and fixes.
    Mostly formatting.

commit 299665897e1c1cd432470a3595acc88b7e8fa607
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Tue Nov 19 21:23:47 2013 +0100

    Work on the mod browser

commit fb189beee5c065baeb552e5b03605a8d2759bda3
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Nov 18 21:57:43 2013 +0100

    Non-quickmod mods now register themselfes. They are overriden by quickmod mods.

commit 42f0f64cd21ab722a867793711e67c8fae6ab49a
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Nov 18 20:01:39 2013 +0100

    Add a modAdded signal to the mods list

commit 25edc023bb56d5bd6d57c613075aab3ac978d4f8
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Nov 18 20:01:15 2013 +0100

    Fix include guards

commit aa97bf1a1ea0d4fccdea43871d83235047f2f5e9
Merge: 97aadb2 30b3395
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Nov 18 19:08:43 2013 +0100

    Merge remote-tracking branch 'upstream/develop' into quickmod

commit 97aadb25f507530a0ed5d4c87f7caa8b0a9b3811
Merge: ebd0b9e b8d4e63
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Nov 18 19:06:51 2013 +0100

    Merge remote-tracking branch 'origin/quickmod' into quickmod

commit ebd0b9e4e7df904d7e38bcc7bcf2a175eed99367
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Mon Nov 18 19:05:42 2013 +0100

    Mod browser. Closing in on installing mods now.

commit 1ee4237e58fa35f890a017bff2a7c294490086ef
Author: robotbrain <robotbrainify@gmail.com>
Date:   Mon Nov 18 12:14:52 2013 -0500

    Fixes, cleanup, and recursive dependancies.

commit b8d4e63077abc6b0694e5325db3b7f9c26145dac
Merge: 30934d4 d8f30d1
Author: 02JanDal <jan@dalheimer.de>
Date:   Mon Nov 18 07:47:10 2013 -0800

    Merge pull request #1 from robotbrain/quickmod

    Fix downloading to use NetJob.

commit e4839992ab0444c3b70057886dcc8c7326b18d30
Author: robotbrain <robotbrainif@gmail.com>
Date:   Mon Nov 18 10:11:52 2013 -0500

    And done resolution.
    Now for installation

commit f14e8ac3c7100efb9900027e24ce1209d82d52cb
Merge: b0f2a1d 6ada87f
Author: robotbrain <robotbrainif@gmail.com>
Date:   Mon Nov 18 10:09:15 2013 -0500

    Merge commit '6ada87f' into quickmod

commit b0f2a1dc9b99911521ced312707802561990d366
Merge: 898d722 42f0f64
Author: robotbrain <robotbrainif@gmail.com>
Date:   Mon Nov 18 10:07:11 2013 -0500

    Merge branch 'quickmod' of https://github.com/02JanDal/MultiMC5 into quickmod

commit 6ada87f234af4084bab8ee435d25d3dabbfacafe
Author: robotbrain <robotbrainify@gmail.com>
Date:   Mon Nov 18 10:00:53 2013 -0500

    Dependancy resolution almost done.

commit d8f30d17743d9527d47f35477327fe9338c7bb8e
Author: robotbrainify <robotbrainify@gmail.com>
Date:   Mon Nov 18 09:48:26 2013 -0500

    Fix downloading to use NetJob.

commit 30934d414f7aec24988ea8dde559bce0fb46946d
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Nov 17 23:05:47 2013 +0100

    Fix two things in the quickmod model

commit 2acf76420b9030ba236c11a62424faf1a154e7f9
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Nov 17 22:55:35 2013 +0100

    Fix building under Qt 5.1.1

commit 898d72240f8193315c821817d309d9ad0b2ad31c
Merge: 7cb785e 268068c
Author: robotbrain <robotbrainif@gmail.com>
Date:   Sun Nov 17 16:06:55 2013 -0500

    Merge branch 'quickmod' of https://github.com/02JanDal/MultiMC5 into quickmod

commit 268068cf25576eb4d03dae130d0bce809b8d4d82
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sun Nov 17 21:59:27 2013 +0100

    Redoing the quickmod system. Registering of mod files and keeping them updated is currently implemented.

commit 7cb785efd24679dddc6d6868e5dbecae38a0fd23
Author: robotbrain <robotbrainif@gmail.com>
Date:   Sun Nov 17 15:52:15 2013 -0500

    Initial dependacy resolution. Infrastructure only, no implementation.

commit 163df8a339d06dd74a9bd362c79514aa76fc5d1b
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 16 12:50:11 2013 +0100

    Make stuff more user friendly

commit ca0f320b9345ffa1cb07f84065770bcccf2357bd
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 16 12:09:36 2013 +0100

    Prepare for dependency resolving

    Open a QuickModFile from a non-QFile device.
    Add parsing for a recommends and a depends field in the json files

commit 5bcd066ae1d91d8fefc16e12e4a2fbbec0374509
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 16 10:59:32 2013 +0100

    Launching of instances after installation

commit 1fcb786cb2ef25c398c9a5a2c6ff52bbad30dc6c
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 16 10:30:28 2013 +0100

    Attempt to minimize the changes in the existing code

commit 655ce8924348a2f182e38e5d6101c9965803d400
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 16 10:16:33 2013 +0100

    Instance groups

commit 1450ba2048179115e57a3a11a76cb1d3fc40c7ed
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Sat Nov 16 09:51:36 2013 +0100

    Icons! This time for mods.

commit ce8646f622853532a64723a196445ddc58ebe25f
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Nov 15 23:40:23 2013 +0100

    Got rid of an old unused function

commit 6a7de9fb856991159abffb7ff264a1f97980d7da
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Nov 15 23:38:19 2013 +0100

    Fixes for the downloading

commit 7c34710d0e7e7ade7b5cf65c1b2d94185072165f
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Nov 15 23:37:53 2013 +0100

    Make multi-mod-file installing work

commit 6dcf8ccdb3c360cb3c10931a00365a2db6517d0a
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Fri Nov 15 23:37:11 2013 +0100

    Some love for the welcome page

commit 0a62b2688c49fb2642d915003e2c0aa0634808a6
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Nov 14 22:04:51 2013 +0100

    Some changes, seems to work now.

    For some reason the download some times hangs, as does the webview sometimes. Remote host problem?

commit b6c310aeb0fa05d7fb0e27556985b4706b0de53a
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Nov 13 22:26:43 2013 +0100

    Loads of work. Added webkitwidgets as a dependency. Almost works...

commit 0b9a4493992c66071a151416f585980306e941cc
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Nov 13 19:32:42 2013 +0100

    Fix mainwindow not showing

commit b9f7d0e319b500a3b2d97b14242ae6a317bb7826
Merge: 3d84ae0 9693a5e
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Nov 13 19:21:09 2013 +0100

    Merge remote-tracking branch 'upstream/develop' into quickmod

commit 3d84ae0eca120c3bf398f5ebcef98a12ef2b40d2
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Wed Nov 13 19:16:10 2013 +0100

    First work on quickmodding

commit 7f89f64656d0294c78e217628a994457db701ce5
Merge: bb7e898 dc3b0fc
Author: Jan Dalheimer <jan@dalheimer.de>
Date:   Thu Nov 7 17:22:29 2013 +0100

    Merge branch 'master' of https://github.com/02JanDal/MultiMC5 into quickmod