Merge pull request #1 from sayterdarkwynd/master

Update to latest Aug 30 2016
sayterdarkwynd · Aug 30, 2016 · 7293dfb · 7293dfb
2 parents 579129d + 67f1418
commit 7293dfb
Show file tree

Hide file tree

Showing 644 changed files with 4,429 additions and 1,614 deletions.
diff --git a/.metadata b/.metadata
diff --git a/biomes/oredistributions.configfunctions.patch b/biomes/oredistributions.configfunctions.patch
@@ -223,11 +223,11 @@
 "path":"/bloodstonesurface",
 "value": 
   [
-    [0.5, [ [ "coal", 0.9], [ "uranium", 0.00], [ "solarium", 0.00], [ "copper", 0.20], [ "iron", 0.55], [ "lead", 0.20], [ "sulphur", 0.20],[ "mascagnite", 0.30],[ "lazulite", 0.30],[ "magnesium", 0.30],[ "berlinite", 0.40],[ "quietus", 0.40],[ "fublooddiamond", 0.40],[ "neptunium", 0.60] ] ],
-    [1.5, [ [ "coal", 0.9], [ "uranium", 0.00], [ "solarium", 0.00], [ "copper", 0.20], [ "iron", 0.55], [ "tungsten", 0.55], [ "lead", 0.20], [ "sulphur", 0.20],[ "mascagnite", 0.30],[ "lazulite", 0.30],[ "magnesium", 0.30],[ "berlinite", 0.40],[ "quietus", 0.40],[ "fublooddiamond", 0.20],[ "neptunium", 0.60] ] ],
-    [2.5, [ [ "coal", 0.9], [ "uranium", 0.20], [ "solarium", 0.00], [ "copper", 0.20], [ "iron", 0.55], [ "titanium", 0.55],[ "lead", 0.20], [ "sulphur", 0.20],[ "mascagnite", 0.30],[ "lazulite", 0.30],[ "magnesium", 0.30],[ "berlinite", 0.40],[ "quietus", 0.40],[ "fublooddiamond", 0.20],[ "neptunium", 0.60] ] ],
-    [3.5, [ [ "coal", 0.9], [ "uranium", 0.20], [ "solarium", 0.00], [ "copper", 0.20], [ "iron", 0.55], [ "durasteel", 0.55],[ "lead", 0.20], [ "sulphur", 0.20],[ "mascagnite", 0.30],[ "lazulite", 0.30],[ "magnesium", 0.30],[ "berlinite", 0.40],[ "quietus", 0.40],[ "fublooddiamond", 0.20],[ "neptunium", 0.60] ] ],
-    [4.5, [ [ "coal", 0.9], [ "uranium", 0.20], [ "solarium", 0.00], [ "copper", 0.20], [ "iron", 0.55], [ "aegisalt", 0.50], [ "ferozium", 0.50], [ "violium", 0.50], [ "lead", 0.25], [ "sulphur", 0.25],[ "mascagnite", 0.30],[ "lazulite", 0.30],[ "magnesium", 0.30],[ "berlinite", 0.40],[ "quietus", 0.40],[ "fublooddiamond", 0.20],[ "neptunium", 0.60] ] ],
+    [0.5, [ [ "coal", 0.9], [ "uranium", 0.00], [ "solarium", 0.00], [ "copper", 0.20], [ "iron", 0.55], [ "lead", 0.20], [ "sulphur", 0.20],[ "mascagnite", 0.30],[ "lazulite", 0.30],[ "magnesium", 0.30],[ "berlinite", 0.40],[ "quietus", 0.40],[ "fublooddiamond", 0.10],[ "neptunium", 0.60] ] ],
+    [1.5, [ [ "coal", 0.9], [ "uranium", 0.00], [ "solarium", 0.00], [ "copper", 0.20], [ "iron", 0.55], [ "tungsten", 0.55], [ "lead", 0.20], [ "sulphur", 0.20],[ "mascagnite", 0.30],[ "lazulite", 0.30],[ "magnesium", 0.30],[ "berlinite", 0.40],[ "quietus", 0.40],[ "fublooddiamond", 0.10],[ "neptunium", 0.60] ] ],
+    [2.5, [ [ "coal", 0.9], [ "uranium", 0.20], [ "solarium", 0.00], [ "copper", 0.20], [ "iron", 0.55], [ "titanium", 0.55],[ "lead", 0.20], [ "sulphur", 0.20],[ "mascagnite", 0.30],[ "lazulite", 0.30],[ "magnesium", 0.30],[ "berlinite", 0.40],[ "quietus", 0.40],[ "fublooddiamond", 0.10],[ "neptunium", 0.60] ] ],
+    [3.5, [ [ "coal", 0.9], [ "uranium", 0.20], [ "solarium", 0.00], [ "copper", 0.20], [ "iron", 0.55], [ "durasteel", 0.55],[ "lead", 0.20], [ "sulphur", 0.20],[ "mascagnite", 0.30],[ "lazulite", 0.30],[ "magnesium", 0.30],[ "berlinite", 0.40],[ "quietus", 0.40],[ "fublooddiamond", 0.12],[ "neptunium", 0.60] ] ],
+    [4.5, [ [ "coal", 0.9], [ "uranium", 0.20], [ "solarium", 0.00], [ "copper", 0.20], [ "iron", 0.55], [ "aegisalt", 0.50], [ "ferozium", 0.50], [ "violium", 0.50], [ "lead", 0.25], [ "sulphur", 0.25],[ "mascagnite", 0.30],[ "lazulite", 0.30],[ "magnesium", 0.30],[ "berlinite", 0.40],[ "quietus", 0.40],[ "fublooddiamond", 0.15],[ "neptunium", 0.60] ] ],
     [5.5, [ [ "coal", 0.9], [ "uranium", 0.20], [ "solarium", 0.20], [ "copper", 0.20], [ "iron", 0.55], [ "aegisalt", 0.50], [ "ferozium", 0.50], [ "violium", 0.50], [ "lead", 0.25], [ "sulphur", 0.25],[ "mascagnite", 0.35],[ "lazulite", 0.30],[ "magnesium", 0.30],[ "berlinite", 0.40],[ "quietus", 0.40],[ "fublooddiamond", 0.20],[ "neptunium", 0.60] ] ]
   ]
 },
