Commit graph

4360 Commits

Autor SHA1 Nachricht Datum
Jesse Boyd
0e22d4718a
fix some merge issues 2019-11-19 22:07:30 +00:00
Jesse Boyd
5d8adbc10c
Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:25:36 +00:00
Jesse Boyd
2c9f192baf
Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
Jesse Boyd
1556101a98
java based merging? 2019-11-19 15:10:36 +00:00
Jesse Boyd
3eb77e3e8b
7e3fc6c8e7 2019-11-19 04:49:13 +00:00
Kenzie Togami
d9b0aeca7f
7e3fc6c8e7 2019-11-19 04:49:08 +00:00
Kenzie Togami
122f3b2562
8af68fc884 2019-11-19 04:43:30 +00:00
Jesse Boyd
1b07846746
some adapter refactoring 2019-11-19 04:40:40 +00:00
Jesse Boyd
751765cc01
Fix cyl/hcyl args 2019-11-19 01:41:51 +00:00
Jesse Boyd
319b3c5f7f
fix chunks not being submitted 2019-11-18 14:49:52 +00:00
Matthew Miller
ded86d4872 Fixed issues brought up in review 2019-11-18 19:50:52 +10:00
Jesse Boyd
4c32949210
temp fix for undo
also fix inspect brush using wrong ids
2019-11-18 07:23:48 +00:00
Jesse Boyd
0087a0d6ab
Various minor
fix undo null sections
fix cancel for certain parallel jobs
optimize schem paste
2019-11-17 22:47:56 +00:00
Jesse Boyd
0394f3516b
Fix radius mask 2019-11-17 20:52:58 +00:00
Jesse Boyd
329df8d33b
various minor
Increase target size
remove unnecessary brush sync
send chunk on biome change
2019-11-17 20:29:25 +00:00
Jesse Boyd
3f92f12e89
synchronize char blocks 2019-11-17 20:02:33 +00:00
Jesse Boyd
e661652c12
Fix setting blocks in null sections 2019-11-17 19:30:28 +00:00
Jesse Boyd
868554367a
Fix schem load legacy 2019-11-17 18:20:00 +00:00
Jesse Boyd
69c225c00f
Fix //vis 2019-11-17 17:22:21 +00:00
Matthew Miller
625be46b30 Allow translation files to be missing entries, and use the english version in place. 2019-11-17 16:04:13 +10:00
Matthew Miller
5d0335eea5 Fixed typo in brush radius too large 2019-11-17 15:31:46 +10:00
Matthew Miller
f3c97887bc Only download translations if a key is provided 2019-11-17 14:21:36 +10:00
Jesse Boyd
c3f86fd6da wip brush vis mode 2019-11-17 05:00:10 +11:00
Matthew Miller
9a01bf9ab2 When custom files are found, use the base files for default values. 2019-11-16 22:46:31 +10:00
Matthew Miller
87fb9f6d0e Added the remaining translation nodes 2019-11-16 22:46:31 +10:00
Matthew Miller
fc0fee39cb Added a tonne more translations 2019-11-16 22:45:36 +10:00
Matthew Miller
4ba54c4337 Further translations 2019-11-16 22:45:36 +10:00
Matthew Miller
0e6037584f Remove support for pluralisation to match Minecraft and alleviate issues with over-complexity 2019-11-16 22:43:23 +10:00
Matthew Miller
455a40b3fc Add a few more strings 2019-11-16 22:43:22 +10:00
Matthew Miller
c01d2f7c24 Further translations 2019-11-16 22:42:14 +10:00
Matthew Miller
1cca2182a9 Fixed gradle setup 2019-11-16 22:42:14 +10:00
Matthew Miller
96e56bdd0c Rebase translation work for easier rebasing 2019-11-16 22:42:14 +10:00
Jesse Boyd
0b1a36bb7d
WIP VisualExtent 2019-11-16 00:20:14 +00:00
Jesse Boyd
49baebeaa3
Fix some more arguments 2019-11-15 18:06:27 +00:00
Jesse Boyd
1c90d2a341
Fix some more arguments 2019-11-15 18:01:36 +00:00
Jesse Boyd
88c946188b
Fix brush pattern args 2019-11-15 17:57:28 +00:00
Matthew Miller
77ef0ae417
Bypass Bukkit in more situations (#532)
* Bypass Bukkit in more situations

* Use orElseGet

* Apply the same optimisation in the reverse BlockData adapter, and use lambdas instead of AIC

* Remove bukkit type checks

* Improve reliability of fallbacks
2019-11-15 12:02:46 +10:00
Jesse Boyd
e7e2b44b34
merge 2019-11-14 21:24:13 +00:00
Jesse Boyd
d9998982d1
Remove IncendoPaste 2019-11-14 21:20:55 +00:00
NotMyFault
30e38bfed4
Remove commands.yml from debugpaste
Why does this class exists twice?
2019-11-14 22:11:18 +01:00
NotMyFault
b253ef6ddc
Remove commands.yml from debugpaste for now 2019-11-14 22:10:35 +01:00
NotMyFault
05722169f6
Exclude tests in Actions
Actions act per-branch
2019-11-14 20:29:03 +01:00
Jesse Boyd
3dde61cee6
Legacy schem reader offset 2019-11-14 19:23:41 +00:00
Jesse Boyd
601890fe64
Fix biome sending 2019-11-14 19:21:28 +00:00
Jesse Boyd
b38ff03ca6
Fix P2 hook PlotPlayer.wrap 2019-11-14 19:21:05 +00:00
Jesse Boyd
54f62e689b
WIP level dat for MCAWorld 2019-11-14 19:20:35 +00:00
Jesse Boyd
d7b3db215e
Use SingleBlockTypeMask for fixLiquid 2019-11-14 17:57:43 +00:00
Jesse Boyd
2670e66ce2
Fix mask optimize 2019-11-14 17:25:37 +00:00
Jesse Boyd
69e1c53076
Fix fill args 2019-11-14 17:25:17 +00:00
Jesse Boyd
1071e7c226
Print help on invalid arg 2019-11-14 17:24:10 +00:00