Commit Graph

4677 Commits

Author SHA1 Message Date
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
N0tMyFaultOG
da96365504 Updating a few links 2020-07-13 13:13:43 +02:00
Hannes Greule
11e762f07a Add basic angle mask suggestions
Mask suggestions are a bit broken in general so this doesn't change much
2020-07-13 11:15:01 +02:00
Hannes Greule
7198c03cd3 Reimplement angle mask parsing 2020-07-13 02:25:30 +02:00
Hannes Greule
8e33ff9549 Make mask parsing actually working 2020-07-13 02:18:05 +02:00
dordsor21
eb9ed098bb use z not x 2020-07-11 12:41:33 +01:00
dordsor21
ef58cf567b Clean up P2 v5 hook a little.
Should be a good step at removing any OOBs and incorrect-height-sets
2020-07-11 12:39:27 +01:00
Octavia Togami
4c299bc0b8 Replace setPosition with trySetPosition (#1403)
Allows cancellation information to be fed back into the ascend/descend
algorithms.

(cherry picked from commit 71e104bcb187a5313e88dda5df79059c8ffbc1fe)
2020-07-10 13:22:48 -04:00
NotMyFault
c82fec931a Update discord link at debugpaste 2020-07-09 23:43:48 +02:00
dordsor21
33b2b634ac Allow specific P2 queue hooks to be disabled 2020-07-09 22:14:24 +01:00
MattBDev
6d6de61560 Updated missing biomes, entities, and categories. 2020-07-06 23:54:55 -04:00
Matthew Miller
39439fb405 fix: require extent for mask parsing (#1373)
(cherry picked from commit 1ced57c301bc1c98667a260fd8b6aa128675f0d2)
2020-07-06 23:47:33 -04:00
Octavia Togami
c0bfe06e4b Set ES6 compat flag for Rhino
(cherry picked from commit 849a515d4a5c02c083e5ab343db40d7eb05b2f51)
2020-07-06 23:45:28 -04:00
wizjany
852abce989 Build script cleanup/updates.
(cherry picked from commit 57b73b9e1f35fa7abb4738ccba7a45d9e1fdc786)
2020-07-06 23:43:16 -04:00
wizjany
da577a3752 Fix buildscript issue on certain locales.
(cherry picked from commit e64cfe5d3776cb74288591f3e0d19ed4bfe45518)
2020-07-06 23:42:18 -04:00
Hannes Greule
6fb10c3879 Make surface brush not replacing the whole world 2020-07-06 02:30:08 +02:00
Hannes Greule
ed6f3e7b4a Implement simplex mask (fixes #437) 2020-07-05 11:19:48 +02:00
dordsor21
704e76eb6d Fixes #519
Use regex for finding colour codes
Merge styles rather than replacing and undoing our work sometimes.
2020-07-04 14:15:49 +01:00
dordsor21
d92cded832 add biomes, and do it all at once using a clipboard. Crude, but eh 2020-07-04 12:45:00 +01:00
Hannes Greule
11373c865a Fix BlockCategoryMasks not working 2020-07-03 21:57:30 +02:00
Hannes Greule
9da4bbef5f Fix scatter/splatter brush 2020-07-03 20:43:34 +02:00
dordsor21
77204df3f0 prevent players being teleported down a single block after some edits 2020-07-03 16:56:20 +01:00
dordsor21
e2ab87cc07 lazy //deform AIOOB fix.
Fixes #495
2020-07-03 16:45:28 +01:00
dordsor21
f7d375c76c Lazy heightmap range fix 2020-07-03 16:29:27 +01:00
dordsor21
9e25c736a0 Add new blocks to BlockTypes 2020-07-03 14:12:43 +01:00
dordsor21
2812841481 Add -p flag to //drain to allow kelp and watergrass to be removed.
properly fixed #464
2020-07-03 14:01:16 +01:00
dordsor21
ea7897934f Implement ability to use -w flag on //drain
fixes #464
2020-07-03 13:49:17 +01:00
dordsor21
63bc151f6c Hopefully allow for unloaded world to be referenced after GC.
Possibly fixes #504
2020-07-03 13:27:26 +01:00
dordsor21
fae528ab64 add a couple more changes++
Fixes #508
2020-07-03 13:18:09 +01:00
dordsor21
f1d4104480 Bunch of changes to help masks 2020-07-02 22:09:12 +01:00
dordsor21
18c9da372c GetBlocks should default to air not reserved 2020-07-02 18:16:15 +01:00
dordsor21
b58877a57b Use BlockType not BlockState 2020-07-02 14:51:09 +01:00
dordsor21
d3afc9c65d Update to p2 5.12.2 and implement clear pipeline 2020-07-02 14:34:05 +01: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
dordsor21
ce406e404b We shouldn't be setting REGENERATIVE_CLEAR to false 2020-07-01 19:46:43 +01: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
dordsor21
3e40f82d9a fix error on loading for some versions 2020-07-01 15:05:38 +01:00
N0tMyFaultOG
fdbef4e12c Update DummyFawe.src 2020-07-01 14:22:04 +02:00
dordsor21
efc1a888d8 update links, versions, etc 2020-07-01 13:17:19 +01:00
Hannes Greule
0bb6bc3563 Start reimplementation of simplex pattern (#520)
* Start reimplementation of simplex pattern

* Fix suggestions

* Allow nested weighted patterns

* Add documentation and improve error handling

* Remove unnecessary code and obsolete TODOs
2020-07-01 13:01:39 +01:00
dordsor21
6be429cc96 Lighting:
- bring fixes to 1.16
- Fix for all lighting where it only set sky lighting if not present, even if it was trying to set block lighting (unlikely to have caused issues as block lighting seems always to be present, but wrong nonetheless)
2020-07-01 12:55:58 +01:00
dordsor21
3b19738ea0 Merge branch '1.15' into 1.16
# Conflicts:
#	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/wrapper/AsyncWorld.java
#	worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncDataContainer.java
2020-07-01 12:47:04 +01:00
dordsor21
3f3c49c0a8 Looks like working block setting and removal 2020-07-01 12:41:20 +01:00
dordsor21
4ca19acb48 implement 1.16 methods 2020-06-30 13:51:27 +01:00
dordsor21
f84958957c Fix various lighting issues
fixes #496
possibly fixes #497
2020-06-30 13:44:26 +01:00