Merge branch 'master' into patch-2

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)

build.gradle

@@ -100,6 +100,7 @@ subprojects {
         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/"}
@@ -107,7 +108,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"}
     }
 }

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
     }
 }

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'

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("=======================================");
         }

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");

core/src/main/resources/cn/message.yml

@@ -20,6 +20,18 @@ info:
   require_selection_in_mask: '&7你选中的 %s 不在蒙版内.你只能在允许的区域内编辑.'
   worldedit_volume: '&7你不能选择 %current% 大小的区域.所允许的最大区域为 %max%.'
   worldedit_iterations: '&7你不能重复 %current% 次.所允许的最多重复为 %max% 次.'
+  file_deleted: '%s0 已被删除。'
+  schematic_pasting: '&7正在粘贴布局。此操作无法撤销。'
+  lighting_propogate_selection: '&7光照已在 %s0 个区块内传播。（注：您可使用 //removelight 移除）'
+  updated_lighting_selection: '&7已更新 %s0 个区块内的光照。（数据包可能要稍后发出）'
+  set_region: '&7选择区域已设置为您当前允许的区域'
+  worldedit_command_limit: '&7请等待完成您的当前操作'
+  worldedit_delayed: '&7正在处理您的快异创世操作，请稍后···'
+  worldedit_run: '&7很抱歉造成延误，现正执行 %s'
+  worldedit_complete: '&7编辑完成。'
+  require_selection_in_mask: '&7您选中的 %s 不在蒙版内。您只能在允许的区域内编辑。'
+  worldedit_volume: '&7您不能选择 %current% 大小的区域。所允许的最大区域为 %max%。'
+  worldedit_iterations: '&7您不能重复 %current% 次。所允许的最多重复为 %max% 次。'
   worldedit_unsafe: '&7已阻止对此命令的访问'
   worldedit_dangerous_worldedit: '&c%s1 在 %s0 处进行了不安全的编辑'
   worldedit_toggle_tips_on: '&7已禁用FAWE提示.'