@@ -236,12 +236,12 @@
 "path":"/bloodstonedeepOres",
 "value": 
   [
-    [0.5, [ [ "coal", 0.9], [ "uranium", 0.00], [ "solarium", 0.00], [ "copper", 0.75], [ "iron", 0.75], [ "lead", 0.7], [ "sulphur", 0.75],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.60],[ "berlinite", 0.60],[ "quietus", 0.70], [ "fublooddiamond", 0.50],[ "neptunium", 0.60] ] ],
-    [1.5, [ [ "coal", 0.9], [ "uranium", 0.00], [ "solarium", 0.00], [ "copper", 0.75], [ "iron", 0.25], [ "tungsten", 0.75], [ "lead", 0.75], [ "sulphur", 0.75],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.60],[ "berlinite", 0.20],[ "quietus", 0.62], [ "fublooddiamond", 0.50],[ "neptunium", 0.60] ] ],
-    [2.5, [ [ "coal", 0.9], [ "uranium", 0.60], [ "solarium", 0.00], [ "copper", 0.75], [ "iron", 0.25], [ "titanium", 0.75], [ "lead", 0.75], [ "sulphur", 0.75],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.60],[ "berlinite", 0.20],[ "quietus", 0.62], [ "fublooddiamond", 0.50],[ "neptunium", 0.60] ] ],
-    [3.5, [ [ "coal", 0.9], [ "uranium", 0.60], [ "solarium", 0.00], [ "copper", 0.75], [ "iron", 0.25], [ "durasteel", 0.75], [ "lead", 0.75], [ "sulphur", 0.75],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.60],[ "berlinite", 0.20],[ "quietus", 0.62], [ "fublooddiamond", 0.55],[ "neptunium", 0.60] ] ],
-    [4.5, [ [ "coal", 0.9], [ "uranium", 0.60], [ "solarium", 0.00], [ "copper", 0.75], [ "iron", 0.25], [ "aegisalt", 0.80], [ "ferozium", 0.80], [ "violium", 0.80], [ "lead", 0.55], [ "sulphur", 0.55],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.60],[ "berlinite", 0.65],[ "quietus", 0.71], [ "fublooddiamond", 0.55],[ "neptunium", 0.60] ] ],
-    [5.5, [ [ "coal", 0.9], [ "uranium", 0.60], [ "solarium", 0.60], [ "copper", 0.75], [ "iron", 0.25], [ "aegisalt", 0.80], [ "ferozium", 0.80], [ "violium", 0.80], [ "lead", 0.55], [ "sulphur", 0.55],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.60],[ "berlinite", 0.65],[ "quietus", 0.71], [ "fublooddiamond", 0.55],[ "neptunium", 0.60] ] ]    
+    [0.5, [ [ "coal", 0.9], [ "uranium", 0.00], [ "solarium", 0.00], [ "copper", 0.75], [ "iron", 0.75], [ "lead", 0.7], [ "sulphur", 0.75],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.60],[ "berlinite", 0.60],[ "quietus", 0.70], [ "fublooddiamond", 0.20],[ "neptunium", 0.60] ] ],
+    [1.5, [ [ "coal", 0.9], [ "uranium", 0.00], [ "solarium", 0.00], [ "copper", 0.75], [ "iron", 0.25], [ "tungsten", 0.75], [ "lead", 0.75], [ "sulphur", 0.75],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.60],[ "berlinite", 0.20],[ "quietus", 0.75], [ "fublooddiamond", 0.20],[ "neptunium", 0.60] ] ],
+    [2.5, [ [ "coal", 0.9], [ "uranium", 0.60], [ "solarium", 0.00], [ "copper", 0.75], [ "iron", 0.25], [ "titanium", 0.75], [ "lead", 0.75], [ "sulphur", 0.75],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.60],[ "berlinite", 0.20],[ "quietus", 0.80], [ "fublooddiamond", 0.20],[ "neptunium", 0.60] ] ],
+    [3.5, [ [ "coal", 0.9], [ "uranium", 0.60], [ "solarium", 0.00], [ "copper", 0.75], [ "iron", 0.25], [ "durasteel", 0.75], [ "lead", 0.75], [ "sulphur", 0.75],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.60],[ "berlinite", 0.20],[ "quietus", 0.72], [ "fublooddiamond", 0.25],[ "neptunium", 0.60] ] ],
+    [4.5, [ [ "coal", 0.9], [ "uranium", 0.60], [ "solarium", 0.00], [ "copper", 0.75], [ "iron", 0.25], [ "aegisalt", 0.80], [ "ferozium", 0.80], [ "violium", 0.80], [ "lead", 0.55], [ "sulphur", 0.55],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.80],[ "berlinite", 0.65],[ "quietus", 0.86], [ "fublooddiamond", 0.25],[ "neptunium", 0.60] ] ],
+    [5.5, [ [ "coal", 0.9], [ "uranium", 0.60], [ "solarium", 0.60], [ "copper", 0.75], [ "iron", 0.25], [ "aegisalt", 0.80], [ "ferozium", 0.80], [ "violium", 0.80], [ "lead", 0.55], [ "sulphur", 0.55],[ "mascagnite", 0.60],[ "lazulite", 0.60],[ "magnesium", 0.80],[ "berlinite", 0.65],[ "quietus", 0.97], [ "fublooddiamond", 0.25],[ "neptunium", 0.60] ] ]    
   ]
 },
 
