Merge remote-tracking branch 'refs/remotes/upstream/master'

# Conflicts: # pom.xml # src/main/java/io/ncbpfluffybear/fluffymachines/FluffyMachines.java # src/main/java/io/ncbpfluffybear/fluffymachines/items/tools/CargoManipulator.java
SlimefunGuguProject · Apr 8, 2024 · 035fe56 · 035fe56
2 parents 22b4c94 + 12197d3
commit 035fe56
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -162,7 +162,7 @@
         <dependency>
             <groupId>net.guizhanss</groupId>
             <artifactId>GuizhanLibPlugin</artifactId>
-            <version>1.6.1</version>
+            <version>1.7.6</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/io/ncbpfluffybear/fluffymachines/FluffyMachines.java b/src/main/java/io/ncbpfluffybear/fluffymachines/FluffyMachines.java
@@ -114,11 +114,6 @@ public void onEnable() {
         getServer().getPluginManager().registerEvents(new KeyedCrafterListener(), this);
 
         final Metrics metrics = new Metrics(this, 8927);
-
-        getLogger().log(Level.INFO, ChatColor.GREEN + "你好！要共享服务器到" +
-            "Slimefun社区吗?");
-        getLogger().log(Level.INFO, ChatColor.GREEN + "加入官方Slimefun服务器" +
-            "https://discord.gg/slimefun");
     }
 
     @Override