mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-06-21 09:35:17 +02:00
Lazy merge v5/v6
This commit is contained in:
NotMyFault
parent
361b936aa0
commit
ffe298710d
4
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
4
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
|
|
@ -7,7 +7,7 @@ body:
|
|||
attributes:
|
||||
value: |
|
||||
Thanks for taking the time to fill out this bug report for PlotSquared! Fill out the following form to your best ability to help us fix the problem.
|
||||
Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://wiki.intellectualsites.com/PlotSquared).
|
||||
Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/PlotSquared/wiki).
|
||||
|
||||
- type: dropdown
|
||||
attributes:
|
||||
|
|
@ -99,4 +99,4 @@ body:
|
|||
- type: textarea
|
||||
attributes:
|
||||
label: Anything else?
|
||||
description: You can provide additional context below.
|
||||
description: You can provide additional context below.
|
||||
|
|
|
|||
2
.github/ISSUE_TEMPLATE/config.yml
vendored
2
.github/ISSUE_TEMPLATE/config.yml
vendored
|
|
@ -4,5 +4,5 @@ contact_links:
|
|||
url: https://discord.gg/intellectualsites
|
||||
about: Our support Discord, please ask questions and seek support here.
|
||||
- name: PlotSquared Wiki
|
||||
url: https://wiki.intellectualsites.com/PlotSquared
|
||||
url: https://github.com/IntellectualSites/PlotSquared/wiki
|
||||
about: Take a look at the wiki page for instructions how to setup PlotSquared and use its commands.
|
||||
|
|
|
|||
2
.github/ISSUE_TEMPLATE/feature_request.yml
vendored
2
.github/ISSUE_TEMPLATE/feature_request.yml
vendored
|
|
@ -7,7 +7,7 @@ body:
|
|||
attributes:
|
||||
value: |
|
||||
Thanks for taking the time to fill out this feature request for PlotSquared! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added.
|
||||
For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://wiki.intellectualsites.com/PlotSquared).
|
||||
For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/PlotSquared/wiki).
|
||||
|
||||
- type: textarea
|
||||
attributes:
|
||||
|
|
|
|||
|
|
@ -322,7 +322,7 @@ public abstract class Command {
|
|||
}
|
||||
if (this.allCommands.isEmpty()) {
|
||||
player.sendMessage(
|
||||
StaticCaption.of("Not Implemented: https://issues.intellectualsites.com/newIssue?project=PS"));
|
||||
StaticCaption.of("Not Implemented: https://github.com/IntellectualSites/PlotSquared/issues"));
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
Command cmd = getCommand(args[0]);
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ public class DebugPaste extends SubCommand {
|
|||
b.append("OS Arch: ").append(System.getProperty("os.arch")).append('\n');
|
||||
b.append("# Okay :D Great. You are now ready to create your bug report!");
|
||||
b.append(
|
||||
"\n# You can do so at https://issues.intellectualsites.com/projects/ps");
|
||||
"\n# You can do so at https://github.com/IntellectualSites/PlotSquared/issues");
|
||||
b.append("\n# or via our Discord at https://discord.gg/intellectualsites");
|
||||
|
||||
final IncendoPaster incendoPaster = new IncendoPaster("plotsquared");
|
||||
|
|
@ -123,7 +123,7 @@ public class DebugPaste extends SubCommand {
|
|||
|
||||
try {
|
||||
final File logFile =
|
||||
new File(PlotSquared.platform().getDirectory(), "../../logs/latest.log");
|
||||
new File("logs/latest.log");
|
||||
if (Files.size(logFile.toPath()) > 14_000_000) {
|
||||
throw new IOException(
|
||||
"The latest.log is larger than 14MB. Please reboot your server and submit a new paste.");
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ public class PluginCmd extends SubCommand {
|
|||
player.sendMessage(StaticCaption.of(
|
||||
"<gray>>> </gray><gold><bold>Authors<reset><gray>: </gray><gold>Citymonstret </gold><gray>& </gray><gold>Empire92 </gold><gray>& </gray><gold>MattBDev </gold><gray>& </gray><gold>dordsor21 </gold><gray>& </gray><gold>NotMyFault </gold><gray>& </gray><gold>SirYwell</gold>"));
|
||||
player.sendMessage(StaticCaption.of(
|
||||
"<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://wiki.intellectualsites.com/plotsquared/home>https://wiki.intellectualsites.com/plotsquared/home</gold>"));
|
||||
"<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://github.com/IntellectualSites/PlotSquared/wiki>https://github.com/IntellectualSites/PlotSquared/wiki</gold>"));
|
||||
player.sendMessage(StaticCaption.of(
|
||||
"<gray>>> </gray><gold><bold>Discord<reset><gray>: </gray><gold><click:open_url:https://discord.gg/intellectualsites>https://discord.gg/intellectualsites</gold>"));
|
||||
player.sendMessage(
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ public class Settings extends Config {
|
|||
public List<String> WORLDS = new ArrayList<>(Collections.singletonList("*"));
|
||||
|
||||
|
||||
@Comment("See: https://wiki.intellectualsites.com/en/plotsquared/optimization/plot-analysis for a description of each value.")
|
||||
@Comment("See: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis for a description of each value.")
|
||||
public static final class CALIBRATION {
|
||||
|
||||
public int VARIETY = 0;
|
||||
|
|
@ -235,7 +235,7 @@ public class Settings extends Config {
|
|||
|
||||
|
||||
@Comment({"Chunk processor related settings",
|
||||
"See https://wiki.intellectualsites.com/en/plotsquared/optimization/chunk-processor for more information."})
|
||||
"See https://github.com/IntellectualSites/PlotSquared/wiki/Chunk-processor for more information."})
|
||||
public static class Chunk_Processor {
|
||||
|
||||
@Comment("Auto trim will not save chunks which aren't claimed")
|
||||
|
|
@ -296,7 +296,7 @@ public class Settings extends Config {
|
|||
@Comment("Replace wall when merging")
|
||||
public static boolean MERGE_REPLACE_WALL = true;
|
||||
@Comment({"Blocks that may not be used in plot components",
|
||||
"Checkout the wiki article regarding plot components before modifying: https://wiki.intellectualsites.com/en/plotsquared/installation/plot-components"})
|
||||
"Checkout the wiki article regarding plot components before modifying: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-Components"})
|
||||
public static List<String>
|
||||
INVALID_BLOCKS = Arrays.asList(
|
||||
// Acacia Stuff
|
||||
|
|
@ -418,7 +418,7 @@ public class Settings extends Config {
|
|||
|
||||
|
||||
@Comment({"Schematic Settings",
|
||||
"See https://wiki.intellectualsites.com/en/plotsquared/schematics/on-claim for more information."})
|
||||
"See https://github.com/IntellectualSites/PlotSquared/wiki/Schematic-on-Claim for more information."})
|
||||
public static final class Schematics {
|
||||
|
||||
@Comment(
|
||||
|
|
@ -530,7 +530,7 @@ public class Settings extends Config {
|
|||
|
||||
|
||||
@Comment({"Backup related settings",
|
||||
"See https://wiki.intellectualsites.com/en/plotsquared/backups for more information."})
|
||||
"See https://github.com/IntellectualSites/PlotSquared/wiki/Backups for more information."})
|
||||
public static final class Backup {
|
||||
|
||||
@Comment("Automatically backup plots when destructive commands are performed, e.g. /plot clear")
|
||||
|
|
@ -728,7 +728,7 @@ public class Settings extends Config {
|
|||
public static boolean
|
||||
PERSISTENT_ROAD_REGEN = false;
|
||||
@Comment({"Enable the `/plot component` preset GUI",
|
||||
"Read more about components here: https://wiki.intellectualsites.com/en/plotsquared/installation/plot-components"})
|
||||
"Read more about components here: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-Components"})
|
||||
public static boolean COMPONENT_PRESETS = true;
|
||||
@Comment("Enable per user locale")
|
||||
public static boolean PER_USER_LOCALE = false;
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@ is to provide a lag-free and smooth experience.
|
|||
|
||||
* [Download](https://www.spigotmc.org/resources/77506/)
|
||||
* [Discord](https://discord.gg/intellectualsites)
|
||||
* [Wiki](https://wiki.intellectualsites.com/plotsquared/home)
|
||||
* [Wiki](https://github.com/IntellectualSites/PlotSquared/wiki)
|
||||
* [Issues](https://github.com/IntellectualSites/PlotSquared/issues)
|
||||
* [Translations](https://intellectualsites.crowdin.com/plotsquared/)
|
||||
|
||||
### Developer Resources
|
||||
* [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)
|
||||
* [API Documentation](https://github.com/IntellectualSites/PlotSquared/wiki/API-Documentation)
|
||||
* [Event API](https://github.com/IntellectualSites/PlotSquared/wiki/Events)
|
||||
* [Flag API](https://github.com/IntellectualSites/PlotSquared/wiki/API-Flag)
|
||||
|
||||
# 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.
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user