Merge pull request #1577 from Krutoy242/master

RFTools Spawner, Solars, Food, Crafts and other fixes and improvments
EnigmaticaModpacks · Mar 28, 2020 · 9598ec8 · 9598ec8
2 parents 03bf3f2 + c7f3dd9
commit 9598ec8
Show file tree

Hide file tree

Showing 16 changed files with 5,583 additions and 57 deletions.
diff --git a/config/FarmingForBlockheads/Market.json b/config/FarmingForBlockheads/Market.json
@@ -59,7 +59,26 @@
     "harvestcraft:juniperberryseeditem": "1*minecraft:emerald",
     "harvestcraft:tomatilloseeditem": "1*minecraft:emerald",
 	  "minecraft:mooshroom_spawn_egg": "10*minecraft:emerald",
-	"minecraft:spawn_egg@{EntityTag: {id: \"quark:frog\"}}": "10*minecraft:emerald"
+	  "minecraft:spawn_egg@{EntityTag: {id: \"quark:frog\"}}": "10*minecraft:emerald",
+    "rustic:sapling:1": "10*minecraft:emerald",
+    "rustic:sapling": "10*minecraft:emerald",
+    "rustic:wildberry_bush": "10*minecraft:emerald",
+    "rustic:chili_pepper_seeds": "1*minecraft:emerald",
+    "rustic:tomato_seeds": "1*minecraft:emerald",
+    "rustic:marsh_mallow": "1*minecraft:emerald",
+    "rustic:ginseng": "1*minecraft:emerald",
+    "rustic:bee": "1*minecraft:emerald",
+    "rustic:core_root": "1*minecraft:emerald",
+    "rustic:cloudsbluff": "1*minecraft:emerald",
+    "rustic:wind_thistle": "1*minecraft:emerald",
+    "rustic:mooncap_mushroom": "1*minecraft:emerald",
+    "rustic:horsetail": "1*minecraft:emerald",
+    "rustic:deathstalk_mushroom": "1*minecraft:emerald",
+    "rustic:cohosh": "1*minecraft:emerald",
+    "rustic:chamomile": "1*minecraft:emerald",
+    "rustic:blood_orchid": "1*minecraft:emerald",
+    "rustic:aloe_vera": "1*minecraft:emerald",
+    "rustic:grape_stem": "1*minecraft:emerald"
   },
   "defaults amount": {
     "Vanilla Seeds": 1,

diff --git a/config/enderio/enderiomachines.cfg b/config/enderio/enderiomachines.cfg
@@ -149,20 +149,20 @@ generator {
         B:helmetChargeOthers=true
 
         # Energy generated per TICK by Simple Photovoltaic Panels. (synced from server) [range: 1 ~ 2147483647, default: 10]
-        I:solarPanel0Gen=10
+        I:solarPanel0Gen=50
 
         # Energy generated per TICK by Photovoltaic Panels. (synced from server) [range: 1 ~ 2147483647, default: 40]
-        I:solarPanel1Gen=40
+        I:solarPanel1Gen=200
 
         # Energy generated per TICK by Advanced Photovoltaic Panels. (synced from server) [range: 1 ~ 2147483647, default: 80]
-        I:solarPanel2Gen=80
+        I:solarPanel2Gen=800
 
         # Energy generated per TICK by Vibrant Photovoltaic Panels. (synced from server) [range: 1 ~ 2147483647, default: 160]
-        I:solarPanel3Gen=160
-        I:solarPanelFourOutput=1920
-        I:solarPanelOneOutput=40
-        I:solarPanelThreeOutput=640
-        I:solarPanelTwoOutput=160
+        I:solarPanel3Gen=3200
+        I:solarPanelOneOutput=800
+        I:solarPanelTwoOutput=3200
+        I:solarPanelThreeOutput=12800
+        I:solarPanelFourOutput=51200
 
         # When enabled Photovoltaic Panels accept Liquid Sunshine directly above them as source of sunlight. (synced from server) [default: true]
         B:solarPoweredBySunshine=true

diff --git a/config/enderio/enderiopowertools.cfg b/config/enderio/enderiopowertools.cfg
@@ -18,22 +18,22 @@ capbank {
     I:tier1_maxStorage=10000000
 
     # The maximum IO per tick for a single tier two capacitor bank. (synced from server) [range: 1 ~ 1000000000, default: 5000]
-    I:tier2_maxIO=50000
+    I:tier2_maxIO=500000
 
     # The maximum storage for a single tier two capacitor bank. (synced from server) [range: 1 ~ 2000000000, default: 5000000]
-    I:tier2_maxStorage=50000000
+    I:tier2_maxStorage=500000000
 
     # The maximum IO per tick for a single tier three capacitor bank. (synced from server) [range: 1 ~ 1000000000, default: 25000]
-    I:tier3_maxIO=250000
+    I:tier3_maxIO=5000000
 
     # The maximum storage for a single tier three capacitor bank. (synced from server) [range: 1 ~ 2000000000, default: 25000000]
-    I:tier3_maxStorage=500000000
+    I:tier3_maxStorage=2000000000
 
     # The maximum IO per tick for a creative capacitor bank. (synced from server) [range: 1 ~ 1000000000, default: 500000]
-    I:tierC_maxIO=100000
+    I:tierC_maxIO=1000000000
 
     # The maximum storage for a creative capacitor bank. (synced from server) [range: 1 ~ 2000000000, default: 100000000]
-    I:tierC_maxStorage=100000000
+    I:tierC_maxStorage=2000000000
 }
 
 

diff --git a/config/nuclearcraft.cfg b/config/nuclearcraft.cfg
@@ -773,10 +773,10 @@ generators {
 
     # RF/t generated. Order: Basic, Advanced, DU, Elite.
     I:solar_power <
-        20
-        60
-        180
-        540
+        40
+        160
+        640
+        2560
      >
 
     # Mean lifetimes of adjacent radioactive blocks. Order: Thorium, Uranium, Depleted Thorium, Depleted Uranium, Depleted Neptunium, Depleted Plutonium, Depleted Americium, Depleted Curium, Depleted Berkelium, Depleted Californium.
@@ -1391,7 +1391,7 @@ radiation {
      >
 
     # If enabled along with hardcore containers, radiation shielding can be applied to tile entities.
-    B:radiation_tile_shielding=true
+    B:radiation_tile_shielding=false
 
     # The maximum rate at which scrubbers will remove radiation as a fraction of the radiation level of the chunk it is in.
     D:radiation_scrubber_fraction=0.1

diff --git a/config/rftools/dimlets.json b/config/rftools/dimlets.json
@@ -277,36 +277,6 @@
       "dimlet": false
     }
   },
-  {
-    "filter": {
-      "mod": "flatcoloredblocks",
-      "name": "flatcoloredblock_glowing.*",
-      "type": "material"
-    },
-    "settings": {
-      "rarity": 4,
-      "create": 500,
-      "maintain": 500,
-      "ticks": 100,
-      "worldgen": false,
-      "dimlet": true
-    }
-  },
-  {
-    "filter": {
-      "mod": "flatcoloredblocks",
-      "name": "flatcoloredblock.*",
-      "type": "material"
-    },
-    "settings": {
-      "rarity": 2,
-      "create": 100,
-      "maintain": 50,
-      "ticks": 10,
-      "worldgen": false,
-      "dimlet": true
-    }
-  },
   {
     "filter": {
       "mod": "biomesoplenty",
@@ -635,6 +605,102 @@
       "dimlet": true
     }
   },
+  {
+    "filter": {
+      "mod": "thermalfoundation",
+      "name": "storage"
+    },
+    "settings": {
+      "rarity": 5,
+      "create": 900000,
+      "maintain": 750000,
+      "ticks": 900,
+      "worldgen": false,
+      "dimlet": true
+    }
+  },
+  {
+    "filter": {
+      "mod": "actuallyadditions",
+      "name": [
+        "block_crystal",
+        "block_testifi_bucks_green_wall",
+        "block_testifi_bucks_white_wall"
+      ],
+      "type": "material"
+    },
+    "settings": {
+      "rarity": 5,
+      "create": 900000,
+      "maintain": 750000,
+      "ticks": 900,
+      "worldgen": false,
+      "dimlet": true
+    }
+  },
+  {
+    "filter": {
+      "mod": "extrautils2",
+      "name": [
+        "compressed",
+        "decorativesolid"
+      ],
+      "type": "material"
+    },
+    "settings": {
+      "rarity": 3,
+      "create": 100000,
+      "maintain": 50000,
+      "ticks": 300,
+      "worldgen": false,
+      "dimlet": true
+    }
+  },
+  {
+    "filter": {
+      "mod": "redstonearsenal",
+      "name": "storage",
+      "type": "material"
+    },
+    "settings": {
+      "rarity": 5,
+      "create": 600000,
+      "maintain": 500000,
+      "ticks": 300,
+      "worldgen": false,
+      "dimlet": true
+    }
+  },
+  {
+    "filter": {
+      "mod": "nuclearcraft",
+      "name": "ingot_block",
+      "type": "material"
+    },
+    "settings": {
+      "rarity": 5,
+      "create": 300000,
+      "maintain": 250000,
+      "ticks": 300,
+      "worldgen": false,
+      "dimlet": true
+    }
+  },
+  {
+    "filter": {
+      "mod": "enderio",
+      "name": "block_alloy",
+      "type": "material"
+    },
+    "settings": {
+      "rarity": 5,
+      "create": 300000,
+      "maintain": 250000,
+      "ticks": 300,
+      "worldgen": false,
+      "dimlet": true
+    }
+  },
   {
     "filter": {
       "type": "material"