Petr Mrázek 
							
						 
					 
					
						
						
							
						
						8650aa81f0 
					 
					
						
						
							
							Fix settings dialog when offline  
						
						 
						
						
						
						
					 
					
						2014-01-18 10:31:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						54a9ee5eb0 
					 
					
						
						
							
							Merge branch 'feature_localization' of  https://github.com/02JanDal/MultiMC5  into develop  
						
						 
						
						... 
						
						
						
						Conflicts:
	gui/dialogs/SettingsDialog.cpp
	gui/dialogs/SettingsDialog.ui 
						
						
					 
					
						2014-01-12 23:04:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						28c35ea0db 
					 
					
						
						
							
							Fix proxy settings radio buttons not triggering updates of the proxy settings.  
						
						 
						
						
						
						
					 
					
						2014-01-07 02:19:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Forkk 
							
						 
					 
					
						
						
							
						
						0a312d3b08 
					 
					
						
						
							
							Implement proxy settings  
						
						 
						
						
						
						
					 
					
						2014-01-06 15:02:58 -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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						8950953d91 
					 
					
						
						
							
							Hopefully fix Qt 5.1 compilation  
						
						 
						
						
						
						
					 
					
						2014-01-04 19:20:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						7f6b344b49 
					 
					
						
						
							
							Clean up/update translation code and made language selectable in the settings dialog  
						
						 
						
						
						
						
					 
					
						2014-01-04 16:13:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						eb4e7d3f67 
					 
					
						
						
							
							Save/restore settings dialog (and instance specific settings) window geometry  
						
						 
						
						
						
						
					 
					
						2014-01-02 02:20:34 +00: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						76438f6afe 
					 
					
						
						
							
							Fix spelling mistake  
						
						 
						
						
						
						
					 
					
						2013-12-30 14:55:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						5d0868a056 
					 
					
						
						
							
							Notify the user of any errors  
						
						 
						
						
						
						
					 
					
						2013-12-30 14:45:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						c01678a3fa 
					 
					
						
						
							
							Don't use stuff that's new in 5.2 if we don't compile with that  
						
						 
						
						
						
						
					 
					
						2013-12-30 14:05:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						5a7fc1e123 
					 
					
						
						
							
							Use /usr/bin as default on linux  
						
						 
						
						
						
						
					 
					
						2013-12-30 13:00:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						3380bc7563 
					 
					
						
						
							
							Launch an editor for the custom.json file. Also allow overriding of the system default editor  
						
						 
						
						
						
						
					 
					
						2013-12-29 17:51:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						82c87aa06f 
					 
					
						
						
							
							Initial FTB support. Allows "tracking" of FTB instances.  
						
						 
						
						
						
						
					 
					
						2013-12-21 23:40:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						be8dba9ee2 
					 
					
						
						
							
							Remove obsolete auto login option.  
						
						 
						
						
						
						
					 
					
						2013-12-16 22:30:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						afa5e14e20 
					 
					
						
						
							
							Better (but unsorted) Java detection  
						
						 
						
						
						
						
					 
					
						2013-12-11 04:54:00 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						d6b09f7c13 
					 
					
						
						
							
							Add java checker to the instance settings  
						
						 
						
						
						
						
					 
					
						2013-11-25 01:14:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						ca297fca79 
					 
					
						
						
							
							Prepare for rework of instance launch/update  
						
						 
						
						... 
						
						
						
						Added missing licenses
Added a Java functionality checker (detects 32/64bit java)
Refactor of *Update - no longer based on BaseUpdate, but Task directly
Fixed runner script to not derp up on 32bit linux. Could add more detection and error reporting there.
Resources are now split into graphics and generated. Generated resources are placed in the build tree and included from there.
Used the Java checker in the main settings dialog (TODO: instance settings).
Partial support for ${arch}-using libraries - both 32 and 64 variants of ${arch} are downloaded. 
						
						
					 
					
						2013-11-24 06:36:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						bb7e8985f6 
					 
					
						
						
							
							Reformat and (slightly) decruft all the things.  
						
						 
						
						
						
						
					 
					
						2013-11-04 02:53:05 +01:00