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

[pull] develop from LiteLDev:develop #1

Open
wants to merge 737 commits into
base: develop
Choose a base branch
from

Conversation

pull[bot]
Copy link

@pull pull bot commented Feb 13, 2024

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

zimuya4153 and others added 25 commits August 5, 2024 21:53
# Conflicts:
#	src/mc/client/services/persona/ArmSize.h
#	src/mc/deps/core/common/bedrock/Diagnostics.h
#	src/mc/deps/core/mce/Blob.h
#	src/mc/deps/core/mce/Color.h
#	src/mc/deps/core/mce/Image.h
#	src/mc/deps/core/sem_ver/SemVersion.h
#	src/mc/deps/core/string/HashedString.h
#	src/mc/deps/core/threading/TaskStatus.h
#	src/mc/deps/core/utility/BinaryStream.h
#	src/mc/deps/json/Value.h
#	src/mc/deps/raknet/AddressOrGUID.h
#	src/mc/deps/raknet/SystemAddress.h
#	src/mc/entity/systems/EntitySystems.h
#	src/mc/gametest/framework/GameTestBatch.h
#	src/mc/math/Vec3.h
#	src/mc/nbt/ByteArrayTag.h
#	src/mc/nbt/ByteTag.h
#	src/mc/nbt/CompoundTag.h
#	src/mc/nbt/CompoundTagVariant.h
#	src/mc/nbt/FloatTag.h
#	src/mc/nbt/IntArrayTag.h
#	src/mc/nbt/IntTag.h
#	src/mc/nbt/ListTag.h
#	src/mc/nbt/StringTag.h
#	src/mc/network/NetworkPeer.h
#	src/mc/network/packet/ScorePacketInfo.h
#	src/mc/network/packet/TextPacket.h
#	src/mc/server/ServerPlayer.h
#	src/mc/server/commands/CommandBlockNameResult.h
#	src/mc/server/commands/CommandContext.h
#	src/mc/server/commands/CommandOutput.h
#	src/mc/server/commands/CommandParameterData.h
#	src/mc/server/commands/CommandPosition.h
#	src/mc/server/commands/CommandRegistry.h
#	src/mc/server/commands/MinecraftCommands.h
#	src/mc/server/commands/RelativeFloat.h
#	src/mc/server/commands/RotationData.h
#	src/mc/util/BytesDataInput.h
#	src/mc/util/BytesDataOutput.h
#	src/mc/util/ExpressionNode.h
#	src/mc/util/Random.h
#	src/mc/util/molang/MolangScriptArg.h
#	src/mc/world/Container.h
#	src/mc/world/actor/Actor.h
#	src/mc/world/effect/MobEffectInstance.h
#	src/mc/world/item/ItemStackBase.h
#	src/mc/world/item/registry/ItemStack.h
#	src/mc/world/level/BlockPos.h
#	src/mc/world/level/BlockSource.h
#	src/mc/world/level/IConstBlockSource.h
#	src/mc/world/level/Level.h
#	src/mc/world/level/biome/source/FixedBiomeSource.h
#	src/mc/world/level/block/ComposterBlock.h
#	src/mc/world/level/block/registry/BlockTypeRegistry.h
#	src/mc/world/level/chunk/StructureAnimationAction.h
#	src/mc/world/level/dimension/Dimension.h
#	src/mc/world/level/dimension/OverworldDimension.h
#	src/mc/world/level/levelgen/VoidGenerator.h
#	src/mc/world/level/levelgen/WorldGenerator.h
#	src/mc/world/level/levelgen/feature/IFeature.h
#	src/mc/world/level/levelgen/feature/registry/FeatureRegistry.h
#	src/mc/world/level/levelgen/flat/FlatWorldGenerator.h
#	src/mc/world/level/levelgen/structure/VillageFeature.h
#	src/mc/world/level/levelgen/v1/NetherGenerator.h
#	src/mc/world/level/levelgen/v1/OverworldGenerator.h
#	src/mc/world/level/levelgen/v1/OverworldGenerator2d.h
#	src/mc/world/level/levelgen/v1/OverworldGeneratorMultinoise.h
#	src/mc/world/level/levelgen/v1/TheEndGenerator.h
#	src/mc/world/level/pathfinder/Path.h
#	src/mc/world/level/saveddata/maps/MapDecoration.h
#	src/mc/world/level/storage/GameRule.h
#	src/mc/world/level/storage/GameRules.h
#	src/mc/world/level/storage/LevelStorage.h
#	src/mc/world/phys/AABB.h
#	src/mc/world/phys/HitResult.h
#	src/mc/world/scores/Scoreboard.h
#	test/include_all.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.