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
3,633 Commits 1 Branch 0 Tags
b22445746442e160ea0e2dd7ec53962348b370a1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MattBDev 3212f32b01 Merge remote-tracking branch 'origin/commanding-pipeline' into commanding-pipeline 2019-11-02 15:59:57 -04:00
MattBDev d8d7c8c53f Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline 
 Conflicts:
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/filters/DistrFilter.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ChunkCache.java
	worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/ParallelQueueExtent.java
	worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java
	worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java
	worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java
	worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
	worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java
	worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
 2019-11-02 15:58:46 -04:00
MattBDev f262271519 Message updates 2019-11-02 15:53:25 -04:00
MattBDev 678a99667d Replaced an empty for loop with a while loop for better readability. 2019-10-25 13:40:56 -04:00
MattBDev d20b8ddb2a Fixed/Removed some wrong JavaDocs 2019-10-25 13:40:13 -04:00
MattBDev ca843f1b90 Minor changes for readability 2019-10-23 22:34:44 -04:00
MattBDev 1b28dcda40 Minor changes to match upstream more closely 2019-10-23 14:29:37 -04:00
MattBDev c050132737 Merge branch 'commanding-pipeline' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding-pipeline 
 Conflicts:
	worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
 2019-10-23 13:40:45 -04:00
MattBDev fd408c64ed Selective merge of commanding branch. 2019-10-23 12:58:36 -04:00
MattBDev fb91456bdd Some changes to make the diff between 1.14-snapshot and commanding branch smaller. 2019-10-11 10:34:56 -04:00
MattBDev 0d794c1004 Minor annotation change. 2019-10-10 20:30:51 -04:00
MattBDev c9aa6816df Limit shouldn't ever be null. 2019-10-09 23:01:51 -04:00
MattBDev 7d60053aaf Fixed the mixup of backslash and forward slash 2019-10-09 21:51:37 -04:00
MattBDev f5ded1e50b New command fix attempt 2019-10-09 21:43:14 -04:00
MattBDev e0895ef042 New command fix attempt 2019-10-09 21:05:47 -04:00
MattBDev c928564b59 Delete "in" 2019-10-09 20:47:23 -04:00
MattBDev ccd8f2c2a9 Attempt to fix command execution. 2019-10-09 20:43:28 -04:00
MattBDev 183d733825 Add a check to prevent PlotSquared Features from trying to load. 2019-10-09 16:28:33 -04:00
MattBDev da3019ae3d More compile fixes and upstream mergesa 2019-10-09 16:15:26 -04:00
MattBDev 67b3fa054a Allow Actors to use generation commands 2019-10-07 15:23:40 -04:00
MattBDev 11d30d2f94 Disabled FAWE commands until the plugin can actually set a block again 2019-10-07 15:09:52 -04:00
MattBDev 7ac29d6173 Merge remote-tracking branch 'origin/commanding' into commanding 2019-10-07 12:58:10 -04:00
MattBDev 3431bd0644 Remove old plugin support and migrate to Piston (non-FAWE) 2019-10-07 12:27:18 -04:00
MattBDev 78872719f3 Remove old Plugin compat. 2019-10-07 12:26:29 -04:00
MattBDev a8511d4a63 Merge remote-tracking branch 'origin/commanding' into commanding 2019-10-03 20:37:27 -04:00
MattBDev 51a5c22677 I hope these are the last few errors 2019-10-03 20:37:19 -04:00
MattBDev 3ed9bdc7c9 I hope these are the last few errors 2019-10-03 20:27:19 -04:00
MattBDev f963e63f58 Attempt to fix compiling 2019-10-03 19:35:55 -04:00
MattBDev e5c1d9e6cf Merge remote-tracking branch 'origin/commanding' into commanding 2019-09-21 21:21:15 -04:00
MattBDev 94e4fb089a Attempt to fix dependency resolution with PlotSquared 2019-09-21 21:20:59 -04:00
MattBDev 1e08e9678e Attempt to fix dependency resolution with PlotSquared 2019-09-21 21:14:36 -04:00
MattBDev 24a147465d Fixed a bunch of extends and removed slottableblockbag 2019-09-21 21:00:45 -04:00
MattBDev 8b96cdc9a5 * 
A tribute to Jesse
 2019-09-20 21:52:35 -04:00
