Merge branch 'develop' into macos-develop

backwardsEric · Dec 1, 2024 · 6cf20eb · 6cf20eb
2 parents 42cc87a + 413fb5e
commit 6cf20eb
Show file tree

Hide file tree

Showing 20 changed files with 833 additions and 399 deletions.
diff --git a/hengband.spec b/hengband.spec
@@ -1,4 +1,4 @@
-%define version 3.0.1.20
+%define version 3.0.1.21
 %define release 1
 
 Summary: hengband %{version}
@@ -151,6 +151,9 @@ exit 0
 %license lib/help/jlicense.txt
 
 %changelog
+* Fri Nov 29 2024 whitehara <white@vx-xv.com>
+- hengband RPM 3.0.1.21(Beta)
+
 * Tue Aug 27 2024 whitehara <white@vx-xv.com>
 - hengband RPM 3.0.1.20(Beta)
 

diff --git a/lib/edit/BaseitemDefinitions.jsonc b/lib/edit/BaseitemDefinitions.jsonc
@@ -22906,7 +22906,7 @@
       "id": 682,
       "name": {
         "ja": "黒曜石",
-        "en": "obsidian"
+        "en": "obsidians"
       },
       "symbol": {
         "character": "$",