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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						43a39a3bfb
					 | 
					
						
						
							
							Harden CacheDownload.
						
						
						
						
						
						
						
						It's now super hard. SRSLY. 
						
						
					 | 
					
						2014-01-11 02:06:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						8e286c2b5c
					 | 
					
						
						
							
							Make CacheDownload use QSaveFile
						
						
						
						
						
						
					 | 
					
						2014-01-10 22:08:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sky
							
						 
					 | 
					
						
						
							
						
						3c189a6553
					 | 
					
						
						
							
							Hide user properties in the console too
						
						
						
						
						
						
					 | 
					
						2014-01-10 12:52:14 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						c51a993ff7
					 | 
					
						
						
							
							Add logging calls to the java checker.
						
						
						
						
						
						
					 | 
					
						2014-01-09 01:20:24 +01: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sky
							
						 
					 | 
					
						
						
							
						
						7773e77150
					 | 
					
						
						
							
							Don't include debugging messages :(
						
						
						
						
						
						
					 | 
					
						2014-01-07 03:18:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sky
							
						 
					 | 
					
						
						
							
						
						5fe0ed7e8f
					 | 
					
						
						
							
							Return a properly sorted list of checked javas
						
						
						
						
						
						
					 | 
					
						2014-01-07 03:16:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						012b007e56
					 | 
					
						
						
							
							Do not log each and every possible update. Only the latest one.
						
						
						
						
						
						
					 | 
					
						2014-01-07 02:43:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						7d76fd57e9
					 | 
					
						
						
							
							Get rid of some obsolete functions
						
						
						
						
						
						
					 | 
					
						2014-01-05 23:24:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						becaebd60d
					 | 
					
						
						
							
							Remove the $PWD hack and tests that depended on it.
						
						
						
						
						
						
					 | 
					
						2014-01-05 19:54:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						613c01dab5
					 | 
					
						
						
							
							Some more updater fixes
						
						
						
						
						
						
						
						Paths were wrong - still used work directory instead of root 
						
						
					 | 
					
						2014-01-05 13:17:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Forkk
							
						 
					 | 
					
						
						
							
						
						ee02eecfdc
					 | 
					
						
						
							
							Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
						
						
						
						
						
						
					 | 
					
						2014-01-04 19:47:28 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Forkk
							
						 
					 | 
					
						
						
							
						
						d30962bf00
					 | 
					
						
						
							
							Implement changing update channels
						
						
						
						
						
						
						
						Allow the user to select which update channel they would like to
download updates from. 
						
						
					 | 
					
						2014-01-04 19:46:47 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						b49fa9d2a9
					 | 
					
						
						
							
							Mess with the updater again.
						
						
						
						
						
						
					 | 
					
						2014-01-05 00:06:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						8fa69307d2
					 | 
					
						
						
							
							Fix mod list checkboxes
						
						
						
						
						
						
					 | 
					
						2014-01-04 23:45:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						3b97e3c363
					 | 
					
						
						
							
							Fix a few things related to the translations
						
						
						
						
						
						
					 | 
					
						2014-01-04 11:49:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						71e1410b9f
					 | 
					
						
						
							
							Don't try to check for notifications if we don't have a URL for it
						
						
						
						
						
						
					 | 
					
						2014-01-03 20:39:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						df9f9a34ef
					 | 
					
						
						
							
							Fix for pre-Qt5.2
						
						
						
						
						
						
					 | 
					
						2014-01-03 20:12:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						b3dd1eba21
					 | 
					
						
						
							
							Notifications system. Mainly to be used in case the updater breaks.
						
						
						
						
						
						
					 | 
					
						2014-01-03 19:19:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						c35012f1a5
					 | 
					
						
						
							
							DEBUG: Add some logging for instance loading.
						
						
						
						
						
						
					 | 
					
						2014-01-03 02:42:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						1455f051e4
					 | 
					
						
						
							
							Force cached updater binary to always resolve as stale
						
						
						
						
						
						
					 | 
					
						2014-01-02 23:58:53 +01: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Forkk
							
						 
					 | 
					
						
						
							
						
						4495e20cd7
					 | 
					
						
						
							
							Add news checking system and news toolbar
						
						
						
						
						
						
					 | 
					
						2014-01-02 13:25:38 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						c0b6fd0647
					 | 
					
						
						
							
							Make .ico files usable (the plugin is already included)
						
						
						
						
						
						
					 | 
					
						2014-01-02 18:51:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								max96at
							
						 
					 | 
					
						
						
							
						
						092b15fc87
					 | 
					
						
						
							
							Removed incomplete osx java detection log message
						
						
						
						
						
						
					 | 
					
						2014-01-02 17:07:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Noah Mayr
							
						 
					 | 
					
						
						
							
						
						cdebeff179
					 | 
					
						
						
							
							Improved java detection on OSX.
						
						
						
						
						
						
					 | 
					
						2014-01-02 17:01:26 +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
							
						 
					 | 
					
						
						
							
						
						396e63500e
					 | 
					
						
						
							
							Allow the use of synonyms in settings. Refactor settings.
						
						
						
						
						
						
						
						Remove a bunch of obsolete/unused code. 
						
						
					 | 
					
						2014-01-01 15:10:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						952b63f68d
					 | 
					
						
						
							
							Refactor icon lists heavily
						
						
						
						
						
						
						
						* Icon list now uses a filesystem watcher for updates
* Icon folder is user-customizable
* All the little details. ALL OF THEM. 
						
						
					 | 
					
						2013-12-31 01:32:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						654f444f55
					 | 
					
						
						
							
							Fix various LiteLoader related bugs.
						
						
						
						
						
						
					 | 
					
						2013-12-29 04:17:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						fbf1cc2848
					 | 
					
						
						
							
							Merge https://github.com/robotbrain/MultiMC5 into develop
						
						
						
						
						
						
					 | 
					
						2013-12-29 03:36:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								robotbrainify
							
						 
					 | 
					
						
						
							
						
						8549e5317f
					 | 
					
						
						
							
							Litemod version info.
						
						
						
						
						
						
					 | 
					
						2013-12-28 20:28:24 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						997be947c9
					 | 
					
						
						
							
							Maybe break updater even more?
						
						
						
						
						
						
					 | 
					
						2013-12-29 01:13:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						695ad1474e
					 | 
					
						
						
							
							Merge branch 'feature_liteloader' of https://github.com/02JanDal/MultiMC5 into develop
						
						
						
						
						
						
					 | 
					
						2013-12-28 23:48:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jan Dalheimer
							
						 
					 | 
					
						
						
							
						
						5b54a4ca8c
					 | 
					
						
						
							
							Don't hardcode stuff!!!
						
						
						
						
						
						
					 | 
					
						2013-12-28 23:34:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Petr Mrázek
							
						 
					 | 
					
						
						
							
						
						c816a26647
					 | 
					
						
						
							
							Set permissions for the updater binary after updating it.
						
						
						
						
						
						
					 | 
					
						2013-12-28 22:32:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |