Merge remote-tracking branch 'origin/1.15' into 1.15

Dieser Commit ist enthalten in:
MattBDev 2020-02-27 20:28:01 -05:00
Commit 6e7cc2d2bc
2 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen

Datei anzeigen

@ -388,7 +388,7 @@ public class Settings extends Config {
" - Downloads can be deleted by the user", " - Downloads can be deleted by the user",
" - Supports clipboard uploads, downloads and saves", " - Supports clipboard uploads, downloads and saves",
}) })
public String URL = "https://empcraft.com/fawe/"; public String URL = "https://athion.net/fawe/";
@Comment({ @Comment({
"The web interface for assets", "The web interface for assets",
" - All schematics are organized and public", " - All schematics are organized and public",

Datei anzeigen

@ -36,7 +36,7 @@ public abstract class FaweMaskManager {
return this.key; return this.key;
} }
public abstract FaweMask getMask(final Player player, MaskType type); public FaweMask getMask(final Player player, MaskType type){ return null; }
public boolean isValid(FaweMask mask) { public boolean isValid(FaweMask mask) {
return true; return true;