Commit Graph

4788 Commits

Author SHA1 Message Date
NotMyFault
0a28059792
Merge pull request #24 from Combustible/upstream_formatting_changes
Restore the formatting of many things to upstream WorldEdit - no code changes
2018-12-20 21:23:59 +01:00
Byron Marohn
c0fa1602ad Restore the formatting of many things to upstream WorldEdit - no code changes
This patch touches many files but changes absolutely no functionality.
The goal here is to make future merges with worldedit produce fewer
conflicts that have to be resolved.

This patch was made by painstakingly diff'ing files and copying changes
over from the last upstream merge commit (02c6f11b) into this codebase.

Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-20 11:33:56 -08:00
Matthew Miller
b300c21185 Update draw.js and roof.js 2018-12-20 13:43:01 +10:00
NotMyFault
f37bd403d8
Merge pull request #23 from boy0001/1.13.2-R0.1-NBT
Fixing NBT
2018-12-19 16:40:23 +01:00
NotMyFault
7eac605474 Fixing NBT 2018-12-19 16:33:15 +01:00
NotMyFault
5520813ae6 Switching from IRC to Discord
To offer us a better possibility to help you regarding issues or bugs, join us on discord https://discord.gg/ngZCzbU
2018-12-18 21:54:17 +01:00
Matthew Miller
5eb9b779d7 Move the pasting system over to WorldEdit, and add a /we report command. Currently only reports system status and the config. Need to add a platform reporter system. 2018-12-18 19:28:55 +10:00
Matthew Miller
8f236afae9 Added a display name to Actors 2018-12-18 17:36:53 +10:00
NotMyFault
d00b49aa1c
Merge pull request #22 from dordsor21/master
Fix build take 2
2018-12-17 14:49:30 +01:00
dordsor21
07c86f32ae Definitely fix build 2018-12-17 13:47:29 +00:00
dordsor21
6d40fd88e9 Add mavenLocal high up 2018-12-17 12:48:52 +00:00
NotMyFault
50039290bc
Merge pull request #21 from dordsor21/master
Fix build
2018-12-17 13:33:31 +01:00
dordsor21
5be8d83ce4 Add local repo 2018-12-17 11:54:09 +00:00
dordsor21
8eabb7e507 Fix build 2018-12-17 11:43:45 +00:00
Matthew Miller
700e41b706 Remove the final stage committer from the MultiStageReorder extent, as it caused issues and no longer appears to be entirely necessary. 2018-12-13 20:30:54 +10:00
Matthew Miller
502cfb338f Back to snapshot for continued development 2018-12-11 11:19:39 +10:00
Matthew Miller
3ead4995ca Bump to Beta 4 2018-12-11 11:19:26 +10:00
Matthew Miller
17f52cb228
Merge pull request #432 from sk89q/feature/multipass3
Added multi-pass fixing for MultiStageReorder, and a Fast-Mode equivalent
2018-12-11 10:32:55 +10:00
NotMyFault
7a1b75f110
Significantly improved the quality of Simplified Chinese translation 2018-12-10 16:58:27 +01:00
Matthew Miller
926f6a6ab8 Flush undo/redo 2018-12-09 16:28:01 +10:00
Matthew Miller
6f3016c7f0 Fixed up the commitRequired checks. 2018-12-09 16:28:01 +10:00
Matthew Miller
5f2c77b719 Further work on this. Currently fast mode breaks doors, gotta work out why applying physics to doors breaks them. 2018-12-09 16:28:01 +10:00
Matthew Miller
618cbd2250 Few small fixes 2018-12-09 16:28:01 +10:00
Matthew Miller
59f9864ba3 Set fast to the default 2018-12-09 16:28:01 +10:00
Matthew Miller
7f11b2800d Added an option to switch reorder modes 2018-12-09 16:28:01 +10:00
Matthew Miller
b3f5bc030e Few fixes for FastModeExtent. 2018-12-09 16:28:01 +10:00
Matthew Miller
36430863a1 Update adapters 2018-12-09 16:28:01 +10:00
Matthew Miller
7d468357e3 Added "fast mode corrections" 2018-12-09 16:27:02 +10:00
Matthew Miller
4e5e9f609e Added the multi-staging from the multipass2 branch 2018-12-09 16:27:02 +10:00
Matthew Miller
5acd0d8537 Update adapters for the broken Spigot builds. 2018-12-09 16:08:11 +10:00
Matthew Miller
b1d8d4901d
Merge pull request #437 from JOO200/master
Add check for unchanged materials in BlockBagExtent
2018-12-06 15:07:14 +10:00
JOO200
a73faf0c8b Check by setting blocks with BlockBagExtend for changed materials. 2018-12-05 17:09:06 +01:00
Matthew Miller
be0d21e2a9 Filter out commands that the player doesn't have permissions for. Workaround for a Spigot issue. 2018-12-05 16:32:20 +10:00
Kenzie Togami
b192466ce2
Remove recursion in VaultResolver
Correctly call into `perms` instead of creating an infinite recursion.
2018-11-30 13:15:09 -08:00
Matthew Miller
7ad181f8a4 Back to snapshot for continued development 2018-11-28 20:31:30 +10:00
Matthew Miller
7ae310e625 Bump to beta 2 2018-11-28 20:25:14 +10:00
Matthew Miller
8e18ecb645
Merge pull request #330 from Europia79/vpcmdfix
Fixes issue 3315 with VirtualPlayers
2018-11-24 13:16:56 +10:00
NotMyFault
99fb2b546c Fixing Italian translation 2018-11-21 14:37:44 +01:00
Matthew Miller
ee8602b77b Added a Vault resolver to WEPIF. Means any Vault-enabled perm plugin will theoretically work with it 2018-11-18 15:58:15 +10:00
Matthew Miller
e0dcd2e9c2 Disable signing task when not signing. 2018-11-18 14:28:37 +10:00
Matthew Miller
2dc9321da6 Added support for axis rotations. 2018-11-17 12:00:19 +10:00
NotMyFault
ec22c4f180
Merge pull request #19 from IronApollo/master
Fix for '//mask ?' resulting in pattern error
Fixes CommandSuggestionEvent 
Update FaweLocalBlockQueue to support Plotsquared restrictions
2018-11-14 07:41:42 +01:00
Jesse Boyd
d27cc51844
Merge pull request #20 from N0tMyFaultOG/master
Updating & fixing repo
2018-11-14 16:25:17 +11:00
Matthew Miller
24800a662a Finish removal of PlayerDirection, and partially added diagonal support back to commands. 2018-11-12 12:38:13 +10:00
Matthew Miller
bf98dcff09 Updated bStats 2018-11-10 19:26:46 +10:00
Matthew Miller
f0070c111c Fixed adapters not being updated 2018-11-06 15:53:14 +10:00
NotMyFault
9b1836f336 Language update 2/2 2018-11-05 16:54:31 +01:00
Matthew Miller
626861aa99 Fixed serialisation of vectors. 2018-11-05 23:27:03 +10:00
NotMyFault
291ce3dfd7
Adding Italian translation 2018-11-04 20:56:22 +01:00
Matthew Miller
4e4ed6c893 Fixed missing BaseBlock import 2018-11-04 17:27:36 +10:00