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
MattBDev
7f3c4c4828
A lot of removals, upstream merges, and maybe more.
2019-06-07 20:58:48 -04:00
MattBDev
6c94cca15e
Selective upstream merge
...
Signed-off-by: MattBDev <4009945+MattBDev@users.noreply.github.com>
2019-06-04 12:40:11 -04:00
MattBDev
c73fc28847
Minor upstream changes
2019-05-31 11:20:02 -04:00
MattBDev
aea5b68ced
Upstream merges and a few code cleanups
2019-05-30 16:07:30 -04:00
Jesse Boyd
6bc5b4a823
.
2019-05-29 06:31:22 +10:00
Jesse Boyd
c797dcb194
WIP filter patterns
2019-05-12 23:32:04 +10:00
Jesse Boyd
113aeb1689
Use fuzzy blocks in default block parser
2019-05-07 16:40:37 +10:00
Jesse Boyd
55b02e1b1f
Implement FuzzyBlockState
2019-05-06 15:58:55 +10:00
Jesse Boyd
eec08c81ad
async chunk loading
2019-05-02 01:45:18 +10:00
Jesse Boyd
33e119ccb6
implement block get
2019-05-01 02:19:10 +10:00
wizjany
3ffa54af84
Fix TrueZip region stores.
...
I think. Someone tell me if this breaks their setup with truezip, but
it works for me now and didn't before. I'm assuming people using .zip
just used the normal zip store anyway.
(cherry picked from commit dcfb769d96
)
2019-04-28 17:28:15 -04:00
Jesse Boyd
208929c378
Fix ItemType.getBlockType
2019-04-23 16:16:26 +10:00
Jesse Boyd
290f047f6a
Fix tab complete error for single property states
2019-04-23 15:08:05 +10:00
Jesse Boyd
a8b0fd21bb
Minor tweaks to work with build.js
2019-04-14 22:46:01 +10:00
Jesse Boyd
6996a97027
various minor
...
CFI works without PlotSquared
tab completion
biome tweaks
WIP on anvil
document disallowed-blocks in legacy config
2019-04-11 21:32:32 +10:00
Jesse Boyd
d61e5f33f1
some minor fixes
...
/br sspl - says to click same spot again to apply, clicked same spot and nothing happens
/br layer - gives an error message "there was an error handling a FAWE command: [See console]
/br clipboard - doesn't let me execute because of max radius of 5, however am unable to set a lower radius as there is no option for it
/br butcher - tried to kill some mobs, but didn't work (nothing happened)
/br splatter - tried to execute the command, nothing happened
2019-04-11 05:14:58 +10:00
Jesse Boyd
808d32bc85
make bit mask protected
...
TODO same for BIT_OFFSET
2019-04-10 22:03:51 +10:00
Jesse Boyd
31ac2b69d1
Fix block rotation
2019-04-07 17:41:26 +10:00
Jesse Boyd
0afae082c2
Remove string switches for BlockType
2019-04-06 03:34:11 +11:00
Jesse Boyd
144215c813
Don't construct new BaseBlock
2019-04-06 01:12:57 +11:00
Jesse Boyd
9e2832c273
Use BlockVectorSet
2019-04-06 01:01:05 +11:00
Jesse Boyd
2143b9b5b7
finish block registry
2019-04-05 17:51:42 +11:00
Jesse Boyd
94d5d8df8e
Merge branch 'master' into breaking
2019-04-05 15:47:04 +11:00
Jesse Boyd
140809c903
Working now
2019-04-05 15:15:10 +11:00
Jesse Boyd
33f5322fda
WIP merge (i'll finish this later)
2019-04-05 01:24:47 +11:00
Jesse Boyd
1beea3cd22
Some more upstream merge
2019-04-04 21:28:41 +11:00
Jesse Boyd
8897109dc4
wip upstream merge
2019-04-04 00:25:16 +11:00
Jesse Boyd
7086eb8b3e
continue with merge
2019-04-03 22:28:57 +11:00
Jesse Boyd
8aef06b29e
*
...
haven't done one of these in a while
*continuing with merge in previous commit
2019-04-03 17:00:59 +11:00
Jesse Boyd
f361619037
Merge remote-tracking branch 'upstream/master' into breaking
2019-04-03 16:53:34 +11:00
matt
29692f3fbe
Migrate to SLF4J
2019-04-02 18:21:02 -04:00