Skip to content

Commit 59d52b1

Browse files
FirstMegaGame4FirstMegaGame4
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 # src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f # src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 # src/main/generated/.cache/584c1a43949a9c899dc112415674d20efb051ed8 # src/main/generated/.cache/90eeb0d915a79c389c7026cb5e3cb8d595013f56 # src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 # src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 # src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512
2 parents 7d8adb0 + 3ec367f commit 59d52b1

13 files changed

Lines changed: 129 additions & 15 deletions

File tree

‎gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ org.gradle.parallel=true
44

55
# Fabric Properties
66
# check these on https://fabricmc.net/develop
7-
minecraft_version=1.21
8-
yarn_mappings=1.21+build.1
7+
minecraft_version=1.21.1
8+
yarn_mappings=1.21.1+build.3
99
loader_version=0.16.8
1010

1111
# Mod Properties
@@ -14,7 +14,7 @@ maven_group=com.mmodding.extravaganza
1414
archives_base_name=extravaganza
1515

1616
# Dependencies
17-
fabric_version=0.100.1+1.21
17+
fabric_version=0.115.1+1.21.1
1818

1919
# Integrations
2020
ouch_integration=true

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1+
#Wed Mar 12 15:31:34 CET 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
4-
networkTimeout=10000
5-
validateDistributionUrl=true
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
76
zipStorePath=wrapper/dists

‎src/main/generated/data/c/tags/block/stripped_logs.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"extravaganza:stripped_hevea_brasiliensis_log"
4+
]
5+
}

‎src/main/generated/data/c/tags/block/stripped_woods.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"extravaganza:stripped_hevea_brasiliensis_wood"
4+
]
5+
}

‎src/main/generated/data/extravaganza/tags/block/festive_rubber_ladders.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"values": [
3+
"extravaganza:black_festive_rubber_ladder",
4+
"extravaganza:blue_festive_rubber_ladder",
5+
"extravaganza:brown_festive_rubber_ladder",
6+
"extravaganza:cyan_festive_rubber_ladder",
7+
"extravaganza:gray_festive_rubber_ladder",
8+
"extravaganza:green_festive_rubber_ladder",
9+
"extravaganza:light_blue_festive_rubber_ladder",
10+
"extravaganza:light_gray_festive_rubber_ladder",
11+
"extravaganza:lime_festive_rubber_ladder",
12+
"extravaganza:magenta_festive_rubber_ladder",
13+
"extravaganza:orange_festive_rubber_ladder",
14+
"extravaganza:pink_festive_rubber_ladder",
15+
"extravaganza:purple_festive_rubber_ladder",
16+
"extravaganza:red_festive_rubber_ladder",
17+
"extravaganza:white_festive_rubber_ladder",
18+
"extravaganza:yellow_festive_rubber_ladder",
19+
"extravaganza:plant_festive_rubber_ladder",
20+
"extravaganza:tomato_festive_rubber_ladder",
21+
"extravaganza:tear_festive_rubber_ladder",
22+
"extravaganza:nymph_festive_rubber_ladder",
23+
"extravaganza:colorful_festive_rubber_ladder"
24+
]
25+
}

‎src/main/generated/data/extravaganza/tags/block/trash_cans.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"values": [
3+
"extravaganza:black_trash_can",
4+
"extravaganza:blue_trash_can",
5+
"extravaganza:brown_trash_can",
6+
"extravaganza:cyan_trash_can",
7+
"extravaganza:gray_trash_can",
8+
"extravaganza:green_trash_can",
9+
"extravaganza:light_blue_trash_can",
10+
"extravaganza:light_gray_trash_can",
11+
"extravaganza:lime_trash_can",
12+
"extravaganza:magenta_trash_can",
13+
"extravaganza:orange_trash_can",
14+
"extravaganza:pink_trash_can",
15+
"extravaganza:purple_trash_can",
16+
"extravaganza:red_trash_can",
17+
"extravaganza:white_trash_can",
18+
"extravaganza:yellow_trash_can",
19+
"extravaganza:plant_trash_can",
20+
"extravaganza:tomato_trash_can",
21+
"extravaganza:tear_trash_can",
22+
"extravaganza:nymph_trash_can"
23+
]
24+
}

‎src/main/generated/data/minecraft/tags/block/logs_that_burn.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"extravaganza:hevea_brasiliensis_log",
44
"extravaganza:hevea_brasiliensis_wood",
55
"extravaganza:stripped_hevea_brasiliensis_log",
6-
"extravaganza:hevea_brasiliensis_wood"
6+
"extravaganza:stripped_hevea_brasiliensis_wood"
77
]
88
}

‎src/main/generated/data/minecraft/tags/block/saplings.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"extravaganza:hevea_brasiliensis_sapling"
4+
]
5+
}

‎src/main/generated/data/minecraft/tags/block/wooden_buttons.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"extravaganza:hevea_brasiliensis_button"
4+
]
5+
}

‎src/main/generated/data/minecraft/tags/block/wooden_doors.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"extravaganza:hevea_brasiliensis_door"
4+
]
5+
}

0 commit comments

Comments
 (0)