Skip to content

Commit d84a7fa

Browse files
simibubisimibubi
committed
Merge branch 'pr/6288' into mc1.18/dev
2 parents 96a05e7 + 67f77cf commit d84a7fa

File tree

110 files changed

+1687
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1687
-129
lines changed

‎build.gradle

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,12 @@ dependencies {
201201

202202
// implementation fg.deobf("curse.maven:ic2-classic-242942:4563059")
203203
// implementation fg.deobf("curse.maven:druidcraft-340991:3101903")
204+
205+
// implementation fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-1.16.5:0.10.0-Beta25")
206+
// runtimeOnly fg.deobf("curse.maven:galosphere-631098:4398234")
207+
// runtimeOnly fg.deobf("curse.maven:elementary-ores-332609:3956498")
208+
// runtimeOnly fg.deobf("curse.maven:flib-661261:3956196")
209+
// runtimeOnly fg.deobf("curse.maven:infernal-expansion-395078:3854062")
204210
// runtimeOnly fg.deobf("vazkii.arl:AutoRegLib:1.4-35.69")
205211
// runtimeOnly fg.deobf("vazkii.quark:Quark:r2.0-212.984")
206212
// runtimeOnly fg.deobf("curse.maven:mantle-74924:4509007")
@@ -220,6 +226,13 @@ dependencies {
220226
// implementation fg.deobf("curse.maven:architectury-api-419699:4521465")
221227
// implementation fg.deobf("curse.maven:ftb-library-forge-404465:4396792")
222228
// implementation fg.deobf("curse.maven:ftb-teams-forge-404468:4579981")
229+
// runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924")
230+
// runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212")
231+
// runtimeOnly fg.deobf("curse.maven:citadel-331936:3783096")
232+
// runtimeOnly fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465")
233+
// runtimeOnly fg.deobf("curse.maven:exnihilosequentia-400012:4083676")
234+
// runtimeOnly fg.deobf("curse.maven:upgrade-aquatic-326895:4365140")
235+
// runtimeOnly fg.deobf("curse.maven:blueprint-382216:3991478")
223236

224237
// https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
225238
// Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings

‎src/generated/resources/.cache/cache

Lines changed: 98 additions & 55 deletions
Large diffs are not rendered by default.

‎src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"create:blasting/silver_ingot_compat_iceandfire"
6+
]
7+
},
8+
"criteria": {
9+
"has_item": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"items": [
15+
"create:crushed_raw_silver"
16+
]
17+
}
18+
]
19+
}
20+
},
21+
"has_the_recipe": {
22+
"trigger": "minecraft:recipe_unlocked",
23+
"conditions": {
24+
"recipe": "create:blasting/silver_ingot_compat_iceandfire"
25+
}
26+
}
27+
},
28+
"requirements": [
29+
[
30+
"has_item",
31+
"has_the_recipe"
32+
]
33+
]
34+
}

‎src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"create:smelting/silver_ingot_compat_iceandfire"
6+
]
7+
},
8+
"criteria": {
9+
"has_item": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"items": [
15+
"create:crushed_raw_silver"
16+
]
17+
}
18+
]
19+
}
20+
},
21+
"has_the_recipe": {
22+
"trigger": "minecraft:recipe_unlocked",
23+
"conditions": {
24+
"recipe": "create:smelting/silver_ingot_compat_iceandfire"
25+
}
26+
}
27+
},
28+
"requirements": [
29+
[
30+
"has_item",
31+
"has_the_recipe"
32+
]
33+
]
34+
}

‎src/generated/resources/data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"create:crafting///tree_fertilizer"
6+
]
7+
},
8+
"criteria": {
9+
"has_item": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"items": [
15+
"minecraft:bone_meal"
16+
]
17+
}
18+
]
19+
}
20+
},
21+
"has_the_recipe": {
22+
"trigger": "minecraft:recipe_unlocked",
23+
"conditions": {
24+
"recipe": "create:crafting///tree_fertilizer"
25+
}
26+
}
27+
},
28+
"requirements": [
29+
[
30+
"has_item",
31+
"has_the_recipe"
32+
]
33+
]
34+
}

‎src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_iceandfire.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"type": "minecraft:blasting",
3+
"ingredient": {
4+
"item": "create:crushed_raw_silver"
5+
},
6+
"result": "iceandfire:silver_ingot",
7+
"experience": 0.1,
8+
"cookingtime": 100,
9+
"conditions": [
10+
{
11+
"modid": "iceandfire",
12+
"type": "forge:mod_loaded"
13+
}
14+
]
15+
}

‎src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"type": "minecraft:crafting_shapeless",
3+
"ingredients": [
4+
{
5+
"tag": "minecraft:small_flowers"
6+
},
7+
{
8+
"tag": "minecraft:small_flowers"
9+
},
10+
{
11+
"tag": "create:upgrade_aquatic/coral"
12+
},
13+
{
14+
"item": "minecraft:bone_meal"
15+
}
16+
],
17+
"result": {
18+
"item": "create:tree_fertilizer",
19+
"count": 2
20+
}
21+
}

‎src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_coal_end.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"type": "create:crushing",
3+
"ingredients": [
4+
{
5+
"item": "elementaryores:ore_coal_end"
6+
}
7+
],
8+
"results": [
9+
{
10+
"item": "minecraft:coal"
11+
},
12+
{
13+
"item": "minecraft:coal",
14+
"chance": 0.25
15+
},
16+
{
17+
"item": "create:experience_nugget",
18+
"chance": 0.75
19+
},
20+
{
21+
"item": "minecraft:end_stone",
22+
"chance": 0.12
23+
}
24+
],
25+
"processingTime": 350,
26+
"conditions": [
27+
{
28+
"modid": "elementaryores",
29+
"type": "forge:mod_loaded"
30+
}
31+
]
32+
}

‎src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_coal_nether.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"type": "create:crushing",
3+
"ingredients": [
4+
{
5+
"item": "elementaryores:ore_coal_nether"
6+
}
7+
],
8+
"results": [
9+
{
10+
"item": "minecraft:coal"
11+
},
12+
{
13+
"item": "minecraft:coal",
14+
"chance": 0.25
15+
},
16+
{
17+
"item": "create:experience_nugget",
18+
"chance": 0.75
19+
},
20+
{
21+
"item": "minecraft:netherrack",
22+
"chance": 0.12
23+
}
24+
],
25+
"processingTime": 350,
26+
"conditions": [
27+
{
28+
"modid": "elementaryores",
29+
"type": "forge:mod_loaded"
30+
}
31+
]
32+
}

‎src/generated/resources/data/create/recipes/crushing/compat/elementaryores/ore_copper_end.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"type": "create:crushing",
3+
"ingredients": [
4+
{
5+
"item": "elementaryores:ore_copper_end"
6+
}
7+
],
8+
"results": [
9+
{
10+
"item": "create:crushed_raw_copper",
11+
"count": 5
12+
},
13+
{
14+
"item": "create:crushed_raw_copper",
15+
"chance": 0.25
16+
},
17+
{
18+
"item": "create:experience_nugget",
19+
"chance": 0.75
20+
},
21+
{
22+
"item": "minecraft:end_stone",
23+
"chance": 0.12
24+
}
25+
],
26+
"processingTime": 350,
27+
"conditions": [
28+
{
29+
"modid": "elementaryores",
30+
"type": "forge:mod_loaded"
31+
}
32+
]
33+
}

0 commit comments

Comments
 (0)