MattBDev 68c8fca672 Fixed PlotSquared compiling issues 2019-09-19 16:43:21 -04:00
MattBDev c926cddbd6 Item Registry Test is now functional 2019-09-19 14:56:03 -04:00
MattBDev 16e24a2400 Created an Item Registry Test (non-functional) 2019-09-19 11:30:22 -04:00
MattBDev 3bcfcd3008 Fixed bug with wands and updated tests 2019-09-18 15:09:04 -04:00
MattBDev 4357c4b049 Fixed not being able to login. 2019-09-15 12:50:37 -04:00
MattBDev 6cff848598 Merge remote-tracking branch 'origin/commanding' into commanding 2019-09-13 23:19:46 -04:00
MattBDev 0bddb565ab Fixed compile issue 2019-09-13 23:19:28 -04:00
MattBDev d415f79e4b Fixed compile issue 2019-09-13 23:17:40 -04:00
MattBDev e72f1b32df I hate when md_5 actually decides to do stuff. 2019-09-13 23:12:49 -04:00
MattBDev 8ce644b737 Merge remote-tracking branch 'origin/commanding' into commanding 2019-09-13 23:07:12 -04:00
MattBDev 14ed3f1d9c Remove FawePlayer and API modifications 2019-09-13 23:05:16 -04:00
MattBDev c65e06cb1b Removed tool command 2019-09-03 15:40:59 -04:00
MattBDev 2548b955ac Remove immutable list from brushes to prevent possible startup issue. 2019-09-03 15:33:07 -04:00
MattBDev cafb4120ef More upstream compatibility fixes 2019-09-03 15:21:53 -04:00
MattBDev e88adea066 Added WorldConverter.java 2019-09-03 12:35:22 -04:00
MattBDev ae2d765533 Removed duplicated method and implemented missing ones 2019-09-03 12:17:21 -04:00
MattBDev c03015adc8 Temporarily removed the world command 
Issues need to be worked out and investigated.
 2019-09-02 15:41:43 -04:00
MattBDev 46550a076f Possible compile fix 2019-09-02 15:37:01 -04:00
MattBDev 06a92d29b1 Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding 
# Conflicts:
#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
#	worldedit-libs/core/build.gradle.kts
 2019-09-02 15:24:53 -04:00
MattBDev c20f4c6b7f Fixed a null pointer. Merged in a bunch of CLI stuff. 2019-09-02 15:22:43 -04:00
MattBDev 20fff1c668 Commands can't have overlapping aliases 2019-08-22 21:40:22 -04:00
MattBDev c36db8de37 Attempt 2 2019-08-22 21:10:31 -04:00
MattBDev 70d4af006a attempt at setting up fawe.properties 2019-08-22 21:06:03 -04:00
MattBDev b5b89412d9 Let's try this 2019-08-22 16:12:50 -04:00
MattBDev 37d3fcd01c upgrade zstd 2019-08-22 15:21:38 -04:00
MattBDev b2ca05bc54 shade in missing dependency 2019-08-22 15:11:13 -04:00
MattBDev 32b9aa26b2 Re-add accidentally removed method 2019-08-22 13:20:29 -04:00
MattBDev cc7e452d4b We aren't even using this yet 2019-08-22 13:17:30 -04:00
MattBDev 135c12b650 More compile fixes 2019-08-22 13:14:27 -04:00
MattBDev 6998c2d230 fix compile 2019-08-20 16:03:50 -04:00
MattBDev e415e73623 Another attempt to fix piston 2019-08-20 15:30:55 -04:00
MattBDev 0f5c49c9f5 comment out a maven url 2019-08-20 15:23:14 -04:00
MattBDev 7d254bc839 migrate to gradle to kotlin 2019-08-20 15:16:08 -04:00
MattBDev 64a1bfc9b3 migrate to gradle to kotlin 2019-08-20 14:52:24 -04:00
MattBDev 2a054b9220 swapped core and bukkit 2019-08-19 15:22:39 -04:00
MattBDev 8193eac8c8 Revert "revert ivy change" 
This reverts commit d1af07b6
 2019-08-19 15:11:29 -04:00
