[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release templates-1.3.2
[AB-xxx] adding macro for defaulting easier in case of null values
2026-01-08 02:17:42 +00:00 · 2022-05-15 17:50:20 +02:00 · 2022-05-15 17:50:16 +02:00 · 2022-05-15 13:08:47 +02:00 · 2022-02-12 23:30:07 +01:00 · 2022-02-12 23:08:33 +01:00
56 changed files with 154 additions and 87 deletions
--- a/abstracto-modules/anti-raid/pom.xml
+++ b/abstracto-modules/anti-raid/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/assignable-roles/pom.xml
+++ b/abstracto-modules/assignable-roles/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/core/pom.xml
+++ b/abstracto-modules/core/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>core</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>

    <build>
        <plugins>
--- a/abstracto-modules/core/src/main/resources/en_US/builtins/default_template_if_null_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/builtins/default_template_if_null_en_US.ftl
@@ -0,0 +1 @@
+<#macro default_template_if_null value="" template_key=""><#if value?has_content>${value}<#else><#include "${template_key}"></#if></#macro>
--- a/abstracto-modules/entertainment/pom.xml
+++ b/abstracto-modules/entertainment/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/experience-tracking/pom.xml
+++ b/abstracto-modules/experience-tracking/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>experience-tracking</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/abstracto-modules/invite-filter/pom.xml
+++ b/abstracto-modules/invite-filter/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/link-embed/pom.xml
+++ b/abstracto-modules/link-embed/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/logging/pom.xml
+++ b/abstracto-modules/logging/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/moderation/pom.xml
+++ b/abstracto-modules/moderation/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>moderation</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl
+++ b/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl
@@ -21,10 +21,10 @@
            },
            <#include "success_color">,
            "description": "<#list userNotes as note><#assign note=note/>
-<#assign user><#if note.fullUser.member?has_content>${note.fullUser.member.asMention?json_string}<#else>${note.fullUser.aUserInAServer.userReference.id?c}</#if></#assign>
-<#assign noteText>${note.note.note?json_string}</#assign>
-<#assign noteId>${note.note.userNoteId.id}</#assign>
-<#assign date><@format_instant_date_time instant=note.note.created/></#assign>
+<#assign user><#if note.member.memberMention?has_content>${note.member.memberMention}<#else>${note.member.userId?c}</#if></#assign>
+<#assign noteText>${note.note?json_string}</#assign>
+<#assign noteId>${note.noteId}</#assign>
+<#assign date><@format_instant_date_time instant=note.created/></#assign>
 <@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/>
 </#list>"
        }
--- a/abstracto-modules/moderation/src/main/resources/en_US/command/mutes/mutes_mute_entry_en_US.ftl
+++ b/abstracto-modules/moderation/src/main/resources/en_US/command/mutes/mutes_mute_entry_en_US.ftl
@@ -1,10 +1,10 @@
 <#include "format_instant">
-<#assign muteId>${mute.mute.muteId.id}</#assign>
-<#assign reason>${mute.mute.reason}</#assign>
-<#assign mutedUserText><#if mute.mutedUser.member??>${mute.mutedUser.member.asMention}(${mute.mutedUser.member.user.id})<#else>${mute.mutedUser.userId?c}</#if></#assign>
-<#assign mutingUserText><#if mute.mutingUser.member??>${mute.mutingUser.member.asMention}(${mute.mutingUser.member.user.id})<#else>${mute.mutingUser.userId?c}</#if></#assign>
-<#assign muteDate><@format_instant_date_time instant=mute.mute.muteDate/></#assign>
-<#assign muteEnded>${mute.mute.muteEnded?string('✅', '❌')}</#assign>
+<#assign muteId>${mute.muteId}</#assign>
+<#assign reason>${mute.reason}</#assign>
+<#assign mutedUserText><#if mute.mutedUser.memberMention??>${mute.mutedUser.memberMention}(${mute.mutedUser.userId?c})<#else>${mute.mutedUser.userId?c}</#if></#assign>
+<#assign mutingUserText><#if mute.mutingUser.memberMention??>${mute.mutingUser.memberMention}(${mute.mutedUser.userId?c})<#else>${mute.mutingUser.userId?c}</#if></#assign>
+<#assign muteDate><@format_instant_date_time instant=mute.muteDate/></#assign>
+<#assign muteEnded>${mute.muteEnded?string('✅', '❌')}</#assign>
 <#assign muteDuration>${fmtDuration(mute.muteDuration)}</#assign>

 <#include "mutes_mute_entry_text">
