858 Commits

Autor	SHA1	Nachricht	Datum
Jesse Boyd	1beea3cd22	Some more upstream merge	2019-04-04 21:28:41 +11:00
Jesse Boyd	8897109dc4	wip upstream merge	2019-04-04 00:25:16 +11:00
Jesse Boyd	7086eb8b3e	continue with merge	2019-04-03 22:28:57 +11:00
Jesse Boyd	8aef06b29e	* ... haven't done one of these in a while *continuing with merge in previous commit	2019-04-03 17:00:59 +11:00
Jesse Boyd	4cd8d08134	merge with upstream (broken)	2019-04-03 16:53:58 +11:00
Jesse Boyd	f361619037	Merge remote-tracking branch 'upstream/master' into breaking	2019-04-03 16:53:34 +11:00
Jesse Boyd	9fbcbc7cea	<pattern> not <block> ... As there are actual commands that will only accept blocks	2019-04-03 15:40:31 +11:00
matt	2407f9246f	How did it compile locally?	2019-04-03 00:21:42 -04:00
matt	122236f6c7	Too lazy to write a commit message	2019-04-02 23:36:32 -04:00
matt	29692f3fbe	Migrate to SLF4J	2019-04-02 18:21:02 -04:00
matt	47e66913e3	Selective upstream merge	2019-04-02 16:26:51 -04:00
matt	4af43eb84c	WeatherTypes now matches upstream	2019-04-02 15:43:40 -04:00
matt	6ccd0eb58e	Fixed deleted code due to IDE glitch	2019-04-02 15:22:54 -04:00
matt	1a19bc457f	Added Nullable to BlockTypes	2019-04-02 15:03:59 -04:00
matt	3419bb6f30	Fixed stats issue.	2019-04-01 22:09:59 -04:00
matt	86ce762982	Minor performance tweaks and cleaning of metrics ... Why were metrics so messed up in the first place?	2019-04-01 20:42:10 -04:00
Jesse Boyd	f87e31683e	don't use origin as the region bounds	2019-04-02 00:19:32 +11:00
Jesse Boyd	c9f1fed282	Fixes #88	2019-04-02 00:08:56 +11:00
Jesse Boyd	c820406e8c	Fix binding order	2019-04-01 23:55:15 +11:00
Jesse Boyd	64a134a9ee	Merge remote-tracking branch 'refs/remotes/origin/master' into new-vector-system ... # Conflicts: # build.gradle # worldedit-core/build.gradle # worldedit-core/src/main/java/com/boydti/fawe/util/IncendoPaster.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java # worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java	2019-04-01 23:50:16 +11:00
Jesse Boyd	bf53194650	Again #47	2019-04-01 21:41:44 +11:00
Jesse Boyd	ff67f6343f	Binding improvements ... WIP towards deprecating parsers and unifying the command bindings Allow registering dynamic bindings - Supports nesting bindings	2019-04-01 21:35:55 +11:00
Jesse Boyd	6e6a3f9035	Fix plotsquared schematic hook	2019-04-01 21:30:21 +11:00
Jesse Boyd	49e3102779	Fix lazy nbt reading for int/long arrays	2019-04-01 21:29:41 +11:00
Jesse Boyd	8afd96f03b	Fixes #87 oops	2019-04-01 18:48:14 +11:00
Jesse Boyd	603df92f79	Merge pull request #34 from Cygaan/master ... Fix copying entities	2019-04-01 13:42:59 +11:00
Jesse Boyd	a44c38c170	Merge pull request #40 from Combustible/sponge_schematic_tweak ... Fix sponge schematics not correctly setting dimensions if there are no entities	2019-04-01 13:42:47 +11:00
Jesse Boyd	49b2df1f2e	remove redundant methods	2019-04-01 05:06:03 +11:00
Jesse Boyd	92a7bd5e44	minor tweak for mutable vectors	2019-04-01 03:09:20 +11:00
Jesse Boyd	7b5230ad08	Fawe shouldn't default to have any dissallowed blocks	2019-03-31 22:36:34 +11:00
wizjany	a80420d14b	Add biome storage to BlockArrayClipboard.	2019-03-30 00:42:28 -04:00
wizjany	4e66b9a336	Revert 6b3426e1. ... Empty base blocks are always immutable. Fuzzy states don't have NBT.	2019-03-30 00:41:47 -04:00
wizjany	42d0d6e79a	Use getTag instead of requireTag in a few places.	2019-03-29 23:44:18 -04:00
matt	7ae8d567f3	Cleaned a class	2019-03-28 20:41:16 -04:00
NotMyFault	cb482ccbd5	Remove auto updater and minors ... - Remove Changelog command - Remove Auto updater	2019-03-28 21:31:28 +01:00
matt	699783ba72	Another selective merge	2019-03-28 15:02:37 -04:00
wizjany	d7d2d03ee8	Clipboard offset pattern is now #copy@[x,y,z]. ... Since the parsers were changed around, unescaped commas are parsed as separate blocks now.	2019-03-27 23:36:59 -04:00
matt	acc8eb0a99	Lambda's and References and Cleanups! Oh My!	2019-03-27 12:17:05 -04:00
matt	1424998327	Simplified switch statements and minor formatting	2019-03-27 11:36:26 -04:00
NotMyFault	67fd0668ee	ocd	2019-03-27 15:40:53 +01:00
NotMyFault	8623dd0009	Fixes #80	2019-03-27 15:38:21 +01:00
matt	712479adbb	Reverted incompatible EntityType upstream change	2019-03-27 00:16:54 -04:00
wizjany	74bff83e38	Don't let items types be null. ... Better fail-fast if registry doesn't load? or why-ever else this happens	2019-03-26 22:30:46 -04:00
wizjany	6b3426e1de	BaseBlock is technically mutable so that technically shouldn't use it.	2019-03-26 18:14:35 -04:00
wizjany	2a194b0434	Add pattern that randomly chooses states. ... Also works with fuzzy states. Syntax is `*type`, e.g. `//set *stone_slab` or with states, `//set *oak_fence[waterlogged=false]`	2019-03-26 18:11:32 -04:00
matt	9fcf805148	Pattern doesn't need to be deprecated	2019-03-26 16:35:22 -04:00
NotMyFault	464719c02a	Revert upstream change	2019-03-26 21:00:28 +01:00
matt	3420b8329b	Remove most of PseudoRandom, a few minor cleaning changes, and an upstream change	2019-03-26 13:41:09 -04:00
matt	0d88a6bce2	Merging upstream changes	2019-03-26 13:27:09 -04:00
wizjany	8eccdc7444	Add -f flag to //count to allow fuzzy inputs. ... Also re-implement //distr -c. And remove outdated help text on //copy.	2019-03-25 22:38:51 -04:00
matt	85bfd16d7c	Code cleaning ... Most notable change: Remove redundant type parameters and replaced with <>. This is a small step to bring us closer to upstream parity.	2019-03-25 19:55:32 -04:00
IronApollo	3236bdd78e	Changes to NBT-handling in operations and extents, changes to match the widely supported setBlock functionality, minor code cleanup	2019-03-25 13:42:11 -04:00
Josh Knight	4c3b09895d	Merge pull request #76 from IntellectualSites/new-vector-system2 ... Revert "Make end tag singleton"	2019-03-25 06:09:13 -04:00
NotMyFault	68c8950cdc	Add IncendoPaster ... Co-Authored-By: Alexander Söderberg <citymonstret@hotmail.com>	2019-03-24 23:02:32 +01:00
NotMyFault	a64ff8f299	Make master build (probably)	2019-03-24 20:58:05 +01:00
wizjany	692ba6fda3	Checkstyle.	2019-03-22 14:03:43 -04:00
matt	456f821ce0	Revert "Make end tag singleton" ... This reverts commit 13d2ae20 Why was this changed. I doubt it did much in terms of performance. It's better to stay as close as we can to the worldedit repo.	2019-03-22 12:51:44 -04:00
Sauilitired	44bfc2f753	Fixes #17, and an annoying typo in SnipeData :)	2019-03-21 07:20:47 +01:00
wizjany	9b473cecbd	Fixes and changes to forest/forestgen. ... * Sync up implementations of the two commands. * Fix generating trees in spots with replaceable blocks. * Make message when you mistype tree-type arg more correct. Fixes WORLDEDIT-3869.	2019-03-20 21:05:11 -04:00
wizjany	1934006d14	Better enforce the Request lifetime. ... Previously, the current request would just get a new EditSession when one was created. Now, a Request is reset before and after: - a command is used and - an interact is fired with the platform This means each action taken will get a single, non-reusable Request. Note that this only applies to actions taken through the platform. API users will not be using requests anyway, since things like Masks, etc. will be constructed directly instead of being passed through the platform's parsers and so on. (e.g. if a plugin loads a schematic into the world with a mask, they should create the EditSession and mask it directly, and not use that Mask again for another EditSession in another World). Also, get rid of a bunch of (some now-)unnecessary EditSession creation during command dispatching. Note that this also fixed the dynamic selection mask, which apparently has been broken for some unknown amount of time.	2019-03-20 19:13:54 -04:00
wizjany	25631af31c	Add RequestExtent to be used when a delayed EditSession is needed. ... For example, if you set a mask that takes an extent (many of them), and then move to another world, the mask will test blocks in the old world and return bad results.	2019-03-20 19:13:54 -04:00
Josh Knight	83bdb3c8e8	Merge pull request #11 from IntellectualSites/incendo-paste ... Make debugpaste use Incendo Paste Viewer, rather than Hastebin.	2019-03-19 10:36:21 -04:00
Matthew Miller	d186cce393	Merge remote-tracking branch 'origin/feature/slf4j-logging'	2019-03-19 20:32:21 +10:00
wizjany	9d2d43f0db	Add -f to //schem save to confirm overwriting. ... Overwriting existing schematics now checks delete perm. Also allow delete to be run from console. Fixes WORLDEDIT-3868.	2019-03-15 17:08:11 -04:00
wizjany	18414fe3b5	Fix symlink detection.	2019-03-15 09:10:51 -04:00
Kenzie Togami	d6804737cf	Switch to SLF4J logging.	2019-03-13 19:51:48 -07:00
wizjany	1c5d3368a0	Defer permissions check when making LocalSession. ... Also use Java7 Paths to get rid of some funky logic.	2019-03-11 21:31:43 -04:00
Matthew Miller	a5cec7728d	Merge pull request #452 from EngineHub/forge-1.13 ... Added support for Forge 1.13	2019-03-11 22:52:30 +10:00
wizjany	a59d994d84	Hook up the biome registry.	2019-03-11 00:15:21 -04:00
wizjany	a22b5535fe	Shh checkstyle, I'm a C# dev now.	2019-03-08 16:14:16 -05:00
wizjany	7c89ece96e	Few tweaks to schematic loading and error fixes. ... * Not all EntityTypes in Bukkit have the correct enum name. * Don't read entire schematic files to list. Go off file extension only. (Reading in files is more accurate, but slow.) * Enforce extensions. (Due to the above, while you can technically make a schematic called 'test.txt', it's better that we save it as 'test.txt.schem'.) * Fix a few minor warnings.	2019-03-08 16:00:49 -05:00
wizjany	de08c8b8c7	Add better control over expression timeouts. (#451) ... Add better control over expression timeouts. * //timeout command can be used to change player's current timeout. * Config now also has a max timeout, can be bypassed with permission * Timeout of < 0 will let expressions run indefinitely. * Said expressions won't run on a separate thread, slightly reducing the overhead from context switching. For large //gen commands, for example, this can actually increase speed.	2019-03-06 19:58:32 -05:00
NotMyFault	8a528b26b6	Update P2 repo and minors	2019-03-06 17:35:42 +01:00
IronApollo	c98a311146	Update to working PlotSquared repo; Update to PlotSquared C>Captions class rename; Cleaning and minor modifications to SpongeSchematicReader	2019-03-06 03:06:47 -05:00
Kenzie Togami	4878f38250	Fix platform registration, config setup	2019-03-04 19:36:06 -08:00
wizjany	f84f3c6f85	Fix error when parsing hand/offhand/pos1 as blocks.	2019-03-03 19:51:49 -05:00
wizjany	aafb854e4f	More useful names for block ItemTypes.	2019-03-02 12:26:26 -05:00
wizjany	c3ee926a2e	Correctness improvement for legacy data in expression generation.	2019-03-02 11:55:03 -05:00
wizjany	e53962dadd	Apply source function after source mask in ForwardExtentCopy. ... The source function should only get applied to actually copied blocks.	2019-03-01 21:15:21 -05:00
wizjany	f46c70093c	Fix the long-range build tool's ability to build mid-air.	2019-03-01 20:10:46 -05:00
wizjany	0656ef1920	Fix LayerVisitor stopping early instead of skipping covered columns.	2019-03-01 19:25:10 -05:00
wizjany	4bd6d73085	Fix some bad copy-pasta in expression environment queries.	2019-02-28 01:03:02 -05:00
IronApollo	0fa9d7a4a7	Changes to EditSession to improve upstream compatibility	2019-02-27 09:01:07 -05:00
IronApollo	3ffb5ff00d	Changes to fix some PlotSquared compatibility issues, plus fix block Mask parsing	2019-02-27 08:09:04 -05:00
wizjany	243d6476ac	Re-add smooth filtering via a mask. ... Instead of trying to maintain a list of "natural terrain blocks", just let the user specify a mask of blocks to use for the height map filter. https://gfycat.com/severaljauntycondor	2019-02-26 23:54:53 -05:00
wizjany	9eeb0acffe	Add radius checks to a few more utility commands.	2019-02-25 18:41:20 -05:00
wizjany	2f734d4570	Check radius instead of diameter for clipboard brush. ... This brings it more in line with other brushes in terms of allowable size.	2019-02-25 18:41:19 -05:00
Matthew Miller	5de8e0852c	Treat categories as empty when missing	2019-02-18 21:17:36 +10:00
IronApollo	24fbc86cdd	INDEV -- Pushed for in-house testing and development	2019-02-17 03:47:32 -05:00
Matthew Miller	50a286b070	Update the block/item category registries - this won't build until a Spigot PR is merged though.	2019-02-17 13:30:40 +10:00
Matthew Miller	3683a0438a	Use nonNull rather than !isNull	2019-02-16 19:58:06 +10:00
Matthew Miller	db1315e043	Refactor registries to entirely use the platform	2019-02-16 19:35:13 +10:00
Matthew Miller	1b101740fe	Use a proper registry for biomes	2019-02-16 17:27:00 +10:00
Matthew Miller	d6bc85ccbe	Speed up the BlockState hashCode method by caching (As it's Immutable). Allows some better optimisations in the future by using them as map keys	2019-02-16 12:46:10 +10:00
wizjany	de9d202681	Clear shaped brush material on command. ... The initial material is held in the factory, but if a brush was previously bound, that pattern is used. Now, using `//br set` will clear the previous material, allowing the OperationFactory's material to work. This can be changed later with `/mat`, which will once again set the fill on the tool, overriding the factory's context.	2019-02-15 14:51:26 -05:00
wizjany	313cd20b14	Make legacy compat layer return straight stairs.	2019-02-14 17:53:30 -05:00
wizjany	88014b18a3	Added a few new things using block states. ... * `//set ##*tag` sets all states in the tag (not just default state per type) * `//set ^type` is a pattern changing block type but copying all valid existing states * `//set ^[prop=val,...]` sets the property `prop` to `val` wherever the existing block has that property * `//set ^type[prop=val,...]` does both of the above Those work anywhere a pattern is taken, of course. * The mask syntax `^[prop=val]` matches blocks with the property `prop` set to `val`, or blocks that don't have the property at all. * The mask syntax `^=[prop=val]` only matches blocks that have the property. Those work anywhere a mask is taken, of course. (`//mask`, `//gmask`, `//replace`, etc) The `//drain` command now takes `-w` flag that removes the waterlogged state from blocks (in addition to removing water, as before).	2019-02-14 17:21:01 -05:00
wizjany	287be0209c	Slight readability and usability improvements. ... Also no longer allows trailing strings (e.g. //set #clipboardasdf).	2019-02-12 17:11:57 -05:00
wizjany	19796aa3be	Added offset to ClipboardPattern. ... Takes input like '//set #clipboard@-1,0,1' which shifts the pattern over. It also now extends RepeatingExtentPattern, which was previously unused.	2019-02-12 17:11:57 -05:00
Wizjany	76400e533d	Add missing flags to clipboard brush usage.	2019-02-11 12:50:51 -05:00
Matthew Miller	3e988e7ffe	Fixed parsing fuzzy blocks failing.	2019-02-11 20:30:42 +10:00
wizjany	6708e8292f	Restore generation of hollow shapes. ... Unfortunately this is a bit slower than before since we can't cache block id & data values. However, applying patterns generally isn't too expensive, and hollow regions were entirely broken before.	2019-02-09 20:30:57 -05:00
IronApollo	0763e4c05c	Pull changes from upstream to match cdd7117	2019-02-07 09:11:51 -05:00
IronApollo	511c279153	Fixed issues regarding block transformations and using the BaseBlock to apply a function.	2019-02-07 09:04:14 -05:00
Byron Marohn	f6788f16e4	Fix sponge schematics not correctly setting dimensions if there are no entities ... Signed-off-by: Byron Marohn <combustible@live.com>	2019-02-06 20:48:30 -08:00
wizjany	cdd71178f5	Ensure BlockCategories are initialized. ... We should probably have a way to initialize all these catalog classes ahead of time.	2019-02-04 22:34:25 -05:00
wizjany	dddf2b963a	Fix long-range build tool. ... Blocks were always placed around 0,0,0 since the trace direction was being used as a position. Also the message was backwards.	2019-02-03 19:27:30 -05:00
IronApollo	0e5847e1ce	Various fixes	2019-02-03 09:22:10 -05:00
IronApollo	2d586ff53e	Registry changes & additions	2019-02-03 08:53:04 -05:00
Matthew Miller	4a8931a55a	Added a ##tag parser Pattern. gives a random combination using the blocks from the tag with an equal distribution.	2019-02-03 07:59:06 -05:00
Brokkonaut	2bae161e5c	Make biome changes undoable	2019-02-03 07:38:11 -05:00
Matthew Miller	b27913324b	Tweak the last access extent cache to provide better caching	2019-02-03 07:35:38 -05:00
Kenzie Togami	8f11d0469b	Clarify state when asking for caps with no platforms (+ fuzzy system changes)	2019-02-03 07:30:18 -05:00
Matthew Miller	7d7da78dbc	Fuzzier fuzzies	2019-02-03 07:13:21 -05:00
Kenzie Togami	4b5b7b8003	Clean up other compiler warnings	2019-02-03 06:06:07 -05:00
Kenzie Togami	590b7e23a9	Remove all raw usages of BSH, improve API generics	2019-02-03 05:01:39 -05:00
Matthew Miller	1d87642b52	Minor improvements to the server side CUI	2019-02-03 03:54:04 -05:00
gamerforEA	ea0ca470f1	Fix Metrics injection	2019-02-03 03:51:15 -05:00
Matthew Miller	26d4ea101e	Fixed the bundle being directly used outside of the registry system.	2019-02-03 03:44:10 -05:00
Matthew Miller	53308416ff	Start work on modularising masks and patterns	2019-02-03 03:33:52 -05:00
Matthew Miller	d5e4c76bfe	Allow a pattern for the leave-id of //move	2019-02-03 02:47:32 -05:00
Matthew Miller	d80ac24c63	Pass the exception converter through more.	2019-02-02 11:36:55 -05:00
Matthew Miller	9c3964d330	Added a way to get the spawn position of a world	2019-02-02 11:29:51 -05:00
Matthew Miller	c935e381b7	Added a method to teleport entities across worlds.	2019-02-02 11:23:02 -05:00
Matthew Miller	7a9bd226ce	Update draw.js and roof.js	2019-02-02 11:21:43 -05:00
Matthew Miller	45f1de6009	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.	2019-02-02 11:20:36 -05:00
Matthew Miller	54142c8669	Added a display name to Actors	2019-02-02 09:37:14 -05:00
Matthew Miller	bc3562eb57	Few fixes for FastModeExtent.	2019-02-02 09:26:18 -05:00
Matthew Miller	e88b8c961d	Added "fast mode corrections"	2019-02-02 09:21:16 -05:00
Matthew Miller	346eee8953	Added the multi-staging from the multipass2 branch	2019-02-02 09:12:30 -05:00
JOO200	63bf01fdaf	Check by setting blocks with BlockBagExtend for changed materials.	2019-02-02 09:05:59 -05:00
Matthew Miller	b276907dcd	Filter out commands that the player doesn't have permissions for. Workaround for a Spigot issue.	2019-02-02 08:54:36 -05:00
Matthew Miller	f3c633582e	Finish removal of PlayerDirection, and partially added diagonal support back to commands. (Other minor changes to WorldEdit-Sponge and FAVS)	2019-02-02 08:43:57 -05:00
Matthew Miller	13bf8429ce	Fixed serialisation of vectors.	2019-02-02 08:30:02 -05:00
Gerrygames	e724b1f1cd	fix NPE when reading sponge schematics with tile entities or entities	2019-02-01 13:40:22 +01:00
IronApollo	e53535319d	Plenty of changes to core block behavior to become more compatible with upstream WorldEdit (still more to be done!)	2019-01-31 10:08:58 -05:00
Matthew Miller	f3ec5bbdde	Added a ##tag parser Pattern. gives a random combination using the blocks from the tag with an equal distribution.	2019-01-31 22:28:04 +10:00
Cygaan	6046fa1cec	Only copy entities from within the region	2019-01-28 17:36:39 +01:00
Cygaan	d48ea909b5	Actually filter out players, not everything else	2019-01-28 17:31:29 +01:00
Matthew Miller	2f9c7f19f5	Added support for 'rotation' BlockState values.	2019-01-22 21:59:20 +10:00
Matthew Miller	2e0fa300b7	Actually support disabling chunk loading extent	2019-01-22 21:34:37 +10:00
Brokkonaut	432a201266	Make biome changes undoable	2019-01-21 19:07:29 +01:00
IronApollo	271b45f3ba	Final changes for the Vector update (probable fix for the "copying player entity" bug)	2019-01-17 05:23:47 -05:00
IronApollo	62e6e9de96	Some general changes to the handling of blocks	2019-01-14 05:49:05 -05:00
IronApollo	f74381b93f	Merge remote-tracking branch 'refs/remotes/isfawe/new-vector-system' into new-vector-system	2019-01-13 02:00:14 -05:00
IronApollo	90b3439dc2	Even more changes made towards a proper Vector update, as well as minor FAVS changes to accomodate for recent vector changes.	2019-01-13 01:38:08 -05:00
Matthew Miller	628c9cc0b7	Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block.	2019-01-10 09:54:21 -05:00
NotMyFault	c0c0db0d6e	Adding discord to debugpaste	2019-01-10 14:57:32 +01:00
NotMyFault	b200744d57	Cya hastebin	2019-01-10 14:46:10 +01:00
Kenzie Togami	4d6045813c	Move vectors to static creators, for caching	2019-01-10 07:17:04 -05:00
Byron Marohn	ab6aed703d	Merge current FAWE master (227d6d91) into new-vector-system ... Signed-off-by: Byron Marohn <combustible@live.com>	2019-01-09 22:35:26 -08:00
Sauilitired	33ad31454e	Make debugpaste use Incendo Paste Viewer, rather than Hastebin.	2019-01-10 04:04:52 +01:00
IronApollo	a9919d130c	Current progress #4	2019-01-09 03:32:38 -05:00
IronApollo	842b1307c7	Current Progress #3	2019-01-09 02:13:44 -05:00
Matthew Miller	871541d8c0	Tweak the last access extent cache to provide better caching	2018-12-29 19:21:45 +10:00
SirYwell	193361ac32	fix //removenear exception for size < 1	2018-12-29 08:47:57 +01:00
Kenzie Togami	2f8bdccf65	Clarify state when asking for caps with no platforms	2018-12-28 22:20:12 -08:00
Matthew Miller	862b63d43a	Can't query the row directly	2018-12-28 18:06:41 +10:00
Matthew Miller	54b6e57186	Few minor improvements to the fuzzy system.	2018-12-28 15:05:05 +10:00
Matthew Miller	b544782f3b	Make the base fuzzy cached per block type	2018-12-27 15:33:19 +10:00
Matthew Miller	8da984d9f9	Fuzzier fuzzies	2018-12-27 15:19:58 +10:00
Kenzie Togami	386668d221	Clean up other compiler warnings	2018-12-26 16:50:24 -08:00
Kenzie Togami	3fefcbf971	Remove all raw usages of BSH, improve API generics	2018-12-26 16:39:10 -08:00
Matthew Miller	a88f6b8430	Minor improvements to the server side CUI	2018-12-26 18:15:17 +10:00
Byron Marohn	2259f7d025	Merge upstream changes through 88f22f2e ... This was not a straightforward merge. A new method was added upstream to: worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java This file has been substantially changed vs upstream worldedit. I merged things as best I could - added the new method to this interface, and then implemented it in: worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java Unfortunately there's no easy way to test that it works - so I left a note... Signed-off-by: Byron Marohn <combustible@live.com>	2018-12-23 19:58:49 -08:00
IronApollo	d4157b7e0e	Current progress with update	2018-12-23 11:19:33 -05:00
Matthew Miller	b75d5149eb	Fixed the bundle being directly used outside of the registry system.	2018-12-23 21:43:20 +10:00
Matthew Miller	1d5e9b7d04	Few fixes	2018-12-23 21:24:58 +10:00
Matthew Miller	645fd682b6	Finish porting all the old masks across	2018-12-23 19:10:05 +10:00
Matthew Miller	6312bcecf6	Fixed the item parser not using the ItemRegistry	2018-12-23 19:02:58 +10:00
Matthew Miller	c5d9aadab8	Start work on modularising masks and patterns	2018-12-23 18:56:26 +10:00
Matthew Miller	d6977aeae4	Allow a pattern for the leave-id of //move	2018-12-22 17:26:02 +10:00
SirYwell	cf96c478be	change entity list to ignore player when pasting	2018-12-22 00:46:05 +01:00
Byron Marohn	801793cc12	Merge upstream changes through 7961fa58 ... Signed-off-by: Byron Marohn <combustible@live.com>	2018-12-21 12:13:43 -08:00
Byron Marohn	dab9e9a799	Fix imports - build working again ... Signed-off-by: Byron Marohn <combustible@live.com>	2018-12-21 08:09:58 -08:00
Matthew Miller	8d07877463	Pass the exception converter through more.	2018-12-21 17:31:27 +10:00
Matthew Miller	ea30578781	Added a way to get the spawn position of a world	2018-12-21 17:05:30 +10:00
Matthew Miller	c949b07df1	Added a method to teleport entities across worlds.	2018-12-21 16:56:10 +10: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	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
dordsor21	07c86f32ae	Definitely fix build	2018-12-17 13:47:29 +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
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	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
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
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	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
Matthew Miller	24800a662a	Finish removal of PlayerDirection, and partially added diagonal support back to commands.	2018-11-12 12:38:13 +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
Matthew Miller	53bc730909	Merge pull request #435 from sk89q/feature/trace-unflushed-sessions ... Add tracing for unflushed EditSessions	2018-11-04 17:21:25 +10:00
Kenzie Togami	b6f6f3dde6	Correct trace property name	2018-11-03 23:06:52 -07:00
Kenzie Togami	2c8b2fe089	Move vectors to static creators, for caching	2018-11-03 23:00:24 -07:00
Kenzie Togami	399e0ad5fa	Refactor vector system to be cleaner ... - Move Vector, etc. into `.math` package - Drop many methods that will be auto-promoted anyways, eg. with `divide(int)` and `divide(double)` the first is now gone. - Take Block vectors into their own class hierarchy - Make it clear throughout the API what takes blockvectors - many more improvements	2018-11-03 23:00:23 -07:00
Kenzie Togami	e202348dac	Simplify commit-required detection	2018-11-03 22:22:43 -07:00
NotMyFault	69168c7262	Updating & fixing repo ... - Updated Paper download link going to 1.13 - Updated translations from boy0001/FastAsyncWorldEdit -	2018-11-02 13:20:54 +01:00
IronApollo	9896a1339e	Updates to FaweLocalBlockQueue to allow FAWE-P2 compatibility	2018-11-01 07:24:56 -04:00
Kenzie Togami	b8ae611c73	Checkstyle requires calling super.finalize	2018-10-30 18:44:32 -07:00
Kenzie Togami	e1fbaaff59	Add tracing for unflushed EditSessions	2018-10-30 18:39:51 -07:00
Kenzie Togami	3b5972b7f2	Flush / unbuffer more tools	2018-10-30 18:06:00 -07:00
IronApollo	767607ea68	Fix for '//mask ?' resulting in pattern error	2018-10-29 06:39:40 -04:00
Matthew Miller	93de97dc19	Allow modifying the region of a BlockArrayClipboard	2018-10-24 16:50:15 +10:00
Matthew Miller	275a2fa887	Fixed a few bad javadoc imports	2018-10-24 16:33:04 +10:00
Kenzie Togami	d1312c66e1	Ensure we flush iff it is needed	2018-10-20 19:54:13 -07:00
Kenzie Togami	a3f1c71d97	Make EditSession closeable for easy flushing	2018-10-20 19:50:35 -07:00
Kenzie Togami	1fa1ff895b	Flush or disable buffers in tools	2018-10-20 19:47:17 -07:00
Jesse Boyd	a7c6d5e987	schem list validation	2018-10-17 23:57:36 +11:00
Jesse Boyd	f65887c957	Some ammendments to PR boy0001/WorldEdit#9	2018-10-17 23:41:38 +11:00
NotMyFault	2d8a2fc9c7	Minors ... - Typo fixes - updated jenkins download link	2018-10-16 22:15:45 +02:00
Jesse Boyd	c04f99a720	#1158	2018-10-16 02:27:10 +11:00
Matthew Miller	dd2fcbac23	Merge pull request #430 from sk89q/feature/chunk-batching-mode ... Chunk Batching	2018-10-15 13:50:10 +10:00
IronApollo	17e8be0bd2	Fixes some schematic files not being found with proper input	2018-10-14 07:14:12 -04:00
Matthew Miller	f8bf547c9e	Added some missing bukkit registries	2018-10-14 17:55:57 +10:00
Jesse Boyd	7cf7c0712f	fix fixwater/lava + tile paste	2018-10-13 19:50:13 +11:00
Jesse Boyd	bc25b76ac0	Fix getLegacyCombined	2018-10-13 19:16:53 +11:00
Jesse Boyd	3414fdd5a0	Fix brush cache Name	2018-10-13 18:55:09 +11:00
Jesse Boyd	888cbcedee	tweak undo message	2018-10-13 15:21:39 +11:00
Jesse Boyd	1a12c065a1	Various minor fixes ... Fix drain Fix some messages lacking prefix Fix non persistent brushes	2018-10-13 15:15:38 +11:00
Matthew Miller	0a149a796f	Make distr operation based	2018-10-12 15:28:40 +10:00
Kenzie Togami	e16dacc11e	Small patches for timed-calc post-1.12-merge	2018-10-11 17:25:06 -07:00
Kenzie Togami	21db86f26b	Register a platform for expression tests	2018-10-11 17:18:52 -07:00
Kenzie Togami	bb923aeb59	Attach a configurable timeout to expression evaluation	2018-10-11 17:18:52 -07:00
Matthew Miller	844971bca6	Java on TC doesn't compile this code for some reason.	2018-10-11 22:04:16 +10:00
Matthew Miller	495b9d07b5	Not all "north/south/east/west" are boolean	2018-10-11 21:39:41 +10:00
Kenzie Togami	2824a92c19	Fix some minor ordering bugs	2018-10-10 12:23:00 -07:00
Kenzie Togami	7d4906cfe9	Add chunk batching flag, enable by default	2018-10-10 11:38:23 -07:00
Kenzie Togami	ff391ca0b3	Update licenses	2018-10-10 11:38:23 -07:00
Kenzie Togami	f73be4b75c	Add newline to LocatedBlock.java	2018-10-10 11:38:23 -07:00
Kenzie Togami	e059490cd1	Rework block-batching, create draft of chunk batching	2018-10-10 11:38:23 -07:00
Matthew Miller	6ecbf19406	Properly rotate fences etc	2018-10-08 22:32:26 +10:00
Kenzie Togami	ff877ec03b	Make BlockType#getDefaultState like other fields	2018-10-04 17:20:07 -07:00
Kenzie Togami	ef2c07ca24	Update forge for new block API	2018-10-04 17:18:43 -07:00
Kenzie Togami	d0ea5121f2	Make some BlockType fields lazy, to avoid early Platform dependencies	2018-10-04 17:18:01 -07:00
NotMyFault	730e50a710	That wasn't supposed to be like that	2018-10-04 20:52:54 +02:00
NotMyFault	39ba616ffa	heightmapinterface permission ... Heightmapinterface permission added as you can download it on any server	2018-10-04 20:42:43 +02:00
NotMyFault	4b07928994	Fixing wrong syntax	2018-10-04 20:20:05 +02:00
Kenzie Togami	2cad9a2c09	Switch to a license plugin for headers	2018-10-04 00:29:34 -07:00
NotMyFault	5896b2eba4	Typo fix and neatify	2018-10-04 01:12:29 +02:00
NotMyFault	a26cf574de	Warn before update restart	2018-10-04 00:44:00 +02:00
NotMyFault	037714ab76	Possibly fix for searchItem message	2018-10-04 00:29:01 +02:00
BuildTools	6a3177f4e7	Fixed DefaultBlockParser incorrectly referencing disallowedBlocks	2018-10-02 07:32:24 -04:00
BuildTools	620308b2ba	Bypass warning invalid block registered for __RESERVED__	2018-10-02 05:51:08 -04:00
Kenzie Togami	36cbc5d9d0	Cleanup javadoc warnings in worldedit-core	2018-10-01 15:30:23 -07:00
Matthew Miller	59584ba10c	[Experimental] Don't check for permissions on root parents.	2018-09-26 15:41:27 +10:00
Jesse Boyd	cfbf7dbec0	Update from sk89q/master	2018-09-25 15:35:21 +10:00
Matthew Miller	fd6034fbdd	Added the 1.13.1 new blocks.	2018-09-23 20:22:33 +10:00
Jesse Boyd	f07dfbfeff	Fix inventory mode + nbt	2018-09-23 17:29:13 +10:00
Jesse Boyd	00ac111e46	Fix height brush	2018-09-23 17:10:56 +10:00
Jesse Boyd	e452fc9556	Fix schem load NPE	2018-09-23 15:48:09 +10:00
Matthew Miller	1a2cd3a948	Fixes WORLDEDIT-3609, Message should say cut when //cut is used.	2018-09-20 17:09:50 +10:00
Matthew Miller	4969dac39c	Potential minor performance improvements when checking fuzzy equality.	2018-09-20 16:56:46 +10:00
Jesse Boyd	5b5336cc83	some fixes ... Use sponge schematic format instead of structure block Fix VS undo running on main thread Fix missing sections when setting blocks	2018-09-18 12:49:33 +10:00
Jesse Boyd	83464013ba	Fix oregen	2018-09-14 07:38:29 +10:00
Jesse Boyd	8ed67f66ad	Merge boy0001/FastAsyncWorldEdit	2018-09-14 02:42:55 +10:00
Jesse Boyd	ee9467b5e4	Merge with origin/master	2018-09-12 20:23:34 +10:00
Jesse Boyd	277ff8f787	Fix command confirmation session	2018-09-08 09:10:36 +10:00
Jesse Boyd	ffa9eace6f	Fix /none	2018-09-08 03:17:27 +10:00
Jesse Boyd	fc949e3efc	Fixes #1112	2018-09-08 03:11:56 +10:00
Jesse Boyd	11fe5061cc	Fix optional heightmap NPE	2018-09-08 02:06:25 +10:00
Jesse Boyd	5559e2dec5	Merge remote-tracking branch 'refs/remotes/sk89q/master'	2018-09-08 01:53:04 +10:00
Jesse Boyd	1c8845f23f	Fixes #1011	2018-09-08 01:34:29 +10:00
Jesse Boyd	39a85d54ea	pull changes from boy0001/FastAsyncWorldEdit	2018-09-08 01:31:30 +10:00
Jesse Boyd	6ae0d3f64e	Fixes boy0001/FastAsyncWorldEdit#1099	2018-09-08 01:09:31 +10:00
Jesse Boyd	d99765f13f	add min/max args	2018-09-07 06:45:19 +10:00
Jesse Boyd	7af1b3dcc8	Add heightmap web util command	2018-09-07 06:40:13 +10:00
Jesse Boyd	594d72d2fe	Fix free build restrictions	2018-09-05 07:09:24 +10:00
Jesse Boyd	685a3c015f	*(part of previous commit)	2018-09-05 05:10:26 +10:00
Jesse Boyd	82ede1d42b	freebuild region restrictions	2018-09-05 05:10:15 +10:00
Gerrygames	934680dac2	fix sponge schematic offset	2018-09-04 14:26:50 +02:00
Jesse Boyd	5f8e2ed4d8	Allow local images for brushes	2018-09-03 07:46:35 +10:00
Jesse Boyd	b24d322d29	Update from sk89q/master	2018-09-03 00:10:38 +10:00
Brokkonaut	480f2de3af	Add 1.13 chunk format for snapshots ... Fixes WORLDEDIT-3714	2018-09-02 04:33:08 +02:00
Matthew Miller	8bfbc55c71	Enable experimental //walls for non-cuboid regions.	2018-08-30 16:42:50 +10:00
Matthew Miller	fdc3cd56f7	Add a mask for block categories. Eg, you can now do //replace ##wool minecraft:sand to replace all wool with sand	2018-08-30 14:51:38 +10:00
Jesse Boyd	418cfa6d03	Update towny hook / fix pattern traverser	2018-08-29 01:04:25 +10:00
Jesse Boyd	abd886acd7	some hasty refactoring	2018-08-28 02:56:28 +10:00
Matthew Miller	c931095736	Little bit of formatting	2018-08-27 17:24:18 +10:00
Jesse Boyd	a61c856adc	Allow certain commands to bypass queuing	2018-08-24 19:33:52 +10:00
Jesse Boyd	c3db5c0cf1	Fix persistent brushes	2018-08-24 07:18:14 +10:00
Jesse Boyd	dbd31ea347	Fixes boy0001/FastAsyncWorldedit#1090	2018-08-24 01:22:30 +10:00
Jesse Boyd	963d1192c2	Don't require Selection classifier for region binding	2018-08-23 13:37:03 +10:00
Jesse Boyd	f43faae917	Update favs	2018-08-23 06:02:04 +10:00
Jesse Boyd	9927cde616	JS command perms	2018-08-22 17:13:01 +10:00
Jesse Boyd	9129ca2519	Fix copy/paste printing decimal position	2018-08-22 04:23:35 +10:00
Jesse Boyd	6d3aabecda	Don't default to air for legacy mapper	2018-08-22 04:13:42 +10:00
Jesse Boyd	260290aa85	fix frb #import	2018-08-22 04:08:13 +10:00
Jesse Boyd	8de18566c0	Searchitem use fawe prefix	2018-08-22 03:52:13 +10:00
Jesse Boyd	f161c69a66	Use parse for search item	2018-08-22 03:25:42 +10:00
Jesse Boyd	c55353e5b1	Various command (use es6 if java9 + nashorn)	2018-08-22 03:22:37 +10:00
Jesse Boyd	43531a0da0	Use expression for brush radius	2018-08-22 02:58:10 +10:00
Matthew Miller	69ab1781c6	Replace FuzzyBlockMask with BlockMask, and added BlockTypeMask as a more performant mask for just block types.	2018-08-20 15:57:42 +10:00
Matthew Miller	d3b3d57041	Merge pull request #420 from sk89q/server-side-cui ... Added a server side version of WorldEditCUI with limited functionality	2018-08-20 14:46:08 +10:00
Matthew Miller	7b83f97c35	Fixed NotABlockException not getting thrown	2018-08-19 14:41:09 +10:00
Matthew Miller	0f8cc99c35	Disable server CUI by default.	2018-08-19 13:46:24 +10:00
Matthew Miller	4d0df10f88	Fixed sessions not saving on shutdown	2018-08-19 13:01:08 +10:00
Matthew Miller	41c307a4b5	Set the session to dirty if the server CUI is changed.	2018-08-19 10:46:46 +10:00
Matthew Miller	dc39300af8	Merge pull request #364 from mickare/patch-1 ... Fix region contain method	2018-08-18 20:33:53 +10:00
Matthew Miller	eba91cac5f	Added a config option to entirely disable server side cui.	2018-08-18 19:42:45 +10:00
Matthew Miller	20b67db48d	Added a command to turn it on/off	2018-08-18 16:34:32 +10:00
Matthew Miller	f8585adc79	Remove debug code	2018-08-18 15:27:26 +10:00
Matthew Miller	7f419618cc	Switch to using fake blocks, no more world pollution	2018-08-18 15:22:49 +10:00
Matthew Miller	cf10f8ff8a	Proof of concept server-side CUI handler. Note: This pollutes the world with blocks atm	2018-08-18 14:22:08 +10:00
Jesse Boyd	0cc0ee7f03	Basic tab suggestions	2018-08-18 01:37:35 +10:00
Jesse Boyd	5d47d1bce6	Rethrow input parse in mask parser	2018-08-17 23:07:41 +10:00
Jesse Boyd	44c5447edb	Parse instead of get block for masks	2018-08-17 23:05:34 +10:00
Jesse Boyd	b8cc785717	Use Uri instead of BufferedImage for parameter	2018-08-17 22:48:33 +10:00
Jesse Boyd	ae65708d82	Fix some command parsing issues ... Tab complete runs on main thread - that could be an issue	2018-08-17 20:13:33 +10:00
Jesse Boyd	43d5459595	Fix __reserved__ being solid	2018-08-17 19:21:45 +10:00
Jesse Boyd	177bfaa930	Rename setCopyEntities to setCopyingEntities	2018-08-17 18:33:37 +10:00
Jesse Boyd	36ede1b27d	Fixes boy0001/FastAsyncWorldedit#1078	2018-08-17 18:27:48 +10:00
Jesse Boyd	20feefcab2	Fix schematic load with no specified format	2018-08-17 02:55:41 +10:00
Jesse Boyd	d85ad6e116	Implement CuboidClipboard	2018-08-17 01:54:13 +10:00
Jesse Boyd	50fce3147f	Add BuiltInClipboardFormat	2018-08-17 00:05:56 +10:00
Jesse Boyd	ebd27781a7	Catch pattern syntax	2018-08-16 23:38:56 +10:00
Jesse Boyd	4ffb9bce6c	Various minor ... Fix image brush Fix some java 9 issues Fix metrics being disabled Fix compile: duplicate method in SimpleBlockMaterial Load as both FastAsyncWorldEdit and WorldEdit	2018-08-16 23:21:39 +10:00
Jesse Boyd	6ebdc00fba	Merge remote-tracking branch 'refs/remotes/sk89q/master' ... # Conflicts: # worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java # worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java # worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockMaterial.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/GravityBrush.java # worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java # worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java # worldedit-core/src/main/java/com/sk89q/worldedit/util/TargetBlock.java # worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/OldChunk.java # worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/PassthroughBlockMaterial.java	2018-08-16 20:06:27 +10:00
Jesse Boyd	2172ebba83	Fix some issues with java 9 / reflection	2018-08-16 19:56:31 +10:00
Matthew Miller	bc5609114b	Add a material to check if air is air, because there are now 3 types of air.	2018-08-16 15:42:11 +10:00
Jesse Boyd	8de1fff263	Fix block parse NPE	2018-08-16 00:34:20 +10:00
Jesse Boyd	15d0d16da6	Update the tips to reflect 1.13 changes	2018-08-16 00:31:44 +10:00
Jesse Boyd	19125bee5f	Update Existing pattern usage	2018-08-16 00:14:03 +10:00
Jesse Boyd	7ed96ec358	Add property pattern	2018-08-16 00:12:07 +10:00
Jesse Boyd	659ed09bf1	Fix compile	2018-08-16 00:04:16 +10:00
Jesse Boyd	13d2ae20d5	Make end tag singleton	2018-08-15 17:02:17 +10:00
Jesse Boyd	1d3cf75d06	*Fix merge	2018-08-15 14:13:41 +10:00
Jesse Boyd	a67441bbff	Merge remote-tracking branch 'refs/remotes/sk89q/master' ... # Conflicts: # worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java # worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java # worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java	2018-08-15 14:02:51 +10:00
Matthew Miller	c31161d068	Moved report framework to WorldEdit and fixed a few bugs.	2018-08-15 12:45:18 +10:00
Jesse Boyd	db65e96700	Ignore invalid properties	2018-08-14 20:57:32 +10:00
Jesse Boyd	ced4fed9db	Create pom	2018-08-14 20:41:52 +10:00
Jesse Boyd	131fd39f63	Various minor ... Add entity registry Re-add AbstractLoggingExtent Fill in missing nbt on entity load	2018-08-14 19:24:10 +10:00
Jesse Boyd	55d34343dd	Fix some api compatibility issues	2018-08-14 17:18:49 +10:00
Jesse Boyd	1740c845d2	What are the dud BlockCategories?	2018-08-14 11:00:44 +10:00
Jesse Boyd	76a55b7712	Merge remote-tracking branch 'refs/remotes/sk89q/master' ... # Conflicts: # worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java # worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java # worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java # worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java # worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java # worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java	2018-08-14 01:36:00 +10:00
Jesse Boyd	1601ea07a8	Clear the command/method map after registration	2018-08-14 00:39:19 +10:00