Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
MattBDev 2020-03-10 17:23:34 -04:00
commit 77dfdf111a
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -9,7 +9,7 @@ FAWE is a fork of WorldEdit that has huge speed and memory improvements and cons
## Links ## Links
* [Spigot Page](https://www.spigotmc.org/threads/fast-async-worldedit.100104/) * [Spigot Page](https://www.spigotmc.org/threads/fast-async-worldedit.100104/)
* [Discord](https://discord.gg/ngZCzbU) * [Discord](https://discord.gg/KxkjDVg)
* [Wiki](https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/wiki) * [Wiki](https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/wiki)
* [Report Issue](https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues) * [Report Issue](https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues)
@ -38,4 +38,4 @@ $ gradlew build
Have an idea for an optimization, or a cool feature? Have an idea for an optimization, or a cool feature?
- We will accept most PR's - We will accept most PR's
- Let us know what you've tested / what may need further testing - Let us know what you've tested / what may need further testing
- If you need any help, create a ticket or discuss on [Discord](https://discord.gg/ngZCzbU) - If you need any help, create a ticket or discuss on [Discord](https://discord.gg/KxkjDVg)

2
build.gradle.kts
View File

@ -9,7 +9,7 @@ logger.lifecycle("""
1) Read COMPILING.md if you haven't yet 1) Read COMPILING.md if you haven't yet
2) Try running 'build' in a separate Gradle run 2) Try running 'build' in a separate Gradle run
3) Use gradlew and not gradle 3) Use gradlew and not gradle
4) If you still need help, ask on Discord! https://discord.gg/ngZCzbU 4) If you still need help, ask on Discord! https://discord.gg/KxkjDVg
Output files will be in [subproject]/build/libs Output files will be in [subproject]/build/libs
******************************************* *******************************************

2
contrib/craftscripts/SUBMITTING.txt
View File

@ -7,4 +7,4 @@ Note: Legally you should not release things to the public domain as not
all countries have the concept of public domain in their copyright law. all countries have the concept of public domain in their copyright law.
You can also post your scripts here: You can also post your scripts here:
https://discord.gg/YKbmj7V or http://forum.sk89q.com/forums/craftscripts.6/ https://discord.gg/KxkjDVg or http://forum.sk89q.com/forums/craftscripts.6/

2
worldedit-core/src/main/resources/de/message.yml
View File

@ -366,7 +366,7 @@ tips:
tip_biome_pattern: 'Tipp: Das #biome[forest] Muster kann in jedem Befehl genutzt tip_biome_pattern: 'Tipp: Das #biome[forest] Muster kann in jedem Befehl genutzt
werden' werden'
tip_biome_mask: 'Tipp: Beschränke ein Biom mit der `$jungle` Maske' tip_biome_mask: 'Tipp: Beschränke ein Biom mit der `$jungle` Maske'
tip_discord: Du benötigst Hilfe mit FAWE? https://discord.gg/ngZCzbU tip_discord: Du benötigst Hilfe mit FAWE? https://discord.gg/KxkjDVg
tip_replace_regex: 'Tipp: Ersetze mit regex: //replace .*_log <pattern>' tip_replace_regex: 'Tipp: Ersetze mit regex: //replace .*_log <pattern>'
tip_replace_regex_2: 'Tipp: Ersetze mit regex: //replace .*stairs[facing=(north|south)] tip_replace_regex_2: 'Tipp: Ersetze mit regex: //replace .*stairs[facing=(north|south)]
<pattern>' <pattern>'

2
worldedit-core/src/main/resources/fr/message.yml
View File

@ -333,7 +333,7 @@ tips:
tip_select_connected: Astuce, Sélectionner tous les blocs connectés avec //sel fuzzy' tip_select_connected: Astuce, Sélectionner tous les blocs connectés avec //sel fuzzy'
tip_set_pos1: Astuce, Utilisez pos1 comme motif avec //set pos1 tip_set_pos1: Astuce, Utilisez pos1 comme motif avec //set pos1
tip_farwand: Astuce, Sélectionnez les points distants avec //farwand.' tip_farwand: Astuce, Sélectionnez les points distants avec //farwand.'
tip_discord: 'Besoin d''aide ? Aide en anglais disponible : https://discord.gg/ngZCzbU' tip_discord: 'Besoin d''aide ? Aide en anglais disponible : https://discord.gg/KxkjDVg'
tip_lazycut: 'Conseil, Il est plus sûr d''utiliser //lazycut' tip_lazycut: 'Conseil, Il est plus sûr d''utiliser //lazycut'
tip_fast: 'Astuce, Définir rapidement et sans défaire en utilisant //fas' tip_fast: 'Astuce, Définir rapidement et sans défaire en utilisant //fas'
tip_cancel: 'Astuce, Vous pouvez //cancel et éditer en cours de traitement.' tip_cancel: 'Astuce, Vous pouvez //cancel et éditer en cours de traitement.'

2
worldedit-core/src/main/resources/lang/strings.json
View File

@ -300,7 +300,7 @@
"fawe.tips.tip.select.connected": "Tip: Select all connected blocks with //sel fuzzy", "fawe.tips.tip.select.connected": "Tip: Select all connected blocks with //sel fuzzy",
"fawe.tips.tip.set.pos1": "Tip: Use pos1 as a pattern with //set pos1", "fawe.tips.tip.set.pos1": "Tip: Use pos1 as a pattern with //set pos1",
"fawe.tips.tip.farwand": "Tip: Select distant points with //farwand", "fawe.tips.tip.farwand": "Tip: Select distant points with //farwand",
"fawe.tips.tip.discord": "Need help using FAWE? https://discord.gg/ngZCzbU", "fawe.tips.tip.discord": "Need help using FAWE? https://discord.gg/KxkjDVg",
"fawe.tips.tip.lazycut": "Tip: It is safer to use //lazycut", "fawe.tips.tip.lazycut": "Tip: It is safer to use //lazycut",
"fawe.tips.tip.fast": "Tip: Set fast and without undo using //fast", "fawe.tips.tip.fast": "Tip: Set fast and without undo using //fast",
"fawe.tips.tip.cancel": "Tip: You can //cancel an edit in progress", "fawe.tips.tip.cancel": "Tip: You can //cancel an edit in progress",

2
worldedit-core/src/main/resources/nl/message.yml
View File

@ -363,4 +363,4 @@ tips:
worden' worden'
tip_biome_mask: 'Tip: Er wordt een restrictie geplaatst op de biome met `$jungle` tip_biome_mask: 'Tip: Er wordt een restrictie geplaatst op de biome met `$jungle`
mask' mask'
tip_discord: Heb je hulp nodig bij FAWE? https://discord.gg/ngZCzbU tip_discord: Heb je hulp nodig bij FAWE? https://discord.gg/KxkjDVg

2
worldedit-forge/src/main/resources/META-INF/mods.toml
View File

@ -3,7 +3,7 @@ modLoader="javafml"
# A version range to match for said mod loader - for regular FML @Mod it will be the minecraft version (without the 1.) # A version range to match for said mod loader - for regular FML @Mod it will be the minecraft version (without the 1.)
loaderVersion="[24,)" loaderVersion="[24,)"
# A URL to refer people to when problems occur with this mod # A URL to refer people to when problems occur with this mod
issueTrackerURL="https://discord.gg/enginehub" issueTrackerURL="https://discord.gg/KxkjDVg"
# A URL for the "homepage" for this mod, displayed in the mod UI # A URL for the "homepage" for this mod, displayed in the mod UI
displayURL="https://worldedit.enginehub.org/" displayURL="https://worldedit.enginehub.org/"
# A file name (in the root of the mod JAR) containing a logo for display # A file name (in the root of the mod JAR) containing a logo for display