Commit Graph

3435 Commits

Author SHA1 Message Date
orthoplex64 c6ef09380e Update maze.js 2018-12-31 19:04:32 -06:00
NotMyFault 9556f81255 Update README.md 2018-12-29 14:09:46 +01:00
NotMyFault fa1529e4cb Merge pull request #9 from SirYwell/master
fix //removenear exception for size < 1
2018-12-29 13:14:15 +01: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 59f78b3cdf Merge pull request #442 from sk89q/feature/fuzzier-fuzzies
Refactor the Fuzzy system to be immutable
2018-12-28 15:05:56 +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
Matthew Miller f4ed48b262 Merge pull request #441 from sk89q/feature/no-rawtypes
Cleanup compiler warnings and BlockStateHolder raw types
2018-12-27 12:31:00 +10:00
Kenzie Togami 386668d221 Clean up other compiler warnings 2018-12-26 16:50:24 -08:00
Kenzie Togami de7d9421b1 Add generics to other rawtypes 2018-12-26 16:45:46 -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
Matthew Miller 4cc8e9a1c0 Merge pull request #438 from sk89q/feature/modular-patterns-masks
Modularise Patterns & Masks
2018-12-26 15:25:28 +10:00
Matthew Miller 976a92d5ea Merge pull request #440 from gamerforEA/master
Fix BlockType and ItemType registration for Sponge distributive
2018-12-25 21:08:07 +10:00
gamerforEA 66415dfa34 Fix BlockType and ItemType registration for Sponge distributive 2018-12-24 22:19:05 +04:00
Matthew Miller 514f82190b Merge pull request #439 from gamerforEA/master
Fix Metrics injection for Sponge distributive
2018-12-24 22:38:52 +10:00
gamerforEA 2e62389bdc Update SpongeAPI 2018-12-24 16:07:09 +04:00
gamerforEA 53ddc3fac0 Fix Metrics injection 2018-12-24 16:02:13 +04:00
NotMyFault 4198932432 Merge pull request #8 from Combustible/merge_part_2
Merge upstream changes through 88f22f2
2018-12-24 08:25:08 +01: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
NotMyFault 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
dordsor21 98446f32d7 Update build.gradle 2018-12-23 23:29:30 +00:00
dordsor21 850ac10101 Merge pull request #1 from IntellectualSites/master
h
2018-12-23 23:29:11 +00:00
NotMyFault 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
Byron Marohn 4d9abcdcb3 Update WorldGuard repo to use https
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-23 14:44:34 -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
NotMyFault 8d5a655a2e Merge pull request #5 from SirYwell/master
change entity list to ignore player when pasting
2018-12-22 09:04:45 +01: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
NotMyFault 74fade22a6 Merge pull request #3 from Combustible/merge_part_1
Merge part 1
2018-12-21 22:30:04 +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
NotMyFault 3f1d807472 Merge pull request #2 from Combustible/fix_build
Fix build - gradle URLs & bad imports
2018-12-21 17:30:04 +01: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
Byron Marohn 447b4e8868 Update gradle settings to new repository URL
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 08:04:08 -08:00
N0tMyFaultOG 5b38172821 Minors 2018-12-21 11:57:14 +01: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
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