Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

23w51b yet more stuff #3756

Merged
merged 3 commits into from
Dec 25, 2023
Merged

Conversation

apple502j
Copy link
Contributor

Conflict to be resolved later

@apple502j apple502j added refactor A PR that renames existing names. new A PR that maps mainly new names snapshot A PR that targets a snapshot version of Minecraft labels Dec 19, 2023
…-yet-more-stuff

# Conflicts:
#	mappings/net/minecraft/block/Fertilizable.mapping
#	mappings/net/minecraft/client/Mouse.mapping
#	mappings/net/minecraft/client/gui/hud/ChatHud.mapping
#	mappings/net/minecraft/client/gui/hud/InGameHud.mapping
#	mappings/net/minecraft/client/gui/screen/TitleScreen.mapping
#	mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping
#	mappings/net/minecraft/client/network/ServerInfo.mapping
#	mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping
#	mappings/net/minecraft/client/util/ParticleUtil.mapping
#	mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping
#	mappings/net/minecraft/entity/mob/PiglinEntity.mapping
#	mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping
#	mappings/net/minecraft/entity/mob/ZombieEntity.mapping
#	mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping
#	mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping
#	mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping
#	mappings/net/minecraft/entity/passive/ChickenEntity.mapping
#	mappings/net/minecraft/entity/passive/CowEntity.mapping
#	mappings/net/minecraft/entity/passive/FoxEntity.mapping
#	mappings/net/minecraft/entity/passive/HorseEntity.mapping
#	mappings/net/minecraft/entity/passive/LlamaEntity.mapping
#	mappings/net/minecraft/entity/passive/PandaEntity.mapping
#	mappings/net/minecraft/entity/passive/TurtleEntity.mapping
#	mappings/net/minecraft/entity/player/PlayerEntity.mapping
#	mappings/net/minecraft/item/map/MapState.mapping
#	mappings/net/minecraft/server/function/FunctionBuilder.mapping
#	mappings/net/minecraft/server/function/Macro.mapping
#	mappings/net/minecraft/world/WorldEvents.mapping
#	mappings/net/minecraft/world/WorldSaveHandler.mapping
@apple502j
Copy link
Contributor Author

Conflict resolved, @Shnupbups please make sure to SCREAM.

Copy link
Contributor

@Shnupbups Shnupbups left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, sorry about all the forgetting to use SCREAMING_SNAKE_CASE, I must have been really tired haha. I think with the babyDimensions ones specifically I just started with the AbstractDonkeyEntity one, which isn't static final for some reason and thus camelCase is fine, and assumed others would be the same without looking closely. As for the dateTimeFormatter one... that was just extra sloppy on my part haha.

@apple502j apple502j requested a review from Shnupbups December 21, 2023 07:01
@Shnupbups Shnupbups merged commit 302d5a0 into FabricMC:23w51b Dec 25, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new A PR that maps mainly new names refactor A PR that renames existing names. snapshot A PR that targets a snapshot version of Minecraft
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants