[AB-xxx] updating remind templates for user installable support

adding more info and reducing some information from userInfo command

.gitignore

@@ -19,4 +19,7 @@ target/
 *.ear
 *.zip
 *.tar.gz
+*.rar
 
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 Sheldan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

abstracto-modules/anti-raid/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/assignable-roles/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/core/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>core</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
 
     <build>
         <plugins>

abstracto-modules/core/src/main/resources/en_US/exceptions/generic_interaction_exception_embed_en_US.ftl

@@ -1,8 +1,6 @@
 {
     "embeds": [
         {
-            <#include "member_author">
-            <@member_author member=member/>,
             <#include "exception_color">,
             "metaConfig" : {
                 "preventEmptyEmbed": "true"

abstracto-modules/core/src/main/resources/en_US/exceptions/input_invalid_format_exception_en_US.ftl

@@ -1,3 +0,0 @@
-<#assign invalidFormat=model.invalidFormat>
-<#assign validFormat=model.validFormat>
-<#include "input_invalid_format_exception_text">

abstracto-modules/custom-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/entertainment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/experience-tracking/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>experience-tracking</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/experience-tracking/src/main/resources/en_US/listener/levelAction/levelAction_sendMessageToChannel_template_embed_en_US.ftl

@@ -1,3 +0,0 @@
-{
-    "additionalMessage": "<@safe_include "${templateKey}"/>"
-}

abstracto-modules/giveaway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>giveaway</artifactId>

abstracto-modules/image-generation/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>image-generation</artifactId>

abstracto-modules/invite-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/link-embed/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/logging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/moderation/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>moderation</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/modmail/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>modmail</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <groupId>dev.sheldan.abstracto-templates.templates</groupId>
     <artifactId>abstracto-modules</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
 
     <modules>
         <module>core</module>

abstracto-modules/profanity-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/remind/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl

@@ -1,10 +1,10 @@
 {
     "embeds": [
         {
-            <#include "member_author">
+            <#include "user_author">
-            <#include "member_avatar">
+            <@user_detail_author user=userDisplay/>,
-            <@member_display_author member=memberNameDisplay/>,
             <#include "abstracto_color">,
+            <#assign reminderId=reminderDisplay.id>
             "description": "<@safe_include "remind_reminder_description"/>",
             "fields": [
                 {
@@ -13,18 +13,22 @@
                 },
                 {
                     "name": "<@safe_include "remind_reminder_note_field_title"/>",
-                    "value": "${reminder.text?json_string}"
+                    "value": "${reminderDisplay.text?json_string}"
-                },
+                }
+                <#if messageUrl?has_content>,
                 {
                     "name": "<@safe_include "remind_reminder_link_field_title"/>",
                     "value": "[<@safe_include "remind_reminder_link_content_display_text"/>](${messageUrl})"
                 }
+                </#if>
             ]
         }
-    ],
+    ]
-<#assign participantsMentions><#list reminderParticipants as participant>${participant.memberMention}<#sep>, </#list></#assign>
+<#if !reminderDisplay.userCommand>,
-    "additionalMessage": "${memberNameDisplay.memberMention?json_string} 🔔
+<#assign participantsMentions><#if reminderParticipants?has_content><#list reminderParticipants as participant>${participant.memberMention}<#sep>, </#list></#if></#assign>
+    "additionalMessage": "${userDisplay.userMention?json_string} 🔔
 
 ${participantsMentions}
 "
+</#if>
 }

abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl

@@ -3,9 +3,8 @@
     "embeds": [
         {
             <#assign id>${reminder.id}</#assign>
-            <#include "member_author">
+            <#include "user_author">
-            <#include "member_avatar">
+            <@user_detail_author user=userDisplay/>,
-            <@member_display_author member=memberDisplay/>,
             <#include "abstracto_color">,
             <#assign reminderTargetDate><@format_instant_date_time instant=reminder.targetDate/></#assign>
             <#if message?has_content>
@@ -17,8 +16,11 @@
             </#if>
 
         }
-    ],
+    ]
-    "additionalMessage": "${memberDisplay.memberMention?json_string}",
+    <#if !reminder.userCommand>,
+    "additionalMessage": "${userDisplay.userMention?json_string}"
+    </#if>
+    <#if joinButtonId?has_content>,
     "buttons": [
         {
             "label": "<@safe_include "remind_reminder_join_button_label"/>",
@@ -29,4 +31,5 @@
             }
         }
     ]
+    </#if>
 }

abstracto-modules/remind/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl

@@ -2,8 +2,8 @@
 {
     "embeds": [
         {
-            <#include "member_author">
+            <#include "user_author">
-            <@member_author member=member/>,
+            <@user_detail_author user=userDisplay/>,
             <#include "abstracto_color">,
             "title": {
                 "title": "<@safe_include "reminders_reminders_embed_title"/>"
@@ -17,7 +17,7 @@
                     <#assign id>${reminderDisplay.id}</#assign>
                     <#assign reminderTargetDate><@format_instant_date_time instant=reminderDisplay.targetDate/></#assign>
                     <#assign reminderText=reminderDisplay.text/>
-                    <#assign messageLink=reminderDisplay.message.jumpUrl/>
+                    <#if !reminderDisplay.userCommand><#assign messageLink=reminderDisplay.message.jumpUrl/></#if>
                     <#assign joined=reminderDisplay.joined/>
                     <#assign joinedText><#if joined><@safe_include "reminder_joined_text"/></#if></#assign>
                     "name": "<@safe_include "reminders_reminder_field_title"/>",

abstracto-modules/repost-detection/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/starboard/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/statistic/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>statistic</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/sticky-roles/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>sticky-roles</artifactId>

abstracto-modules/suggestion/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/twitch/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/utility/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>utility</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl

@@ -1,20 +1,12 @@
 {
     "embeds": [
         {
-            <#include "member_author">
-            <@member_author member=memberInfo/>,
             <#include "abstracto_color">,
-            "imageUrl":  "${memberInfo.user.effectiveAvatarUrl}",
+            "imageUrl":  "${avatarUrl}",
             "fields": [
-                {
-                    <#include "member_user_name">
-                    "name": "<@safe_include "showAvatar_response_embed_user_field_title"/>",
-                    "value": "<@member_member_name member=memberInfo/>",
-                    "inline": "true"
-                },
                 {
                     "name": "<@safe_include "showAvatar_response_embed_image_field_title"/>",
-                    "value": "[<@safe_include "showAvatar_response_embed_image_field_value_display"/>](${memberInfo.user.effectiveAvatarUrl})",
+                    "value": "[<@safe_include "showAvatar_response_embed_image_field_value_display"/>](${avatarUrl})",
                     "inline": "true"
                 }
             ]

abstracto-modules/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_en_US.ftl

@@ -8,6 +8,18 @@
             <#include "member_avatar">
             "thumbnail":  "<@member_display_avatar member=memberDisplay/>",
             "fields": [
+                {
+                    "name": "<@safe_include "userInfo_response_embed_user_name_field_title"/>",
+                    "value": "${memberDisplay.userName}",
+                    "inline": "true"
+                },
+                <#if memberDisplay.displayName?has_content>
+                {
+                    "name": "<@safe_include "userInfo_response_embed_global_name_field_title"/>",
+                    "value": "${memberDisplay.displayName}",
+                    "inline": "true"
+                },
+                </#if>
                 {
                     "name": "<@safe_include "userInfo_response_embed_id_field_title"/>",
                     "value": "${id?c}",
@@ -20,22 +32,26 @@
                     "inline": "true"
                 },
                 </#if>
+                <#if onlineStatus?has_content>
                 {
                     "name": "<@safe_include "userInfo_response_embed_status_field_title"/>",
                     "value": "${onlineStatus?json_string}",
                     "inline": "true"
                 },
+                </#if>
+                <#if joinDate?has_content>
                 {
                     "name": "<@safe_include "userInfo_response_embed_joined_field_title"/>",
                     "value": "<@format_instant_date_time instant=joinDate/>",
                     "inline": "true"
                 },
+                </#if>
                 {
                     "name": "<@safe_include "userInfo_response_embed_registered_field_title"/>",
                     "value": "<@format_instant_date_time instant=creationDate/>",
                     "inline": "true"
                 }
-                <#if roles?size gt 0>
+                <#if roles?has_content && roles?size gt 0>
                 ,
                 {
                     "name": "<@safe_include "userInfo_response_embed_roles_field_title"/>",
@@ -44,7 +60,7 @@
                     "valueSplitLength": 250
                 }
                 </#if>
-                <#if activities?size gt 0>
+                <#if activities?has_content && activities?size gt 0>
                 ,
                 {
                     "name": "<@safe_include "userInfo_response_embed_activity_field_title"/>",

abstracto-modules/voice-channel-context/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/webservices/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>dev.sheldan.abstracto-templates</groupId>
     <artifactId>templates</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
 
     <modules>
         <module>abstracto-modules</module>
@@ -24,7 +24,7 @@
         <connection>scm:git:${project.scm.url}</connection>
         <developerConnection>scm:git:${project.scm.url}</developerConnection>
         <url>https://github.com/Sheldan/abstracto-templates.git</url>
-        <tag>templates-1.4.42</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <repositories>

translations/anti-raid/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/assignable-roles/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/core/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>core</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/core/src/main/resources/en_US/exception/input_invalid_format_exception_text_en_US.ftl

@@ -1 +0,0 @@
-Invalid input format: ${invalidFormat}. Valid format is ${validFormat}.

translations/custom-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/entertainment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/experience-tracking/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>experience-tracking</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/experience-tracking/src/main/resources/en_US/commands/showLevelActions/showLevelActions_action_remove_member_from_channel_above_level_config_en_US.ftl

@@ -1 +1 @@
-<#assign channelMention="<#${parameters.channelId?c}>"> Removes member from ${channelMention}
+<#assign channelMention="<#${parameters.channelId?c}>"> Removes member ${channelMention}

translations/experience-tracking/src/main/resources/en_US/commands/showLevelActions/showLevelActions_action_send_message_to_channel_above_level_config_en_US.ftl

@@ -1 +0,0 @@
-<#assign channelMention="<#${parameters.channelId?c}>"> <#assign templateKey=parameters.templateKey> Send template ${templateKey} in ${channelMention}

translations/experience-tracking/src/main/resources/en_US/commands/showLevelActions/showLevelActions_action_send_message_to_channel_above_level_en_US.ftl

@@ -1 +0,0 @@
-sends a message to a channel once a member reaches the level

translations/giveaway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>giveaway</artifactId>

translations/image-generation/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>image-generation</artifactId>

translations/invite-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/link-embed/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/logging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/moderation/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>moderation</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/moderation/src/main/resources/en_US/listener/moderationAction/moderationAction_mute_response_text_en_US.ftl

@@ -1 +1 @@
-User has been muted.
+User has been banned.

translations/modmail/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>modmail</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <groupId>dev.sheldan.abstracto-templates.translations</groupId>
     <artifactId>translations</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
 
     <modules>
         <module>core</module>

translations/profanity-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/remind/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/remind/src/main/resources/en_US/commands/remind/remind_reminder_description_en_US.ftl

@@ -1 +1 @@
-Reminder ID ${reminder.id?c}
+Reminder ID ${reminderId?c}

translations/remind/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl

@@ -1 +1 @@
-Due on ${reminderTargetDate} with text `${reminderText}` started [here](${messageLink}) ${joinedText}
+Due on ${reminderTargetDate} with text `${reminderText}`<#if messageLink?has_content> started [here](${messageLink})</#if> ${joinedText}

translations/repost-detection/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/starboard/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/statistic/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>statistic</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/sticky-roles/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
 
     <artifactId>sticky-roles</artifactId>

translations/suggestion/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/twitch/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

translations/utility/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>utility</artifactId>
-    <version>1.4.42</version>
+    <version>1.4.39-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_global_name_field_title_en_US.ftl

@@ -0,0 +1 @@
+Display name

translations/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_user_name_field_title_en_US.ftl

@@ -0,0 +1 @@
+User name

translations/voice-channel-context/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>translations</artifactId>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

translations/webservices/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.4.42</version>
+        <version>1.4.39-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>