12aab80a83
Document some bits of Spawner. ( #1547 )
...
* Document some bits of Spawner.
* Update mappings/net/minecraft/world/gen/PillagerSpawner.mapping
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
* captain
* Update Spawner.mapping
* Update mappings/net/minecraft/world/gen/Spawner.mapping
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-07-07 22:52:20 +01:00
b446f6047d
20w27a
2020-07-01 17:44:38 +01:00
ec7bed90ba
Some command source docs, remove a few old Registry tracker names and some world data stuff ( #1522 )
2020-06-30 20:08:39 +01:00
8a6a1db2ce
Map chunk and chunk statuses (Reattached) ( #1511 )
...
* Map chunk and chunk statuses
* Update mappings/net/minecraft/world/chunk/ProtoChunk.mapping
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
* So we don't have #1493 here
* chunks is fine
* Update mappings/net/minecraft/block/Block.mapping
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
* Update ChunkStatus.mapping
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-06-26 12:34:45 +01:00
6ae7f75387
Default structures and minor fixes ( #1509 )
...
* Map default structure adders
* Fix incorrect case for static final field in LootTableRanges
* Remove -New suffix from NbtHelper's UUID methods
* Code review
2020-06-25 13:27:28 +01:00
2847e6a8af
1.16-pre5 world gen mappings ( #1469 )
...
Some overlap with #1453 , but nothing major.
2020-06-24 17:35:17 +01:00
d3e8fd1935
Fix lots of spelling errors throughout yarn ( #1506 )
...
* Fix lots of spelling errors throughout yarn
* Delete empty comment
2020-06-24 17:34:48 +01:00
c72ab7649e
Some fixes ( #1481 )
...
* Some fixes
* FeaturePiece -> StructurePiece
2020-06-20 19:51:40 +01:00
a4305ccae9
1.16-pre8
2020-06-17 17:11:43 +01:00
49710ba86a
1.16-pre3
2020-06-10 18:05:28 +01:00
b506248928
TreeDecorator.getType() ( #1445 )
2020-06-08 18:24:47 +01:00
098cbb1f3c
Some pre 2 mappings ( #1422 )
...
* Some mappings
* Rename
2020-06-07 17:29:37 +01:00
de4314e606
Added a bunch of mappings based of strings related to the custom dime… ( #1384 )
...
* Added a bunch of mappings based of strings related to the custom dimensions.
* Added liach's suggestions
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
* Apply suggestions from code review
I had to redo these 3 times, went a bit too fast the last time =/
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
* Update mappings/net/minecraft/world/dimension/StructuresConfig.mapping
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
* Moved package
* Removed old mapping files
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-06-07 17:29:30 +01:00
428928b420
A bunch of param names ( #1436 )
2020-06-07 16:01:40 +01:00
ffd49220ab
Added mappings for new fields in DefaultBiomeFeatures ( #1432 )
...
* Added mappings for new fields in DefaultBiomeFeatures
* Update mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping
Fixed typo
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
2020-06-07 15:21:05 +01:00
10be6db16a
Registry codec stuff, and that thing is registry not dimension tracker ( #1425 )
...
* Registry codec stuff, and that thing is registry not dimension tracker
Signed-off-by: liach <liach@users.noreply.github.com>
* Paragraph
Signed-off-by: liach <liach@users.noreply.github.com>
* Update mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping
Co-authored-by: i509VCB <i509vcb@gmail.com>
Co-authored-by: liach <liach@users.noreply.github.com>
Co-authored-by: i509VCB <i509vcb@gmail.com>
2020-06-05 20:11:11 +01:00
0295b1e8d5
1.16-pre1
2020-06-04 20:08:31 +01:00
3e57ee1372
Structure and feature stuff ( #1415 )
2020-06-04 16:50:13 +01:00
e1c2ee273f
A handful of random mappings ( #1417 )
...
* A handful of random mappings
* follow the conventions lol
* Review tweaks
* and this
2020-06-04 16:49:10 +01:00
7112703c90
Map more 1.16 additions to default biome features ( #1405 )
...
* Map the remaining Nether feature configs
* Map the configured ruined portal features
* Move DefaultBiomeFeatures to world.gen.feature package
2020-05-31 18:21:24 +01:00
2fbbb01395
Misc. Issue Resolution ( #1401 )
...
* PlayerAbilitiesS2CPacket.fovModifier -> walkSpeed (#1392 )
* GameJoinS2CPacket seed -> sha256Seed (#1360 )
* checkBlockRerender -> scheduleBlockRerenderIfNecessary (#1332 )
* StatusEffectType -> StatusEffectCategory (#1036 )
StatusEffect -> StatusEffectType
StatusEfectInstance -> StatusEffect
(and related names)
* SettingsScreen -> OptionsScreen (#787 )
AccessibilityScreen -> AccessibilityOptionsScreen
Moved OptionsScreen to options package with all the other options screens
* Finishes making maximum/minimum -> max/min (#672 )
(the ones in TreeDecoratorConfig as they have no postfix)
DefaultBiomeFeatures moved to world/gen/feature from world/biome (#667 )
* fix missing file
* Revert "StatusEffectType -> StatusEffectCategory (#1036 )"
This reverts commit 07f887a3d2
2020-05-30 19:31:17 +01:00
e9c5c02d50
20w22a
2020-05-29 14:31:34 +01:00
fa4f735b49
Add Structure Mappings ( #1393 )
2020-05-25 11:46:53 +01:00
4c6a867e69
Named the Codecs where possible ( #1388 )
...
Only in files where there is a single static Codec.
Also named 2 (I think) loggers to "LOGGER". should have kept the seperate maybe bu /shrug
2020-05-21 12:35:32 +01:00
77f8ede4b4
20w20a mappings ( #1353 )
...
* 20w20a mappings
* GameModeSelectScreen -> GameModeSelectionScreen
* Revert class_5281 to obfuscated in favor of #1350
* Some improvements
* worldBorderProperties -> worldBorder
* Merge non-conflicting names
* Rename some existing mappings where names got lost
* Small changes
* Remove leftover rebase tags
* Remove duplicate mappings
* 20w21a changes
* Cleanup & Map ChunkGeneratorType.Preset
* Adjust DimensionType mappings
* hellish -> hasCeiling
2020-05-20 22:57:06 +01:00
4f89f2fdba
20w21a
2020-05-20 17:12:58 +01:00
6d03f1f103
updated distance to spacing to make consistent with naming for other structures and in useages in StructureFeature classes, particularly AbstractTempleFeature ( #1362 )
2020-05-18 14:08:31 +01:00
bfbea641fc
map chunk generators and biome sources ( #1352 )
...
* map chunk generators and biome sources
* map more parameters and functions, and rename noise
* bikeshedding
* Apply suggestions from code review
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
* disambiguate depth noise
* Update mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
2020-05-14 21:55:51 +01:00
015995dd3f
20w20a
2020-05-13 18:06:00 +01:00
f452d4fec2
Start on chunk generator docs ( #1346 )
...
* start on chunk generator docs
* fix typo
* linkplain
* update chunk generator jdoc.
* comma
2020-05-12 01:17:01 +01:00
077ab15730
Music & fixes ( #1339 )
...
* Music & fixes
* musicSound -> music
2020-05-09 17:00:24 +01:00
1f2d9d7e4b
Bring back the parameters ( #1307 )
...
* Bring back the parameters
* better
* isBlock -> matches
* matches -> is / isOf
2020-05-02 13:31:02 +01:00
aab2c54e5c
multiplayer enigma boogaloo ( #1298 )
...
* a lot of very random mappings
* fix mappings
* typo
* Update mappings/net/minecraft/client/font/TextRenderer.mapping
Co-Authored-By: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-04-29 20:28:00 +01:00
9a617e4707
20w18a
2020-04-29 17:24:56 +01:00
659b0da1dd
20w17a
2020-04-22 16:59:47 +01:00
206a6e5b76
Pick up shnupbup's stuff ( #1288 )
...
* stuff
Removed duplicated mapping
Signed-off-by: liach <liach@users.noreply.github.com>
Map a lot of detail missed by shnupbups
Signed-off-by: liach <liach@users.noreply.github.com>
Few more interesting mappings
Signed-off-by: liach <liach@users.noreply.github.com>
* view -> world
Co-Authored-By: Yanis48 <doublecraft.official@gmail.com>
* Update mappings/net/minecraft/world/gen/feature/RuinedPortalFeaturePiece.mapping
Co-Authored-By: Yanis48 <doublecraft.official@gmail.com>
* Better document these 4 things
Signed-off-by: liach <liach@users.noreply.github.com>
Co-authored-by: Shnupbups <shnupbups@gmail.com>
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
Co-authored-by: liach <liach@users.noreply.github.com>
2020-04-18 20:16:55 +01:00
863b0e905c
20w16a
2020-04-15 16:34:32 +01:00
558487a1c0
i mapped things: HD remaster ( #1271 )
...
* some stuff HD remaster
* Update mappings/net/minecraft/world/biome/BasaltDeltaBiome.mapping
Co-Authored-By: Yanis48 <doublecraft.official@gmail.com>
* Delta -> Deltas
* Apply suggestions from code review
Co-Authored-By: liach <7806504+liach@users.noreply.github.com>
* Update mappings/net/minecraft/world/gen/feature/DeltaFeatureConfig.mapping
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-04-14 15:01:16 +01:00
cf0ef0a6bd
20w15a
2020-04-08 15:44:19 +01:00
b4efaeadd2
trunk placer and tree generation mappings ( #1261 )
...
Signed-off-by: liach <liach@users.noreply.github.com>
Co-authored-by: liach <liach@users.noreply.github.com>
2020-04-05 15:53:26 +01:00
032ee0894b
Region and session lock ( #1254 )
...
* Region and session lock
Signed-off-by: liach <liach@users.noreply.github.com>
* Update mappings/net/minecraft/world/gen/StructureAccessor.mapping
Co-Authored-By: Yanis48 <doublecraft.official@gmail.com>
Co-authored-by: liach <liach@users.noreply.github.com>
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
2020-04-04 21:19:01 +01:00
0c14fa6444
20w14a
2020-04-02 18:40:17 +01:00
b931f3b1de
Map class 4966 and associated chunk generator stuff ( #1207 )
...
Signed-off-by: liach <liach@users.noreply.github.com>
Co-authored-by: liach <liach@users.noreply.github.com>
2020-03-19 16:24:12 +00:00
ab907504e7
20w12a
2020-03-18 18:59:27 +00:00
a1b8da33a9
Enchantments, vines, particles 11a ( #1174 )
...
* Enchantments, vines, particles 11a
Fixes #1084 as well
* Detail on what the ench method does
Signed-off-by: liach <liach@users.noreply.github.com>
* Now this thing has a builder ye
Signed-off-by: liach <liach@users.noreply.github.com>
* Update mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping
* Update mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping
* Rename method sin weeping vine feature as requested by @supercoder7979
Signed-off-by: liach <liach@users.noreply.github.com>
* Vines -> VineLogic
Signed-off-by: liach <liach@users.noreply.github.com>
Co-authored-by: liach <liach@users.noreply.github.com>
2020-03-13 13:55:19 +00:00
2cd906df4e
Map LevelGeneratorOptions ( #1175 )
...
* Map LevelGeneratorOptions
* Delete build.gradle
* FIX MESS
This reverts commit 1401dd2a73#1 )
* Stuff around this level gen stuff
Signed-off-by: liach <liach@users.noreply.github.com>
* Another missed
* one more field
Co-authored-by: liach <liach@users.noreply.github.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: liach <liach@users.noreply.github.com>
2020-03-13 13:55:03 +00:00
9497721136
20w11a
2020-03-11 17:25:56 +00:00
55b6d0c988
FoliagePlacer mapping and doc, Tree mapping, and a lot of misc feature mapping ( #1159 )
...
* a whole lot of feature mappings
* fix wrong comment placement
* removed empty comment
* Apply suggestions from code review
Co-Authored-By: liach <7806504+liach@users.noreply.github.com>
* fix based on reivew
* fix docs
* Update FoliagePlacer.mapping
* Apply suggestions from code review
Co-Authored-By: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2020-03-10 16:34:02 +00:00
948804d428
Suggest mappings ( #1123 )
...
* OverworldChunkGeneratorConfig%field_13224 -> biomeSize
* OverworldChunkGeneratorConfig%field_13223 -> riverSize
* OverworldChunkGeneratorConfig%field_13222 -> forcedBiome
* OverworldChunkGeneratorConfig%field_13221 -> minY
* ServerWorld#method_18210(1) -> getSurface
* EnchantmentHelper#method_24365(3) -> getMatchingEquipment
* EnchantmentHelper#getMatchingEquipment(3) -> getMatchingEnchantedEquipment
* Update mappings/net/minecraft/block/BedBlock.mapping
Co-Authored-By: liach <7806504+liach@users.noreply.github.com>
* Update mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig.mapping
Co-Authored-By: liach <7806504+liach@users.noreply.github.com>
* Update mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig.mapping
Co-Authored-By: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-03-07 17:38:28 +00:00
ab47a6c0bc
bedrock floor/ceiling mappings
...
Supersedes #1121
Signed-off-by: liach <liach@users.noreply.github.com>
2020-03-07 17:36:39 +00:00
c552e79ea1
named and commented various seeding methods ( #1118 )
...
* named and commented various seeding methods
* finished commenting
* various changes
* fixed my bad spelling
* split paragraphs
* Update mappings/net/minecraft/world/gen/ChunkRandom.mapping
Co-Authored-By: Runemoro <runemoro1@gmail.com>
* Update mappings/net/minecraft/world/gen/ChunkRandom.mapping
Co-Authored-By: Runemoro <runemoro1@gmail.com>
* Update mappings/net/minecraft/world/gen/ChunkRandom.mapping
Co-Authored-By: Runemoro <runemoro1@gmail.com>
* Update mappings/net/minecraft/world/gen/ChunkRandom.mapping
Co-Authored-By: Runemoro <runemoro1@gmail.com>
* changed pos to block
Co-authored-by: Runemoro <runemoro1@gmail.com>
2020-03-05 23:59:17 +00:00
1b7aa91a4d
20w10a
...
bit of a big one
2020-03-04 20:22:46 +00:00
1d3ea3b886
fungi -> fungus ( #1136 )
2020-02-28 16:06:45 +00:00
8e7f7a8d35
20w09a
2020-02-26 17:56:39 +00:00
692f7fadd9
Random fixes ( #1109 )
...
* fiiiiiiiiiiixes
* revert for c2s packet
* "loot table" -> "table"
* juuxeled
2020-02-17 13:46:39 +00:00
3d99571478
Random worldgen things ( #1105 )
...
* Renamed StateProvider -> BlockStateProvider
It provides block states, and is registered in Registry.BLOCK_STATE_PROVIDER_TYPE.
Also closes #1037 .
* RuleTest -> RuleTestType, AbstractRuleTest -> RuleTest
Closes #1102 .
* RuleTest docs, TreeDecorator mappings
* Remove empty comment
2020-02-09 19:05:03 +00:00
eedc80b174
Add Feature mappings ( #1097 )
...
* add feature mappings
* update basalt mappings
* map missing feature name
* Add random parameters
Co-Authored-By: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2020-02-08 21:26:33 +00:00
e8a95c0d83
1.16 biome mappings ( #1088 )
...
* First pass of new biomes stuff
* Name MultiNoiseBiomeSource noise generators according to the names we chose
* Remove 2 2s
* rand -> random
2020-02-06 20:02:32 +00:00
9b88b3c3e8
20w06a
2020-02-05 17:27:03 +00:00
980c35338c
Hodgepodge mappings 1 ( #1075 )
...
Signed-off-by: liach <liach@users.noreply.github.com>
2020-01-29 14:02:51 +00:00
876eeae0e2
Carver mappings ( #1073 )
...
* Added seaLevel to Carver.carve
* More carver progress
* Finished? carver mappings
2020-01-24 10:12:19 +00:00
245ba5c444
Fixed #838 , #860 and unnamed deserializers ( #1040 )
...
* fixed things
* deserialize2 -> deserialize
2020-01-08 14:35:10 +00:00
4a1242d867
Fix some world gen mappings and map some unmapped stuff ( #1002 )
...
* Fix some mappings and map some unmapped stuff - world gen
* add a single javadoc comment
* edit jdoc
* liach requested changes
* liach's actual requested changes
2019-12-10 08:48:53 +02:00
89b749da2a
Update enigma for Javadoc support.
...
Mappings were re-written storing the inner classes at the end of the file.
2019-12-02 13:55:18 +00:00
8545f04438
Finish DefaultBiomeFeatures mappings and some other stuff ( #993 )
2019-12-02 13:48:38 +00:00
b3ce1dd168
more world gen mappings, fix some names, refactor some biome source related stuff ( #983 )
...
* more world gen mappings and fix some names
* update pr. refactor some stuff
2019-11-26 08:42:27 +00:00
ffb857ca3b
Map some mostly world gen stuff ( #975 )
...
* map some mostly world gen stuff
* suggested changes and be more consistent
* more tree stuff named and other stuff
* update field mapping to suggested
2019-11-24 10:52:54 +00:00
1075e2fd3f
46a new stuff ( #955 )
...
* 46a new stuff
Signed-off-by: liach <liach@users.noreply.github.com>
* render
Signed-off-by: liach <liach@users.noreply.github.com>
2019-11-13 19:59:16 +00:00
02908445ab
Mapped all top-level classes ( #934 )
...
* Mapped all top-level classes
No more obfuscated top-level class
Signed-off-by: liach <liach@users.noreply.github.com>
* Mapping inner classes (Still some left)
These to go:
net/minecraft/datafixers/fixes/LeavesFix$class_1192
net/minecraft/structure/NetherFortressGenerator$class_3404
net/minecraft/structure/OceanMonumentGenerator$class_3367
net/minecraft/structure/OceanMonumentGenerator$class_3368
net/minecraft/structure/OceanMonumentGenerator$class_3369
net/minecraft/structure/OceanMonumentGenerator$class_3370
net/minecraft/structure/OceanMonumentGenerator$class_3371
net/minecraft/structure/OceanMonumentGenerator$class_3372
net/minecraft/structure/OceanMonumentGenerator$class_3373
net/minecraft/structure/OceanMonumentGenerator$class_3375
net/minecraft/structure/OceanMonumentGenerator$class_3388
net/minecraft/structure/StrongholdGenerator$class_3427
net/minecraft/structure/StrongholdGenerator$class_3466
net/minecraft/structure/Structure$class_3500
net/minecraft/structure/WoodlandMansionGenerator$class_3478
Signed-off-by: liach <liach@users.noreply.github.com>
* Update StructurePoolBasedGenerator.mapping
* Fixes as suggested by @Runemoro
Signed-off-by: liach <liach@users.noreply.github.com>
2019-11-02 21:51:27 +00:00
bf6fdd7195
19w44a
2019-10-30 16:28:24 +00:00
faa40892e4
Foliage placer and block placer mappings ( #932 )
...
* Foliage placer, block placer, block state provider
* Fix
2019-10-30 14:21:39 +00:00
47a4de08b2
lots of world gen mappings ( #924 )
...
* lots of world gen mappings
* some changes
* move state providers to a new package
2019-10-30 14:21:17 +00:00
68328eddc5
Some new stuff ( #903 )
2019-10-09 20:35:45 +01:00
841e352c61
19w41a
2019-10-09 18:17:26 +01:00
b198b9c6ca
Merge #822
...
# Conflicts:
# mappings/net/minecraft/entity/LivingEntity.mapping
# mappings/net/minecraft/entity/mob/MobEntity.mapping
# mappings/net/minecraft/util/SystemUtil.mapping
2019-09-12 14:28:23 +01:00
6bcf8b8ce9
19w36a
2019-09-05 10:54:58 +01:00
80e8183975
Begin 19w34a mappings ( #828 )
...
* Begin 19w34a mappings
* more stuff
* More stuff
* stuff
* stuff again
* Update EntityRenderer.mapping
* x
* Finish mapping and modify BeeEntity, name string damagesource, map bee model
* Fix typo in class_1282 method 21748
* Update BeeEntity.mapping
* Update BeeHiveBlockEntity.mapping
* more stuff
2019-08-25 15:18:10 +00:00
23d9781b47
some more gen mappings and other stuff ( #819 )
...
* some gen mappings
* requested changes
2019-08-19 17:24:19 +01:00
618083791c
Fix some methods not using intermediaries ( #788 )
2019-07-08 18:09:22 +02:00
e20cfe9b0e
1.14.4-pre3
2019-07-08 13:27:46 +01:00
618de57dfb
1.14.4-pre2
2019-07-04 16:29:01 +01:00
ab32dae2fa
1.14.4-pre1
2019-07-03 20:50:19 +02:00
1a6f261a2e
The Great Intermediary Update, Part 1
2019-06-28 23:55:20 +02:00
b6ed693b8d
1.14.3-pre4
2019-06-19 20:24:08 +01:00
b27778997a
1.14.3-pre3
2019-06-19 18:48:53 +01:00
8554a5ae8c
1.14.3-pre2
2019-06-07 12:45:25 +01:00
bdbf125b33
1.14.3-pre1
2019-06-03 18:48:18 +02:00
8f058161f4
Add some obf classes and fix my snake case thing ( #685 )
...
Signed-off-by: liach <liach@users.noreply.github.com>
2019-05-07 23:48:24 +02:00
fa072139bf
1.14.1 Pre-Release 1
2019-05-07 17:05:49 +01:00
802650ea21
Removed enum constants were auto mapping works, added them where it does not. ( #663 )
2019-05-06 17:57:44 +01:00
de13dda07c
1.14 Pre-Release 5
2019-04-18 22:01:39 +01:00
782b07c692
1.14 Pre-Release 4
2019-04-17 17:41:25 +01:00
13943c582b
update to 1.14 Pre-Release 3
2019-04-16 17:51:03 +02:00
d59d0ed42f
Client mappings ( #620 )
2019-04-16 16:13:47 +02:00
4365e0f69a
Fix #615 ( #616 )
2019-04-16 16:12:45 +02:00
2fd19127ea
1.14 Pre-Release 2
2019-04-12 15:38:24 +01:00
b13686aed0
1.14 Pre-Release 1
2019-04-10 16:36:17 +01:00
5048461b98
Map remaining 19w14b classes ( #593 )
2019-04-07 09:05:39 +02:00
0e8b18ad3f
19w14b
2019-04-05 17:03:47 +01:00
6bc3deea2f
Merge branch 'pull/590' into 19w14a
...
# Conflicts:
# mappings/net/minecraft/entity/Entity.mapping
# mappings/net/minecraft/entity/mob/SlimeEntity.mapping
# mappings/net/minecraft/entity/passive/AbstractTraderEntity.mapping
# mappings/net/minecraft/entity/passive/VillagerEntity.mapping
2019-04-05 16:59:48 +01:00
i509VCB