Merge pull request #3 from GreatOrator/dev

Time for 2.6.6
GreatOrator · Jul 30, 2015 · 23f25aa · 23f25aa
2 parents e75d5a7 + 28850ae
commit 23f25aa
Show file tree

Hide file tree

Showing 146 changed files with 39,320 additions and 2,974 deletions.
diff --git a/client/minecraft/config/AppliedEnergistics2/Facades.cfg b/client/minecraft/config/AppliedEnergistics2/Facades.cfg
@@ -54,6 +54,7 @@ agricraft {
     B:waterChannelFull=false
     B:waterChannelFull.1=false
     B:waterPad=false
+    B:waterPadFull=false
     B:waterTank=false
 }
 

diff --git a/client/minecraft/config/CarpentersBlocks.cfg b/client/minecraft/config/CarpentersBlocks.cfg
@@ -63,7 +63,7 @@ features {
 
     # When enabled, unobstructed stationary fluid adjacent to block will render in the block space.
     # Note: when enabled, you may experience noticeable chunk update lag spikes.
-    I:"Routable Fluids"=false
+    I:"Routable Fluids"=true
 
     # This controls the smoothness of the slope faces.
     # Note: smoothness of 2 is similar to stairs, while a value above 25 is generally fluid.

diff --git a/client/minecraft/config/CustomMainMenu/mainmenu.json b/client/minecraft/config/CustomMainMenu/mainmenu.json
@@ -172,7 +172,7 @@
 
         "example":
         {
-            "text" : "v2.6.5",
+            "text" : "v2.6.6",
             "posX" : 50,
             "posY" : -20,
             "color" : 13938487,

diff --git a/client/minecraft/config/CustomNpcs.cfg b/client/minecraft/config/CustomNpcs.cfg
@@ -20,7 +20,7 @@ DisableExtraItems=false
 DisableExtraBlock=false
 
 #Enables CustomNpcs startup update message
-EnableUpdateChecker=true
+EnableUpdateChecker=false
 
 #Only ops can create and edit npcs
 OpsOnly=false