@@ -575,12 +575,12 @@
 "path":"/ff_deepsurfaceatropusOres",
 "value": 
   [
-    [0.5, [ [ "uranium", 0.00], [ "neptunium", 0.00], [ "iron", 0.62], [ "lead", 0.90], [ "mascagnite", 0.90],[ "lazulite", 0.90],[ "magnesium", 0.90],[ "berlinite", 0.90], [ "fossilbone", 0.70], [ "quietus", 0.55], [ "fublooddiamond", 0.40], [ "fublooddiamond", 0.9] ] ],
-    [1.5, [ [ "uranium", 0.00], [ "neptunium", 0.00], [ "iron", 0.41], [ "tungsten", 0.62], [ "lead", 0.50], [ "mascagnite", 0.50],[ "lazulite", 0.50],[ "magnesium", 0.55],[ "berlinite", 0.50], [ "fossilbone", 0.70], [ "quietus", 0.55], [ "fublooddiamond", 1.0] ] ],
-    [2.5, [ [ "uranium", 0.62], [ "neptunium", 0.00], [ "iron", 0.41], [ "titanium", 0.62], [ "lead", 0.50], [ "sulphur", 0.41],[ "mascagnite", 0.62],[ "lazulite", 0.50],[ "magnesium", 0.60],[ "berlinite", 0.55], [ "fossilbone", 0.70], [ "quietus", 0.60], [ "fublooddiamond", 1.1] ] ],
-    [3.5, [ [ "uranium", 0.62], [ "neptunium", 0.50], [ "iron", 0.41], [ "durasteel", 0.62], [ "lead", 0.55], [ "sulphur", 0.55],[ "mascagnite", 0.60],[ "lazulite", 0.55],[ "magnesium", 0.65],[ "berlinite", 0.60], [ "fossilbone", 0.70], [ "quietus", 0.65], [ "fublooddiamond", 1.2] ] ],
-    [4.5, [ [ "uranium", 0.62], [ "neptunium", 0.50], [ "aegisalt", 0.62], [ "ferozium", 0.62], [ "violium", 0.62], [ "lead", 0.55], [ "mascagnite", 0.70],[ "lazulite", 0.60],[ "magnesium", 0.70],[ "berlinite", 0.65], [ "fossilbone", 0.70], [ "quietus", 0.70], [ "fublooddiamond", 1.1] ] ],
-    [5.5, [ [ "uranium", 0.62], [ "neptunium", 1.24], [ "aegisalt", 0.62], [ "ferozium", 0.62], [ "violium", 0.62], [ "lead", 0.55], [ "mascagnite", 0.80],[ "lazulite", 0.65],[ "magnesium", 0.80],[ "berlinite", 0.65], [ "fossilbone", 0.70], [ "quietus", 0.76], [ "fublooddiamond", 1.2] ] ]
+    [0.5, [ [ "uranium", 0.00], [ "neptunium", 0.00], [ "iron", 0.62], [ "lead", 0.90], [ "mascagnite", 0.90],[ "lazulite", 0.90],[ "magnesium", 0.90],[ "berlinite", 0.90], [ "fossilbone", 0.70], [ "quietus", 0.65], [ "fublooddiamond", 0.30], [ "fublooddiamond", 0.9] ] ],
+    [1.5, [ [ "uranium", 0.00], [ "neptunium", 0.00], [ "iron", 0.41], [ "tungsten", 0.62], [ "lead", 0.50], [ "mascagnite", 0.50],[ "lazulite", 0.50],[ "magnesium", 0.55],[ "berlinite", 0.50], [ "fossilbone", 0.70], [ "quietus", 0.75], [ "fublooddiamond", 0.4] ] ],
+    [2.5, [ [ "uranium", 0.62], [ "neptunium", 0.00], [ "iron", 0.41], [ "titanium", 0.62], [ "lead", 0.50], [ "sulphur", 0.41],[ "mascagnite", 0.62],[ "lazulite", 0.50],[ "magnesium", 0.60],[ "berlinite", 0.55], [ "fossilbone", 0.70], [ "quietus", 0.80], [ "fublooddiamond", 0.4] ] ],
+    [3.5, [ [ "uranium", 0.62], [ "neptunium", 0.50], [ "iron", 0.41], [ "durasteel", 0.62], [ "lead", 0.55], [ "sulphur", 0.55],[ "mascagnite", 0.60],[ "lazulite", 0.55],[ "magnesium", 0.65],[ "berlinite", 0.60], [ "fossilbone", 0.70], [ "quietus", 0.85], [ "fublooddiamond", 0.4] ] ],
+    [4.5, [ [ "uranium", 0.62], [ "neptunium", 0.50], [ "aegisalt", 0.62], [ "ferozium", 0.62], [ "violium", 0.62], [ "lead", 0.55], [ "mascagnite", 0.70],[ "lazulite", 0.60],[ "magnesium", 0.70],[ "berlinite", 0.65], [ "fossilbone", 0.70], [ "quietus", 0.87], [ "fublooddiamond", 0.4] ] ],
+    [5.5, [ [ "uranium", 0.62], [ "neptunium", 1.24], [ "aegisalt", 0.62], [ "ferozium", 0.62], [ "violium", 0.62], [ "lead", 0.55], [ "mascagnite", 0.80],[ "lazulite", 0.65],[ "magnesium", 0.80],[ "berlinite", 0.65], [ "fossilbone", 0.70], [ "quietus", 0.90], [ "fublooddiamond", 0.4] ] ]
   ]
 },    
 

