Commit Graph

431 Commits

Author SHA1 Message Date
Reece Dunham 0343be4ba1
Lots of new mappings (#1504)
* Lots of new mappings

* Apply suggestions from code review

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-12-17 20:03:06 +00:00
Caroline Joy Bell 10e3fa8191
Mapped most of the Entity Model classes (#1709)
* Mapped most of the Entity Model classes

* Update mappings/net/minecraft/client/render/entity/model/IllagerEntityModel.mapping

Co-authored-by: YanisBft <doublecraft.official@gmail.com>

* Addressed some of Yanis' concerns

* Apparently this is anatomically correct, according to Haykam.

Included a JavaDoc for anyone who is not familiar with Turtle anatomy.

* Restored LargePufferfishEntityModel.mapping

* Better?

* Revert "extra" removals

* Mapped one (redundant, probably used for debug) field

* Accept haykam's change: tail -> legs

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

* Accept haykam's change: feet -> foot

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

Co-authored-by: YanisBft <doublecraft.official@gmail.com>
Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>
2020-12-17 20:01:24 +00:00
LambdAurora f8e60ee65d
Backport of latest 1.15.2 mappings back to 1.14.4. (#1094)
Co-authored-by: Chloe Dawn <chloealexisdawn@outlook.com>
Co-authored-by: Chocohead <Chocohead@users.noreply.github.com>
Co-authored-by: Cloak-Bot <57413759+Cloak-Bot@users.noreply.github.com>
Co-authored-by: Dan <cccm5@users.noreply.github.com>
Co-authored-by: Danielshe <daniel@shedaniel.me>
Co-authored-by: DrMeepster <19316085+DrMeepster@users.noreply.github.com>
Co-authored-by: Draylar <samuelhimes@gmail.com>
Co-authored-by: Erlend Åmdal <erlend@aamdal.com>
Co-authored-by: Fudge <natan.lifsiz@gmail.com>
Co-authored-by: Gareth Williams <840990+Gaz492@users.noreply.github.com>
Co-authored-by: Joseph Burton <burtonjae@hotmail.co.uk>
Co-authored-by: João <12478030+YummyLoop@users.noreply.github.com>
Co-authored-by: Julian Dunskus <julian.dunskus@gmail.com>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: Juuxel <kasperi.kauppi@gmail.com>
Co-authored-by: LambdAurora <aurora42lambda@gmail.com>
Co-authored-by: Laura F. D <eyesismine@gmail.com>
Co-authored-by: Laura F. D <l@veriny.tf>
Co-authored-by: Laura S. D <l@veriny.tf>
Co-authored-by: Mikhail Oleynikov <falseresync@gmail.com>
Co-authored-by: Mitchell Skaggs <skaggsm333@gmail.com>
Co-authored-by: Modmuss50 <modmuss50@gmail.com>
Co-authored-by: NeunEinser <daniel30797@gmail.com>
Co-authored-by: NinjaPhenix <NinjaPhenix@users.noreply.github.com>
Co-authored-by: Pyrofab <redstoneinfire@gmail.com>
Co-authored-by: Ramid Khan <ramidzkh@gmail.com>
Co-authored-by: Runemoro <runemoro1@gmail.com>
Co-authored-by: Runemoro <runemoro@live.ca>
Co-authored-by: SPGoding <SPGoding@outlook.com>
Co-authored-by: Shnupbups <shnupbups@gmail.com>
Co-authored-by: Siphalor <Siphalor@users.noreply.github.com>
Co-authored-by: Stuff-Stuffs <stevenziehlke@gmail.com>
Co-authored-by: SuperCoder79 <k.pranav@gmail.com>
Co-authored-by: Tae Lim Kook <uruwi@protonmail.com>
Co-authored-by: UpcraftLP <10714589+UpcraftLP@users.noreply.github.com>
Co-authored-by: Valoeghese <valoeghesemods@gmail.com>
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
Co-authored-by: biom4st3r <37042156+biom4st3r@users.noreply.github.com>
Co-authored-by: comp500 <comp500@users.noreply.github.com>
Co-authored-by: grondag <grondag@users.noreply.github.com>
Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>
Co-authored-by: howtonotwin <rasheeqhere@gmail.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
Co-authored-by: prplz <mhiming@gmail.com>
Co-authored-by: qouteall <45908579+qouteall@users.noreply.github.com>
Co-authored-by: shedaniel <daniel@shedaniel.me>
Co-authored-by: therealfarfetchd <git@therealfarfetchd.dev>
Co-authored-by: valoeghese <46117728+valoeghese@users.noreply.github.com>
Co-authored-by: ­Sollace <Sollace@users.noreply.github.com>
2020-02-16 20:32:39 +00:00
­Sollace 093d7f91c1 Item entity mappings (#796)
* method_6980 -> setCreativeDespawnTime

* method_20397 -> canMerge

* method_6974 -> applyBuoyancy

* method_6976 -> setCovetedItem

* method_6987 -> setDespawnImmediately
2019-08-03 23:47:19 +01:00
Shnupbups 4243e9813b Mapped lots of random things (#794)
* Stuff

* more stuff

* even more stuff

* removed an accidental thing

* stuff 4: electric boogaloo

* Update BlockState.mapping

* Stuff VI: The Search for Stuff V

* Update NativeImage.mapping

* removed things already mapped by Rune's PR

Namely `net/minecraft/realms/YesNoScreen' (`com/mojang/realmsclient/gui/screens/RealmsConfirmScreen` in Rune's PR), `net/minecraft/realms/RealmsError' (`com/mojang/realmsclient/client/RealmsError` in Rune's PR), and `net/minecraft/realms/InvalidClientScreen' (`com/mojang/realmsclient/gui/screens/RealmsClientOutdatedScreen` in Rune's PR).

* Stuff: The Final Stuffening

* Stuff: Revengeance

* Stuff Episode IX: Endgame
2019-07-31 15:20:12 +01:00
­Sollace 8f369ff52e Entity control mappings (#778)
Co-Authored-By: liach <7806504+liach@users.noreply.github.com>
2019-07-16 20:22:47 +02:00
quaternary 5348cc0cfa Smol potion stuff (#775) 2019-07-14 09:17:06 +02:00
modmuss50 69808e7f6c 1.14.4-pre4 2019-07-10 14:32:43 +01:00
liach 08dc88d859 Mapped some non-realms stuff (#782) 2019-07-10 08:52:57 +02:00
Runemoro 618083791c Fix some methods not using intermediaries (#788) 2019-07-08 18:09:22 +02:00
modmuss50 e20cfe9b0e 1.14.4-pre3 2019-07-08 13:27:46 +01:00
modmuss50 618de57dfb 1.14.4-pre2 2019-07-04 16:29:01 +01:00
Adrian Siekierka ab32dae2fa 1.14.4-pre1 2019-07-03 20:50:19 +02:00
Adrian Siekierka 30dc644d22 update Enigma, Stitch; drop unnecessary enum mappings 2019-06-29 09:49:26 +02:00
Adrian Siekierka 4be1c27c10 merge missing 1.14.3-pre2 mappings; update Enigma to fix save NPE 2019-06-29 00:43:29 +02:00
Adrian Siekierka 1a6f261a2e The Great Intermediary Update, Part 1 2019-06-28 23:55:20 +02:00
liach ee0c22d08b Mapped two unmapped classes and some villager stuff (#758)
* Mapped two unmapped classes and some villager stuff

Signed-off-by: liach <liach@users.noreply.github.com>

* optimize name

Signed-off-by: liach <liach@users.noreply.github.com>
2019-06-23 18:55:59 +01:00
modmuss50 b6ed693b8d 1.14.3-pre4 2019-06-19 20:24:08 +01:00
modmuss50 b27778997a 1.14.3-pre3 2019-06-19 18:48:53 +01:00
­Sollace 57f9d99fc1 EntitySize -> EntityDimensions (#745)
* EntitySize -> EntityDimensions

* resizeable -> changing

* constant -> fixed (fite me)

* x/z -> width/height

* EntityType.setSize -> setDimensions

* Entity.getSize -> getDimensions

* EnderDragonPart.partSize -> partDimensions

* PlayerEntity.STANDING_SIZE -> STANDING_DIMENSIONS

* LivingEntity.SLEEPING_SIZE -> SLEEPING_DIMENSIONS

* PlayerEntity.SIZES -> POSE_DIMENSIONS (POSTURES?)

* EntityType.size -> dimensions

* Entity.size -> dimensions

* EntityType.getDefaultSize -> getDimensions

* Entity.refreshSize -> calculateDimensions

* getActiveEyeHeight(pose,size) -> getActiveEyeHeight(pose,dimensions)
2019-06-18 13:05:31 +01:00
Adrian Siekierka 3fae250684 take care of #730 2019-06-14 11:57:55 +02:00
modmuss50 8554a5ae8c 1.14.3-pre2 2019-06-07 12:45:25 +01:00
Chloe Dawn 510f8cbc08 Text refactoring + related mappings (#737)
* Text refactoring + related mappings

* Add a more explicit name for the truncated string getter

* Move Formatting to util package and fully map members

* Advancement#toHoverableText

* Correct mappings in ScoreboardObjective

* Various changes in NbtText and subclasses

* JSONREADER -> JSON_READER

* Shorten TranslatableText argument getter to getArg

* Cleanup mappings in Difficulty class

* Fix Style$Serializer#deserialize json parameter name

* Cleanup some field names in TranslatableText

* More changes to NbtText

* Fix incorrect method name in Texts

* toGreenText -> join

* Use more semantically correct name joinOrdered

* Fix method name in Entity

* Actually fix the method names.. derp
2019-06-07 12:18:04 +01:00
NeunEinser 4419bb5811 Some new 1.14.3 mappings (#731) 2019-06-06 21:37:03 +02:00
Adrian Siekierka bdbf125b33 1.14.3-pre1 2019-06-03 18:48:18 +02:00
Chloe Dawn bb90607728 Item refactoring (#712) 2019-06-03 18:42:18 +02:00
Yanis48 86b6ca3940 Class renamings, mainly entity-related (#720)
* renamings

* tnt minecart entity
2019-06-02 20:35:57 +01:00
Adrian Siekierka 1f9f42e6dd 1.14.2 Pre-Release 3 2019-05-22 16:06:46 +02:00
Adrian Siekierka 7d5de74139
Block.isOpaque, Phase tick mappings (#708) 2019-05-18 21:45:50 +02:00
Yanis48 3abd72da61 Various entity renderer & model mappings (#707) 2019-05-18 13:23:23 +02:00
modmuss50 b60e6e7e6c 1.14.2 Pre-Release 1 2019-05-16 17:28:41 +01:00
howtonotwin ea55a3db01 Name some stuff in and around BoatEntity (#702) 2019-05-16 17:25:06 +01:00
modmuss50 60e13d70f8 Revert 2 bad renames, and downgrade enigma 2019-05-14 12:05:39 +01:00
Chloe Dawn 7a61325ce6 getEntityWorld -> getWorld (#696) 2019-05-13 15:35:00 +01:00
Adrian Siekierka 7290b5ae14 1.14.1 Pre-Release 2 2019-05-09 17:00:37 +02:00
NeunEinser 86634d3461 some new 1.14.1-pre1 stuff (#686) 2019-05-07 23:48:07 +02:00
modmuss50 fa072139bf 1.14.1 Pre-Release 1 2019-05-07 17:05:49 +01:00
tyra 6178ac86fc Update LlamaEntity.mapping (#684)
Adds mappings for two more methods
2019-05-07 16:57:34 +01:00
Runemoro 892d4afb41 FIx issues (#680)
* FIx misnamed things

* Game options and mysterious setblockstate boolean

* a

* Remove duplicate class, remove enum constant from Unit
2019-05-07 15:21:22 +01:00
NeunEinser e375b99270 Entity mappings (#657)
* Entity mapping modifications

* Entity mapping renames

* improvements

* xp -> experience, Snowgolem -> SnowGolem, spitout -> spitOut, lastLeveledUp -> lastPlayedLevelUpSoundTime, missed an instance of targetting

* Rename SnowgolemEntity.mapping to SnowGolemEntity.mapping

Stupid file system doesn't make a difference between cases.

* touchingLava -> inLava, touchLava() - setInLava()

* putOnTopmostSolidBlock -> afterSpawn

* owner -> actor, other improvements

* Actors are evil. Or something.

* Missed some actors, reverted stuff that's now part of #663

* isInfestableBlock -> isInfestable

* getRegularBlock(BlockState) ->fromRegularBlock

Another method with inverse logic in that class.

* use method name from main branch for surface collision
2019-05-07 12:19:00 +01:00
NeunEinser 802650ea21 Removed enum constants were auto mapping works, added them where it does not. (#663) 2019-05-06 17:57:44 +01:00
quaternary b0db177b4f Lots of fields, methods, params relating to blocks and their internals (#651)
* Lots of fields, methods, params relating to blocks and their internals

* Woops

* More STUFF! 😱

* Woops 2 electric boogaloo

* Minor text fix with pistons

* Reviews

* Map Block#n and friends

* Reviews

* 💩

* snowman -> snow golem

* Consistification with wither skull

* s/nt//

* rightChest/leftChest... might be backwards?
2019-05-05 23:31:29 +01:00
Chloe Dawn 6873106509 VerticalEntityPosition -> EntityContext (#669) 2019-05-05 23:23:57 +01:00
Adrian Siekierka 465a1e3701
entity renderer naming consistency fixes (#653) 2019-04-29 08:54:17 +02:00
Runemoro f8505bdd1c Map the new 1.14 classes (#646) 2019-04-24 23:19:40 +02:00
Runemoro ca0680d8ca Item mappings (#641)
* Item mappings

* shouldCheckIfStateAllowsPlacement

* canBeLit
2019-04-23 14:47:50 +01:00
Pyrofab a4d9672e02 Made a few needed changes based on open issues (#645)
* Rename LivingEntity#attack, fixes #482

* Rename ItemCooldownManager#isCooldown, fixes #488

* Rename StringItem, fixes #525

* Rename *riddenEntity to *vehicle, closes #589

* Rename PlayerMoveServerMessage, closes #623

* Disambiguate Rotation, fixes #630

* Distinguish rotation classes more

* Revert to BlockRotation
2019-04-23 14:47:15 +01:00
modmuss50 de13dda07c 1.14 Pre-Release 5 2019-04-18 22:01:39 +01:00
NeunEinser b948925b87 A few new pre-4 mappings (#633)
* A few new pre-4 mappings

* typo

* Update and rename ItemOminousBannerTranslataionKeyRenameFix.mapping to ItemOminousBannerTranslationKeyRenameFix.mapping

* Improvements + some parameter names for CartographyTableContainer
2019-04-18 21:51:33 +01:00
Runemoro 4ce0451a0a Block mappings (#638)
* Block mappings

* upddate -> update

* maxFrostedIceNeighborCount -> maxNeighbors

* tickViewerCount
2019-04-18 21:50:55 +01:00
modmuss50 782b07c692 1.14 Pre-Release 4 2019-04-17 17:41:25 +01:00
Runemoro 4aa3c17b17 A few mappings (#631)
* A few mappings

* Suggestions by liach

* Improvements

* Add methods from liach's PR

* make -> get to match others

* get -> create for methods that create tasks
2019-04-17 17:23:22 +01:00
Adrian Siekierka 13943c582b update to 1.14 Pre-Release 3 2019-04-16 17:51:03 +02:00
NeunEinser 4ef4dc3e8d Command Mappings, mostly arguments and some missing methods/inner classes (#613) 2019-04-16 16:17:28 +02:00
Runemoro 4b82d7412a Misc mappings (#621) 2019-04-16 16:16:45 +02:00
Runemoro d59d0ed42f Client mappings (#620) 2019-04-16 16:13:47 +02:00
liach eca8dc8f6e Some updated raid mappings (#617) 2019-04-16 16:13:03 +02:00
SquidDev 616683e536 A couple more methods for CommandBlockExecutor (#612) 2019-04-14 10:55:58 +02:00
modmuss50 2fd19127ea 1.14 Pre-Release 2 2019-04-12 15:38:24 +01:00
modmuss50 dcf1bdca01 Merge branch 'pull/607' into 1.14_Pre-Release_1
# Conflicts:
#	mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping
2019-04-12 15:20:28 +01:00
liach a4de6322db Map some poi and village stuff (#604)
* Map some poi and village stuff

Signed-off-by: liach <liach@users.noreply.github.com>

* Update based on suggestion
traderrecipe -> tradeoffer

Signed-off-by: liach <liach@users.noreply.github.com>
2019-04-12 15:16:50 +01:00
SquidDev 6216cbc25c Map a collection of random methods (#608) 2019-04-12 15:16:19 +01:00
Runemoro ffdab84e79 Client mappings (#609)
* Client mappings

* Update BlockLeakParticle.mapping

* Update NativeImage.mapping
2019-04-12 15:15:55 +01:00
Runemoro 7bedd4cd9f Map all commands and argument types 2019-04-11 01:58:54 -04:00
modmuss50 b13686aed0 1.14 Pre-Release 1 2019-04-10 16:36:17 +01:00
Runemoro 6bb2ca352f Entity mappings (#595)
* Entity mappings

* More mappings

* A few more names

* More entity mappings

* Update CompositeTask.mapping
2019-04-10 15:34:04 +01:00
liach 94b94160ea Some mappings for 19w14b (#592)
* Some mappings

Map render distance center packet and fix revenge target selection goal

Signed-off-by: liach <liach@users.noreply.github.com>

* More mappings along entities, etc.

Signed-off-by: liach <liach@users.noreply.github.com>

* Save mappings again

Signed-off-by: liach <liach@users.noreply.github.com>

* Fixes a few mappings

Signed-off-by: liach <liach@users.noreply.github.com>
2019-04-10 12:36:55 +01:00
Uriel Salischiker ac757c350a Mappings for some files (#600) 2019-04-07 12:07:33 +02:00
modmuss50 0e8b18ad3f 19w14b 2019-04-05 17:03:47 +01:00
modmuss50 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
liach e2c9a5c337 A few mappings around villagers (#587)
* A few mappings around villagers

Signed-off-by: liach <liach@users.noreply.github.com>

* Update VillagerEntity.mapping

did enigma broke
2019-04-05 16:56:48 +01:00
Yanis48 1d2960ebe7 A few random mappings (#583)
* my little mappings

* plural methods
2019-04-05 16:56:01 +01:00
Sargun Vohra 046e93f136 Mostly EntityType stuff, plus a bit of slime stuff (#588) 2019-04-05 13:58:14 +02:00
Runemoro fca78f74f4 More mappings 2019-04-04 18:04:19 -04:00
Runemoro 8fb75cc949 Entity mappings 2019-04-04 16:04:27 -04:00
modmuss50 845be1d2ec 19w14a 2019-04-03 17:16:41 +01:00
modmuss50 90190d1843 Merge branch 'pull/580' into 19w13b
# Conflicts:
#	mappings/net/minecraft/world/EntityView.mapping
2019-04-03 16:46:13 +01:00
modmuss50 087ce6de98 Merge branch 'pull/579' into 19w13b
# Conflicts:
#	mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping
#	mappings/net/minecraft/world/EntityView.mapping
2019-04-03 16:45:44 +01:00
Sargun Vohra dcf0691315 Make AI task lifecycle easier to understand (#581) 2019-04-03 16:43:23 +01:00
Jonathan Frederick d4d42f2976 TargetPredicate + Misc mappings (#577)
* TargetPredicate: Add some argument mappings

* MobSpawnerLogic: Add method mappings

* EntityPredicates: Add getBottommostEntity mapping

If anyone has a better name please let me know

* LivingEntity: Add mapping for teleport method

* AnimalMateGoal: add some mappings

* AvoidGoal: add setMobEntityTarget mapping

* FleeEntityGoal: add many mappings

* FollowTargetGoal: Add many mappings

* IronGolemLookGoal: Add mappings

* TrackTargetGoal: Add argument mapping

* WolfBegGoal: Add mappings

This also changes an incorrect mapping

* EndermanEntity: Add many mappings

* MobEntity: Add looking and angle mappings

* EntityView: Add a bunch of mappings

* MobSpawnerLogic: Add playerInRange method

* CreeperEntity: add some mappings

* Explosion: map DestructionType

* Add various entity mappings

* DolphinEntity: Clarify field

* HorseBaseEntity: add pathToAdult method

* PandaEntity: add some mappings

* TurtleEntity: Add some mappings

* RaiderEntity: Add some mappings

* Describe ALL of the predicates!

I've tried to give each predicate a descriptive name, instead of just naming all
of them, "targetPredicate"

* Fixup names of some mappings

* AvoidGoal: Use better predicate name

* FleeEntityGoal: Use better predicate name, more mappings
2019-04-03 16:43:01 +01:00
Runemoro 4ebfe3c891 Rendering mappings 2019-03-31 20:45:27 -04:00
modmuss50 f6fbfeffd8 Merge branch 'pull/576' into 19w13b
# Conflicts:
#	mappings/net/minecraft/server/command/ParticleCommand.mapping
2019-03-31 15:23:26 +01:00
liach 6e44cd7dc6 Random mappings around projectiles etc (#575)
Signed-off-by: liach <liach@users.noreply.github.com>
2019-03-31 15:11:51 +01:00
gegy1000 b8e424d707 Cat and Ocelot mapping 2019-03-31 16:06:27 +02:00
Runemoro 1458a5ce72 More mappings 2019-03-31 07:34:42 -04:00
Runemoro 2337da5579 More mappings 2019-03-31 07:15:05 -04:00
Sargun Vohra 791ef4f5e5 Some player stuff (#574)
* Some player stuff

* Update LivingEntity.mapping
2019-03-30 11:06:24 +02:00
modmuss50 0580b466fb 19w13b 2019-03-29 16:19:26 +00:00
Runemoro 4c16cbb961 Merge remote-tracking branch 'upstream/19w13a' into s 2019-03-29 03:39:49 -04:00
Runemoro a1438d1316 Fixes + more names 2019-03-29 03:36:11 -04:00
Runemoro dc3213335d 19w13a mappings 2019-03-29 03:04:08 -04:00
liach b418a046f0 Some stuff about trading and villages (#563)
* Some stuff about trading and villages

Signed-off-by: liach <liach@users.noreply.github.com>

* A few more random mappings

Signed-off-by: liach <liach@users.noreply.github.com>
2019-03-29 00:37:29 +00:00
liach f9e67cc711 I love raids! (#562)
* I love raids!

Signed-off-by: liach <liach@users.noreply.github.com>

* Fix spawn more groups name

Signed-off-by: liach <liach@users.noreply.github.com>
2019-03-28 19:07:49 +00:00
Pyrofab 1ba89c7d1f Finish mapping Brain (#561) 2019-03-28 09:33:27 +02:00
modmuss50 53620837bf 19w13a 2019-03-27 18:35:10 +00:00
Runemoro c67d269dfd Entity mappings (#554)
* Entity mappings

* Update ZombiePigmanEntity.mapping

* Improvements

* Update ProjectileUtil.mapping

* More names
2019-03-27 17:54:42 +00:00
Sargun Vohra 672b1f4d70 Map some xp/loot drop stuff (#556)
* Map some xp/loot drop stuff

* Update KilledByPlayerLootCondition.mapping
2019-03-26 12:22:55 +02:00
Blake Redenius 106c733e04 Map mostly static ArgumentType methods, and a PlayerInventory field. (#550)
* Mappings for the static getArgument ArgumentType methods.

* This field is set to a list of every item list that makes up the players inventory.
2019-03-22 17:56:19 +02:00
modmuss50 6d38740b83 19w12b 2019-03-21 18:06:36 +00:00
modmuss50 8339dfb381 Merge branch 'pull/546' into 19w12a
# Conflicts:
#	mappings/net/minecraft/entity/ai/brain/Brain.mapping
2019-03-21 17:29:44 +00:00