--- a/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_display_response_paginator_en_US.ftl
+++ b/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_display_response_paginator_en_US.ftl
@@ -1,7 +1,7 @@
 {
-<#assign exitOnly=innerModel.warnings?size lt 6/>
+<#assign exitOnly=innerModel.warnings?size lt 5/>
 "embedConfigs": [
-    <#assign chunks=innerModel.warnings?chunk(5)>
+    <#assign chunks=innerModel.warnings?chunk(4)>
    <#list chunks as row><#assign counter=row?index><#assign row=row><#include "warnings_response_entry"><#sep>,</#list>
 ],
 "timeoutSeconds": 120,
--- a/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_response_entry_en_US.ftl
+++ b/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_response_entry_en_US.ftl
@@ -1,7 +1,7 @@
 {
    "embeds": [
        {
-            "description": "<#list row as warning><#assign warning=warning><@safe_include "warnings_warn_entry"/></#list>"
+            "description": "<#list row as warning><#assign warning=warning><@safe_include "warnings_warn_entry"/>\n</#list>"
        }
    ],
    "buttons": [
--- a/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_warn_entry_en_US.ftl
+++ b/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_warn_entry_en_US.ftl
@@ -1,13 +1,14 @@
 <#include "format_instant">
-<#assign decayed=warning.warning.decayed/>
-<#assign warnId>${warning.warning.warnId.id}</#assign>
-<#assign reason>${warning.warning.reason}</#assign>
-<#assign warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#else>${warning.warnedUser.userId?c}</#if></#assign>
-<#assign warningUserText><#if warning.warningUser.member??>${warning.warningUser.member.asMention}(${warning.warningUser.member.user.id})<#else>${warning.warningUser.userId?c}</#if></#assign>
-<#assign warnDate><@format_instant_date_time instant=warning.warning.warnDate/></#assign>
+<#assign decayed=warning.decayed/>
+<#assign warnId=warning.warnId/>
+<#assign reason=warning.reason/>
+<#assign warnedUserText><#if warning.warnedUser.memberMention??>${warning.warnedUser.memberMention}(${warning.warnedUser.userId})<#else>${warning.warnedUser.userId?c}</#if></#assign>
+<#assign warningUserText><#if warning.warningUser.memberMention??>${warning.warningUser.memberMention}(${warning.warnedUser.userId})<#else>${warning.warningUser.userId?c}</#if></#assign>
+<#assign warnDate><@format_instant_date_time instant=warning.warnDate/></#assign>

 <#include "warnings_warn_entry_text">
-<#if warning.warning.decayed>
-<#assign decayDate><@format_instant_date_time instant=warning.warning.decayDate/></#assign>
+
+<#if decayed>
+<#assign decayDate><@format_instant_date_time instant=warning.decayDate/></#assign>
 <#include "warnings_warn_is_decayed">
 </#if>
--- a/abstracto-modules/modmail/pom.xml
+++ b/abstracto-modules/modmail/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>modmail</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl
+++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl
@@ -19,7 +19,7 @@
    ],
    "messageConfig": {
        "allowsRoleMention": true
-    },
+    }
    <#if roles?size gt 0>
    ,"additionalMessage": "<#list roles as role>${role.role.asMention?json_string}<#sep>,</#list>"
    </#if>
--- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl
+++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl
@@ -12,10 +12,31 @@
            <#else>
            "description": "<@safe_include "modmail_no_message_provided"/>"
            </#if>
-            <#if postedMessage.attachments?size gt 0>
-            ,"imageUrl": "${postedMessage.attachments[0].proxyUrl}"
+            <#if attachedImageUrls?size gt 0>
+            ,"imageUrl": "${attachedImageUrls[0]}"
+            </#if>
+            <#if remainingAttachments?size gt 0>
+            ,"fields": [
+                <#list remainingAttachments?keys as attachment><#assign attachment=attachment/>
+                {
+                    "name": "${attachment?json_string}",
+                    "value": "[${attachment?json_string}](${remainingAttachments[attachment]?json_string})"
+                }
+                <#sep>,</#list>
+                ]
            </#if>
        }
+        <#if attachedImageUrls?size gt 1>
+            <#assign attachmentCount>${attachedImageUrls?size}</#assign>
+            ,<#list attachedImageUrls[1..] as attachment><#assign attachment=attachment/>
+        {
+            <#include "modmail_color">,
+            <#assign currentIndex>${attachment?counter + 1}</#assign>
+            "description": "<@safe_include "modmail_attachment_embed_description"/>",
+            "imageUrl": "${attachment}"
+        }
+            <#sep>,</#list>
+        </#if>
    ]
    <#if subscribers?size gt 0>
    ,"additionalMessage": "<#list subscribers as subscriber>${subscriber.asMention?json_string}<#sep>, </#list>"
--- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl
+++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl
@@ -7,11 +7,33 @@
            <#if message.embeds[0].description?has_content>
            ,"description": "${message.embeds[0].description?json_string}"
            </#if>
-            <#if message.embeds[0].image?has_content>
-            ,"imageUrl": "${message.embeds[0].image.proxyUrl}"
+            <#if message.embeds?size gt 0 && message.embeds[0].image??>
+                ,"imageUrl": "${message.embeds[0].image.proxyUrl}"
+            </#if>
+            <#if message.embeds?size gt 0 && message.embeds[0].fields?size gt 0>
+                ,"fields": [
+                <#list message.embeds[0].fields as field><#assign field=field/>
+                    {
+                    "name": "${field.name?json_string}",
+                    "value": "${field.value?json_string}"
+                    }
+                    <#sep>,</#list>
+                ]
            </#if>
            ,"timeStamp": "${message.timeCreated}"
        }
+        <#if message.embeds?size gt 1>
+        <#assign attachmentCount>${message.embeds?size}</#assign>
+            <#list message.embeds[1..] as embed><#assign embed=embed/>
+            <#if embed.image?? && embed.image.proxyUrl??>
+        ,{
+            <#include "modmail_color">,
+            <#assign currentIndex>${embed?counter + 1}</#assign>
+            "description": "<@safe_include "modmail_attachment_embed_description"/>",
+            "imageUrl": "${embed.image.proxyUrl}"
+        }
+            </#if></#list>
+        </#if>
    ]
    <#if modMailMessage.anonymous>
    ,"additionalMessage": "<@safe_include "modmail_anonymous_message_note"/>"
--- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_staff_message_embed_en_US.ftl
+++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_staff_message_embed_en_US.ftl
@@ -10,9 +10,30 @@
            <#if text?has_content>
            ,"description": "${text?json_string}"
            </#if>
-            <#if postedMessage.attachments?size gt 0>
-            ,"imageUrl": "${postedMessage.attachments[0].proxyUrl}"
+            <#if attachedImageUrls?size gt 0>
+                ,"imageUrl": "${attachedImageUrls[0]}"
+            </#if>
+            <#if remainingAttachments?size gt 0>
+                ,"fields": [
+                <#list remainingAttachments?keys as attachment><#assign attachment=attachment/>
+                    {
+                    "name": "${attachment?json_string}",
+                    "value": "[${attachment?json_string}](${remainingAttachments[attachment]?json_string})"
+                    }
+                    <#sep>,</#list>
+                ]
            </#if>
        }