MattBDev 548683d50a enable build scanning 
This will be removed once we are done with the commanding branch
 2019-08-19 14:16:02 -04:00
MattBDev 1eec4884c8 Attempt at fixing NamespacedRegistry 2019-08-19 14:12:28 -04:00
MattBDev 45f947a3b2 migrated settings.gradle to kotlin 2019-08-19 14:00:37 -04:00
MattBDev f04cae1686 Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding 2019-08-18 10:42:37 -04:00
MattBDev 4db192c9b8 fixes and brush command tweaks 2019-08-17 18:50:06 -04:00
MattBDev 48446c5f58 fix ivy 2019-08-15 15:55:57 -04:00
MattBDev f8758994c3 gradle updates 2019-08-15 15:39:20 -04:00
MattBDev cbbe8b5dfa upstream changes 2019-08-15 15:24:18 -04:00
MattBDev 5c6c41a95a Docs, command, and formatting changes. 2019-08-03 22:43:29 -04:00
MattBDev 21a8899ba8 remove favs 2019-08-03 19:57:29 -04:00
MattBDev 9fb2202068 Fix 1.14.4 compile 
# Conflicts:
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/beta/BukkitQueue.java
 2019-07-31 19:06:31 -04:00
MattBDev 0449b5d8ba Remove FAVS and update Gradle 2019-07-31 19:03:04 -04:00
MattBDev c4c90c99a8 Fix Gradle Script 2019-07-30 15:28:25 -04:00
MattBDev cb03ed2fe8 remove Fast2DIterator 2019-07-30 15:27:59 -04:00
MattBDev 0d2b0025ce Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding 
# Conflicts:
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/MaskCommands.java
 2019-07-29 21:06:11 -04:00
MattBDev 198427dc3d fix more compile errors 2019-07-29 21:05:31 -04:00
MattBDev 12114ec987 Minor changes 2019-07-29 11:19:38 -04:00
MattBDev 7f51791d6c Merge remote-tracking branch 'remotes/origin/commanding' into commanding 
# Conflicts:
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
 2019-07-29 10:58:41 -04:00
MattBDev ca54f8c371 Work on CLI and I forget what else 2019-07-29 10:57:28 -04:00
MattBDev 7963b2c92f Removed commands.yml 
I also did a few renames as well as a command registration fix.
 2019-07-26 19:23:24 -04:00
MattBDev 9a4473b73f Formatting 2019-07-25 15:09:12 -04:00
MattBDev 3a3efb8117 Updated a class, minor command tweaks, and formatting 2019-07-25 14:58:59 -04:00
MattBDev ff5860113d It started on work with commands then I got carried away. 2019-07-25 14:44:10 -04:00
MattBDev 01c371df9c Minor upstream changes and obviously more command work 2019-07-23 19:17:38 -04:00
MattBDev 9816eb3102 More work on commands 2019-07-23 16:26:18 -04:00
MattBDev 478c330c1e Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding 
# Conflicts:
#	worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
#	worldedit-core/src/main/java/com/boydti/fawe/object/extent/NullExtent.java
 2019-07-22 22:26:00 -04:00
MattBDev b230999ca0 Mainly formatting and some work on schematic commands 2019-07-22 22:22:32 -04:00
MattBDev 46f5b12b36 Convert tabs to whitespace. 2019-07-22 16:42:40 -04:00
MattBDev 9c3122a227 More work on getting commands to compile 2019-07-21 22:49:08 -04:00
MattBDev 0e54f196fc Deleted a class and work on generation commands 2019-07-16 23:57:35 -04:00
MattBDev 8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00