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

More tweaks #34

Merged
merged 36 commits into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
9762e80
no enderman, stop
MuteTiefling Jul 12, 2024
cd338b5
Create default.js
MuteTiefling Jul 12, 2024
2d1562e
Update CHANGELOG.md
MuteTiefling Jul 12, 2024
56033a1
neptune
MuteTiefling Jul 13, 2024
14f388e
Update neptunes_bounty.js
MuteTiefling Jul 13, 2024
95d7a9e
Update neptunes_bounty.js
MuteTiefling Jul 13, 2024
6b2f715
Update neptunes_bounty.js
MuteTiefling Jul 13, 2024
905cbfb
taggening and loots
MuteTiefling Jul 13, 2024
323412c
tags
MuteTiefling Jul 13, 2024
0a28136
Update .gitignore
MuteTiefling Jul 13, 2024
823e832
replacements
MuteTiefling Jul 13, 2024
3103672
safer mek
MuteTiefling Jul 13, 2024
43f64e0
Update lockbox.js
MuteTiefling Jul 13, 2024
4840ba4
improve box loot
MuteTiefling Jul 13, 2024
ea142f2
stonecutter
MuteTiefling Jul 13, 2024
69f8551
Update stonecutting.js
MuteTiefling Jul 13, 2024
8b01e4b
off with their heads
MuteTiefling Jul 13, 2024
d105457
Reduce tallow drop rates
MuteTiefling Jul 13, 2024
25c2f6d
loot cleanup
MuteTiefling Jul 13, 2024
97e35f2
quest additions
MuteTiefling Jul 13, 2024
5210f80
links
MuteTiefling Jul 13, 2024
eaa69db
Update beheading_tools.js
MuteTiefling Jul 13, 2024
a21ed4f
Update info.js
MuteTiefling Jul 13, 2024
a85702f
smithing templates
MuteTiefling Jul 13, 2024
5ca7b52
transmutation
MuteTiefling Jul 14, 2024
c4141e7
rates
MuteTiefling Jul 14, 2024
3936e82
remove note about mek reactors exploding
MuteTiefling Jul 14, 2024
913cbc4
modular force quests and alternat recipes
MuteTiefling Jul 15, 2024
021e42b
changelogs, loots
MuteTiefling Jul 15, 2024
6e55eda
loot
MuteTiefling Jul 15, 2024
60613a3
update global modifications for lootjs 3.0.2+
MuteTiefling Jul 15, 2024
35d0aec
jdt quest updates
MuteTiefling Jul 15, 2024
c2bf208
just dire quests
MuteTiefling Jul 16, 2024
2c8c3db
Guards! Guards!
MuteTiefling Jul 17, 2024
7f49c83
charged
MuteTiefling Jul 20, 2024
ec02416
deepslate
MuteTiefling Jul 20, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,4 @@ command_history.txt
.vscode/recipe.json
.vscode/probe.code-snippets
config/darkmodeeverywhere-client.toml
/debug
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,24 @@
- Blaze Rods may be obtained through material transformations in addition to mob drops [\#30](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/30)
- Genetics: Resequenced quests! [\#30](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/30)
- Sulfur may now be crafted into yellow dye [\#30](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/30)
- Enderman can no longer pick up blocks [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Default Sleep Percent to 25% [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Default FireTick off [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Neptune's bounty can now drop Blue Chocobo Eggs as well as other goodies. Happy fishing! [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Tackle Box is now cheaper [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Mekanism's Radiation and Meltdowns are disabled [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Chipped and Chiseled blocks are added to the Stonecutter, allowing them to be automated through AE2 [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- The Ender Dragon now drops eggs on death [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Mobs with heads can now be beheaded by certain tools [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Smithing Templates may be crafted through Nucleosynthesis [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- MI Upgrades can now be crafted through Nucleosynthesis [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Several new ingot transmutations have been added to Nucleosynthesis [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Mekanism Plutonium Pellets may be converted to MI's Plutonium Dust [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Modular Force Field Quests! [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Energized Steel may be used in place of Steel for any Modular Force Field craft [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Guard Villagers are human too and may be sacrificed for Occultism Rituals [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Powah can now charge Certus Quartz [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)
- Reinforced Deepslate can now be crafted. It's wither proof! [\#34](https://github.com/EnigmaticaModpacks/Enigmatica10/pull/34)

#### 🦟 Bugs Fixed

Expand Down
2 changes: 1 addition & 1 deletion config/Mekanism/general.toml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
#Radiation Settings
[general.radiation]
#Enable worldwide radiation effects. Don't be a downer and disable this.
radiationEnabled = true
radiationEnabled = 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 @@ -118,7 +118,7 @@
#Range: 1.0 ~ 1.7976931348623157E308
surfaceAreaTarget = 4.0
#Whether catastrophic meltdowns can occur from Fission Reactors. If disabled instead of melting down the reactor will turn off and not be able to be turned back on until the damage level decreases.
meltdownsEnabled = true
meltdownsEnabled = false
#The radius of the explosion that occurs from a meltdown.
#Range: 1.0 ~ 500.0
meltdownRadius = 8.0
Expand Down
56 changes: 51 additions & 5 deletions config/ftbquests/quests/chapters/25ADADD36B4FDE05.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -463,20 +463,66 @@
}
{
dependencies: ["11EDFB60C787114D"]
icon: {
components: {
"justdirethings:cauterizewounds_upgrade_installed": 1b
"justdirethings:dropteleport_upgrade_installed": 1b
"justdirethings:forge_energy": 500000
"justdirethings:glowing_upgrade_installed": 1b
"justdirethings:smoker_upgrade_installed": 1b
}
id: "justdirethings:eclipsealloy_sword"
}
id: "3ED6754FC6B0A36D"
rewards: [{
exclude_from_claim_all: true
id: "641269408A7E7C16"
table_id: 167859363417192230L
id: "4B40229FCC7CDB1D"
table_id: 5796131842680319111L
type: "loot"
}]
tasks: [
{
id: "34E6ED3A221ADB0E"
item: { components: { "ftbfiltersystem:filter": "item_tag(c:tools)mod(justdirethings)not(item(justdirethings:ferricore_wrench))" }, count: 1, id: "ftbfiltersystem:smart_filter" }
type: "item"
}
{
id: "5C006233B30BB427"
item: { count: 1, id: "minecraft:smithing_table" }
type: "item"
}
{
id: "0219421FBD8DB647"
item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(justdirethings:upgrades)" }, count: 1, id: "ftbfiltersystem:smart_filter" }
type: "item"
}
]
x: 3.0d
y: -0.5d
}
{
dependencies: ["3ED6754FC6B0A36D"]
dependency_requirement: "one_started"
icon: {
components: {
"ftbquests:icon": "justdirethings:item/eclipsealloy_chestplate"
}
id: "ftbquests:custom_icon"
}
id: "0DA6F0172E06CCB1"
rewards: [{
exclude_from_claim_all: true
id: "3C3DBBB8E4A9297B"
table_id: 5796131842680319111L
type: "loot"
}]
tasks: [{
id: "34E6ED3A221ADB0E"
item: { components: { "ftbfiltersystem:filter": "item_tag(c:tools)mod(justdirethings)not(item(justdirethings:ferricore_wrench))" }, count: 1, id: "ftbfiltersystem:smart_filter" }
id: "57BE29AB834A63FE"
item: { components: { "ftbfiltersystem:filter": "and(mod(justdirethings)item_tag(c:armors))" }, count: 1, id: "ftbfiltersystem:smart_filter" }
type: "item"
}]
x: 3.0d
y: -0.5d
y: 0.5d
}
]
}
Loading