+        <#if attachedImageUrls?size gt 1>
+            <#assign attachmentCount>${attachedImageUrls?size}</#assign>
+            ,<#list attachedImageUrls[1..] as attachment><#assign attachment=attachment/>
+        {
+            <#include "modmail_color">,
+            <#assign currentIndex>${attachment?counter + 1}</#assign>
+            "description": "<@safe_include "modmail_attachment_embed_description"/>",
+            "imageUrl": "${attachment}"
+        }
+                <#sep>,</#list>
+        </#if>
    ]
 }
--- a/abstracto-modules/pom.xml
+++ b/abstracto-modules/pom.xml
@@ -4,14 +4,14 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates</groupId>
        <artifactId>templates</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <groupId>dev.sheldan.abstracto-templates.templates</groupId>
    <artifactId>abstracto-modules</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>

    <modules>
        <module>core</module>
--- a/abstracto-modules/profanity-filter/pom.xml
+++ b/abstracto-modules/profanity-filter/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/remind/pom.xml
+++ b/abstracto-modules/remind/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/repost-detection/pom.xml
+++ b/abstracto-modules/repost-detection/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/starboard/pom.xml
+++ b/abstracto-modules/starboard/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/statistic/pom.xml
+++ b/abstracto-modules/statistic/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>statistic</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/abstracto-modules/suggestion/pom.xml
+++ b/abstracto-modules/suggestion/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/utility/pom.xml
+++ b/abstracto-modules/utility/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>utility</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/abstracto-modules/voice-channel-context/pom.xml
+++ b/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.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/webservices/pom.xml
+++ b/abstracto-modules/webservices/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@

    <groupId>dev.sheldan.abstracto-templates</groupId>
    <artifactId>templates</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>

    <modules>
        <module>abstracto-modules</module>
@@ -23,7 +23,7 @@
    <scm>
        <url>https://maven.pkg.github.com/Sheldan/abstracto-templates</url>
        <developerConnection>scm:git:git@github.com:Sheldan/abstracto-templates.git</developerConnection>
-      <tag>templates-1.3.0</tag>
+      <tag>HEAD</tag>
  </scm>

    <repositories>
--- a/translations/anti-raid/pom.xml
+++ b/translations/anti-raid/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>translations</artifactId>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/translations/assignable-roles/pom.xml
+++ b/translations/assignable-roles/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>translations</artifactId>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/translations/core/pom.xml
+++ b/translations/core/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
        <artifactId>translations</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>core</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/translations/utility/src/main/resources/en_US/config/module_utility_description_en_US.ftl
+++ b/translations/utility/src/main/resources/en_US/config/module_utility_description_en_US.ftl
--- a/translations/entertainment/pom.xml
+++ b/translations/entertainment/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>translations</artifactId>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/translations/experience-tracking/pom.xml
+++ b/translations/experience-tracking/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
        <artifactId>translations</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>experience-tracking</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/translations/invite-filter/pom.xml
+++ b/translations/invite-filter/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>translations</artifactId>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/translations/link-embed/pom.xml
+++ b/translations/link-embed/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>translations</artifactId>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/translations/link-embed/src/main/resources/en_US/listener/message_embed_embed_quoted_by_field_value_en_US.ftl
+++ b/translations/link-embed/src/main/resources/en_US/listener/message_embed_embed_quoted_by_field_value_en_US.ftl
@@ -1 +1 @@
-${user} from [${channelName}](${messageLink})
+${user} from [${channelName} (original)](${messageLink})
--- a/translations/logging/pom.xml
+++ b/translations/logging/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>translations</artifactId>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/translations/moderation/pom.xml
+++ b/translations/moderation/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
        <artifactId>translations</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>moderation</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/translations/moderation/src/main/resources/en_US/commands/userNotes/user_notes_note_entry_en_US.ftl
