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

Jump to bottom

Small update #1237

Merged

klikli-dev merged 33 commits into klikli-dev:version/1.21.1 from Eqis-Edu:1.21.1

Oct 31, 2024

Contributor

Eqis-Edu commented Oct 26, 2024 •

edited

Loading

Another text fix Update en_us.json #1236 to datagen
Add hidden ritual advancements New rituals missing hidden advancements for quest building #1238
More text consistencies Wild Illager Summon appears misnamed #1240 (wild/possessed evoker, also to breezes)
Add a page in Dimensional Mineshaft entry about config for miner go to output before break (not exactly Miner's are not being deposited in the Dimensional Mineshaft's output when near breaking #1241 wants, but it's what I offer)
Add a page in Divination Rod entry about config to locate any ore
Add a note in Ronaza's entry about the iron rod not rendering
Removed outdated quotes about decay
Item 10 from [1.21] Small QoL and improvements #1155 (purified ink texture)
Familiar ring texture change
Bone meal crushing recipe
Slight change in width of spirits hitbox to fit in one block
Rozana's Contact blocks can be placed in ritual satchel
Removed remaing non-pentacles entries advancement locks
Add missing food item tag
Add Marid Essence to miner and stabilizer recipe
Add Afrit Essence to stabilizer recipe
Change the Afrit Crusher recipe
+ Iesnium, emeral, lapis, amethyst, obsidian (all dust)
EMI integration news:
+ Crushing show min and max tier in tooltip, the min is visual too
+ Show the repair ritual when looking for the craft of a valid item (because repair in crafting/anvil/grindstone appers)
+ Show extra drops from possessed mobs (hardcoded for now, trying todo better)
Changed chalks advancements structure to work better in ATM and others modpacks

Pictures:

(ATM testing, need changing the slot some times but work)

Eqis-Edu and others added 11 commits

October 24, 2024 18:38


          Update SummonUnboundAfritEntry.java

b2f9eb9


          Update PossessDjinniEntry.java

2e275ec


          Update PossessFoliotEntry.java

672bcee


          Update PossessUnboundAfritEntry.java

a7b490e


          Update SummonMaridEntry.java

2ca7124


          Update OccultismBookProvider.java

fa70fc1


          Update ENUSProvider.java


          en_us to datagen and missing links

7ab113d


          Merge branch 'klikli-dev:version/1.21.1' into 1.21.1

94075b5


          en_us to datagen

af96ad8


          ritual hidden advancements

2de8ce2

Eqis-Edu changed the title ~~Another text fix~~ Another text fix and add missing hidden advancements

Eqis-Edu added 11 commits

October 27, 2024 12:56


          eldritch miner aluminium to aluminum

9231e91


          eldritch miner jade, onyx, raw cobalt

d5ace99


          More text consistencies

e30c3b8


          Small texture changes

e4c9205


          width of spirits hitbox

24ebb0a


          Visual crushing min tier


          hardcoded alternative output possessions

f78381b


          crushing bones

7fab685


          crushing min and max tier tooltip

976274c


          non pentacles entries only read conditions

6a0bd89


          eldritch materials in satchel

2558e0b

Eqis-Edu changed the title ~~Another text fix and add missing hidden advancements~~ Small update

Eqis-Edu added 4 commits

October 29, 2024 10:51


          add missing food item tag

7f192d9


          add pages about items config

bb2c72e


          familiar ring texture

cb98c0c


          marid essence to craft miner and stabilizer, afrit essence to craft s…

0c10353

…tabilizer

Owner

klikli-dev commented Oct 30, 2024

@Eqis-Edu can you ping me when it is ready to merge? I don't want to pull the trigger while you are still in the middle of things!


          familiar_ring.png removed one invisible pixel

d30bb3e

Eqis-Edu added 5 commits

October 30, 2024 10:33


          changed afrit crusher recipe

eaf902f


          EMI show repair ritual when look how craft item

7804b80


          removed outdated quotes about decay

c17adb1


          datagen

20208fd


          chalk advancements change

97a1613

Contributor Author

Eqis-Edu commented Oct 31, 2024

@klikli-dev Now is ready!


          ronazas iron bar advice

1ff7127

klikli-dev mentioned this pull request

Update en_us.json #1236

Open

klikli-dev merged commit e1d33ce into klikli-dev:version/1.21.1

klikli-dev mentioned this pull request

Wild Illager Summon appears misnamed #1240

Closed

Contributor

MuteTiefling commented Oct 31, 2024

Add a page in Divination Rod entry about config to locate any ore

Why not just change this (and the nearly invisible glass plane) to something else?

This message will go unnoticed and players will still be left confused.

klikli-dev mentioned this pull request

New rituals missing hidden advancements for quest building #1238

Closed

MuteTiefling reviewed

View reviewed changes

src/generated/resources/assets/occultism/lang/en_us.json

    
            @@ -1487,7 +1491,7 @@
          
                "item.occultism.ritual_dummy.craft_storage_remote": "Ritual: Craft Storage Accessor",

                "item.occultism.ritual_dummy.craft_storage_remote.tooltip": "The Storage Accessor can be linked to a Storage Actuator to remotely access items.",

                "item.occultism.ritual_dummy.craft_witherite_dust": "Ritual: Craft Witherite Dust",

                "item.occultism.ritual_dummy.craft_witherite_dust.tooltip": "A afrit will infuse wither essence in the netherite dust.",

                "item.occultism.ritual_dummy.craft_witherite_dust.tooltip": "An afrit will infuse netherite dust with wither essence.",

Contributor

MuteTiefling Oct 31, 2024

Afrit should be capitalized to fit with the rest of the books written style.

src/generated/resources/assets/occultism/lang/en_us.json

-                "ritual.occultism.possess_zombie_piglin.finished": "Summoned possessed zombie piglin successfully.",
-                "ritual.occultism.possess_zombie_piglin.interrupted": "Summoning of possessed zombie piglin interrupted.",
-                "ritual.occultism.possess_zombie_piglin.started": "Started summoning possessed zombie piglin.",
+                "ritual.occultism.possess_zombie_piglin.finished": "Summoned possessed zombified piglin successfully.",

Contributor

MuteTiefling Oct 31, 2024

Capitalization

src/generated/resources/assets/occultism/lang/en_us.json

-                "ritual.occultism.possess_zombie_piglin.interrupted": "Summoning of possessed zombie piglin interrupted.",
-                "ritual.occultism.possess_zombie_piglin.started": "Started summoning possessed zombie piglin.",
+                "ritual.occultism.possess_zombie_piglin.finished": "Summoned possessed zombified piglin successfully.",
+                "ritual.occultism.possess_zombie_piglin.interrupted": "Summoning of possessed zombified piglin interrupted.",

Contributor

MuteTiefling Oct 31, 2024

Capitalization

src/generated/resources/assets/occultism/lang/en_us.json

    
                "ritual.occultism.possess_zombie_piglin.started": "Started summoning possessed zombie piglin.",

                "ritual.occultism.possess_zombie_piglin.finished": "Summoned possessed zombified piglin successfully.",

                "ritual.occultism.possess_zombie_piglin.interrupted": "Summoning of possessed zombified piglin interrupted.",

                "ritual.occultism.possess_zombie_piglin.started": "Started summoning possessed zombified piglin.",

Contributor

MuteTiefling Oct 31, 2024

Capitalization

src/generated/resources/assets/occultism/lang/en_us.json

-                "ritual.occultism.summon_horde_illager.finished": "Summoned the small illager invasion successfully.",
-                "ritual.occultism.summon_horde_illager.interrupted": "Summoning of the small illager invasion interrupted.",
-                "ritual.occultism.summon_horde_illager.started": "Started summoning the small illager invasion.",
+                "ritual.occultism.summon_horde_illager.finished": "Summoned the wild illager invasion successfully.",

Contributor

MuteTiefling Oct 31, 2024

Capitalization

src/generated/resources/assets/occultism/lang/en_us.json

-                "ritual.occultism.summon_horde_illager.interrupted": "Summoning of the small illager invasion interrupted.",
-                "ritual.occultism.summon_horde_illager.started": "Started summoning the small illager invasion.",
+                "ritual.occultism.summon_horde_illager.finished": "Summoned the wild illager invasion successfully.",
+                "ritual.occultism.summon_horde_illager.interrupted": "Summoning of the wild illager invasion interrupted.",

Contributor

MuteTiefling Oct 31, 2024

Capitalization

src/generated/resources/assets/occultism/lang/en_us.json

    
                "ritual.occultism.summon_horde_illager.started": "Started summoning the small illager invasion.",

                "ritual.occultism.summon_horde_illager.finished": "Summoned the wild illager invasion successfully.",

                "ritual.occultism.summon_horde_illager.interrupted": "Summoning of the wild illager invasion interrupted.",

                "ritual.occultism.summon_horde_illager.started": "Started summoning the wild illager invasion.",

Contributor

MuteTiefling Oct 31, 2024

Capitalization

src/generated/resources/assets/occultism/lang/en_us.json

    
                "ritual.occultism.summon_horde_illager.started": "Started summoning the small illager invasion.",

                "ritual.occultism.summon_horde_illager.finished": "Summoned the wild illager invasion successfully.",

                "ritual.occultism.summon_horde_illager.interrupted": "Summoning of the wild illager invasion interrupted.",

                "ritual.occultism.summon_horde_illager.started": "Started summoning the wild illager invasion.",

                "ritual.occultism.summon_marid_crusher.conditions": "Not all requirements for this ritual are met.",

                "ritual.occultism.summon_marid_crusher.finished": "Summoned marid ore crusher successfully.",

Contributor

MuteTiefling Oct 31, 2024

Capitalization

src/generated/resources/assets/occultism/lang/en_us.json

    
                "ritual.occultism.summon_horde_illager.started": "Started summoning the small illager invasion.",

                "ritual.occultism.summon_horde_illager.finished": "Summoned the wild illager invasion successfully.",

                "ritual.occultism.summon_horde_illager.interrupted": "Summoning of the wild illager invasion interrupted.",

                "ritual.occultism.summon_horde_illager.started": "Started summoning the wild illager invasion.",

                "ritual.occultism.summon_marid_crusher.conditions": "Not all requirements for this ritual are met.",

                "ritual.occultism.summon_marid_crusher.finished": "Summoned marid ore crusher successfully.",

                "ritual.occultism.summon_marid_crusher.interrupted": "Summoning of marid ore crusher interrupted.",

Contributor

MuteTiefling Oct 31, 2024

Capitalization

klikli-dev mentioned this pull request

Omnibus: Recent Changes klikli-dev/modonomicon#261

Open

3 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet