Skip to content

Commit

Permalink
Merge pull request #1538 from NillerMedDild/develop
Browse files Browse the repository at this point in the history
0.4.3
  • Loading branch information
NielsPilgaard authored Mar 4, 2021
2 parents c9d4a7f + 7d07f15 commit 4948b20
Show file tree
Hide file tree
Showing 85 changed files with 1,788 additions and 2,202 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,4 @@ config/neat-client.toml
config/itemzoom-client.toml
config/inventoryhud-client.toml
config/ftbchunks-client.toml
config/immersiveengineering-client.toml
54 changes: 34 additions & 20 deletions changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,32 @@
### Enigmatica 6 v0.4.2
### Enigmatica 6 v0.4.3

_Using Forge-1.16.5-36.0.40_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.4.2.md)_
_Using Forge-1.16.5-36.0.40_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.4.3.md)_

**If you're updating from 0.3.x please read the last two changelogs**

**Improvements/Changes**

**If you're updating from 0.3.x please read the last two changelogs**
- Disabled the "Reloaded with no KubeJs errors" message on world-join.

**Bug Fixes**

- JustEnoughResources: No more double reloading, should speed up the time it takes to load singleplayer
- UpdateServerScript: Fixed overrides folder not being moved correctly on Unix based operating systems.
- ImmersiveEngineering: Temporarily removed Jerrycan recipe due to an issue with the Jerrycan
- Powah: Cleaned up ways to obtain Uranitite, only the valid ones are shown now.

### Enigmatica 6 v0.4.2

_Using Forge-1.16.5-36.0.40_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.4.2.md)_

**If you're updating from 0.3.x please read the last two changelogs**

**New Mods!**

