Merge branch '1.20.2' into 1.20.1

FrozenBlock · Jun 25, 2024 · 8b8857d · 8b8857d
2 parents b655047 + 6710fd3
commit 8b8857d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/src/main/resources/assets/wilderwild/sounds.json b/src/main/resources/assets/wilderwild/sounds.json
@@ -3049,33 +3049,31 @@
   "music.overworld.magmatic_caves": {
     "sounds": [
       {
-        "name": "music/game/endless",
-        "stream": true,
-        "volume": 0.4
+        "name": "music.game",
+        "type": "event"
       },
       {
         "name": "music/game/an_ordinary_day",
         "stream": true
       },
       {
-        "name": "music/game/puzzlebox",
-        "stream": true,
-        "volume": 0.4
-      },
-      {
-        "name": "music/game/watcher",
+        "name": "music/game/bromeliad",
         "stream": true,
         "volume": 0.4
       },
       {
-        "name": "music/game/bromeliad",
+        "name": "music/game/crescent_dunes",
         "stream": true,
         "volume": 0.4
       }
     ]
   },
   "music.overworld.frozen_caves": {
     "sounds": [
+      {
+        "name": "music.game",
+        "type": "event"
+      },
       {
         "name": "music/game/infinite_amethyst",
         "stream": true,
@@ -3089,16 +3087,6 @@
         "name": "music/game/stand_tall",
         "stream": true,
         "volume": 0.4
-      },
-      {
-        "name": "music/game/komorebi",
-        "stream": true,
-        "volume": 0.8
-      },
-      {
-        "name": "music/game/watcher",
-        "stream": true,
-        "volume": 0.4
       }
     ]
   },

diff --git a/src/main/resources/data/minecraft/tags/blocks/overworld_natural_logs.json b/src/main/resources/data/minecraft/tags/blocks/overworld_natural_logs.json
@@ -3,7 +3,6 @@
   "values": [
     "wilderwild:baobab_log",
     "wilderwild:cypress_log",
-    "wilderwild:palm_log",
-    "wilderwild:palm_crown"
+    "wilderwild:palm_log"
   ]
 }