更新到2.3.3 (Active & Compat)

Xujiayao · Jun 15, 2024 · e3b824c · e3b824c
1 parent 9b6003d
commit e3b824c
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 28 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -25,6 +25,7 @@ body:
         If a version is not listed below, it is not supported by DMCC.
       multiple: false
       options:
+        - "1.21"
         - "1.20.6"
         - "1.20.5"
         - "1.20.4"
@@ -58,6 +59,8 @@ body:
       multiple: false
       options:
         - "Latest Build (GitHub Actions)"
+        - "2.3.3"
+        - "2.3.3-compat"
         - "1.20.5-2.3.2"
         - "2.3.2"
         - "2.3.2-compat"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog 更新日志
 
-## Discord-MC-Chat 1.20.5-2.3.2 for Minecraft 1.20.5 - 2024/4/24
+## Discord-MC-Chat 2.3.3 for Minecraft 1.19.4+ - 2024/6/15
 
 Starting from Minecraft 1.20.5 (Snapshot 24w14a), the game requires Java 21.
 
@@ -12,21 +12,31 @@ Therefore, in order to ensure compatibility with multiple versions, DMCC now req
 
 ## New Features 新特性
 
-- Compatible with version 1.20.5
-  兼容 1.20.5 版本
+- Italian translation (#229)
+  意大利语翻译
+
+- Spanish translation (#232)
+  西班牙语翻译
+
+- Compatible with version 1.21 (#237)
+  兼容 1.21 版本
 
 ## Changes 更改
 
-N/A
+- Fix special characters in emojis / emotes not being escaped (#227)
+  修复表情中的特殊字符没有被转义
 
 ## Removed 移除
 
-N/A
+- Move 1.19.1 - 1.19.3 versions to Compat update channel
+  将 1.19.1 - 1.19.3 版本移至 Compat 更新通道
 
 ## Contributors 贡献者
 
 - @Xujiayao
+- @Lucadecastle
+- @BroxyZF
 
 ## Detailed Information 详细信息
 
-https://github.com/Xujiayao/Discord-MC-Chat/compare/2.3.2...1.20.5-2.3.2
+https://github.com/Xujiayao/Discord-MC-Chat/compare/1.20.5-2.3.2...2.3.3
diff --git a/CHANGELOG_COMPAT.md b/CHANGELOG_COMPAT.md
@@ -1,15 +1,30 @@
 # Changelog 更新日志
 
-## Discord-MC-Chat 2.3.2-compat for Minecraft 1.14.4+ - 2024/3/17
+## Discord-MC-Chat 2.3.3-compat for Minecraft 1.14.4+ - 2024/6/15
+
+Starting from Minecraft 1.20.5 (Snapshot 24w14a), the game requires Java 21.
+
+Therefore, in order to ensure compatibility with multiple versions, DMCC now requires Fabric Loader version >=0.15.10 and Java version >=21, regardless of whether the game version is later than Minecraft 1.20.5.
+
+从 Minecraft 1.20.5（快照 24w14a）开始，游戏要求 Java 21。
+
+因此，为了保证多版本兼容性，无论游戏版本是否晚于 Minecraft 1.20.5，DMCC 现在都要求 Fabric Loader 版本 >=0.15.10 且 Java 版本 >=21。
 
 ## New Features 新特性
 
-N/A
+- Move 1.19.1 - 1.19.3 versions to Compat update channel
+  将 1.19.1 - 1.19.3 版本移至 Compat 更新通道
+
+- Italian translation (#229)
+  意大利语翻译
+
+- Spanish translation (#232)
+  西班牙语翻译
 
 ## Changes 更改
 
-- Fix server crashes due to player deaths caused by falling blocks and intentional game design (#223)
-  修复玩家因下落的方块和刻意的游戏设计而死亡导致服务器崩溃
+- Fix special characters in emojis / emotes not being escaped (#227)
+  修复表情中的特殊字符没有被转义
 
 ## Removed 移除
 
@@ -18,7 +33,9 @@ N/A
 ## Contributors 贡献者
 
 - @Xujiayao
+- @Lucadecastle
+- @BroxyZF
 
 ## Detailed Information 详细信息
 
-https://github.com/Xujiayao/Discord-MC-Chat/compare/2.3.1-compat...2.3.2-compat
+https://github.com/Xujiayao/Discord-MC-Chat/compare/2.3.2-compat...2.3.3-compat
diff --git a/README.md b/README.md
@@ -139,7 +139,9 @@ Languages currently available:
 |---------|-----------------------|
 | `de_de` | Deutsch (Deutschland) |
 | `en_us` | English (US)          |
+| `es_es` | Español (España)      |
 | `fr_fr` | Français (France)     |
+| `it_it` | Italiano (Italia)     |
 | `ko_kr` | 한국어（대한민국）             |
 | `no_no` | Norsk Bokmål (Norge)  |
 | `pl_pl` | Polski (Polska)       |

diff --git a/README_CN.md b/README_CN.md
@@ -139,7 +139,9 @@ Discord-MC-Chat (DMCC), formerly known as MC-Discord-Chat and MCDiscordChat (MCD
 |---------|-----------------------|
 | `de_de` | Deutsch (Deutschland) |
 | `en_us` | English (US)          |
+| `es_es` | Español (España)      |
 | `fr_fr` | Français (France)     |
+| `it_it` | Italiano (Italia)     |
 | `ko_kr` | 한국어（대한민국）             |
 | `no_no` | Norsk Bokmål (Norge)  |
 | `pl_pl` | Polski (Polska)       |

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx8G
 org.gradle.parallel=true
 
 # Mod Properties
-mod_version=2.3.2
+mod_version=2.3.3
 maven_group=com.xujiayao.discord_mc_chat
 archives_base_name=Discord-MC-Chat
 

diff --git a/update/version.json b/update/version.json
@@ -0,0 +1,4 @@
+{
+	"version": "2.3.3",
+	"changelog": "<https://github.com/Xujiayao/Discord-MC-Chat/releases/tag/2.3.3>\n\n> Starting from Minecraft 1.20.5 (Snapshot 24w14a), the game requires Java 21.\n> \n> Therefore, in order to ensure compatibility with multiple versions, DMCC now requires Fabric Loader version >=0.15.10 and Java version >=21, regardless of whether the game version is later than Minecraft 1.20.5."
+}
diff --git a/update/versions.json b/update/versions.json
@@ -1,37 +1,32 @@
 {
 	"versions": [
 		{
-			"version": "2.3.2",
-			"changelog": "<https://github.com/Xujiayao/Discord-MC-Chat/releases/tag/1.20.5-2.3.2>\n\n> Starting from Minecraft 1.20.5 (Snapshot 24w14a), the game requires Java 21.\n> \n> Therefore, in order to ensure compatibility with multiple versions, DMCC now requires Fabric Loader version >=0.15.10 and Java version >=21, regardless of whether the game version is later than Minecraft 1.20.5.",
+			"version": "2.3.3",
+			"changelog": "<https://github.com/Xujiayao/Discord-MC-Chat/releases/tag/2.3.3>\n\n> Starting from Minecraft 1.20.5 (Snapshot 24w14a), the game requires Java 21.\n> \n> Therefore, in order to ensure compatibility with multiple versions, DMCC now requires Fabric Loader version >=0.15.10 and Java version >=21, regardless of whether the game version is later than Minecraft 1.20.5.",
 			"minecraft_dependency": [
-				"~1.20.5"
-			]
-		},
-		{
-			"version": "2.3.2",
-			"changelog": "<https://github.com/Xujiayao/Discord-MC-Chat/releases/tag/2.3.2>",
-			"minecraft_dependency": [
-				"1.19.1",
-				"1.19.2",
-				"1.19.3",
 				"~1.19.4",
 				"1.20",
 				"1.20.1",
 				"1.20.2",
 				"1.20.3",
-				"1.20.4"
+				"1.20.4",
+				"~1.20.5",
+				"~1.21"
 			]
 		},
 		{
-			"version": "2.3.2-compat",
-			"changelog": "<https://github.com/Xujiayao/Discord-MC-Chat/releases/tag/2.3.2-compat>",
+			"version": "2.3.3-compat",
+			"changelog": "<https://github.com/Xujiayao/Discord-MC-Chat/releases/tag/2.3.3-compat>\n\n> Starting from Minecraft 1.20.5 (Snapshot 24w14a), the game requires Java 21.\n> \n> Therefore, in order to ensure compatibility with multiple versions, DMCC now requires Fabric Loader version >=0.15.10 and Java version >=21, regardless of whether the game version is later than Minecraft 1.20.5.",
 			"minecraft_dependency": [
 				"~1.14.4",
 				"~1.15.2",
 				"~1.16.4",
 				"~1.17",
 				"~1.18",
-				"1.19"
+				"1.19",
+				"1.19.1",
+				"1.19.2",
+				"1.19.3"
 			]
 		}
 	]