- [Abnormals Delight](https://www.curseforge.com/minecraft/mc-mods/abnormals-delight)
* [Create Plus](https://www.curseforge.com/minecraft/mc-mods/create-plus)
* [Inventory HUD+](https://www.curseforge.com/minecraft/mc-mods/inventory-hud-forge)
- [Abnormals Delight](https://www.curseforge.com/minecraft/mc-mods/abnormals-delight)

* [Create Plus](https://www.curseforge.com/minecraft/mc-mods/create-plus)
* [Inventory HUD+](https://www.curseforge.com/minecraft/mc-mods/inventory-hud-forge)

**Improvements/Changes**

Expand Down Expand Up @@ -46,23 +60,23 @@ _Using Forge-1.16.5-36.0.40_ | _[Mod Updates](https://github.com/NillerMedDild/E

**Bug Fixes**

- **Extremely slow nether/end generation**
- Aluminum Ore Texture \(World Generation\) [\#1404](https://github.com/NillerMedDild/Enigmatica6/issues/1404)
- \[0.4.1\] Can't create the "Feedthrough Insulator" multiblock [\#1451](https://github.com/NillerMedDild/Enigmatica6/issues/1451)
- Compact Crafting Field Projector does not drop itself when broken with a valid tool [\#1438](https://github.com/NillerMedDild/Enigmatica6/issues/1438)
- Crash when "crafting" the stonecutter [\#921](https://github.com/NillerMedDild/Enigmatica6/issues/921)
- Ender Biotite has no use [\#1497](https://github.com/NillerMedDild/Enigmatica6/issues/1497)
- Ether \(BYG\) crafting table cannot be converted to vanilla crafting table [\#1492](https://github.com/NillerMedDild/Enigmatica6/issues/1492)
- Green Dye crafting recipe from Yellow and Blue Dye [\#1467](https://github.com/NillerMedDild/Enigmatica6/issues/1467)
- Integrated Dynamics guide book in the Akashic Tome broken [\#1416](https://github.com/NillerMedDild/Enigmatica6/issues/1416)
- Issues with recipes that use Farmer's Delight knife with Cooking for Blockheads and Refined Storage. [\#920](https://github.com/NillerMedDild/Enigmatica6/issues/920)
- New tips! [#1453](https://github.com/NillerMedDild/Enigmatica6/pull/1453) ([Merlo17](https://github.com/Merlo17))
- Non-functional "small" crafting recipe for Compact Crafting [\#1430](https://github.com/NillerMedDild/Enigmatica6/issues/1430)
- RFTools Quests - XNet Tutorial Link is timestamped [\#1494](https://github.com/NillerMedDild/Enigmatica6/issues/1494)
- **Extremely slow nether/end generation**
- Aluminum Ore Texture \(World Generation\) [\#1404](https://github.com/NillerMedDild/Enigmatica6/issues/1404)
- \[0.4.1\] Can't create the "Feedthrough Insulator" multiblock [\#1451](https://github.com/NillerMedDild/Enigmatica6/issues/1451)
- Compact Crafting Field Projector does not drop itself when broken with a valid tool [\#1438](https://github.com/NillerMedDild/Enigmatica6/issues/1438)
- Crash when "crafting" the stonecutter [\#921](https://github.com/NillerMedDild/Enigmatica6/issues/921)
- Ender Biotite has no use [\#1497](https://github.com/NillerMedDild/Enigmatica6/issues/1497)
- Ether \(BYG\) crafting table cannot be converted to vanilla crafting table [\#1492](https://github.com/NillerMedDild/Enigmatica6/issues/1492)
- Green Dye crafting recipe from Yellow and Blue Dye [\#1467](https://github.com/NillerMedDild/Enigmatica6/issues/1467)
- Integrated Dynamics guide book in the Akashic Tome broken [\#1416](https://github.com/NillerMedDild/Enigmatica6/issues/1416)
- Issues with recipes that use Farmer's Delight knife with Cooking for Blockheads and Refined Storage. [\#920](https://github.com/NillerMedDild/Enigmatica6/issues/920)
- New tips! [#1453](https://github.com/NillerMedDild/Enigmatica6/pull/1453) ([Merlo17](https://github.com/Merlo17))
- Non-functional "small" crafting recipe for Compact Crafting [\#1430](https://github.com/NillerMedDild/Enigmatica6/issues/1430)
- RFTools Quests - XNet Tutorial Link is timestamped [\#1494](https://github.com/NillerMedDild/Enigmatica6/issues/1494)

**Mod Removals**

- Temporarily removed [YUNG's Better Caves (Forge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-caves) while we find a solution to dimensional worldgen issues.
- Temporarily removed [YUNG's Better Caves (Forge)](https://www.curseforge.com/minecraft/mc-mods/yungs-better-caves) while we find a solution to dimensional worldgen issues.

### Enigmatica 6 v0.4.1

Expand Down
30 changes: 30 additions & 0 deletions config/alexsmobs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@
mungusBiomeTransformationType = 2
#List of all mungus mushrooms, biome transformations and surface blocks. Each is seperated by a |. Add an entry with a block registry name, biome registry name, and block registry name(for the ground).
mungusBiomeMatches = ["minecraft:red_mushroom|minecraft:mushroom_fields|minecraft:mycelium", "minecraft:brown_mushroom|minecraft:mushroom_fields|minecraft:mycelium", "minecraft:crimson_fungus|minecraft:crimson_forest|minecraft:crimson_nylium", "minecraft:warped_fungus|minecraft:warped_forest|minecraft:warped_nylium"]
#Whether guster spawns are limited to when it is raining/thundering.
limitGusterSpawnsToWeather = true
#Whether Crimson Mosquitoes can transform into Warped Moscos if attacking a Mungus or any listed creature.
warpedMoscoTransformation = true
#List of extra(non mungus) mobs that will trigger a crimson mosquito to become a warped mosquito. Ex: "minecraft:mooshroom", "alexsmobs:warped_toad"
warpedMoscoMobTriggers = [""]

[general.spawning]
#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
Expand Down Expand Up @@ -255,4 +261,28 @@
#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
#Range: > 0
mantisShrimpSpawnRolls = 0
#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
#Range: 0 ~ 1000
gusterSpawnWeight = 35
#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
#Range: > 0
gusterSpawnRolls = 0
#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn. NOTE: By default the warped mosco doesn't spawn in any biomes.
#Range: 0 ~ 1000
warpedMoscoSpawnWeight = 1
#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
#Range: > 0
warpedMoscoSpawnRolls = 1000
#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
#Range: 0 ~ 1000
straddlerSpawnWeight = 85
#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
#Range: > 0
straddlerSpawnRolls = 0
#Spawn Weight, added to a pool of other mobs for each biome. Higher number = higher chance of spawning. 0 = disable spawn
#Range: 0 ~ 1000
stradpoleSpawnWeight = 10
#Random roll chance to enable mob spawning. Higher number = lower chance of spawning
#Range: > 0
stradpoleSpawnRolls = 3

12 changes: 1 addition & 11 deletions config/alexsmobs/cockroach_spawns.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
{
"biomes": [
[
{
"type": "BIOME_DICT",
"negate": false,
"value": "overworld"
},
{
"type": "BIOME_DICT",
"negate": true,
"value": "ocean"
},
{
"type": "BIOME_DICT",
"negate": true,
"value": "mushroom"
"value": "overworld"
}
]
]
Expand Down
16 changes: 16 additions & 0 deletions config/alexsmobs/guster_spawns.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"biomes": [
[
{
"type": "BIOME_DICT",
"negate": false,
"value": "overworld"
},
{
"type": "BIOME_CATEGORY",
"negate": false,
"value": "desert"
}
]
]
}
11 changes: 11 additions & 0 deletions config/alexsmobs/straddler_spawns.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"biomes": [
[
{
"type": "REGISTRY_NAME",
"negate": false,
"value": "minecraft:basalt_deltas"
}
]
]
}
11 changes: 11 additions & 0 deletions config/alexsmobs/stradpole_spawns.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"biomes": [
[
{
"type": "REGISTRY_NAME",
"negate": false,
"value": "minecraft:basalt_deltas"
}
]
]
}
3 changes: 3 additions & 0 deletions config/alexsmobs/warped_mosco_spawns.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"biomes": []
}
15 changes: 14 additions & 1 deletion config/apotheosis/deadly.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,25 @@ general {
"random spawners" {
# [range: 0 ~ 50, default: 1]
I:"alexsmobs:bone_serpent"=1

# [range: 0 ~ 50, default: 1]
I:"alexsmobs:bone_serpent_part"=1

# [range: 0 ~ 50, default: 1]
I:"alexsmobs:guster"=1

# [range: 0 ~ 50, default: 1]
I:"alexsmobs:mimicube"=1

# [range: 0 ~ 50, default: 1]
I:"alexsmobs:soul_vulture"=1

# [range: 0 ~ 50, default: 1]
I:"alexsmobs:straddler"=1

# [range: 0 ~ 50, default: 1]
I:"alexsmobs:warped_mosco"=1

# [range: 0 ~ 50, default: 1]
I:"artifacts:mimic"=1

Expand Down Expand Up @@ -484,4 +495,6 @@ general {
8@minecraft:cave_spider
1@minecraft:creeper
>
}
}


10 changes: 10 additions & 0 deletions config/ars_nouveau-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@
cut = true
#Fell enabled?
fell = true
#Summon Steed enabled?
summon_steed = true
#Summon Wolves enabled?
summon_wolves = true

#Mana
[mana]
Expand Down Expand Up @@ -342,6 +346,12 @@
#Fell cost
#Range: > -2147483648
fell_cost = 150
#Summon Steed cost
#Range: > -2147483648
summon_steed_cost = 0
#Summon Wolves cost
#Range: > -2147483648
summon_wolves_cost = 0

#Starting Spells
["Starter Spells"]
Expand Down
10 changes: 0 additions & 10 deletions config/backtools.toml

This file was deleted.

40 changes: 0 additions & 40 deletions config/clickmachine.cfg

This file was deleted.

19 changes: 0 additions & 19 deletions config/dogslie.toml

This file was deleted.

5 changes: 0 additions & 5 deletions config/dwarfcoal-common.toml

This file was deleted.

Loading

0 comments on commit 4948b20

Please sign in to comment.