Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-12 04:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/1.16' into fixEntities

Browse Source
This commit is contained in:
Aurora
2020-08-16 17:01:45 +02:00
parent b582d3f70d 5f2d60deb3
commit 3aa041aa7e
69 changed files with 815 additions and 4688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java
View File

@ -80,6 +80,9 @@ public class Settings extends Config {
"Specific aspects can be turned on and off further below"
})
public boolean PLOTSQUARED_HOOK = true;
@Comment({"Send anonymous FAWE statistics to https://bstats.org/.",
"Please keep this setting enabled. It helps us identifying which parts of FAWE are used the most to organize future updates better."})
public boolean BSTATS = true;
}
@Comment("Paths for various directories")

2
worldedit-core/src/main/java/com/boydti/fawe/util/IncendoPaster.java
View File

@ -233,6 +233,8 @@ public final class IncendoPaster implements Paster {
b.append("Uptime: ").append(TimeUnit.MINUTES.convert(rb.getUptime(), TimeUnit.MILLISECONDS) + " minutes").append('\n');
b.append("Free Memory: ").append(runtime.freeMemory() / 1024 / 1024 + " MB").append('\n');
b.append("Max Memory: ").append(runtime.maxMemory() / 1024 / 1024 + " MB").append('\n');
b.append("Total Memory: ").append(runtime.totalMemory() / 1024 / 1024 + " MB").append('\n');
b.append("Available Processors: ").append(runtime.availableProcessors()).append('\n');
b.append("Java Name: ").append(rb.getVmName()).append('\n');
b.append("Java Version: '").append(System.getProperty("java.version")).append("'\n");
b.append("Java Vendor: '").append(System.getProperty("java.vendor")).append("'\n");