Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						fc3c0b0971 
					 
					
						
						
							
							Merge branch 'feature_crashreport' into develop  
						
						 
						
						
						
						
					 
					
						2014-05-21 15:57:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						94cb5c7d77 
					 
					
						
						
							
							Restore manage screenshots in main window.  
						
						 
						
						
						
						
					 
					
						2014-05-18 23:12:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						911ac19a56 
					 
					
						
						
							
							Screenshot upload dialog(s) now have the console window as parent.  
						
						 
						
						
						
						
					 
					
						2014-05-18 19:07:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						7f2a16917e 
					 
					
						
						
							
							Add static data path for ... static data. Like translations. Move translations there.  
						
						 
						
						
						
						
					 
					
						2014-05-17 18:21:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						8a8c4193e6 
					 
					
						
						
							
							Finish status pills.  
						
						 
						
						
						
						
					 
					
						2014-05-17 16:23:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						927217c7f0 
					 
					
						
						
							
							Status pills. This doesn't build yet.  
						
						 
						
						
						
						
					 
					
						2014-05-15 23:20:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew 
							
						 
					 
					
						
						
							
						
						5099964c67 
					 
					
						
						
							
							Implement backtraces on Windows.  
						
						 
						
						... 
						
						
						
						Much !!FUN!! was had 
						
						
					 
					
						2014-05-10 14:16:27 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						0902fd5bec 
					 
					
						
						
							
							Fix version select dialog filtering  
						
						 
						
						
						
						
					 
					
						2014-05-04 13:20:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Forkk 
							
						 
					 
					
						
						
							
						
						605a334057 
					 
					
						
						
							
							Show Patreon patrons in the about dialog  
						
						 
						
						
						
						
					 
					
						2014-05-01 12:43:55 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						a9dfe6d7ec 
					 
					
						
						
							
							Fix quit shortcut connect() call  
						
						 
						
						
						
						
					 
					
						2014-04-21 21:48:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						e955b1c6f9 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/feature_new_login_dialog2' into develop  
						
						 
						
						
						
						
					 
					
						2014-04-21 21:39:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Taeyeon Mori 
							
						 
					 
					
						
						
							
						
						adecc53df8 
					 
					
						
						
							
							Add a quit shortcut to the main window ( #200 )  
						
						 
						
						... 
						
						
						
						The shortcut is Ctrl+Q on every platform but windows, which doesn have one.
See also: http://qt-project.org/doc/qt-5/qkeysequence.html#details  (StandardKey Quit) 
						
						
					 
					
						2014-04-21 21:37:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						c9465e9e86 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/feature_raise_console' into develop  
						
						 
						
						
						
						
					 
					
						2014-04-21 21:25:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						565dab24b5 
					 
					
						
						
							
							Download and cache FML libs for legacy minecraft versions.  
						
						 
						
						... 
						
						
						
						* minor fix for version filtering (1.5 no longer shows forge for 1.5.1 and 1.5.2)
* FML libs are downloaded to mods/minecraftforge/libs and cached
* FML libs are copied to instances which contain FML or forge 
						
						
					 
					
						2014-04-19 21:24:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Taeyeon Mori 
							
						 
					 
					
						
						
							
						
						0959aeb046 
					 
					
						
						
							
							Make the console window raise itself after minecraft closes ( #193 )  
						
						 
						
						... 
						
						
						
						This needs further testing:
http://stackoverflow.com/questions/6087887/bring-window-to-front-raise-show-activatewindow-dont-work  
						
						
					 
					
						2014-04-17 14:13:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						89edc3e15e 
					 
					
						
						
							
							Comments and reformating  
						
						 
						
						... 
						
						
						
						[ci skip] 
						
						
					 
					
						2014-04-16 18:03:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						f67ca674c4 
					 
					
						
						
							
							Fix bug  
						
						 
						
						
						
						
					 
					
						2014-04-16 17:54:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						3ed5b1570b 
					 
					
						
						
							
							LoginDialog changes  
						
						 
						
						
						
						
					 
					
						2014-04-16 17:38:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Taeyeon Mori 
							
						 
					 
					
						
						
							
						
						4674aad125 
					 
					
						
						
							
							Create a new login dialog  
						
						 
						
						
						
						
					 
					
						2014-04-16 16:19:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						86830967b6 
					 
					
						
						
							
							Give the Patreon button a logo  
						
						 
						
						
						
						
					 
					
						2014-04-12 02:05:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sky 
							
						 
					 
					
						
						
							
						
						1657313105 
					 
					
						
						
							
							Add Patreon button. Needs an icon (used I for now).  
						
						 
						
						
						
						
					 
					
						2014-04-11 02:59:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						50d18a06d5 
					 
					
						
						
							
							Context menu tweaks  
						
						 
						
						... 
						
						
						
						* Add create/copy instance actions to the context menu.
* Context menu for the instance view background.
* Top of the context menu is now a header, fixing the misclick problems. 
						
						
					 
					
						2014-04-08 00:16:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						482ad250a4 
					 
					
						
						
							
							Workaround for dirty build folders.  
						
						 
						
						... 
						
						
						
						My disgust just turned into barely contained rage :< 
						
						
					 
					
						2014-04-06 03:59:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						42e305bb9d 
					 
					
						
						
							
							Get rid of long rebuilds because of minor cmake config changes  
						
						 
						
						
						
						
					 
					
						2014-04-06 00:33:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						29b00eab31 
					 
					
						
						
							
							Fix FTB-related issues  
						
						 
						
						
						
						
					 
					
						2014-03-31 00:19:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						fbc29b6a06 
					 
					
						
						
							
							Fix many memory leaks.  
						
						 
						
						
						
						
					 
					
						2014-03-30 20:11:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						5f7a48a35e 
					 
					
						
						
							
							Fix issues with badly encoded escape sequences in config files.  
						
						 
						
						
						
						
					 
					
						2014-03-29 21:16:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						9617326cf8 
					 
					
						
						
							
							Raise console window when it's open, but hidden behind other windows.  
						
						 
						
						
						
						
					 
					
						2014-03-24 01:54:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						4a24ea6c38 
					 
					
						
						
							
							Make some more error messages translateable.  
						
						 
						
						
						
						
					 
					
						2014-03-23 19:07:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						1705832feb 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/feature_notif_65449324' into develop  
						
						 
						
						
						
						
					 
					
						2014-03-19 22:28:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						39d3739442 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/feature_json_fixes' into develop  
						
						 
						
						
						
						
					 
					
						2014-03-19 22:26:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						55e4cb6fb5 
					 
					
						
						
							
							Allow reseting notifications  
						
						 
						
						
						
						
					 
					
						2014-03-15 14:35:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						4f452d5815 
					 
					
						
						
							
							Add a timer for clicking away the notification dialog  
						
						 
						
						
						
						
					 
					
						2014-03-15 14:18:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						42a85def60 
					 
					
						
						
							
							Get rid of one reloadInstanceVersion  
						
						 
						
						
						
						
					 
					
						2014-03-14 21:18:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						e95619fa67 
					 
					
						
						
							
							Pull in BaseInstaller related changes from quickmod  
						
						 
						
						
						
						
					 
					
						2014-03-14 20:48:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						e5b4dee1c0 
					 
					
						
						
							
							Move version stuff to the model and reimplement reordering  
						
						 
						
						
						
						
					 
					
						2014-03-14 19:51:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						fcc5bc2ce0 
					 
					
						
						
							
							Merge branch 'develop' into feature_badges  
						
						 
						
						... 
						
						
						
						Conflicts:
	logic/OneSixInstance.cpp 
						
						
					 
					
						2014-03-10 19:24:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						73fc9c79cf 
					 
					
						
						
							
							Instance badges. Some easter eggs and one for broken so far.  
						
						 
						
						
						
						
					 
					
						2014-03-10 17:38:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						7fd56a30bd 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/feature_commands' into integration_butchery  
						
						 
						
						
						
						
					 
					
						2014-03-09 23:46:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						b2c803a378 
					 
					
						
						
							
							Improve reporting of version file errors.x  
						
						 
						
						
						
						
					 
					
						2014-03-09 23:42:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						ffff2cd324 
					 
					
						
						
							
							Remove version patch reordering. Remove the main class display from onesix edit mods.  
						
						 
						
						
						
						
					 
					
						2014-03-09 17:38:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						cc1de6a649 
					 
					
						
						
							
							Fix another GroupView bug  
						
						 
						
						
						
						
					 
					
						2014-03-07 15:46:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						47bc7e5ee3 
					 
					
						
						
							
							More refactor.  
						
						 
						
						
						
						
					 
					
						2014-03-05 01:50:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						6b76af116e 
					 
					
						
						
							
							Merge branch 'develop' into feature_version_json_butchery  
						
						 
						
						
						
						
					 
					
						2014-03-03 21:57:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jan Dalheimer 
							
						 
					 
					
						
						
							
						
						211a72e144 
					 
					
						
						
							
							Fix a GroupView crash that was triggered by the FTB tracking  
						
						 
						
						
						
						
					 
					
						2014-03-03 19:12:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						d66f2500a6 
					 
					
						
						
							
							No end in sight :<  
						
						 
						
						
						
						
					 
					
						2014-03-03 01:44:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						80d146866c 
					 
					
						
						
							
							Remove widgets from logic.  
						
						 
						
						
						
						
					 
					
						2014-03-02 02:17:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						7c24bcc834 
					 
					
						
						
							
							Reorganize the version-related code.  
						
						 
						
						
						
						
					 
					
						2014-03-01 23:06:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						acff155624 
					 
					
						
						
							
							Merge branch 'feature_screenshots' into integration_json_and_tools  
						
						 
						
						... 
						
						
						
						Conflicts:
	logic/net/URLConstants.h
Resolve issues with multiple definitions of URL constants by moving them to their own object file. 
						
						
					 
					
						2014-02-25 01:52:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petr Mrázek 
							
						 
					 
					
						
						
							
						
						9d4e840a6e 
					 
					
						
						
							
							Screenshots: Optimize image loading and memory use, fix list and button layout.  
						
						 
						
						
						
						
					 
					
						2014-02-25 01:23:33 +01:00