+++ b/translations/moderation/src/main/resources/en_US/commands/userNotes/user_notes_note_entry_en_US.ftl
@@ -1 +1 @@
-${user} has note ${noteId} with text ${noteText} on ${date}
+${user} has note ${noteId} on ${date} with text `${noteText}`.
--- a/translations/moderation/src/main/resources/en_US/commands/warnings/warnings_warn_entry_text_en_US.ftl
+++ b/translations/moderation/src/main/resources/en_US/commands/warnings/warnings_warn_entry_text_en_US.ftl
@@ -1 +1 @@
-Warning #${warnId} with reason: `${reason}` towards user ${warnedUserText} by user ${warningUserText} on ${warnDate}. The warning is **${decayed?then('decayed', 'active')}**
+Warning #${warnId} towards user ${warnedUserText} by user ${warningUserText} on ${warnDate}. It is **${decayed?then('decayed', 'active')}**. The reason was: `${reason}`.
--- a/translations/modmail/pom.xml
+++ b/translations/modmail/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
        <artifactId>translations</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>modmail</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/translations/modmail/src/main/resources/en_US/threadContent/modmail_attachment_embed_description_en_US.ftl
+++ b/translations/modmail/src/main/resources/en_US/threadContent/modmail_attachment_embed_description_en_US.ftl
@@ -0,0 +1 @@
+Attachment ${currentIndex}/${attachmentCount}
--- a/translations/pom.xml
+++ b/translations/pom.xml
@@ -4,14 +4,14 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates</groupId>
        <artifactId>templates</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <groupId>dev.sheldan.abstracto-templates.translations</groupId>
    <artifactId>translations</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>

    <modules>
        <module>core</module>
--- a/translations/profanity-filter/pom.xml
+++ b/translations/profanity-filter/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
        <artifactId>translations</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/translations/remind/pom.xml
+++ b/translations/remind/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>translations</artifactId>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/translations/repost-detection/pom.xml
+++ b/translations/repost-detection/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>translations</artifactId>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/translations/starboard/pom.xml
+++ b/translations/starboard/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>translations</artifactId>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/translations/statistic/pom.xml
+++ b/translations/statistic/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
        <artifactId>translations</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>statistic</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/translations/suggestion/pom.xml
+++ b/translations/suggestion/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>translations</artifactId>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/translations/utility/pom.xml
+++ b/translations/utility/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
        <artifactId>translations</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>utility</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.3-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/translations/voice-channel-context/pom.xml
+++ b/translations/voice-channel-context/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>translations</artifactId>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/translations/webservices/pom.xml
+++ b/translations/webservices/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
        <artifactId>translations</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
Author	SHA1	Message	Date
Sheldan	e505b181e6	[maven-release-plugin] prepare for next development iteration	2022-05-15 17:50:20 +02:00
Sheldan	ab80220944	[maven-release-plugin] prepare release templates-1.3.2	2022-05-15 17:50:16 +02:00
Sheldan	33bdfd29a1	[AB-xxx] adding macro for defaulting easier in case of null values	2022-05-15 13:08:47 +02:00
Sheldan	6a76cd3c61	[AB-xxx] moving the original link hint	2022-02-12 23:30:07 +01:00
Sheldan	1f449750f8	[AB-xxx] adding hint to show where the original link for a message embed is	2022-02-12 23:08:33 +01:00
Sheldan	f39c25e5fc	[maven-release-plugin] prepare for next development iteration	2022-02-12 11:46:32 +01:00
Sheldan	a2d15ea9b1	[maven-release-plugin] prepare release templates-1.3.1	2022-02-12 11:46:28 +01:00
Sheldan	d1657c3b8a	[AB-xxx] moving utility module template to core	2022-02-11 18:45:54 +01:00
Sheldan	120d30049a	[AB-347] adding multiple and generic attachment support to modmail templates fixing modmail notification template	2021-12-25 16:30:25 +01:00
Sheldan	6ea28f2424	[AB-352] changed templates for mutes/user notes/warns after models changed reduced warnings displayed at once placed reason for warnings at different position	2021-12-24 23:42:31 +01:00
Sheldan	60e37b4ef2	[maven-release-plugin] prepare for next development iteration	2021-12-24 13:50:06 +01:00
				`@@ -0,0 +1 @@`
				`<#macro default_template_if_null value="" template_key=""><#if value?has_content>${value}<#else><#include "${template_key}"></#if></#macro>`
				`@@ -0,0 +1 @@`
				`Attachment ${currentIndex}/${attachmentCount}`