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

This commit is contained in:
Alexander Söderberg 2020-05-11 22:11:29 +02:00
commit 3c5dd3d0d2
No known key found for this signature in database
GPG Key ID: C0207FF7EA146678
3 changed files with 6 additions and 4 deletions

View File

@ -47,7 +47,7 @@ public class PluginCmd extends SubCommand {
MainUtil.sendMessage(player, MainUtil.sendMessage(player,
"$2>> $1&lAuthors$2: $1Citymonstret $2& $1Empire92 $2& $1MattBDev $2& $1dordsor21 $2& $1NotMyFault $2& $1SirYwell"); "$2>> $1&lAuthors$2: $1Citymonstret $2& $1Empire92 $2& $1MattBDev $2& $1dordsor21 $2& $1NotMyFault $2& $1SirYwell");
MainUtil.sendMessage(player, MainUtil.sendMessage(player,
"$2>> $1&lWiki$2: $1https://github.com/IntellectualSites/PlotSquared/wiki"); "$2>> $1&lWiki$2: $1https://wiki.intellectualsites.com/plotsquared/home");
MainUtil MainUtil
.sendMessage(player, "$2>> $1&lPremium$2: $1" + PremiumVerification.isPremium()); .sendMessage(player, "$2>> $1&lPremium$2: $1" + PremiumVerification.isPremium());
}); });

View File

@ -207,7 +207,7 @@ public class Settings extends Config {
public List<String> WORLDS = new ArrayList<>(Collections.singletonList("*")); public List<String> WORLDS = new ArrayList<>(Collections.singletonList("*"));
@Comment("See: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis") @Comment("See: https://wiki.intellectualsites.com/en/plotsquared/optimization/plot-analysis")
public static final class CALIBRATION { public static final class CALIBRATION {
public int VARIETY = 0; public int VARIETY = 0;
public int VARIETY_SD = 0; public int VARIETY_SD = 0;

View File

@ -27,10 +27,12 @@ is to provide a lag-free and smooth experience.
* [Download](https://github.com/IntellectualSites/PlotSquared/releases/tag/dev) * [Download](https://github.com/IntellectualSites/PlotSquared/releases/tag/dev)
* [Discord](https://discord.gg/KxkjDVg) * [Discord](https://discord.gg/KxkjDVg)
* [Wiki](https://github.com/IntellectualSites/PlotSquared/wiki) * [Wiki](https://wiki.intellectualsites.com/plotsquared/home)
### Developer Resources ### Developer Resources
* [API Documentation](https://github.com/IntellectualSites/PlotSquared/wiki/API-Documentation) * [API Documentation](https://wiki.intellectualsites.com/en/plotsquared/developer/development-portal)
* [Event API](https://wiki.intellectualsites.com/en/plotsquared/developer/events)
* [Flag API](https://wiki.intellectualsites.com/en/plotsquared/developer/flags)
# Building # Building
Gradle is the **recommended** way to build the project. Use `./gradlew build` in the main project directory to build the project. Gradle is required if you intend to build or develop the Sponge module. Gradle is the **recommended** way to build the project. Use `./gradlew build` in the main project directory to build the project. Gradle is required if you intend to build or develop the Sponge module.