From 846495ee66b12e74767401a15312c7d37d0061c2 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Wed, 12 Dec 2018 16:29:34 +0100 Subject: [PATCH 1/8] Minors --- core/src/main/resources/cn/message.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/cn/message.yml b/core/src/main/resources/cn/message.yml index bc8d3c95..1d7fd6cd 100644 --- a/core/src/main/resources/cn/message.yml +++ b/core/src/main/resources/cn/message.yml @@ -5,7 +5,7 @@ # 请其他译者勿使用机器翻译。谢谢！ info: - prefix: '&8(&4&l快异创世&8)&r&7' + prefix: '&8(&4&lFAWE&8)&r&7' file_deleted: '%s0 已被删除。' schematic_pasting: '&7正在粘贴布局。此操作无法撤销。' lighting_propogate_selection: '&7光照已在 %s0 个区块内传播。（注：您可使用 //removelight 移除）' From 783fda82bfeb0f0d52f31cbbccd09b7e1610cbc4 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Mon, 17 Dec 2018 11:47:06 +0000 Subject: [PATCH 2/8] Should fix build --- build.gradle | 1 - bukkit/build.gradle | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8e08b294..aab6a7fa 100644 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,6 @@ subprojects { maven {url "http://ci.frostcast.net/plugin/repository/everything"} maven {url "http://maven.sk89q.com/artifactory/repo"} maven {url "http://repo.spongepowered.org/maven"} - maven {url "https://repo.inventivetalent.org/content/groups/public/"} maven {url "http://dl.bintray.com/tastybento/maven-repo"} } } diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 9e602560..e9f7cb94 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -31,7 +31,7 @@ dependencies { compile 'org.bukkit.craftbukkit:CraftBukkit:1.8.8' compile 'com.comphenix.protocol:ProtocolLib-API:4.4.0-SNAPSHOT' compile 'com.wasteofplastic:askyblock:3.0.8.2' - compile('org.inventivetalent:mapmanager:1.4.0-SNAPSHOT') { + compile('org.inventivetalent:mapmanager:1.7.1-SNAPSHOT') { transitive = false } } From dbf28a41d45094b88d28a64430610fd6ddeaafe7 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Mon, 17 Dec 2018 11:52:59 +0000 Subject: [PATCH 3/8] Never specified the local repository should be used. --- bukkit/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/bukkit/build.gradle b/bukkit/build.gradle index e9f7cb94..cc354319 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -1,5 +1,6 @@ repositories { flatDir {dirs 'lib'} + mavenLocal() } dependencies { compile project(':core') From 2d77214aa912b8f7f61bc1cd8c71da34f49e52d9 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Mon, 17 Dec 2018 12:41:40 +0000 Subject: [PATCH 4/8] Add local repo even further up --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index aab6a7fa..ea143f69 100644 --- a/build.gradle +++ b/build.gradle @@ -94,6 +94,7 @@ subprojects { } repositories { + mavenLocal() maven {url "https://mvnrepository.com/artifact/"} mavenCentral() maven {url "http://repo.dmulloy2.net/content/groups/public/"} From 5d0d461baf490a880a30ddf57623d51be12f45cf Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Mon, 17 Dec 2018 13:33:06 +0000 Subject: [PATCH 5/8] Remove mavenLocal from bukkit build.gradle --- bukkit/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/bukkit/build.gradle b/bukkit/build.gradle index cc354319..e9f7cb94 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -1,6 +1,5 @@ repositories { flatDir {dirs 'lib'} - mavenLocal() } dependencies { compile project(':core') From f0fbd34d3c16676d03d49af400302f52a4c79940 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Mon, 17 Dec 2018 13:44:03 +0000 Subject: [PATCH 6/8] See if we can't force the actual P2 maven --- build.gradle | 2 +- core/build.gradle | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ea143f69..6dbbb2cd 100644 --- a/build.gradle +++ b/build.gradle @@ -94,13 +94,13 @@ subprojects { } repositories { - mavenLocal() maven {url "https://mvnrepository.com/artifact/"} mavenCentral() maven {url "http://repo.dmulloy2.net/content/groups/public/"} maven {url "https://repo.destroystokyo.com/repository/maven-public//"} maven {url "http://ci.emc.gs/nexus/content/groups/aikar/" } maven {url "http://ci.athion.net/job/PlotSquared/ws/mvn/"} + mavenLocal() maven {url "http://empcraft.com/maven2"} maven {url "https://hub.spigotmc.org/nexus/content/groups/public/"} maven {url "http://maven.sk89q.com/repo/"} diff --git a/core/build.gradle b/core/build.gradle index 6faf5292..8cc6b05c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,5 +1,6 @@ repositories { flatDir {dirs 'lib'} + maven {url "http://ci.athion.net/job/PlotSquared/ws/mvn/"} } dependencies { testCompile 'junit:junit:4.12' @@ -7,6 +8,7 @@ dependencies { compile 'com.google.code.gson:gson:2.2.4' compile 'net.fabiozumbi12:redprotect:1.9.6' compile group: "com.plotsquared", name: "plotsquared-api", version: "latest" + compile 'com.intellectual' compile 'org.primesoft:BlocksHub:2.0' compile 'com.github.luben:zstd-jni:1.1.1' // compile 'org.javassist:javassist:3.22.0-CR1' From 772de99706cffb15746b08b031d2d524bd210bff Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Mon, 17 Dec 2018 13:44:59 +0000 Subject: [PATCH 7/8] * --- core/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index 8cc6b05c..ba41a9b8 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -8,7 +8,6 @@ dependencies { compile 'com.google.code.gson:gson:2.2.4' compile 'net.fabiozumbi12:redprotect:1.9.6' compile group: "com.plotsquared", name: "plotsquared-api", version: "latest" - compile 'com.intellectual' compile 'org.primesoft:BlocksHub:2.0' compile 'com.github.luben:zstd-jni:1.1.1' // compile 'org.javassist:javassist:3.22.0-CR1' From e64debbc2a5f5b843dcb817863213f0d8dfff888 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Tue, 18 Dec 2018 21:15:53 +0100 Subject: [PATCH 8/8] Switching from IRC to Discord To offer us a better possibility to help you, visit us on discord https://discord.gg/ngZCzbU --- README.md | 5 +++-- core/src/main/java/com/boydti/fawe/Fawe.java | 2 +- .../main/java/com/boydti/fawe/installer/InstallerFrame.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 30d1a716..78f59c33 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,10 @@ FAWE is a fork of WorldEdit that has huge speed and memory improvements and considerably more features It is available for Bukkit, Forge, Sponge and Nukkit. +For FAWE for 1.13 see [here](https://github.com/boy0001/WorldEdit/) ## Chat -### - **`> `**[`Discord`](https://discord.gg/ngZCzbU)`|`[`IRC`](http://webchat.esper.net/?nick=&channels=IntellectualCrafters)` | `[`Spigot Forums`](https://www.spigotmc.org/threads/fast-async-worldedit.100104/)**` <`** +### - **`> `**[`Discord`](https://discord.gg/ngZCzbU)`|`[`Spigot Forums`](https://www.spigotmc.org/threads/fast-async-worldedit.100104/)**` <`** ## Releases @@ -28,4 +29,4 @@ $ gradlew build Have an idea for an optimization, or a cool feature? - I'll accept most PR's - Let me know what you've tested / what may need further testing - - If you need any help, create a ticket or discuss on Discord + - If you need any help, create a ticket or discuss on [Discord](https://discord.gg/ngZCzbU) diff --git a/core/src/main/java/com/boydti/fawe/Fawe.java b/core/src/main/java/com/boydti/fawe/Fawe.java index f5a05e62..ec56c20f 100644 --- a/core/src/main/java/com/boydti/fawe/Fawe.java +++ b/core/src/main/java/com/boydti/fawe/Fawe.java @@ -643,7 +643,7 @@ public class Fawe { debug(" - AsyncWorldEdit/WorldEditRegions isn't installed"); debug(" - Any other errors in the startup log"); debug("Contact Empire92 if you need assistance:"); - debug(" - Send me a PM or ask on IRC/Discord"); + debug(" - Send me a PM or ask on Discord"); debug(" - https://discord.gg/ngZCzbU"); debug("======================================="); } diff --git a/core/src/main/java/com/boydti/fawe/installer/InstallerFrame.java b/core/src/main/java/com/boydti/fawe/installer/InstallerFrame.java index 818926a9..ffc1f610 100644 --- a/core/src/main/java/com/boydti/fawe/installer/InstallerFrame.java +++ b/core/src/main/java/com/boydti/fawe/installer/InstallerFrame.java @@ -160,7 +160,7 @@ public class InstallerFrame extends JFrame { } catch (Throwable ignore) { ignore.printStackTrace(); } - URL chat = new URL("http://webchat.esper.net/?nick=&channels=IntellectualCrafters&fg_color=000&fg_sec_color=000&bg_color=FFF"); + URL chat = new URL("https://discord.gg/ngZCzbU"); URLButton chatButton = new URLButton(chat, "Chat"); bottomBar.add(chatButton); URL wiki = new URL("https://github.com/boy0001/FastAsyncWorldedit/wiki");