Skip to content

Commit dde8b0b

Browse files
PssbleTrnglePssbleTrngle
authored
Merge branch '1.21.x' into translate
2 parents c311e18 + acb638d commit dde8b0b

File tree

15 files changed

+155
-14
lines changed

15 files changed

+155
-14
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[versions]
2-
multikulti = "1.21.1-1.2.0"
2+
multikulti = "1.21.1-1.2.3"
33
jei = "19.21.0.247"
44

55
[libraries]
66
multikulti-datagen = { group = "com.possible-triangle", name = "multikulti-datagen-neoforge", version.ref = "multikulti" }
77

88
blueprint = { group = "com.teamabnormals", name = "blueprint", version = "1.21.1-8.0.5" }
99

10-
galena-hats = { "group" = "dev.galena", name = "hats-neoforge", version = "1.21.1-1.2.2" }
10+
galena-hats = { "group" = "dev.galena", name = "hats-neoforge", version = "1.21.1-1.2.4" }
1111

1212
dye-depot = { group = "com.ninni.dye_depot", name = "dye_depot", version = "1.21.1-2.0.0-neoforge" }
1313

‎settings.gradle.kts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ pluginManagement {
22
repositories {
33
gradlePluginPortal()
44
mavenLocal()
5-
maven { url = uri("https://registry.somethingcatchy.net/repository/maven-public/") }
65
}
76
}
87

98
plugins {
10-
id("com.possible-triangle.helper") version ("1.0.54")
11-
id("com.possible-triangle.packwiz") version ("1.0.54")
9+
id("com.possible-triangle.helper") version ("1.0.58")
10+
id("com.possible-triangle.packwiz") version ("1.0.58")
1211
}

‎src/generated/resources/data/c/tags/block/clusters/amethyst.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"values": [
3+
"minecraft:amethyst_cluster",
4+
"minecraft:large_amethyst_bud",
5+
"minecraft:medium_amethyst_bud",
6+
"minecraft:small_amethyst_bud"
7+
]
8+
}

‎src/generated/resources/data/c/tags/block/clusters/quartzite.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"values": [
3+
{
4+
"id": "nomansland:quartzite_cluster",
5+
"required": false
6+
},
7+
{
8+
"id": "nomansland:large_quartzite_bud",
9+
"required": false
10+
},
11+
{
12+
"id": "nomansland:medium_quartzite_bud",
13+
"required": false
14+
},
15+
{
16+
"id": "nomansland:small_quartzite_bud",
17+
"required": false
18+
}
19+
]
20+
}

‎src/generated/resources/data/minecraft/recipe/scribe/small_amethyst_bud.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"type": "oreganized:scribe",
3+
"drop_resources": true,
4+
"from": {
5+
"blocks": "#c:clusters/amethyst"
6+
},
7+
"to": "minecraft:small_amethyst_bud"
8+
}

‎src/generated/resources/data/nomansland/recipe/scribe/small_quartzite_bud.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:mod_loaded",
5+
"modid": "nomansland"
6+
}
7+
],
8+
"type": "oreganized:scribe",
9+
"drop_resources": true,
10+
"from": {
11+
"blocks": "#c:clusters/quartzite"
12+
},
13+
"to": "nomansland:small_quartzite_bud"
14+
}

‎src/generated/resources/data/oreganized/recipe/cutting/grooved_blue_ice.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:mod_loaded",
5+
"modid": "farmersdelight"
6+
}
7+
],
8+
"type": "farmersdelight:cutting",
9+
"ingredients": [
10+
{
11+
"item": "minecraft:blue_ice"
12+
}
13+
],
14+
"result": [
15+
{
16+
"item": {
17+
"count": 1,
18+
"id": "oreganized:grooved_blue_ice"
19+
}
20+
}
21+
],
22+
"tool": {
23+
"item": "oreganized:scribe"
24+
}
25+
}

‎src/generated/resources/data/oreganized/recipe/cutting/grooved_ice.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:mod_loaded",
5+
"modid": "farmersdelight"
6+
}
7+
],
8+
"type": "farmersdelight:cutting",
9+
"ingredients": [
10+
{
11+
"item": "minecraft:ice"
12+
}
13+
],
14+
"result": [
15+
{
16+
"item": {
17+
"count": 1,
18+
"id": "oreganized:grooved_ice"
19+
}
20+
}
21+
],
22+
"tool": {
23+
"item": "oreganized:scribe"
24+
}
25+
}

‎src/generated/resources/data/oreganized/recipe/cutting/grooved_packed_ice.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "neoforge:mod_loaded",
5+
"modid": "farmersdelight"
6+
}
7+
],
8+
"type": "farmersdelight:cutting",
9+
"ingredients": [
10+
{
11+
"item": "minecraft:packed_ice"
12+
}
13+
],
14+
"result": [
15+
{
16+
"item": {
17+
"count": 1,
18+
"id": "oreganized:grooved_packed_ice"
19+
}
20+
}
21+
],
22+
"tool": {
23+
"item": "oreganized:scribe"
24+
}
25+
}

‎src/generated/resources/data/oreganized/recipe/scribe/grooved_blue_ice.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "oreganized:scribe",
3+
"from": {
4+
"blocks": "minecraft:blue_ice"
5+
},
6+
"to": "oreganized:grooved_blue_ice"
7+
}

0 commit comments

Comments
 (0)