Petr Mrázek 
							
						 
					 
					
						
						
							
						
						c84c51860d 
					 
					
						
						
							
							Fix crash bug related to data changes in new group view.  
						
						 
						
						
						
						
					 
					
						2014-02-04 21:18:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						6206a241ea 
					 
					
						
						
							
							A try at fixing the instance delegate. A bit. Maybe.  
						
						 
						
						
						
						
					 
					
						2014-02-04 02:01:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						7839c4ecc0 
					 
					
						
						
							
							Pave.  
						
						 
						
						
						
						
					 
					
						2014-02-04 01:40:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						ac2f64f337 
					 
					
						
						
							
							Reload version after removing custom.json  
						
						 
						
						
						
						
					 
					
						2014-02-03 20:42:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						790402bdce 
					 
					
						
						
							
							Disable anything related to user.json for now. Will be re-enabled once we have a gui for it.  
						
						 
						
						
						
						
					 
					
						2014-02-01 22:32:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						1936bd181f 
					 
					
						
						
							
							Merge branch 'feature_derpstances' of  https://github.com/02JanDal/MultiMC5  into feature_derpstances  
						
						 
						
						... 
						
						
						
						Conflicts:
	gui/dialogs/OneSixModEditDialog.cpp
	logic/OneSixUpdate.cpp 
						
						
					 
					
						2014-02-01 19:37:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						8637cce433 
					 
					
						
						
							
							Fix a bug  
						
						 
						
						
						
						
					 
					
						2014-02-01 16:26:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						4a9e213238 
					 
					
						
						
							
							Change the OneSix library view. It now shows a list of patches.  
						
						 
						
						
						
						
					 
					
						2014-02-01 14:52:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						b4b6091372 
					 
					
						
						
							
							Add 'empty text' to all the version selection dialogs.  
						
						 
						
						... 
						
						
						
						Customize it for the Forge one so people finally shut up about 1.7.4 
						
						
					 
					
						2014-01-29 01:20:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						176783c8ca 
					 
					
						
						
							
							Have the libraries tab show tweaker mods instead of libraries  
						
						 
						
						
						
						
					 
					
						2014-01-27 20:17:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						f9ea3dbfde 
					 
					
						
						
							
							Split parsing/applying. Better error logging. Fix crash.  
						
						 
						
						
						
						
					 
					
						2014-01-27 19:20:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						ffbc5bb62c 
					 
					
						
						
							
							Offline mode can be used even when online.  
						
						 
						
						... 
						
						
						
						Allow the user to pick a player name for offline mode.
