Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RFTools Spawner, Solars, Food, Crafts and other fixes and improvments #1577

Merged
merged 3 commits into from
Mar 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion config/FarmingForBlockheads/Market.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
16 changes: 8 additions & 8 deletions config/enderio/enderiomachines.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions config/enderio/enderiopowertools.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
}


Expand Down
10 changes: 5 additions & 5 deletions config/nuclearcraft.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
126 changes: 96 additions & 30 deletions config/rftools/dimlets.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down
Loading