Merge branch 'fix_ftb' into integration_json_and_tools

2014-02-24 00:28:59 +01:00
parent 7146724607 4883d15262
commit e3d2e5fd74
13 changed files with 320 additions and 145 deletions
--- a/logic/lists/InstanceList.cpp
+++ b/logic/lists/InstanceList.cpp
@ -336,8 +336,6 @@ QList<FTBRecord> InstanceList::discoverFTBInstances()
 					if (!test.exists())
 						continue;
 					record.name = attrs.value("name").toString();
-					if(record.name.contains("voxel", Qt::CaseInsensitive))
-						continue;
 					record.logo = attrs.value("logo").toString();
 					record.mcVersion = attrs.value("mcVersion").toString();
 					record.description = attrs.value("description").toString();