Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2026-07-15 02:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,118 Commits 1 Branch 0 Tags
20304bf7ade9522c132e141a48bd1e9fc56ab669
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MattBDev 20304bf7ad Cherry-pick build-script changes from upstream 2021-02-11 12:00:28 -05:00
MattBDev 8981a5c484 Merge remote-tracking branch 'origin/main' 2021-02-11 11:45:11 -05:00
MattBDev f3d4621589 Minor build script changes 2021-02-04 17:06:49 -05:00
MattBDev 06dc92b7ce Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit 
 Conflicts:
	worldedit-bukkit/build.gradle.kts
 2021-01-18 15:59:51 -05:00
MattBDev 2ce493ae68 Miscellaneous improvements to build scripts. 2021-01-18 15:58:50 -05:00
MattBDev 9058ecdf34 Slight performance improvement during dependency resolution 2021-01-07 21:31:24 -05:00
MattBDev cbf22b8306 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit 2021-01-06 17:06:02 -05:00
MattBDev d691cf40f3 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit 2021-01-06 13:34:42 -05:00
MattBDev 653d362806 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit 2021-01-06 12:53:34 -05:00
MattBDev 030c253732 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit into main 2020-12-16 22:54:26 -05:00
MattBDev fdeaa8ad41 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit into main 2020-12-14 18:23:14 -05:00
MattandGitHub 781c1e943b Fixed dumb typo 2020-10-31 22:09:13 -04:00
MattandGitHub 9fd872a49e Fixed dumb typo 2020-10-31 22:08:45 -04:00
MattandGitHub 985fd90ef7 Update Jars.java (#730) 2020-10-31 22:05:31 -04:00
MattandGitHub 65c0b8905f Update SilentPlayerWrapper.java (#729) 2020-10-31 22:00:14 -04:00
MattandGitHub 0746c1185f Update FaweVersion.java (#728) 2020-10-31 21:56:21 -04:00
MattBDev 44619e1f21 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit into main 2020-10-28 18:47:30 -04:00
MattBDev b5d9ee1532 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit into main 2020-10-23 15:11:29 -04:00
MattBDev 3ab0d05c1d Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit into main 
 Conflicts:
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/blocks/CharBlocks.java
 2020-10-12 18:26:00 -04:00
MattBDev 3fab209bdb Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit into main 2020-10-08 22:53:19 -04:00
MattBDev ae38880e1b Rename FAWE Threads to be more identifiable. 2020-10-08 21:50:05 -04:00
MattBDev c4c50da4f9 Merge branch 'main' of https://github.com/IntellectualSites/FastAsyncWorldEdit into main 2020-10-08 21:47:41 -04:00
MattBDev af3c723e0d Rename FAWE Threads to be more identifiable. 2020-10-08 21:47:34 -04:00
MattBDev 728ced8c06 Merge branch 'main' into logging 2020-10-06 14:47:28 -04:00
MattBDev f5a42c63a7 Better logger support 2020-10-06 14:44:33 -04:00
MattandGitHub 96dcb95b7c Javadoc and Formatting fixes. (#619) 
Javadoc and Formatting fixes.

Also, extremely minor code changes which have been tested.
This commit is only part one of two commits that aim to fix problems with formatting in our project. In part two I will modify the Google Java Style Guide (since it closely matches our code style) for our project so there is guidance on how to format and document. 

* Updated PlotSquared URL
* Removed plugin acronyms
* Fixed a typo
* Fixed grammar
* Use modern block id's
* Update YouTube video URL
 2020-10-05 13:41:41 -04:00
MattandGitHub 2aef0ee27e Delete bug---issue-report-for-fastasyncworldedit.md 2020-09-27 17:35:39 -04:00
MattandGitHub a0f99d6289 Update issue templates 2020-09-27 17:33:07 -04:00
MattandGitHub 2e73746abe Remove Kotlin (#625) 
Shrinks the jar size since we no longer must bundle the Kotlin library. The downside is that some classes grew in size compared to their Kotlin versions.
Many contributors didn't care for Kotlin either.
 2020-09-17 16:31:55 -04:00
MattandGitHub d00899e177 More support for 3D biomes (#608) 
* More support for 3D biomes

* Resolved merge conflicts
 2020-09-12 15:31:42 +02:00
MattandGitHub de199a0e59 More work on masks (#607) 
* Add a #air mask, the opposite of #existing (#1511)

(cherry picked from commit 84fa2bbbc63de7bece01f41c0d5cb7d85cf129e6)

* Remove unused methods in Mask.java

* Remove `test(Extent, BlockVector3)` from Masks.

This was a poorly planned idea. This should save some memory too.

Authored-by: Matthew Miller <[email protected]>
 2020-09-11 21:13:31 +02:00
MattBDev 2fcf4bdf7e Updated Gradle 2020-09-08 15:34:53 -04:00
MattandGitHub 5e04c59c58 Update gradle.yml 
Attempt at caching work from BuildTools.jar
 2020-09-03 17:48:13 -04:00
MattandGitHub 68bd411c37 Fixed a typo in gradle.yml 2020-09-02 13:41:37 -04:00
MattandGitHub c942276029 Update gradle.yml 2020-09-02 13:40:24 -04:00
MattBDev 48d9044366 Fix ItemTypes 2020-08-24 23:01:45 -04:00
MattBDev eeb02d3937 Update gradle and kotlin 2020-08-24 22:53:29 -04:00
MattBDev 8a6db57433 Removed useless functionality 2020-08-24 22:19:07 -04:00
MattBDev a9d37fc6e5 Added BiomeMask.java and updated minor parts of miscellaneous files 2020-08-24 22:04:56 -04:00
MattBDev 02886b0387 Updated the WorldEdit license using find and replace 2020-08-24 21:31:47 -04:00
MattBDev ce078aad70 Updated many exception classes 2020-08-24 21:29:34 -04:00
MattBDev 75a18b9d5b Update BukkitImplLoader 2020-08-24 21:20:18 -04:00
MattBDev fd8cf1ebba Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.16 2020-08-24 21:17:53 -04:00
MattBDev 525da53462 Update WorldEditPlugin 2020-08-24 12:54:22 -04:00
MattBDev fd336feb46 Upstream merge of TranslationManager and ResourceLoader 2020-08-24 12:38:30 -04:00
MattBDev 49f1658f0b Merge remote-tracking branch 'origin/1.16' into 1.16 2020-08-18 15:50:00 -04:00
MattBDev 79b5612311 Upstream merge of the region package and things that may have broken with it. 2020-08-18 15:48:31 -04:00
MattBDev de34047365 Upstream merge of the registry package 2020-08-18 13:46:14 -04:00
MattBDev 72a4bb3552 Upstream merge of the scripting package 2020-08-18 13:43:18 -04:00
MattBDev 4041b2aa1d Updated Math package with upstream and formatted code 2020-08-14 20:49:59 -04:00
MattBDev 69e547688b Updated WNA package with upstream 2020-08-14 20:25:21 -04:00
MattBDev 0a07599abf Update build files and NOTICE.txt 2020-08-14 15:29:15 -04:00
MattBDev 34279fdb46 Added checkstyle.xml 2020-08-14 15:05:20 -04:00
MattBDev 99745b8e59 Fix piston breaking 2020-07-15 13:05:55 -04:00
MattBDev db3718e092 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-07-14 19:18:06 -04:00
MattBDev 3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
MattBDev 79771e83e0 Update checkstyle to match upstream. 2020-07-13 15:03:21 -04:00
MattBDev 204de7eab5 Add new annotations from upstream 2020-07-13 15:02:35 -04:00
MattBDev 1e80c0429a Merge remote-tracking branch 'origin/1.16' into 1.16 2020-07-13 13:09:55 -04:00
MattBDev 2a493ac9c6 Update trySetPosition 2020-07-13 13:09:03 -04:00
MattBDev 6d6de61560 Updated missing biomes, entities, and categories. 2020-07-06 23:54:55 -04:00
MattBDev 6f71aa7804 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-07-01 20:07:17 -04:00
MattBDev ac314fcedb Gradle update 2020-07-01 20:06:59 -04:00
MattBDev 0fb564be0c Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.16 
 Conflicts:
	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java
	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncDataContainer.java
 2020-07-01 12:48:12 -04:00
MattBDev 2517aca66f Removed some unnecessary code. 2020-06-28 17:31:13 -04:00
MattBDev aab10adb79 Fixed all but one remaining API changes in 1.16.1 
No testing has been performed yet.
 2020-06-25 20:57:06 -04:00
MattBDev 9cb24bc37d Merge remote-tracking branch 'origin/1.16' into 1.16 
# Conflicts:
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BlockMaterial_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BukkitAdapter_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BukkitGetBlocks_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/MapChunkUtil_1_16_1.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/nbt/LazyCompoundTag_1_16_1.java
#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R1.java
 2020-06-25 20:29:42 -04:00
MattBDev b7debce4d4 1.16.1 Prep work 2020-06-25 20:29:09 -04:00
MattBDev 7d9dd3b15f 1.16.1 Prep work 2020-06-25 19:56:10 -04:00
MattBDev 437d5a2a43 Minor image brush changes 2020-06-17 22:34:55 -04:00
MattBDev 56f29a3962 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-06-12 21:46:03 -04:00
MattBDev 8105088d60 Minor cleanup 2020-06-12 21:45:49 -04:00
MattBDev 1eacb91267 Make extent public (unsafe) 2020-06-12 21:45:49 -04:00
MattBDev 7cc1994e20 Use StandardCharsets 2020-06-12 21:45:49 -04:00
MattBDev 8a5899459f Use Integer.compare() instead of if statements. 2020-06-12 21:45:49 -04:00
MattBDev 9ce4a415cb Fix errors while using the broken commands 2020-06-12 21:45:49 -04:00
MattBDev 35c2a74c52 Implement more masks 2020-06-12 21:45:49 -04:00
MattBDev 63b81b801b Implement remove on set/iter views of BlockMap 
Fixes #1354.

(cherry picked from commit 637da62e34e676015aa7fbad490cf6f033e55b89)
 2020-06-12 21:45:48 -04:00
MattBDev 9f6e0ebd5c Minor changes to NMS logic 2020-06-12 21:45:48 -04:00
MattBDev 3caf53987f Minor upstream changes 2020-06-12 21:45:48 -04:00
MattBDev 1183c7c957 Fixes #466 2020-05-13 10:23:38 -04:00
MattBDev 0848e68b9f Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit into 1.15 2020-05-11 17:46:55 -04:00
MattBDev 7c35477b8c Remove Empcraft messages 2020-05-11 17:46:41 -04:00
MattBDev ec6ca633a8 Update Gradle for Java 14 support 2020-05-10 20:58:52 -04:00
MattBDev a813cbfcdf Update world interface 2020-05-10 20:57:24 -04:00
MattBDev 5fb18259d5 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-04-30 16:27:08 -04:00
MattBDev ef3642d521 Small spring cleaning 
I changed really small bits and pieces of code. If you have questions just comment and I'll answer them.
 2020-04-30 16:26:52 -04:00
MattandGitHub ba6c391461 Merge pull request #432 from pgrimaud/1.15 
Fix typos
 2020-04-29 13:40:46 -04:00
MattBDev 600a1a5daa Implement previously unsupported methods in DelegateLock 2020-04-29 11:29:02 -04:00
MattBDev 6faa93f3d4 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-04-29 10:58:57 -04:00
MattBDev d9829614f2 Fixes #408 
The issue seems to be that a some upstream code was removed for likely "performance" reasons. Obviously, wrong since it broke stuff.
 2020-04-28 22:26:16 -04:00
MattBDev 3265a9e794 Remove unused regenerate method 2020-04-28 11:16:51 -04:00
MattBDev aeb2820d89 Add debug message to addProcessor 2020-04-27 19:17:23 -04:00
MattBDev c6eefa250e Merge remote-tracking branch 'origin/1.15' into 1.15 
# Conflicts:
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SelectionWand.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java
 2020-04-27 19:04:52 -04:00
MattBDev b13dea19c5 Add debug messages 2020-04-27 19:04:20 -04:00
MattBDev b1ea736eb2 Add debug messages 2020-04-27 17:53:56 -04:00
MattBDev 491be025cc Minor changes to urls and todo's 2020-04-27 17:35:04 -04:00
MattBDev 77a2f1bc41 Remove unneeded repository 
PlotSquared 4 and PlotSquared 5 are both on the same maven repo
 2020-04-24 15:54:40 -04:00
MattandGitHub 8369277e05 Merge pull request #406 from mrlasagne/patch-1 
Fix special masks issue
 2020-04-15 10:28:20 -04:00
MattBDev 8d1efcfb21 Update Bukkit Interfaces to allow for compilation 2020-04-10 13:25:56 -04:00