Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsPilgaard committed Oct 15, 2024
2 parents a01bb9d + 6c3706b commit d0a387d
Show file tree
Hide file tree
Showing 165 changed files with 4,927 additions and 2,570 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -210,3 +210,5 @@ config/darkmodeeverywhere-client.toml
config/ae2-client.toml
/debug
config/ars_nouveau-client.toml
config/ftbessentials.snbt
config/iris.properties
48 changes: 46 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,59 @@
### Enigmatica 10 1.11

#### ⭐ Improvements

- Add new custom compacting recipes such as snow and quartz [\#110](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/110)
- Creeper overhaul creepers and Occultism skeletons will now avoid players with the appropriate scare genes [\#113](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/113)
- Add Budding blocks and Reinforced Deepslate to PNC's block tracker [\#113](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/113)
- Cheaper scaling of many MI components [\#117](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/117)
- Add tags to filter crushed dusts [\#117](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/117)
- Adds cross compat betwen MI and Mek sodium [\#118](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/118)
- Allows creation of Lithium via MI [\#118](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/118)
- Buffs Wireless Chargers [\#118](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/118)
- Otherworld logs can now be sawed in various machines [\#119](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/119)
- Add support for stripping logs with Farmer's Delight [\#125](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/125)
- Eggs and raw meat may now be composted [\#128](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/128)
- Add enderman heads to beheading scripts and add Deeper Darker's axe to the list of valid tools [\#131](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/131)
- Unify Silicon for IF and EnderIO [\#131](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/131)
- Cheaper Source Blocks! [\#131](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/131)
- Fluix may be crafted with Industrial Foregoing [\#131](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/131)
- Leads and Sticky Pistons now accept pink slime [\#133](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/133)
- Ender IO and IF quests (Work in Progress) [\#143](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/143)


#### 🦟 Bugs Fixed

- Restore missing nucleosynthesizing recipes [\#110](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/110)
- Restore missing metallurgic Infusing and enriching recipes [\#110](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/110)
- Fix broken stronghold locator [\#122](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/122)
- Fix broken sawing recipes [\#125](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/125)
- Remove duplicate potion recipes that have been re-added by Ars [\#131](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/131)
- Fix recipe conflict with Sulfur/dye conversion [\#140](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/140)
- Fix Sourcestone button recipe conflict [\#140](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/140)
- Fix recipe conflict with Terracotta Thin Pots [\#140](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/140)
- Add missing loot to a few PNC quests [\#145](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/145)

---

### Enigmatica 10 1.10.1

NeoForge-1.21.1-21.1.37 | [Mod Updates](https://github.com/EnigmaticaModpacks/Enigmatica10/blob/master/changelogs/changelog_mods_1.10.1.md) | [Modlist](https://github.com/EnigmaticaModpacks/Enigmatica10/blob/master/changelogs/modlist_1.10.1.md)

#### ✔️ Added Mods

- [Deeper and Darker](https://www.curseforge.com/minecraft/mc-mods/deeperdarker) (by [KyaniteMods](https://www.curseforge.com/members/KyaniteMods/projects))
- [Deeper and Darker](https://www.curseforge.com/minecraft/mc-mods/deeperdarker) (by [KyaniteMods](https://www.curseforge.com/members/KyaniteMods/projects))

#### ⭐ Improvements

- Adds Ars Loot to Structory towers [\#109](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/109)
- Upgrades the potions found in Structory towers [\#109](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/109)

#### 🦟 Bugs Fixed

- Fix some broken tags and kubejs errors [(\#107)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/107)
- Occultism recipes not showing for many rituals [(\#90)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/90)
- Fix PNC recipes not showing in EMI [(\#108)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/108)
- Occultism recipes not showing for many rituals [(\#90)](https://github.com/EnigmaticaModpacks/Enigmatica10/issues/90)
- VanillaPlus tools may now be enchanted [\#109](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/109)

---

Expand Down
9 changes: 6 additions & 3 deletions automation/settings.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica10"
$CLIENT_NAME = "Enigmatica10"

# Version Of The Modpack
$MODPACK_VERSION = "1.10.1"
$MODPACK_VERSION = "1.11.0"

# Last Version Of The Modpack
# Needed For Changelog Parsing
$LAST_MODPACK_VERSION = "1.10.0"
$LAST_MODPACK_VERSION = "1.10.1"

# =====================================================================//
# CHANGELOG SETTINGS
Expand Down Expand Up @@ -188,7 +188,10 @@ $CONFIGS_TO_REMOVE_FROM_CLIENT_FILES = @(
"theurgy-client.toml",
"fpsreducer/fpsreducer-client.toml",
"NoChatReports/NCR-Client.json",
"ars_nouveau-client.toml"
"ars_nouveau-client.toml",
"toolbelt-client.toml",
"ftbessentials.snbt",
"iris.properties"
)

$FOLDERS_TO_REMOVE_FROM_CLIENT_FILES = @("local/ftbutilities", "local/ftbchunks/data", "local/ftbultimine", "local/ftbultimine-client.snbt", "resourcepacks")
Expand Down
2 changes: 1 addition & 1 deletion config/Mekanism/general.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ maxSolarNeutronActivatorRate = 64
#Settings for configuring Radiation
[radiation]
#Enable worldwide radiation effects.
enabled = true
enabled = false
#The radius of chunks checked when running radiation calculations. The algorithm is efficient, but don't abuse it by making this crazy high.
#Range: 1 ~ 100
chunkCheckRadius = 5
Expand Down
2 changes: 1 addition & 1 deletion config/Mekanism/generators.toml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
#Settings for configuring Fission Reactor Meltdowns.
[fission_reactor.meltdowns]
#Whether catastrophic meltdowns can occur from Fission Reactors. If this is disabled, instead of melting down the reactor will force turn itself off and not be able to be turned back on until the damage level has returned to safe levels.
enabled = true
enabled = false
#The radius of the explosion that occurs from a meltdown.
#Range: 1.0 ~ 500.0
radius = 8.0
Expand Down
2 changes: 2 additions & 0 deletions config/almostunified/placeholders.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"elementium",
"emerald",
"enderium",
"ender_pearl",
"fluorite",
"gold",
"graphite",
Expand All @@ -35,6 +36,7 @@
"peridot",
"platinum",
"potassium_nitrate",
"quartz",
"ruby",
"salt",
"sapphire",
Expand Down
14 changes: 12 additions & 2 deletions config/almostunified/unification/materials.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
{
"mod_priorities": ["minecraft", "kubejs", "modern_industrialization", "mekanism", "occultism", "bigreactors"],
"mod_priorities": [
"minecraft",
"kubejs",
"modern_industrialization",
"mekanism",
"occultism",
"ae2",
"enderio",
"bigreactors"
],
"priority_overrides": {},
"stone_variants": ["stone", "andesite", "deepslate", "diorite", "granite", "nether"],
"tags": [
Expand All @@ -14,7 +23,8 @@
"c:rods/{material}",
"c:storage_blocks/raw_{material}",
"c:storage_blocks/{material}",
"c:wires/{material}"
"c:wires/{material}",
"c:silicon"
],
"ignored_tags": [],
"ignored_items": [],
Expand Down
2 changes: 2 additions & 0 deletions config/ars_ocultas/base-common.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Conversion rate of LP into player mana
conversionRate = 10
12 changes: 12 additions & 0 deletions config/betterdeserttemples-neoforge-1_21.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
###########################################################################################################
## General settings.
###########################################################################################################
["YUNG's Better Desert Temples".General]
# Whether or not vanilla desert pyramids should be disabled.
# Default: true
#
"Disable Vanilla Pyramids" = true
# Whether or not mining fatigue is applied to players in the desert temple if it has not yet been cleared.
# Default: true
#
"Apply Mining Fatigue" = true
7 changes: 7 additions & 0 deletions config/betterdeserttemples/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This directory is for a few additional options for YUNG's Better Desert Temples.
Options provided may vary by version.
This directory contains subdirectories for supported versions. The first time you run Better Desert Temples, a version subdirectory will be created if that version supports advanced options.
For example, the first time you use Better Desert Temples for 1.21 on NeoForge, the 'neoforge-1_21' subdirectory will be created in this folder.
If no subdirectory for your version is created, then that version probably does not support the additional options.
NOTE -- MOST OPTIONS CAN BE FOUND IN A CONFIG FILE OUTSIDE THIS FOLDER!
For example, on NeoForge 1.21 the file is 'betterdeserttemples-neoforge-1_21.toml'.
30 changes: 30 additions & 0 deletions config/betterdeserttemples/neoforge-1_21/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
######################################
# armorstands.json #
######################################
This file contains ItemRandomizers describing the probability distribution of armor on armor stands.
Armor stands spawn in armory rooms and wardrobe rooms.
For information on ItemRandomizers, see the bottom of this README.
######################################
# itemframes.json #
######################################
This file contains ItemRandomizers describing the probability distribution of items in item frames.
Item frames only spawn in food storage rooms and armoury rooms.
For information on ItemRandomizers, see the bottom of this README.
######################################
# ItemRandomizers #
######################################
Describes a set of items and the probability of each item being chosen.
- entries: An object where each entry's key is a item, and each value is that item's probability of being chosen.
The total sum of all probabilities SHOULD NOT exceed 1.0!
- defaultItem: The item used for any leftover probability ranges.
For example, if the total sum of all the probabilities of the entries is 0.6, then
there is a 0.4 chance of the defaultItem being selected.
Here's an example ItemRandomizer:
"entries": {
"minecraft:stone_axe": 0.25,
"minecraft:shield": 0.2,
"minecraft:air": 0.1
},
"defaultItem": "minecraft:iron_axe"
For each item, this randomizer has a 25% chance of returning a stone axe, 20% chance of choosing a shield,
10% chance of choosing air (nothing), and a 100 - (25 + 20 + 10) = 45% chance of choosing an iron axe (since it's the default item).
58 changes: 58 additions & 0 deletions config/betterdeserttemples/neoforge-1_21/armorstands.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"armoryHelmets": {
"entries": {
"minecraft:golden_helmet": 0.2,
"minecraft:chainmail_helmet": 0.3
},
"defaultItem": "minecraft:air"
},
"wardrobeHelmets": {
"entries": {
"minecraft:chainmail_helmet": 0.2,
"minecraft:leather_helmet": 0.4
},
"defaultItem": "minecraft:air"
},
"armoryChestplates": {
"entries": {
"minecraft:chainmail_chestplate": 0.3,
"minecraft:golden_chestplate": 0.2
},
"defaultItem": "minecraft:air"
},
"wardrobeChestplates": {
"entries": {
"minecraft:chainmail_chestplate": 0.2,
"minecraft:leather_chestplate": 0.4
},
"defaultItem": "minecraft:air"
},
"armoryLeggings": {
"entries": {
"minecraft:golden_leggings": 0.2,
"minecraft:chainmail_leggings": 0.3
},
"defaultItem": "minecraft:air"
},
"wardrobeLeggings": {
"entries": {
"minecraft:leather_leggings": 0.4,
"minecraft:chainmail_leggings": 0.2
},
"defaultItem": "minecraft:air"
},
"armoryBoots": {
"entries": {
"minecraft:chainmail_boots": 0.3,
"minecraft:golden_boots": 0.2
},
"defaultItem": "minecraft:air"
},
"wardrobeBoots": {
"entries": {
"minecraft:chainmail_boots": 0.2,
"minecraft:leather_boots": 0.4
},
"defaultItem": "minecraft:air"
}
}
31 changes: 31 additions & 0 deletions config/betterdeserttemples/neoforge-1_21/itemframes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"armouryItems": {
"entries": {
"minecraft:shield": 0.1,
"minecraft:bow": 0.1,
"minecraft:arrow": 0.05,
"minecraft:golden_axe": 0.1,
"minecraft:stone_sword": 0.05,
"minecraft:golden_sword": 0.1,
"minecraft:stone_axe": 0.05,
"minecraft:name_tag": 0.05
},
"defaultItem": "minecraft:air"
},
"storageItems": {
"entries": {
"minecraft:slime_ball": 0.05,
"minecraft:melon_seeds": 0.025,
"minecraft:potato": 0.2,
"minecraft:bread": 0.2,
"minecraft:cookie": 0.1,
"minecraft:beetroot_seeds": 0.025,
"minecraft:pumpkin_seeds": 0.025,
"minecraft:cake": 0.1,
"minecraft:wheat_seeds": 0.025,
"minecraft:rabbit_foot": 0.01,
"minecraft:honey_bottle": 0.1
},
"defaultItem": "minecraft:air"
}
}
7 changes: 7 additions & 0 deletions config/betterendisland-neoforge-1_21.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
["YUNG's Better End Island"]
# Whether the Ender Dragon drops an egg when every time it's defeated.
# Default: false
"Resummoned Dragon Drops Egg" = false
# Whether the vanilla obsidian platform should spawn in the End instead of the revamped platform.
# Default: false
"Spawn Vanilla Obsidian Platform" = false
8 changes: 8 additions & 0 deletions config/betterfortresses-neoforge-1_21.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
###########################################################################################################
## General settings.
###########################################################################################################
["YUNG's Better Nether Fortresses".General]
# Whether or not vanilla Nether Fortresses should be disabled.
# Default: true
#
"Disable Vanilla Nether Fortresses" = true
8 changes: 8 additions & 0 deletions config/betterfortresses/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
This directory is for a few additional options for YUNG's Better Nether Fortresses.
Options provided may vary by version.
This directory contains subdirectories for supported versions. The first time you run Better Nether Fortresses, a version subdirectory will be created if that version supports advanced options.
For example, the first time you use Better Nether Fortresses for MC 1.21 on Forge, the 'forge-1_21' subdirectory will be created in this folder.
If no subdirectory for your version is created, then that version probably does not support the additional options.
NOTE -- Most of this mod's config settings can be found in a config file outside this folder!
For example, on Forge 1.21 the file is 'betterfortresses-forge-1_21.toml'.
Also note that many of the structure's settings such as spawn rate & spawn conditions can only be modified via data pack.
26 changes: 26 additions & 0 deletions config/betterfortresses/neoforge-1_21/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
######################################
# itemframes.json #
######################################
This file contains ItemRandomizers describing the probability distribution of items in item frames.
Item frames only spawn in certain rooms and hallway pieces.
For information on ItemRandomizers, see the bottom of this README.
######################################
# ItemRandomizers #
######################################
Describes a set of items and the probability of each item being chosen.
- entries: An object where each entry's key is an item, and each value is that item's probability of being chosen.
The total sum of all probabilities SHOULD NOT exceed 1.0!
- defaultItem: The item used for any leftover probability ranges.
For example, if the total sum of all the probabilities of the entries is 0.6, then
there is a 0.4 chance of the defaultItem being selected.
Here's an example ItemRandomizer:
{
"entries": {
"minecraft:cobblestone": 0.25,
"minecraft:air": 0.2,
"minecraft:stone_sword": 0.1
},
"defaultItem": "minecraft:iron_axe"
}
This randomizer has a 25% chance of returning cobblestone, 20% chance of choosing air,
10% chance of choosing a stone sword, and a 100 - (25 + 20 + 10) = 45% chance of choosing iron axe (since it's the default item).
Loading

0 comments on commit d0a387d

Please sign in to comment.