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

Small update #1237

Merged
merged 33 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b2f9eb9
Update SummonUnboundAfritEntry.java
Eqis-Edu Oct 24, 2024
2e275ec
Update PossessDjinniEntry.java
Eqis-Edu Oct 25, 2024
672bcee
Update PossessFoliotEntry.java
Eqis-Edu Oct 25, 2024
a7b490e
Update PossessUnboundAfritEntry.java
Eqis-Edu Oct 25, 2024
2ca7124
Update SummonMaridEntry.java
Eqis-Edu Oct 25, 2024
fa70fc1
Update OccultismBookProvider.java
Eqis-Edu Oct 25, 2024
8618388
Update ENUSProvider.java
Eqis-Edu Oct 25, 2024
7ab113d
en_us to datagen and missing links
Eqis-Edu Oct 25, 2024
94075b5
Merge branch 'klikli-dev:version/1.21.1' into 1.21.1
Eqis-Edu Oct 26, 2024
af96ad8
en_us to datagen
Eqis-Edu Oct 26, 2024
2de8ce2
ritual hidden advancements
Eqis-Edu Oct 26, 2024
9231e91
eldritch miner aluminium to aluminum
Eqis-Edu Oct 27, 2024
d5ace99
eldritch miner jade, onyx, raw cobalt
Eqis-Edu Oct 27, 2024
e30c3b8
More text consistencies
Eqis-Edu Oct 27, 2024
e4c9205
Small texture changes
Eqis-Edu Oct 27, 2024
24ebb0a
width of spirits hitbox
Eqis-Edu Oct 27, 2024
5329672
Visual crushing min tier
Eqis-Edu Oct 28, 2024
f78381b
hardcoded alternative output possessions
Eqis-Edu Oct 28, 2024
7fab685
crushing bones
Eqis-Edu Oct 28, 2024
976274c
crushing min and max tier tooltip
Eqis-Edu Oct 28, 2024
6a0bd89
non pentacles entries only read conditions
Eqis-Edu Oct 28, 2024
2558e0b
eldritch materials in satchel
Eqis-Edu Oct 29, 2024
7f192d9
add missing food item tag
Eqis-Edu Oct 29, 2024
bb2c72e
add pages about items config
Eqis-Edu Oct 29, 2024
cb98c0c
familiar ring texture
Eqis-Edu Oct 29, 2024
0c10353
marid essence to craft miner and stabilizer, afrit essence to craft s…
Eqis-Edu Oct 29, 2024
d30bb3e
familiar_ring.png removed one invisible pixel
Eqis-Edu Oct 30, 2024
eaf902f
changed afrit crusher recipe
Eqis-Edu Oct 30, 2024
7804b80
EMI show repair ritual when look how craft item
Eqis-Edu Oct 30, 2024
c17adb1
removed outdated quotes about decay
Eqis-Edu Oct 30, 2024
20208fd
datagen
Eqis-Edu Oct 30, 2024
97a1613
chalk advancements change
Eqis-Edu Oct 31, 2024
1ff7127
ronazas iron bar advice
Eqis-Edu Oct 31, 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
152 changes: 78 additions & 74 deletions src/generated/resources/assets/occultism/lang/en_us.json

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions src/generated/resources/data/c/tags/item/foods.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"values": [
"occultism:datura",
"occultism:demons_dream_essence",
"occultism:otherworld_essence",
"occultism:beaver_nugget",
"occultism:cursed_honey",
"occultism:demonic_meat"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/minecraft/tags/item/meat.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"occultism:demonic_meat"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"craft_dragonyst_dust": {
"conditions": {
"ritual_id": "occultism:ritual/craft_dragonyst_dust"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.craft_dragonyst_dust.description"
},
"hidden": true,
"icon": {
"count": 1,
"id": "occultism:jei_dummy/none"
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.craft_dragonyst_dust.title"
}
},
"requirements": [
[
"craft_dragonyst_dust"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"craft_miner_ancient_eldritch": {
"conditions": {
"ritual_id": "occultism:ritual/craft_miner_ancient_eldritch"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.craft_miner_ancient_eldritch.description"
},
"hidden": true,
"icon": {
"count": 1,
"id": "occultism:jei_dummy/none"
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.craft_miner_ancient_eldritch.title"
}
},
"requirements": [
[
"craft_miner_ancient_eldritch"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"craft_nature_paste": {
"conditions": {
"ritual_id": "occultism:ritual/craft_nature_paste"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.craft_nature_paste.description"
},
"hidden": true,
"icon": {
"count": 1,
"id": "occultism:jei_dummy/none"
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.craft_nature_paste.title"
}
},
"requirements": [
[
"craft_nature_paste"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"craft_research_fragment_dust": {
"conditions": {
"ritual_id": "occultism:ritual/craft_research_fragment_dust"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.craft_research_fragment_dust.description"
},
"hidden": true,
"icon": {
"count": 1,
"id": "occultism:jei_dummy/none"
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.craft_research_fragment_dust.title"
}
},
"requirements": [
[
"craft_research_fragment_dust"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"craft_ritual_satchel_t1": {
"conditions": {
"ritual_id": "occultism:ritual/craft_ritual_satchel_t1"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.craft_ritual_satchel_t1.description"
},
"hidden": true,
"icon": {
"count": 1,
"id": "occultism:jei_dummy/none"
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.craft_ritual_satchel_t1.title"
}
},
"requirements": [
[
"craft_ritual_satchel_t1"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"craft_ritual_satchel_t2": {
"conditions": {
"ritual_id": "occultism:ritual/craft_ritual_satchel_t2"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.craft_ritual_satchel_t2.description"
},
"hidden": true,
"icon": {
"count": 1,
"id": "occultism:jei_dummy/none"
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.craft_ritual_satchel_t2.title"
}
},
"requirements": [
[
"craft_ritual_satchel_t2"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"craft_witherite_dust": {
"conditions": {
"ritual_id": "occultism:ritual/craft_witherite_dust"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.craft_witherite_dust.description"
},
"hidden": true,
"icon": {
"count": 1,
"id": "occultism:jei_dummy/none"
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.craft_witherite_dust.title"
}
},
"requirements": [
[
"craft_witherite_dust"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"misc_budding_amethyst": {
"conditions": {
"ritual_id": "occultism:ritual/misc_budding_amethyst"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.misc_budding_amethyst.description"
},
"hidden": true,
"icon": {
"count": 1,
"id": "occultism:jei_dummy/none"
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.misc_budding_amethyst.title"
}
},
"requirements": [
[
"misc_budding_amethyst"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"misc_reinforced_deepslate": {
"conditions": {
"ritual_id": "occultism:ritual/misc_reinforced_deepslate"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.misc_reinforced_deepslate.description"
},
"hidden": true,
"icon": {
"count": 1,
"id": "occultism:jei_dummy/none"
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.misc_reinforced_deepslate.title"
}
},
"requirements": [
[
"misc_reinforced_deepslate"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"summon_wild_afrit": {
"misc_wild_trim": {
"conditions": {
"ritual_id": "occultism:ritual/summon_wild_afrit"
"ritual_id": "occultism:ritual/misc_wild_trim"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.summon_wild_afrit.description"
"translate": "advancements.occultism.misc_wild_trim.description"
},
"hidden": true,
"icon": {
Expand All @@ -20,12 +20,12 @@
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.summon_wild_afrit.title"
"translate": "advancements.occultism.misc_wild_trim.title"
}
},
"requirements": [
[
"summon_wild_afrit"
"misc_wild_trim"
]
],
"sends_telemetry_event": true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "occultism:occultism/root",
"criteria": {
"possess_bee": {
"conditions": {
"ritual_id": "occultism:ritual/possess_bee"
},
"trigger": "occultism:ritual"
}
},
"display": {
"announce_to_chat": false,
"description": {
"translate": "advancements.occultism.possess_bee.description"
},
"hidden": true,
"icon": {
"count": 1,
"id": "occultism:jei_dummy/none"
},
"show_toast": false,
"title": {
"translate": "advancements.occultism.possess_bee.title"
}
},
"requirements": [
[
"possess_bee"
]
],
"sends_telemetry_event": true
}
Loading