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
Kenzie Togami
ef2c07ca24
Update forge for new block API
2018-10-04 17:18:43 -07:00
Jesse Boyd
abd886acd7
some hasty refactoring
2018-08-28 02:56:28 +10:00
Jesse Boyd
c55353e5b1
Various command (use es6 if java9 + nashorn)
2018-08-22 03:22:37 +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
Matthew Miller
e0e7778536
Fixed some bugs and cleanup some code.
2018-08-13 22:18:12 +10:00
Jesse Boyd
a629d15c74
Copy paste/merge FAWE classes to this WorldEdit fork
...
- so certain people can look at the diff and complain about my sloppy code :(
Signed-off-by: Jesse Boyd <jessepaleg@gmail.com>
2018-08-13 00:03:07 +10:00
Matthew Miller
1480606b52
Fixed a few more issues found looking over the changeset.
2018-08-04 11:43:42 +10:00
Matthew Miller
2239d14a01
Fixed //replace and masks with states.
2018-08-04 11:43:41 +10:00
Matthew Miller
663dd1f4d8
Added an entity, weathertype, and gamemode registry.
2018-08-04 11:43:41 +10:00
Matthew Miller
c3d832c3fd
State system is done. It works. Finally. Still a few rough edges that need fixing however.
2018-08-04 11:43:41 +10:00
Matthew Miller
6b5f218809
Basically finish the state system. Just 1 more bug that I'm encountering.
2018-08-04 11:43:41 +10:00
Matthew Miller
4938f419ad
Almost finished the state system. Just got to have it actually load in the values.
2018-08-04 11:43:41 +10:00
kashike
ee6af8ee76
state stuff
2018-08-04 11:43:40 +10:00
kashike
40a665a509
package move
2018-08-04 11:43:40 +10:00
kashike
70208c38fd
category changes
2018-08-04 11:43:40 +10:00
kashike
d33e2e98aa
registry changes
2018-08-04 11:43:40 +10:00