diff --git a/biomes/surface/arboreal.biome b/biomes/surface/arboreal.biome
@@ -32,6 +32,7 @@
         "pool" : [
           [ 0.4, "blackbeetle" ],
           [ 0.4, "forestbee" ],
+                    [ 0.1, "minerbee" ],
           [ 0.3, "normalbee" ],
 	  [ 0.3, "greentip" ],
 	  [ 0.3, "blueback" ],

diff --git a/biomes/surface/arboreal2.biome b/biomes/surface/arboreal2.biome
@@ -31,6 +31,7 @@
         "pool" : [
           [ 0.4, "blackbeetle" ],
           [ 0.4, "forestbee" ],
+                    [ 0.1, "minerbee" ],
           [ 0.3, "normalbee" ],
 	  [ 0.3, "greentip" ],
 	  [ 0.3, "blueback" ],

diff --git a/biomes/surface/arborealdark.biome b/biomes/surface/arborealdark.biome
@@ -33,6 +33,7 @@
           [ 0.4, "blackbeetle" ],
           [ 0.4, "forestbee" ],
           [ 0.3, "normalbee" ],
+                    [ 0.1, "minerbee" ],
 	  [ 0.3, "greentip" ],
 	  [ 0.3, "blueback" ],
 	  [ 0.3, "aurorabee" ]

diff --git a/biomes/surface/atropus.biome b/biomes/surface/atropus.biome
@@ -11,7 +11,7 @@
         "pool" : [ 
           [ 0.02, "fubloodgolem" ],
           [ 0.09, "anglure2" ],
-          [ 0.03, "headcrab" ],
+          [ 0.03, "fuheadcrab" ],
           [ 0.06, "fleshleech" ],     
           [ 0.06, "pteropod3" ],
 	  [ 0.08, "snaunt2" ],

diff --git a/biomes/surface/atropusdark.biome b/biomes/surface/atropusdark.biome
@@ -9,7 +9,7 @@
         "pool" : [ 
           [ 0.02, "fubloodgolem" ],
           [ 0.09, "anglure2" ],
-          [ 0.03, "headcrab" ],
+          [ 0.03, "fuheadcrab" ],
           [ 0.06, "fleshleech" ],     
           [ 0.06, "pteropod3" ],
 	  [ 0.08, "snaunt2" ],

diff --git a/biomes/surface/bloodstone.biome b/biomes/surface/bloodstone.biome
@@ -9,7 +9,7 @@
         "select" : 2,
         "pool" : [ 
           [ 0.1111, "fubloodgolem" ],     
-          [ 0.1111, "headcrab" ],
+          [ 0.1111, "fuheadcrab" ],
           [ 0.1111, "fleshleech" ],        
           [ 0.1111, "batong" ],
           [ 0.1111, "nautileech" ],     

diff --git a/biomes/surface/bloodstonesea.biome b/biomes/surface/bloodstonesea.biome
@@ -8,7 +8,7 @@
         "select" : 2,
         "pool" : [ 
           [ 0.1111, "fubloodgolem" ],     
-          [ 0.1111, "headcrab" ],
+          [ 0.1111, "fuheadcrab" ],
           [ 0.1111, "fleshleech" ],        
           [ 0.1111, "pteropod3" ],
           [ 0.1111, "nautileech" ],     

diff --git a/biomes/surface/bog.biome b/biomes/surface/bog.biome
@@ -26,6 +26,7 @@
           [ 0.4, "normalbee" ],
           [ 0.4, "fireflyspawner" ],
           [ 0.4, "muddancer" ],
+                    [ 0.05, "minerbee" ],
 		  [ 0.4, "mudstag" ],
 		  [ 0.4, "funewt" ],
 		  [ 0.4, "mousecritter" ],

diff --git a/biomes/surface/chromatic.biome b/biomes/surface/chromatic.biome
@@ -18,6 +18,7 @@
         "select" : 1,
         "pool" : [
           [ 0.1, "normalbee" ],
+                    [ 0.1, "minerbee" ],
           [ 0.1, "stinkjack" ],
           [ 0.1, "fireflyspawner" ],
 		  [ 0.1, "goldbuck" ],

diff --git a/biomes/surface/desertwastes.biome b/biomes/surface/desertwastes.biome
@@ -25,6 +25,7 @@
           [ 0.4, "sunskipper" ],
           [ 0.3, "goldbuck" ],
           [ 0.4, "hellbeetle" ],
+          [ 0.14, "minerbee" ],
           [ 0.3, "volcanicbee" ]
         ]
       },

diff --git a/biomes/surface/eden.biome b/biomes/surface/eden.biome
@@ -10,6 +10,7 @@
         "select" : 3,
         "pool" : [
         [ 0.4, "blackbeetle" ],
+                  [ 0.1, "minerbee" ],
           [ 0.4, "forestbee" ],
           [ 0.3, "normalbee" ],
           [ 0.3, "fireflyspawner" ],

diff --git a/biomes/surface/irradiated.biome b/biomes/surface/irradiated.biome
@@ -30,6 +30,7 @@
           [ 0.4, "junglebee" ],
           [ 0.3, "aridbee" ],
           [ 0.4, "blackbeetle" ],
+          [ 0.2, "minerbee" ],
           [ 0.4, "junglebee" ],
           [ 0.3, "sackbagcritter" ],
           [ 0.3, "hazmatcritter" ],

diff --git a/biomes/surface/lightless.biome b/biomes/surface/lightless.biome
@@ -299,6 +299,7 @@
             }
           ]
         },
+
         {
           "mode" : "floor",
           "priority" : 0.0,

diff --git a/biomes/surface/mountainous.biome b/biomes/surface/mountainous.biome
@@ -46,6 +46,23 @@
       {
         "select" : 2,
         "pool" : "generatedFlying"
+      },
+      {
+        "select" : 5,
+        "pool" : [
+          [ 0.3, "normalbee" ],
+          [ 0.3, "nocturnalbee" ],
+          [ 0.4, "stinkjack" ],
+          [ 0.3, "fireflyspawner" ],
+          [ 0.2, "minerbee" ],
+          [ 0.3, "goldbuck" ],
+          [ 0.4, "frogcritter" ],
+          [ 0.3, "harecritter" ],
+          [ 0.3, "hedgehogcritter" ],
+          [ 0.4, "petalcritter" ],
+          [ 0.3, "snakecritter" ],
+          [ 0.3, "tritrotscritter" ]
+        ]
       }
     ]
   },

diff --git a/biomes/surface/urbanwasteland.biome b/biomes/surface/urbanwasteland.biome
@@ -20,7 +20,8 @@
         "select" : 2,
         "pool" : [
           [ 0.4, "dustmoth" ],
-          [ 0.3, "fudrone" ]
+          [ 0.3, "fudrone" ],
+          [ 0.1, "minerbee" ]          
         ]
       },
       {