Commit Graph

222 Commits

Author SHA1 Message Date
MattBDev
c20f4c6b7f Fixed a null pointer. Merged in a bunch of CLI stuff. 2019-09-02 15:22:43 -04:00
Jesse Boyd
edb626a961
merge 2019-08-26 05:49:00 +01:00
Jesse Boyd
4e49d16505
fix dependencies 2019-08-26 05:45:03 +01:00
Jesse Boyd
ae89c16390
merge 2019-08-23 08:36:33 +01:00
MattBDev
135c12b650 More compile fixes 2019-08-22 13:14:27 -04:00
MattBDev
1eec4884c8 Attempt at fixing NamespacedRegistry 2019-08-19 14:12:28 -04:00
Jesse Boyd
d434dfcfdd
some minor refactoring 2019-08-18 02:09:09 +01:00
MattBDev
cbbe8b5dfa upstream changes 2019-08-15 15:24:18 -04:00
Jesse Boyd
7a57a5dd8c
minor
idk it compiles now
2019-08-10 16:01:42 +10:00
Jesse Boyd
a476ab1ea0
merge 2019-08-07 01:29:49 +10:00
MattBDev
3a3efb8117 Updated a class, minor command tweaks, and formatting 2019-07-25 14:58:59 -04:00
MattBDev
ff5860113d It started on work with commands then I got carried away. 2019-07-25 14:44:10 -04:00
MattBDev
478c330c1e Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding
# Conflicts:
#	worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
#	worldedit-core/src/main/java/com/boydti/fawe/object/extent/NullExtent.java
2019-07-22 22:26:00 -04:00
Jesse Boyd
c05d425f64
couple more compilation issues 2019-07-23 06:58:18 +10:00
MattBDev
46f5b12b36 Convert tabs to whitespace. 2019-07-22 16:42:40 -04:00
Jesse Boyd
4d8cf04be1
fix some more compilation issues 2019-07-22 19:05:14 +10:00
Jesse Boyd
f500b5e056
CommandContext + Confirmation
Use InjectedValueAccess instead
Fix command confirmation
2019-07-19 06:03:27 +10:00
Jesse Boyd
0a924915c8
shift extent queue methods 2019-07-19 02:07:31 +10:00
Jesse Boyd
22a7ad7503
optimized biome streaming to schematics 2019-07-18 22:36:50 +10:00
Jesse Boyd
4ed3fe724e
Merge branch 'breaking-114' into commanding 2019-07-18 20:22:44 +10:00
Jesse Boyd
6e13b44f84
resolve issues with 2e67425d8131a2b1eb7ff752335bccf371801b8b 2019-07-18 20:12:23 +10:00
Jesse Boyd
1bc35eb59a
add missing method to baseblock 2019-07-18 17:00:33 +10:00
Jesse Boyd
be8213d8ee
resolve conflicts 2019-07-18 16:56:57 +10:00
Jesse Boyd
dd38cbe750
. 2019-07-18 04:30:02 +10:00
Jesse Boyd
ff94a1e5ed
8108d0a9 2019-07-18 04:24:21 +10:00
Jesse Boyd
905fbf5a0b
8108d0a9 2019-07-18 02:31:13 +10:00
Jesse Boyd
eff203c3b8
Merge branch 'breaking' into breaking-114 2019-07-17 21:31:06 +10:00
MattBDev
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
Jesse Boyd
48356275af
fix loading legacy biomes 2019-07-17 06:36:48 +10:00
Jesse Boyd
cf09ca7f37
delete FaweQueue 2019-07-12 01:32:14 +10:00
Jesse Boyd
f4947885b2
fix import 2019-07-11 08:46:02 +10:00
Jesse Boyd
cf0c735cf3
Merge branch 'breaking' into breaking-114 2019-07-11 08:08:55 +10:00
Jesse Boyd
cafd4bfece
use Locale.ROOT for uppercase as well 2019-07-10 22:26:31 +10:00
Jesse Boyd
a98a91e066
Use Locale.ROOT 2019-07-10 21:03:00 +10:00
Jesse Boyd
b32d46b08a
Use Locale.ROOT 2019-07-10 21:01:56 +10:00
Jesse Boyd
50e649acb8
update items 2019-07-10 20:58:27 +10:00
Jesse Boyd
20b7b121b1
1.14 blocks 2019-07-10 06:49:51 +10:00
MattBDev
4a40c7d99c Renaming and cleanup and a new method. 2019-07-09 15:50:13 -04:00
Jesse Boyd
f99d6e7478
wip on 1.14 2019-07-09 17:18:51 +10:00
MattBDev
0feebac44b Make AbstractProperty abstract 2019-06-28 19:00:31 -04:00
Jesse Boyd
58c6b6278f
a69b239848 2019-06-29 04:20:48 +10:00
Jesse Boyd
55dad5a972
7f3c4c4828 2019-06-29 01:39:58 +10:00
Jesse Boyd
fecb380d44
aea5b68ced 2019-06-28 22:43:32 +10:00
MattBDev
1932c96d4f Fixed removed import during upstream cleanup. 2019-06-25 13:14:59 -04:00
MattBDev
a69b239848 Upstream 2019-06-25 13:07:47 -04:00
MattBDev
a1c15e1c39 Many upstream changes. Should be non-breaking 2019-06-25 09:00:44 -04:00
MattBDev
0313320816 As Jesse would say... * 2019-06-20 20:05:18 -04:00
MattBDev
1f14d4652e Upstream changes, prefix changes, formatting changes, variable name changes
I think that draining waterlogged items also works now?
2019-06-12 17:13:53 -04:00
NotMyFault
ec001b8d3b Revert "Upstream, generics, formatting"
This reverts commit cd88e513a8.
2019-06-12 15:45:41 +02:00
MattBDev
cd88e513a8 Upstream, generics, formatting 2019-06-11 20:31:56 -04:00