Noah Mayr 
							
						 
					 
					
						
						
							
						
						2831ca94f8 
					 
					
						
						
							
							Added more possible java paths on OSX.  
						
						 
						
						
						
						
					 
					
						2014-01-22 18:28:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						0a592ab99b 
					 
					
						
						
							
							Work towards liteloader support. Fix creating new instance  
						
						 
						
						
						
						
					 
					
						2014-01-22 15:20:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						d166b48072 
					 
					
						
						
							
							Merge branch 'develop' into feature_derpstances  
						
						 
						
						
						
						
					 
					
						2014-01-22 14:06:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						13ac46bc18 
					 
					
						
						
							
							Fix launching  
						
						 
						
						
						
						
					 
					
						2014-01-22 14:06:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						a1a06cc89f 
					 
					
						
						
							
							Derpstances. Everything renamed. Launching does not yet work.  
						
						 
						
						
						
						
					 
					
						2014-01-22 07:33:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						c46c508fc6 
					 
					
						
						
							
							Extract native libs in the launcher part.  
						
						 
						
						
						
						
					 
					
						2014-01-22 02:20:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						b182f12c20 
					 
					
						
						
							
							Fix library path for 64bit natives  
						
						 
						
						
						
						
					 
					
						2014-01-21 00:50:18 +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 
							
						 
					 
					
						
						
							
						
						5eb9ef5d56 
					 
					
						
						
							
							Scale faces to 64x64  
						
						 
						
						
						
						
					 
					
						2014-01-19 23:05:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						50c441a773 
					 
					
						
						
							
							Merge branch 'fix_tests' of  https://github.com/02JanDal/MultiMC5  into develop  
						
						 
						
						
						
						
					 
					
						2014-01-18 22:30:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						e9186d6d2c 
					 
					
						
						
							
							DERP DERP DERP  
						
						 
						
						... 
						
						
						
						DERP ALERT. DUCK AND COVER! 
						
						
					 
					
						2014-01-18 22:20:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						208209e4a7 
					 
					
						
						
							
							Fix derp: there is no static QFileInfo::exists in Qt 5.1.1  
						
						 
						
						
						
						
					 
					
						2014-01-18 22:16:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						3fabb11f4c 
					 
					
						
						
							
							Marginally improve OneSix offline mode launch  
						
						 
						
						... 
						
						
						
						While reconstructing assets, skip files that don't exist.
Report missing OneSix native libraries. 
						
						
					 
					
						2014-01-18 22:11:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						ecc80bd763 
					 
					
						
						
							
							Change the native extraction/loading logic.  
						
						 
						
						
						
						
					 
					
						2014-01-18 03:33:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orochimarufan 
							
						 
					 
					
						
						
							
						
						188d0d5886 
					 
					
						
						
							
							Improve Console window output.  
						
						 
						
						... 
						
						
						
						-> Log Pre- and Post-Launch command happenings
-> Enable the java part to specify the level
TODO: fix logging with mc 1.7's log4j logging infrastructure
Signed-off-by: Orochimarufan <orochimarufan.x3@gmail.com > 
						
						
					 
					
						2014-01-17 22:55:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						7b96d74d3b 
					 
					
						
						
							
							Sort forge versions right. Do not spam the multimc log with mc server status stuff.  
						
						 
						
						
						
						
					 
					
						2014-01-16 23:06:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						d85e820a07 
					 
					
						
						
							
							Fix FTB.  
						
						 
						
						... 
						
						
						
						Add support of private packs.
Fix instance ID problems related to FTB instances. 
						
						
					 
					
						2014-01-15 22:49:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						555cbe00ce 
					 
					
						
						
							
							Do not use the java checker during instance update  
						
						 
						
						
						
						
					 
					
						2014-01-14 01:13:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						4744ea07a8 
					 
					
						
						
							
							Small fix for stale files getting stuck in the cache  
						
						 
						
						
						
						
					 
					
						2014-01-13 02:19:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						85ff1657fd 
					 
					
						
						
							
							Merge branch 'feature_better_launch' into develop  
						
						 
						
						
						
						
					 
					
						2014-01-12 23:56:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						afd1778fd7 
					 
					
						
						
							
							Fix window title problem on OSX.  
						
						 
						
						
						
						
					 
					
						2014-01-12 23:38:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						54a9ee5eb0 
					 
					
						
						
							
							Merge branch 'feature_localization' of  https://github.com/02JanDal/MultiMC5  into develop  
						
						 
						
						... 
						
						
						
						Conflicts:
	gui/dialogs/SettingsDialog.cpp
	gui/dialogs/SettingsDialog.ui 
						
						
					 
					
						2014-01-12 23:04:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						f552366e03 
					 
					
						
						
							
							Merge branch 'feature_mojang_status' into develop  
						
						 
						
						
						
						
					 
					
						2014-01-12 22:34:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						b589a12d17 
					 
					
						
						
							
							Merge branch 'feature_better_launch' into develop  
						
						 
						
						
						
						
					 
					
						2014-01-12 22:17:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						fca4441229 
					 
					
						
						
							
							Replace old launcher part with a shiny new one. No more garbage on the command line.  
						
						 
						
						
						
						
					 
					
						2014-01-12 21:57:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						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