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
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
