Commit Graph

3427 Commits

Author SHA1 Message Date
4ed3fe724e Merge branch 'breaking-114' into commanding 2019-07-18 20:22:44 +10:00
6e13b44f84 resolve issues with 2e67425d8131a2b1eb7ff752335bccf371801b8b 2019-07-18 20:12:23 +10:00
1bc35eb59a add missing method to baseblock 2019-07-18 17:00:33 +10:00
be8213d8ee resolve conflicts 2019-07-18 16:56:57 +10:00
dd38cbe750 . 2019-07-18 04:30:02 +10:00
ff94a1e5ed 8108d0a9 2019-07-18 04:24:21 +10:00
905fbf5a0b 8108d0a9 2019-07-18 02:31:13 +10:00
8d60c0197b Update AsyncChunk.java 2019-07-17 22:09:48 +10:00
7a42bd208f Update AsyncWorld.java 2019-07-17 22:04:05 +10:00
505af853bd setLocation should be synchronized 2019-07-17 22:00:00 +10:00
eff203c3b8 Merge branch 'breaking' into breaking-114 2019-07-17 21:31:06 +10:00
8f902c797d Don't print within high stack depth conditions
FAWE is trying to detect prevent a stackoverflow from block/item lag. Calling print adds to the stack depth.
2019-07-17 21:28:46 +10:00
68ea3d6e99 revert some changes 2019-07-17 20:50:54 +10:00
08dead5a86 cleanup build script 2019-07-17 19:43:14 +10:00
2da3367f3d Switch 2019-07-17 16:21:30 +10:00
3113d8dd69 Optional 2019-07-17 16:11:55 +10:00
cedb261313 fix some Command annotations 2019-07-17 15:43:18 +10:00
ae9efc3df1 Merge branch 'breaking-114' into filter-pipeline 2019-07-17 14:55:04 +10:00
0e54f196fc Deleted a class and work on generation commands 2019-07-16 23:57:35 -04:00
8108d0a936 Major command changes that don't work yet. 2019-07-16 23:44:34 -04:00
48356275af fix loading legacy biomes 2019-07-17 06:36:48 +10:00
5d41bdb7c7 merge from breaking 2019-07-17 06:10:18 +10:00
71a9256617 Merge branch 'breaking' into breaking-114 2019-07-17 06:08:18 +10:00
75f059fdc5 check length, not null 2019-07-17 05:28:55 +10:00
b3e11d2094 patch for missing tile position data 2019-07-17 05:16:08 +10:00
cfbde956f4 some refactoring to pipeline classes (WIP) 2019-07-17 05:10:39 +10:00
fee57017cd Bump dummy version to 1.14 2019-07-11 22:50:28 +02:00
14d5275e05 wip chunk based bitset 2019-07-12 02:10:32 +10:00
d6a8e9738a delete SetQueue 2019-07-12 01:41:54 +10:00
cf09ca7f37 delete FaweQueue 2019-07-12 01:32:14 +10:00
f0cabb7d11 Build 1.14 artifacts 2019-07-11 13:13:43 +02:00
b44dcc91b8 update vs 2019-07-11 20:27:29 +10:00
4dea4f4c45 method changed 2019-07-11 20:12:18 +10:00
f4947885b2 fix import 2019-07-11 08:46:02 +10:00
3e8fd842d8 use ivy repo 2019-07-11 08:42:44 +10:00
2c76c23bf2 don't use nms world.n 2019-07-11 08:11:37 +10:00
cf0c735cf3 Merge branch 'breaking' into breaking-114 2019-07-11 08:08:55 +10:00
280147491d protochunk 2019-07-11 07:52:55 +10:00
18925df124 Fix aggregatedJavadocs task 2019-07-10 13:56:34 +01:00
3492ac63c7 Fix aggregatedJavadocs task 2019-07-10 13:55:54 +01:00
cafd4bfece use Locale.ROOT for uppercase as well 2019-07-10 22:26:31 +10:00
a98a91e066 Use Locale.ROOT 2019-07-10 21:03:00 +10:00
b32d46b08a Use Locale.ROOT 2019-07-10 21:01:56 +10:00
50e649acb8 update items 2019-07-10 20:58:27 +10:00
2e9c5e6804 update legacy.json 2019-07-10 06:52:15 +10:00
20b7b121b1 1.14 blocks 2019-07-10 06:49:51 +10:00
4a40c7d99c Renaming and cleanup and a new method. 2019-07-09 15:50:13 -04:00
6a87d2107d fix compile 2019-07-10 04:58:53 +10:00
19468b64d4 Use bstats for metrics
The metrics config option will be removed in the future
 - The current value will be copied over when generating bstats config
2019-07-09 17:46:27 +10:00
f99d6e7478 wip on 1.14 2019-07-09 17:18:51 +10:00