Commit Graph

2907 Commits

Author SHA1 Message Date
e724b1f1cd fix NPE when reading sponge schematics with tile entities or entities 2019-02-01 13:40:22 +01:00
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
6046fa1cec Only copy entities from within the region 2019-01-28 17:36:39 +01:00
d48ea909b5 Actually filter out players, not everything else 2019-01-28 17:31:29 +01:00
271b45f3ba Final changes for the Vector update (probable fix for the "copying player entity" bug) 2019-01-17 05:23:47 -05:00
cd1d45b856 Updated Paper-API to 1.13.2, minor edits to FastAsyncVoxelSniper 2019-01-16 07:12:02 -05:00
62e6e9de96 Some general changes to the handling of blocks 2019-01-14 05:49:05 -05:00
f74381b93f Merge remote-tracking branch 'refs/remotes/isfawe/new-vector-system' into new-vector-system 2019-01-13 02:00:14 -05:00
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
88b665f141 Update README.md 2019-01-12 18:01:14 +01:00
f5e8a407cc Create ISSUE_TEMPLATE.md 2019-01-12 18:00:39 +01:00
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
c0c0db0d6e Adding discord to debugpaste 2019-01-10 14:57:32 +01:00
b200744d57 Cya hastebin 2019-01-10 14:46:10 +01:00
4d6045813c Move vectors to static creators, for caching 2019-01-10 07:17:04 -05:00
b7bab7fe49 Merge pull request #12 from Combustible/new-vector-system
Merge master changes into IronApollo's WIP new-vector-system branch
2019-01-10 05:39:38 -05:00
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
33ad31454e Make debugpaste use Incendo Paste Viewer, rather than Hastebin. 2019-01-10 04:04:52 +01:00
a9919d130c Current progress #4 2019-01-09 03:32:38 -05:00
842b1307c7 Current Progress #3 2019-01-09 02:13:44 -05:00
227d6d9169 That should work this time... 2019-01-03 13:07:25 +01:00
c622810671 * 2019-01-03 13:01:39 +01:00
1f39257753 Update offset to match CI 2019-01-03 12:52:23 +01:00
2b8afaf930 Merge pull request #10 from SirYwell/master
Temporary removal of tab complete listener
2019-01-03 05:18:13 -05:00
d4971a4e2f Temporary removal of tab complete listener 2019-01-03 10:18:54 +01:00
21a7eb806e Update README.md 2019-01-01 23:44:02 +01:00
9556f81255 Update README.md 2018-12-29 14:09:46 +01:00
fa1529e4cb Merge pull request #9 from SirYwell/master
fix //removenear exception for size < 1
2018-12-29 13:14:15 +01:00
193361ac32 fix //removenear exception for size < 1 2018-12-29 08:47:57 +01:00
4198932432 Merge pull request #8 from Combustible/merge_part_2
Merge upstream changes through 88f22f2
2018-12-24 08:25:08 +01:00
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
8a742275dc Merge pull request #7 from dordsor21/master
Back to HTTP because I removed the jenkins HTTP -> HTTPS rewrite.
2018-12-24 00:34:52 +01:00
98446f32d7 Update build.gradle 2018-12-23 23:29:30 +00:00
850ac10101 Merge pull request #1 from IntellectualSites/master
h
2018-12-23 23:29:11 +00:00
d61a3ed56f Merge pull request #6 from Combustible/fix_worldguard_repo_url
Update WorldGuard repo to use https
2018-12-23 23:55:43 +01:00
4d9abcdcb3 Update WorldGuard repo to use https
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-23 14:44:34 -08:00
d4157b7e0e Current progress with update 2018-12-23 11:19:33 -05:00
8d5a655a2e Merge pull request #5 from SirYwell/master
change entity list to ignore player when pasting
2018-12-22 09:04:45 +01:00
cf96c478be change entity list to ignore player when pasting 2018-12-22 00:46:05 +01:00
74fade22a6 Merge pull request #3 from Combustible/merge_part_1
Merge part 1
2018-12-21 22:30:04 +01:00
801793cc12 Merge upstream changes through 7961fa58
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 12:13:43 -08:00
3f1d807472 Merge pull request #2 from Combustible/fix_build
Fix build - gradle URLs & bad imports
2018-12-21 17:30:04 +01:00
dab9e9a799 Fix imports - build working again
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 08:09:58 -08:00
447b4e8868 Update gradle settings to new repository URL
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 08:04:08 -08:00
5b38172821 Minors 2018-12-21 11:57:14 +01:00
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
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
f37bd403d8 Merge pull request #23 from boy0001/1.13.2-R0.1-NBT
Fixing NBT
2018-12-19 16:40:23 +01:00
7eac605474 Fixing NBT 2018-12-19 16:33:15 +01:00
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