Big auth refactor. Now using session objects instead of the accounts themselves.
Sessions only last for one instance start and hold all the auth and player data. 
						
						
					 
					
						2014-01-27 03:00:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						7d5787025a 
					 
					
						
						
							
							Change naming from Derp -> OneSix until the new instance type supports legacy  
						
						 
						
						
						
						
					 
					
						2014-01-24 18:12:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						156bc8f276 
					 
					
						
						
							
							Forge works now too, and so does forge+liteloader  
						
						 
						
						
						
						
					 
					
						2014-01-23 21:31:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						0a592ab99b 
					 
					
						
						
							
							Work towards liteloader support. Fix creating new instance  
						
						 
						
						
						
						
					 
					
						2014-01-22 15:20:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						a1a06cc89f 
					 
					
						
						
							
							Derpstances. Everything renamed. Launching does not yet work.  
						
						 
						
						
						
						
					 
					
						2014-01-22 07:33:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						3a3c9ac951 
					 
					
						
						
							
							Update the changelog, version, scale the instance icon  
						
						 
						
						
						
						
					 
					
						2014-01-20 01:14:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						2fe033c4a0 
					 
					
						
						
							
							Move a bunch of resources into the resources folder.  
						
						 
						
						... 
						
						
						
						Also, cat is no longer mysterious. It's just FLUFFY! 
						
						
					 
					
						2014-01-19 05:21:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						d8413fa5ec 
					 
					
						
						
							
							Use icon theme so we can have more than one icon size per icon  
						
						 
						
						
						
						
					 
					
						2014-01-19 04:52:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						e6ab57b8b1 
					 
					
						
						
							
							Try to improve status arrows a bit  
						
						 
						
						
						
						
					 
					
						2014-01-19 01:33:32 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						8650aa81f0 
					 
					
						
						
							
							Fix settings dialog when offline  
						
						 
						
						
						
						
					 
					
						2014-01-18 10:31:34 +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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						398167e8b0 
					 
					
						
						
							
							More space between status items  
						
						 
						
						
						
						
					 
					
						2014-01-12 18:44:54 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						a774b3d248 
					 
					
						
						
							
							Show Mojang service statuses in status bar  
						
						 
						
						
						
						
					 
					
						2014-01-12 18:28:42 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						088ad07a80 
					 
					
						
						
							
							Show active account skin whilst it's checked for updates  
						
						 
						
						
						
						
					 
					
						2014-01-11 00:22:08 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						9ddf2aec31 
					 
					
						
						
							
							Add tooltips to Java memory spinboxes  
						
						 
						
						
						
						
					 
					
						2014-01-10 13:16:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						86b6cdfcb3 
					 
					
						
						
							
							Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop  
						
						 
						
						
						
						
					 
					
						2014-01-09 15:42:44 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						e6201f9ff7 
					 
					
						
						
							
							Add "MB" as a suffix to memory spinboxes  
						
						 
						
						
						
						
					 
					
						2014-01-09 15:30:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Forkk 
							
						 
					 
					
						
						
							
						
						52c9cd5497 
					 
					
						
						
							
							Make the GitHub link in the about dialog clickable  
						
						 
						
						... 
						
						
						
						Fixes  #38  
						
						
					 
					
						2014-01-08 23:38:34 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Forkk 
							
						 
					 
					
						
						
							
						
						7d74c9bc25 
					 
					
						
						
							
							Change the issue tracker URL to GitHub issues  
						
						 
						
						... 
						
						
						
						Bump hotfix version number and add an entry in the changelog. 
						
						
					 
					
						2014-01-08 22:51:21 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Forkk 
							
						 
					 
					
						
						
							
						
						b767d4b134 
					 
					
						
						
							
							Fix the window title  
						
						 
						
						... 
						
						
						
						The window title now says
"MultiMC 5 - Version <version> [on <platform>]" 
						
						
					 
					
						2014-01-08 18:02:15 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Forkk 
							
						 
					 
					
						
						
							
						
						b4fcbab513 
					 
					
						
						
							
							Word wrap the update channel description label  
						
						 
						
						... 
						
						
						
						Previously, channel descriptions that were too long would mess up the
dialog. 
						
						
					 
					
						2014-01-08 17:56:38 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Forkk 
							
						 
					 
					
						
						
							
						
						a14eeab2d6 
					 
					
						
						
							
							Add information to the about dialog.  
						
						 
						
						
						
						
					 
					
						2014-01-07 18:31:31 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						28cb66e85c 
					 
					
						
						
							
							Merge pull request  #35  from 02JanDal/fix_keep_selection  
						
						 
						
						... 
						
						
						
						Fix instances getting deselected after FTB instances are loaded (or when ever the model is reset, like on a reload) 
						
						
					 
					
						2014-01-07 05:02:35 -08: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						093143cfef 
					 
					
						
						
							
							Fix instances getting deselected after FTB instances are loaded (or whenever the model is reset)  
						
						 
						
						
						
						
					 
					
						2014-01-06 10:01:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						fcb8612c10 
					 
					
						
						
							
							Implement console window tray icon, console window hiding, better scrolling  
						
						 
						
						
						
						
					 
					
						2014-01-06 02:52:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						ddb961fad5 
					 
					
						
						
							
							Scroll console window for <= lines above the bottom instead of the very bottom.  
						
						 
						
						
						
						
					 
					
						2014-01-06 00:33:16 +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 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						ffacaba1aa 
					 
					
						
						
							
							Fix settings dialog tab ordering again  
						
						 
						
						
						
						
					 
					
						2014-01-05 01:00:29 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						7d5fb1e99b 
					 
					
						
						
							
							Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop  
						
						 
						
						
						
						
					 
					
						2014-01-05 00:14:10 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						79158144df 
					 
					
						
						
							
							Implement the beloved right click context menu. Just a copy of the instance toolbar  
						
						 
						
						
						
						
					 
					
						2014-01-05 00:06:59 +00:00