Skip to content
This repository has been archived by the owner on Jan 25, 2022. It is now read-only.

Commit

Permalink
Merge pull request #102 from wolfkidsounds/3.11.1
Browse files Browse the repository at this point in the history
Ore Generation Update - 3.11.1
  • Loading branch information
wolfkidsounds authored Feb 27, 2021
2 parents 0a33eab + f6dd600 commit 4bae1f5
Show file tree
Hide file tree
Showing 225 changed files with 269,620 additions and 3,424 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
b3.6.zip
b3.9.1.zip
universe-modpack_b3.9.2.zip
universe modpack 3.9.2-eigentlich 3.10.zip
universe-modpack_b3.11.1.zip
2 changes: 2 additions & 0 deletions Client/ambience_music/ambience.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ambience Config
enabled=false
2 changes: 1 addition & 1 deletion Client/config/ExtraPlanets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ dimensionid {

"general settings" {
# This option is used for changing the Lead Ore Spawn Rate [range: 0 ~ 2147483647, default: 5]
I:"Amount of Lead Ore Generation per chunk"=5
I:"Amount of Lead Ore Generation per chunk"=8

# Setting this option to false will disable & remove Achievements for ExtraPlanets
B:"Enable Achievements"=true
Expand Down
8 changes: 4 additions & 4 deletions Client/config/Extreme Reactors/Extreme Reactors.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ recipes {
B:registerGraphiteCoalCraftingRecipes=false

# If set, yellorite ore will smelt into whichever item is registered as ingotUranium in the ore dictionary. If false, it will smelt into ingotYellorium. (Default: true)
B:registerYelloriteSmeltToUranium=true
B:registerYelloriteSmeltToUranium=false

# If set, then all Extreme Reactors components will require uranium ingots (ingotUranium) in place of yellorium ingots and plutonium ingots (ingotPlutonium) in place of blutonium ingots. Will be ignored if no other mod registers uranium ingots and/ore plutonium ingots. Default: true
B:registerYelloriumAsUranium=true
B:registerYelloriumAsUranium=false

# If set, then Extreme Reactors will require hardened or reinforced glass (blockGlassHardened or glassReinforced) instead of plain glass. Will be ignored if no other mod registers those glass types. (default: false)
B:requireObsidianGlass=true
Expand Down Expand Up @@ -191,13 +191,13 @@ worldgen {
B:yelloriteOreEnableWorldGen=true

# Maximum number of yellorite clusters per chunk
I:yelloriteOreMaxClustersPerChunk=2
I:yelloriteOreMaxClustersPerChunk=3

# Maximum height (Y coordinate) in the world to generate yellorite ore
I:yelloriteOreMaxY=32

# Maximum number of yellorite ore to generate in each cluster
I:yelloriteOrePerCluster=5
I:yelloriteOrePerCluster=8
}


4 changes: 2 additions & 2 deletions Client/config/Galacticraft/core.conf
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,10 @@ worldgen {
B:"Retro Gen of GC Oil in existing map chunks"=false

# If this is enabled, copper ore will generate on the overworld.
B:"Enable Copper Ore Gen"=true
B:"Enable Copper Ore Gen"=false

# If this is enabled, tin ore will generate on the overworld.
B:"Enable Tin Ore Gen"=true
B:"Enable Tin Ore Gen"=false

# If this is enabled, aluminum ore will generate on the overworld.
B:"Enable Aluminum Ore Gen"=true
Expand Down
6 changes: 3 additions & 3 deletions Client/config/Netherending Ores.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -510,16 +510,16 @@ recipes {

integration {
# Enable Immersive Engineering recipe integration. [default: true]
B:"Immersive Engineering recipes"=true
B:"Immersive Engineering recipes"=false

# Enable Industrial Craft 2 recipe integration. [default: true]
B:"Industrial Craft 2 recipes"=true
B:"Industrial Craft 2 recipes"=false

# Enable Mekanism recipe integration. [default: true]
B:"Mekanism recipes"=true

# Enable Thermal Expansion recipe integration. [default: true]
B:"Thermal Expansion recipes"=true
B:"Thermal Expansion recipes"=false

# Enable Tinkers' Construct recipe integration. [default: true]
B:"Tinkers' Construct recipes"=true
Expand Down
16 changes: 16 additions & 0 deletions Client/config/Probe.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Configuration file

general {
B:enableEnchantments=true
B:enableEntities=true
B:enableFluids=true
B:enableGlobals=true
B:enableItems=true
B:enableMods=true
B:enableOreDictionary=true
B:enableZenPackage=true
B:enableZenType=true
B:setPrettyPrinting=false
}


2 changes: 1 addition & 1 deletion Client/config/Reforged/reforged.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ items {
B:Battleaxe=true

# Enable the Blowgun plus Darts [default: true]
B:Blowgun=true
B:Blowgun=false

# Enable the Boomerang [default: true]
B:Boomerang=true
Expand Down
2 changes: 1 addition & 1 deletion Client/config/Waystones.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ client {

compat {
# If this is true, activating a waystone will cause a JourneyMap waypoint to be created at its position.
B:"Create JourneyMap Waypoint"=true
B:"Create JourneyMap Waypoint"=false
}


Expand Down
46 changes: 46 additions & 0 deletions Client/config/akashictome.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Configuration file

general {
B:"Allow all items to be added"=false
S:"Blacklisted Mods" <
>
S:"Mod Aliases" <
nautralpledge=botania
incorporeal=botania
thermalexpansion=thermalfoundation
thermaldynamics=thermalfoundation
thermalcultivation=thermalfoundation
redstonearsenal=thermalfoundation
rftoolsdim=rftools
ae2stuff=appliedenergistics2
animus=bloodmagic
integrateddynamics=integratedtunnels
mekanismgenerators=mekanism
mekanismtools=mekanism
>
S:"Whitelisted Items" <
roots:runedtablet
opencomputers:tool:4
immersiveengineering:tool:3
integrateddynamics:on_the_dynamics_of_integration
theoneprobe:probenote
evilcraft:origins_of_darkness
draconicevolution:info_tablet
charset:tablet
>
S:"Whitelisted Names" <
book
tome
lexicon
nomicon
manual
knowledge
pedia
compendium
guide
codex
journal
>
}


77 changes: 77 additions & 0 deletions Client/config/avatar/abilities/air_bubble.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"custom_properties": {
"xpOnUse": 1,
"level1": {
"tier": 3,
"chiCost": 3.0,
"chiPercentOnHit": 0.30,
"chiPerSecond": 1.5,
"cooldown": 80,
"exhaustion": 2.0,
"exhaustionOnHit": 1,
"burnOut": 10.0,
"burnOutRecoverTick": 0.5,
"burnOutOnHit": 5,
"size": 1.5,
"maxHealth": 4,
"hover": false
},
"level2": {
"tier": 3,
"chiCost": 3.25,
"chiPercentOnHit": 0.25,
"chiPerSecond": 1.25,
"cooldown": 70,
"exhaustion": 2.0,
"exhaustionOnHit": 1,
"burnOut": 15.0,
"burnOutRecoverTick": 0.75,
"burnOutOnHit": 5,
"size": 1.75,
"maxHealth": 6
},
"level3": {
"tier": 4,
"chiCost": 3.5,
"chiPercentOnHit": 0.20,
"chiPerSecond": 1,
"cooldown": 65,
"exhaustion": 1.5,
"exhaustionOnHit": 1,
"burnOut": 20.0,
"burnOutRecoverTick": 1.0,
"burnOutOnHit": 5,
"size": 2,
"maxHealth": 8
},
"level4_1": {
"tier": 5,
"chiCost": 4.0,
"chiPercentOnHit": 0.30,
"chiPerSecond": 1,
"cooldown": 80,
"exhaustion": 3.0,
"exhaustionOnHit": 2.0,
"burnOut": 20.0,
"burnOutRecoverTick": 2.0,
"burnOutOnHit": 7.5,
"size": 2.5,
"maxHealth": -1
},
"level4_2": {
"tier": 5,
"chiCost": 4.0,
"chiPercentOnHit": 0.25,
"chiPerSecond": 1.25,
"cooldown": 60,
"exhaustion": 3.0,
"exhaustionOnHit": 1.5,
"burnOut": 20.0,
"burnOutRecoverTick": 1.0,
"burnOutOnHit": 5,
"size": 3,
"maxHealth": 10,
"hover": true
}
}
}
129 changes: 129 additions & 0 deletions Client/config/avatar/abilities/air_burst.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
{
"custom_properties": {
"xpOnHit": 2,
"level1": {
"tier": 4,
"chiCost": 3.0,
"cooldown": 200,
"exhaustion": 2.0,
"burnOut": 15.0,
"burnOutRecoverTick": 0.056,
"performanceAmount": 20,
"lifeTime": 30,
"size": 0.5,
"speed": 6,
"knockback": 2,
"chiOnHit": 1.5,
"damage": 6,
"chargeTime": 60,
"effectRadius": 3,
"effectDamage": 4,
"blastLevel": 4,
"weaknessLevel": 0,
"weaknessDuration": 0,
"slownessLevel": 0,
"slownessDuration": 0,
"blindnessLevel": 0,
"blindnessDuration": 0,
"slowMult": 0.55,
"pullsEnemies": false,
"potionEffects": false

},
"level2": {
"tier": 4,
"chiCost": 3.25,
"cooldown": 180,
"exhaustion": 2.5,
"burnOut": 20.0,
"burnOutRecoverTick": 0.083,
"performanceAmount": 25,
"lifeTime": 35,
"size": 0.75,
"speed": 7,
"knockback": 3,
"chiOnHit": 1.625,
"damage": 7,
"chargeTime": 50,
"effectRadius": 4,
"effectDamage": 4,
"blastLevel": 3,
"slowMult": 0.65
},
"level3": {
"tier": 5,
"chiCost": 3.5,
"cooldown": 165,
"exhaustion": 3.0,
"burnOut": 25.0,
"burnOutRecoverTick": 0.11,
"performanceAmount": 30,
"lifeTime": 40,
"size": 1.0,
"speed": 9,
"knockback": 3.5,
"chiOnHit": 1.75,
"damage": 8,
"chargeTime": 40,
"effectRadius": 5,
"effectDamage": 5,
"blastLevel": 2,
"slowMult": 0.7
},
"level4_1": {
"tier": 6,
"chiCost": 3.75,
"cooldown": 150,
"exhaustion": 3.5,
"burnOut": 30.0,
"burnOutRecoverTick": 0.15,
"performanceAmount": 40,
"lifeTime": 60,
"size": 1.25,
"speed": 18,
"knockback": 6,
"chiOnHit": 1.875,
"damage": 15,
"chargeTime": 30,
"effectRadius": 6,
"effectDamage": 6,
"blastLevel": 1,
"slowMult": 0.65,
"potionEffects": true,
"weaknessLevel": 2,
"weaknessDuration": 20,
"slownessLevel": 3,
"slownessDuration": 5,
"blindnessLevel": 2,
"blindnessDuration": 10
},
"level4_2": {
"tier": 6,
"chiCost": 4.0,
"cooldown": 140,
"exhaustion": 4.0,
"burnOut": 35.0,
"burnOutRecoverTick": 0.18,
"performanceAmount": 35,
"lifeTime": 40,
"size": 1.5,
"speed": 12,
"knockback": 5,
"chiOnHit": 2.0,
"damage": 10,
"chargeTime": 20,
"effectRadius": 10,
"effectDamage": 6,
"blastLevel": 0,
"slowMult": 0.8,
"weaknessLevel": 0,
"weaknessDuration": 0,
"slownessLevel": 0,
"slownessDuration": 0,
"blindnessLevel": 0,
"blindnessDuration": 0,
"pullsEnemies": true,
"potionEffects": false
}
}
}
Loading

0 comments on commit 4bae1f5

Please sign in to comment.