Merge branch 'master' into dev/sql

0PandaDEV · Jul 19, 2024 · eea7103 · eea7103
2 parents b6c3cd0 + 55afb5d
commit eea7103
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -2,11 +2,11 @@ name: Nextron Nightly Builds
 
 on:
   push:
-    branches:
+    branches: 
       - '*'
       - 'dev/**'
   pull_request:
-    branches:
+    branches: 
       - '*'
       - 'dev/**'
   workflow_dispatch:

diff --git a/pom.xml b/pom.xml
@@ -51,12 +51,24 @@
                             <filters>
                                 <filter>
                                     <artifact>*:*</artifact>
-                                    <excludeDefaults>false</excludeDefaults>
-                                    <includes>
-                                        <include>net/wesjd/anvilgui/**</include>
-                                    </includes>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                        <exclude>META-INF/DEPENDENCIES</exclude>
+                                        <exclude>META-INF/LICENSE</exclude>
+                                        <exclude>META-INF/NOTICE</exclude>
+                                        <exclude>META-INF/versions/9/module-info.class</exclude>
+                                    </excludes>
                                 </filter>
                             </filters>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+                                    <addHeader>false</addHeader>
+                                </transformer>
+                            </transformers>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/src/main/java/net/pandadev/nextron/commands/TopCommand.java b/src/main/java/net/pandadev/nextron/commands/TopCommand.java
@@ -10,7 +10,7 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
-@Command(name = "top")
+@Command(name = "top", aliases = {"touchgrass"})
 @Permission("nextron.top")
 public class TopCommand extends HelpBase {