Move some more stuff from ConfServer --> UConf

src/com/massivecraft/factions/entity/UConf.java

@@ -26,9 +26,7 @@ public class UConf extends Entity<UConf>
 	// -------------------------------------------- //
 	// CORE
 	// -------------------------------------------- //
-	
-	public boolean canLeaveWithNegativePower = true;
-	
+
 	public int factionMemberLimit = 0;
 	public double factionPowerMax = 1000.0;
 	
@@ -36,6 +34,19 @@ public class UConf extends Entity<UConf>
 	public int factionTagLengthMax = 10;
 	public boolean factionTagForceUpperCase = false;
 	
+	// -------------------------------------------- //
+	// ASSORTED
+	// -------------------------------------------- //
+	
+	public boolean permanentFactionsDisableLeaderPromotion = false;
+	
+	public int actionDeniedPainAmount = 2;
+	
+	public boolean disablePVPForFactionlessPlayers = false;
+	public boolean enablePVPAgainstFactionlessInAttackersLand = false;
+	
+	public double territoryShieldFactor = 0.3;
+	
 	// -------------------------------------------- //
 	// DEFAULTS
 	// -------------------------------------------- //
@@ -60,6 +71,8 @@ public class UConf extends Entity<UConf>
 	public double powerPerHour = 2.0;
 	public double powerPerDeath = -2.0;
 	
+	public boolean canLeaveWithNegativePower = true;
+	
 	// -------------------------------------------- //
 	// HOMES
 	// -------------------------------------------- //
@@ -88,4 +101,11 @@ public class UConf extends Entity<UConf>
 		Rel.MEMBER, new ArrayList<String>()
 	);
 	
+	// -------------------------------------------- //
+	// INTEGRATION: LWC
+	// -------------------------------------------- //
+	
+	public boolean onUnclaimResetLwcLocks = false;
+	public boolean onCaptureResetLwcLocks = false;
+
 }