Initial rv1 beta merge.

2014-09-13 15:12:47 -05:00
parent 2356b7ce57 c4b8940c1d
commit 4b8cc401d8
58 changed files with 754 additions and 210 deletions
@@ -54,7 +54,7 @@ public enum AEFeature

 	enableDisassemblyCrafting("Crafting"), MolecularAssembler("CraftingFeatures"), MeteoriteCompass("Tools"), Patterns("CraftingFeatures"),

-	ChunkLoggerTrace("Commands", false), Achievements("Misc");
+	ChunkLoggerTrace("Commands", false), LogSecurityAudits("Misc", false), Achievements("Misc");

 	String Category;
 	boolean visible = true;