Index: java/installer2/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- java/installer2/.settings/org.eclipse.jdt.core.prefs	(revision 1026)
+++ java/installer2/.settings/org.eclipse.jdt.core.prefs	(revision 1032)
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
Index: java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties	(revision 1026)
+++ java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties	(revision 1032)
@@ -1,2 +1,2 @@
 appname=AE Installer 2
-appversion=.23
+appversion=.25
Index: java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java	(revision 1026)
+++ java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java	(revision 1032)
@@ -207,5 +207,6 @@
 		System.out.println("TempPath:  " + Paths.getTempPath());
 		System.out.println("ValidPath: " + Installer.verifyRunningDirectory());
-		System.out.println("Platform:  " + PlatformInformation.getPlatform());
+		System.out.println("Platform:  " + System.getProperty("os.name") +
+				" detected as " + PlatformInformation.getPlatform().toString());
 		System.out.println("Architect: "
 				+ PlatformInformation.getArchitecture());
Index: java/installer2/src/net/oni2/aeinstaller/backend/LogPrintStream.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/backend/LogPrintStream.java	(revision 1026)
+++ java/installer2/src/net/oni2/aeinstaller/backend/LogPrintStream.java	(revision 1032)
@@ -23,5 +23,5 @@
 		stdOut = System.out;
 
-		PrintStream ps = new PrintStream(this);
+		PrintStream ps = new PrintStream(this, true);
 		System.setOut(ps);
 		System.setErr(ps);
Index: java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java	(revision 1026)
+++ java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java	(revision 1032)
@@ -198,6 +198,10 @@
 		TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>(
 				new NaturalOrderComparator());
+		log.println("Building sources list");
 		for (File path : foldersOni) {
+			log.println("\tFolder " + path.getPath());
 			for (File levelF : path.listFiles()) {
+				boolean isSecondaryFile = false;
+				log.println("\t\tFolder/file " + levelF.getPath());
 				String fn = levelF.getName().toLowerCase();
 				String levelN = null;
@@ -207,9 +211,14 @@
 				} else if (fn.endsWith(".dat")) {
 					levelN = fn.substring(0, fn.lastIndexOf('.')).toLowerCase();
+				} else if (fn.endsWith(".raw") || fn.endsWith(".sep")) {
+					isSecondaryFile = true;
 				}
 				if (levelN != null) {
+					log.println("\t\t\tAdded for level " + levelN);
 					if (!levels.containsKey(levelN))
 						levels.put(levelN, new Vector<File>());
 					levels.get(levelN).add(levelF);
+				} else if (!isSecondaryFile) {
+					log.println("\t\t\tNot a level file!?");
 				}
 			}
@@ -422,7 +431,12 @@
 
 			log.println("\t\tPatches for " + level);
-
+			
+			log.println("\t\t\tSource files/folders:");
+			for (File srcFolder : oniLevelFolders.get(level)) {
+				log.println("\t\t\t\t" + srcFolder.getPath());
+			}
+
+			// Get files to be patched from vanilla.dat
 			Vector<String> exportPatterns = new Vector<String>();
-			// Get files to be patched from vanilla.dat
 			for (File patch : patches.get(level)) {
 				String patternWildcard = patch.getName();
@@ -449,7 +463,7 @@
 						patternWildcard.indexOf(".oni-patch"));
 				patternWildcard = patternWildcard.replace('-', '*');
-				patternWildcard = patternWildcard + ".oni";
 				Vector<String> patterns = new Vector<String>();
 				patterns.add(patternWildcard);
+				patternWildcard = patternWildcard + ".oni";
 				final Pattern patternRegex = Pattern.compile(
 						patternWildcard.replaceAll("\\*", ".\\*"),
Index: java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java	(revision 1026)
+++ java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java	(revision 1032)
@@ -196,10 +196,10 @@
 		cmbModTypes.removeAllItems();
 
-		TreeMap<String, Type> types = new TreeMap<String, Type>();
-		for (Type t : PackageManager.getInstance().getTypesWithContent()) {
+		TreeMap<String, net.oni2.aeinstaller.backend.packages.Type> types = new TreeMap<String, net.oni2.aeinstaller.backend.packages.Type>();
+		for (net.oni2.aeinstaller.backend.packages.Type t : PackageManager.getInstance().getTypesWithContent()) {
 			types.put(t.getName(), t);
 		}
 		cmbModTypes.addItem("-All-");
-		for (Type t : types.values()) {
+		for (net.oni2.aeinstaller.backend.packages.Type t : types.values()) {
 			cmbModTypes.addItem(t);
 		}
@@ -940,7 +940,7 @@
 	private void updateTableFilter() {
 		Object o = cmbModTypes.getSelectedItem();
-		Type t = null;
-		if (o instanceof Type)
-			t = (Type) o;
+		net.oni2.aeinstaller.backend.packages.Type t = null;
+		if (o instanceof net.oni2.aeinstaller.backend.packages.Type)
+			t = (net.oni2.aeinstaller.backend.packages.Type) o;
 		int downloadState = 0;
 		if (radOnline.isSelected())
Index: java/installer2/src/net/oni2/aeinstaller/gui/reporter/ReporterDialog.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/gui/reporter/ReporterDialog.java	(revision 1026)
+++ java/installer2/src/net/oni2/aeinstaller/gui/reporter/ReporterDialog.java	(revision 1032)
@@ -217,4 +217,6 @@
 			Pattern packagePattern = Pattern.compile(
 					".*/packages/[0-9]{5}[^/]*/.+", Pattern.CASE_INSENSITIVE);
+			Pattern jrePattern = Pattern.compile(
+					".*/JRE/.+", Pattern.CASE_INSENSITIVE);
 			for (File flF : FileUtils.listFilesAndDirs(
 					Paths.getEditionBasePath(), TrueFileFilter.INSTANCE,
@@ -222,5 +224,5 @@
 				String name = flF.getAbsolutePath().substring(baseLength);
 				name = name.replace('\\', '/');
-				if (!packagePattern.matcher(name).matches()) {
+				if (!packagePattern.matcher(name).matches() && !jrePattern.matcher(name).matches()) {
 					if (flF.isFile())
 						fileList.append(name + "\t" + flF.length() + "\n");