Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

.gitignore

@@ -18,3 +18,5 @@ tags
 # YouCompleteMe config stuff.
 .ycm_extra_conf.*
 
+#OSX Stuff
+.DS_Store

CMakeLists.txt

@@ -612,6 +612,18 @@ INSTALL(
 	REGEX "d\\." EXCLUDE
 	REGEX "_debug\\." EXCLUDE
 )
+IF(APPLE)
+	# Accessible plugin to make buttons look decent on osx
+	INSTALL(
+		DIRECTORY "${QT_PLUGINS_DIR}/accessible"
+		DESTINATION ${PLUGIN_DEST_DIR}
+		COMPONENT Runtime
+		REGEX "quick" EXCLUDE
+		REGEX "d\\." EXCLUDE
+		REGEX "_debug\\." EXCLUDE
+	)
+ENDIF()
+
 endif()
 
 # qtconf

gui/dialogs/IconPickerDialog.cpp

@@ -103,7 +103,7 @@ void IconPickerDialog::addNewIcon()
 	QString selectIcons = tr("Select Icons");
 	//: The type of icon files
 	QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(),
-														  tr("Icons") + "(*.png *.jpg *.jpeg)");
+														  tr("Icons") + "(*.png *.jpg *.jpeg *.ico)");
 	MMC->icons()->installIcons(fileNames);
 }
 

logic/JavaUtils.cpp

@@ -177,10 +177,10 @@ QList<QString> JavaUtils::FindJavaPaths()
 #elif OSX
 QList<QString> JavaUtils::FindJavaPaths()
 {
-	QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
-
 	QList<QString> javas;
 	javas.append(this->GetDefaultJava()->path);
+	javas.append("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java");
+	javas.append("/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java");
 
 	return javas;
 }

logic/icons/IconList.cpp

@@ -258,7 +258,7 @@ void IconList::installIcons(QStringList iconFiles)
 		QString target = PathCombine("icons", fileinfo.fileName());
 
 		QString suffix = fileinfo.suffix();
-		if (suffix != "jpeg" && suffix != "png" && suffix != "jpg")
+		if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico")
 			continue;
 
 		if (!QFile::copy(file, target))
@@ -348,4 +348,4 @@ int IconList::getIconIndex(QString key)
 	return -1;
 }
 
-//#include "IconList.moc"
+//#include "IconList.moc"