Merge remote-tracking branch 'origin/main'

# Conflicts: # CHANGELOG.md # update.json
DenisD3D · Jun 15, 2024 · 7415477 · 7415477
2 parents 32580b1 + 47b0cfe
commit 7415477
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,2 @@
-## Mc2Discord 4.2.3
+## 4.2.4 update
 + 1.21 support
diff --git a/mc2discord-core/src/main/resources/assets/mc2discord/m2d-lang/core/en_us.json b/mc2discord-core/src/main/resources/assets/mc2discord/m2d-lang/core/en_us.json
@@ -35,7 +35,7 @@
 
     "config.channels.comment": " Channels configuration\n One [[Channels.Channel]] block should be created per Discord channel you want to setup",
     "config.channels.id.comment": " Id of the Discord channel to send messages in (see: https://github.com/DenisD3D/Mc2Discord/wiki/Discord-ids)",
-    "config.channels.subscriptions.comment": " List of messages types to send that will be sent in this channel. Available values: \"info\", \"chat\", \"command\", \"logs\"",
+    "config.channels.subscriptions.comment": " List of messages types to send that will be sent in this channel. Available values: \"info\", \"chat\", \"command\", \"logs\" (\"info\" is equivalent to adding \"server_start\", \"server_stop\", \"player_connect\", \"player_disconnect\", \"player_death\", \"player_advancement\")",
     "config.channels.mode.comment": " Messages format in this channel. Available values: WEBHOOK, PLAIN_TEXT, EMBED",
 
     "config.messages.comment": " Messages content configuration\n Variables (${xxx}) are replaced by corresponding values (see complete list of variables: https://github.com/DenisD3D/Mc2Discord/wiki/Variables)\n \"global\" variables may be used in any field",
@@ -128,4 +128,4 @@
     "config.misc.other_mods_messages.class_name.comment": " Name of the Java class the message is comming from",
     "config.misc.other_mods_messages.class_index.comment": " Index of the class in the stacktrace",
     "config.misc.other_mods_messages.type.comment": " Type the message will be sent as, must be one found in a Channels.Channel configuration"
-}
+}
diff --git a/update.json b/update.json
@@ -1,31 +1,36 @@
 {
     "homepage": "https://www.curseforge.com/minecraft/mc-mods/mc2discord",
     "promos": {
-        "1.21-latest": "4.2.3",
-        "1.21-recommended": "4.2.3",
-
-        "1.20.2-latest": "4.2.3",
-        "1.20.2-recommended": "4.2.3",
-        "1.20.1-latest": "4.2.3",
-        "1.20.1-recommended": "4.2.3",
-        "1.20.0-latest": "4.2.3",
-        "1.20.0-recommended": "4.2.3",
-
-        "1.19.4-latest": "4.2.3",
-        "1.19.4-recommended": "4.2.3",
-        "1.19.3-latest": "4.2.3",
-        "1.19.3-recommended": "4.2.3",
-
-        "1.18.2-latest": "4.2.3",
-        "1.18.2-recommended": "4.2.3",
-        "1.18.1-latest": "4.2.3",
-        "1.18.1-recommended": "4.2.3",
-        "1.18-latest": "4.2.3",
-        "1.18-recommended": "4.2.3",
-
-
-        "1.12.2-latest": "3.3.1",
-        "1.12.2-recommended": "3.3.1",
+        "1.21-latest": "4.2.4",
+        "1.21-recommended": "4.2.4",
+
+        "1.20.6-latest": "4.2.4",
+        "1.20.6-recommended": "4.2.4",
+        "1.20.5-latest": "4.2.4",
+        "1.20.5-recommended": "4.2.4",
+        "1.20.2-latest": "4.2.4",
+        "1.20.2-recommended": "4.2.4",
+        "1.20.1-latest": "4.2.4",
+        "1.20.1-recommended": "4.2.4",
+        "1.20.0-latest": "4.2.4",
+        "1.20.0-recommended": "4.2.4",
+
+        "1.19.4-latest": "4.2.4",
+        "1.19.4-recommended": "4.2.4",
+        "1.19.3-latest": "4.2.4",
+        "1.19.3-recommended": "4.2.4",
+
+        "1.18.2-latest": "4.2.4",
+        "1.18.2-recommended": "4.2.4",
+        "1.18.1-latest": "4.2.4",
+        "1.18.1-recommended": "4.2.4",
+        "1.18-latest": "4.2.4",
+        "1.18-recommended": "4.2.4",
+
+
+        "1.12.2-latest": "3.3.2",
+        "1.12.2-recommended": "3.3.2",
+
 
         "1.19-latest": "3.2.8",
         "1.19-recommended": "3.2.8",