Merge branch 'master-ceu' into hp-oredicting

config/betterquesting/DefaultQuests.json

@@ -13366,7 +13366,7 @@
       "properties:10": {
         "betterquesting:10": {
           "autoclaim:1": 0,
-          "desc:8": "§6Aluminum Hydroxide §r§rcan be reduced to Alumina in an Electric Blast Furnace. Later on, Alumina can be reduced directly to Aluminium for a small price of 960 EU/t.",
+          "desc:8": "§6Aluminum Hydroxide §r§rcan be reduced to Alumina in an Electric Blast Furnace.",
           "globalshare:1": 0,
           "icon:10": {
             "Count:3": 1,

config/chesttransporter.cfg

@@ -0,0 +1,44 @@
+# Configuration file
+
+general {
+    # Set to false to disable the hunger debuff [default: true]
+    B:debuffHunger=true
+
+    # Set to false to disable the jump debuff [default: true]
+    B:debuffJump=true
+
+    # Set to false to disable the mining fatigue debuff [default: true]
+    B:debuffMiningFatigue=true
+
+    # Set to false to disable the slowness debuff [default: true]
+    B:debuffSlowness=true
+
+    # Set this to false to prevent picking up of mob spawners [default: true]
+    B:pickupSpawners=true
+
+    # Set this to false to prevent the copper transporter to pick up mob spawners [default: true]
+    B:spawnerWithCopper=true
+
+    # Set this to false to prevent the diamond transporter to pick up mob spawners [default: true]
+    B:spawnerWithDiamond=true
+
+    # Set this to false to prevent the gold transporter to pick up mob spawners [default: true]
+    B:spawnerWithGold=true
+
+    # Set this to false to prevent the iron transporter to pick up mob spawners [default: true]
+    B:spawnerWithIron=true
+
+    # Set this to false to prevent the obsidian transporter to pick up mob spawners [default: true]
+    B:spawnerWithObsidian=true
+
+    # Set this to false to prevent the silver transporter to pick up mob spawners [default: true]
+    B:spawnerWithSilver=true
+
+    # Set this to false to prevent the tin transporter to pick up mob spawners [default: true]
+    B:spawnerWithTin=true
+
+    # Set this to false to prevent the wood transporter to pick up mob spawners [default: true]
+    B:spawnerWithWood=true
+}
+
+

config/gregtech/worldgen/vein/beneath/chromite_vein.json

@@ -0,0 +1,31 @@
+{
+  "weight": 80,
+  "density": 0.5,
+  "dimension_filter": ["dimension_id:10"],
+  "max_height": 255,
+  "min_height": 0,
+  "generator": {
+    "type": "layered",
+    "radius": [
+      25,
+      25
+    ]
+  },
+  "filler": {
+    "type": "layered",
+    "values": [
+      {
+        "primary": "ore:olivine"
+      },
+      {
+        "secondary": "ore:magnetite"
+      },
+      {
+        "between": "ore:chromite"
+      },
+      {
+        "sporadic": "ore:emerald"
+      }
+    ]
+  }
+}

config/gregtech/worldgen/vein/beneath/graphite_vein.json

@@ -0,0 +1,31 @@
+{
+  "weight": 40,
+  "density": 1,
+  "dimension_filter": ["dimension_id:10"],
+  "max_height": 255,
+  "min_height": 0,
+  "generator": {
+    "type": "layered",
+    "radius": [
+      8,
+      8
+    ]
+  },
+  "filler": {
+    "type": "layered",
+    "values": [
+      {
+        "primary": "ore:graphite"
+      },
+      {
+        "secondary": "ore:graphite"
+      },
+      {
+        "between": "ore:graphite"
+      },
+      {
+        "sporadic": "ore:graphite"
+      }
+    ]
+  }
+}

config/gregtech/worldgen/vein/nether/graphite_vein.json

@@ -0,0 +1,33 @@
+{
+  "weight": 40,
+  "density": 1,
+  "dimension_filter":[
+        "dimension_id:-1"
+  ],
+  "max_height": 255,
+  "min_height": 0,
+  "generator": {
+    "type": "layered",
+    "radius": [
+      8,
+      8
+    ]
+  },
+  "filler": {
+    "type": "layered",
+    "values": [
+      {
+        "primary": "ore:graphite"
+      },
+      {
+        "secondary": "ore:graphite"
+      },
+      {
+        "between": "ore:graphite"
+      },
+      {
+        "sporadic": "ore:graphite"
+      }
+    ]
+  }
+}

config/gregtech/worldgen/vein/nether/sulfur_deposit_vein.json

@@ -0,0 +1,45 @@
+{
+  "weight": 120,
+  "density": 0.8,
+  "dimension_filter":[
+    "dimension_id:-1"
+  ],
+  "max_height":120,
+  "min_height":0,
+  "generator": {
+    "type": "layered",
+    "radius": [
+      16,
+      16
+    ]
+  },
+  "filler": {
+    "type": "layered",
+    "values": [
+      {
+        "primary": {
+          "block":"susy:resource_block",
+          "variant":"sulfur"
+        }
+      },
+      {
+        "secondary": {
+          "block":"susy:resource_block",
+          "variant":"sulfur"
+        }
+      },
+      {
+        "between": {
+          "block":"susy:resource_block",
+          "variant":"sulfur"
+        }
+      },
+      {
+        "sporadic": {
+          "block":"susy:resource_block",
+          "variant":"sulfur"
+        }
+      }
+    ]
+  }
+}

config/gregtech/worldgen/vein/nether/tantalite_vein.json

@@ -0,0 +1,33 @@
+{
+  "weight": 30,
+  "density": 0.75,
+   "max_height":120,
+   "min_height":0,
+   "dimension_filter":[
+      "dimension_id:-1"
+   ],
+  "generator": {
+    "type": "layered",
+    "radius": [
+      8,
+      8
+    ]
+  },
+  "filler": {
+    "type": "layered",
+    "values": [
+      {
+        "primary": "ore:tantalite"
+      },
+      {
+        "secondary": "ore:columbite"
+      },
+      {
+        "between": "ore:pyrochlore"
+      },
+      {
+        "sporadic": "ore:banded_iron"
+      }
+    ]
+  }
+}

config/gregtech/worldgen/vein/nether/wolframite_vein.json

@@ -0,0 +1,33 @@
+{
+  "weight": 30,
+  "density": 0.75,
+   "max_height":120,
+   "min_height":0,
+   "dimension_filter":[
+      "dimension_id:-1"
+   ],
+  "generator": {
+    "type": "layered",
+    "radius": [
+      8,
+      8
+    ]
+  },
+  "filler": {
+    "type": "layered",
+    "values": [
+      {
+        "primary": "ore:wolframite"
+      },
+      {
+        "secondary": "ore:scheelite"
+      },
+      {
+        "between": "ore:sphalerite"
+      },
+      {
+        "sporadic": "ore:bismuthinite"
+      }
+    ]
+  }
+}

config/gregtech/worldgen/vein/overworld/garnierite_vein.json

@@ -0,0 +1,34 @@
+{
+  "weight": 60,
+  "density": 0.75,
+  "max_height": 80,
+  "min_height": 0,
+  "vein_populator": {
+    "type": "surface_rock",
+    "material": "garnierite"
+  },
+  "generator": {
+    "type": "layered",
+    "radius": [
+      20,
+      20
+    ]
+  },
+  "filler": {
+    "type": "layered",
+    "values": [
+      {
+        "primary": "ore:garnierite"
+      },
+      {
+        "secondary": "ore:garnierite"
+      },
+      {
+        "between": "ore:garnierite"
+      },
+      {
+        "sporadic": "ore:garnierite"
+      }
+    ]
+  }
+}

config/gregtech/worldgen/vein/overworld/pentlandite_vein.json

@@ -0,0 +1,34 @@
+{
+  "weight": 80,
+  "density": 0.75,
+  "max_height": 80,
+  "min_height": 0,
+  "vein_populator": {
+    "type": "surface_rock",
+    "material": "pentlandite"
+  },
+  "generator": {
+    "type": "layered",
+    "radius": [
+      20,
+      20
+    ]
+  },
+  "filler": {
+    "type": "layered",
+    "values": [
+      {
+        "primary": "ore:pentlandite"
+      },
+      {
+        "secondary": "ore:chalcopyrite"
+      },
+      {
+        "between": "ore:pyrite"
+      },
+      {
+        "sporadic": "ore:pyrite"
+      }
+    ]
+  }
+}

config/gregtech/worldgen/vein/overworld/sulfidic_silver_vein.json

@@ -10,8 +10,8 @@
   "generator": {
     "type": "layered",
     "radius": [
-      20,
-      20
+      16,
+      16
     ]
   },
   "filler": {
@@ -21,13 +21,13 @@
         "primary": "ore:acanthite"
       },
       {
-        "secondary": "ore:galena"
+        "secondary": "ore:proustite"
       },
       {
         "between": "ore:pyrargyrite"
       },
       {
-        "sporadic": "ore:proustite"
+        "sporadic": "ore:silver"
       }
     ]
   }