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.

Sign up for GitHub

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

Unhide Master Marid Miner #279

Merged
merged 1 commit into from
Jan 14, 2025
Merged

Unhide Master Marid Miner #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion src/minecraft/config/jei/blacklist.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1842,7 +1842,6 @@ enderio:fused_quartz_np
enderio:clear_glass_nm_light_gray
silentgear:light_blue_fluffy_block
enderio:clear_glass_enm_light_blue
occultism:miner_marid_master
enderio:fused_quartz_na
enderio:fused_quartz_e_lime
pizzacraft:acacia_chopping_board
Expand Down
1 change: 1 addition & 0 deletions .../required_resources/sf5_resources/assets/obscure_tooltips/tooltips/styles/sf5_yellow.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,6 +1373,7 @@
"occultism:familiar_ring",
"occultism:gold_dust",
"occultism:miner_afrit_deeps",
"occultism:miner_marid_master",
"occultism:miner_djinni_ores",
"occultism:miner_foliot_unspecialized",
"openstairs:open_bamboo_stairs",
Expand Down
1 change: 1 addition & 0 deletions src/minecraft/scripts/tags/colors/yellow.zs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,6 +1374,7 @@ val items as ResourceLocation[] = [
<resource:occultism:familiar_ring>,
<resource:occultism:gold_dust>,
<resource:occultism:miner_afrit_deeps>,
<resource:occultism:miner_marid_master>,
<resource:occultism:miner_djinni_ores>,
<resource:occultism:miner_foliot_unspecialized>,
<resource:openstairs:open_bamboo_stairs>,
Expand Down