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

chore: 1.0.0-rc.3 #1615

Merged
merged 22 commits into from
Jan 12, 2025
Merged

chore: 1.0.0-rc.3 #1615

merged 22 commits into from
Jan 12, 2025

Conversation

Lovelylavender4
Copy link
Member

No description provided.

OEOTYAN and others added 21 commits January 7, 2025 20:10
# Conflicts:
#	src/mc/world/level/block/states/BlockStateInstance.h
# Conflicts:
#	src/mc/common/SharedPtr.h
#	src/mc/common/WeakPtr.h
#	src/mc/deps/application/common/utility/ThreadOwnerBase.h
#	src/mc/deps/core/container/MovePriorityQueue.h
#	src/mc/deps/core/container/list_base_hook.h
#	src/mc/deps/core/file/Path.h
#	src/mc/deps/core/file/PathBuffer.h
#	src/mc/deps/core/file/PathPart.h
#	src/mc/deps/core/string/HashedString.h
#	src/mc/deps/core/threading/IAsyncResult.h
#	src/mc/deps/core/threading/SPSCQueue.h
#	src/mc/deps/core/threading/TaskStartInfoEx.h
#	src/mc/deps/core/utility/AutomaticID.h
#	src/mc/deps/core/utility/BinaryStream.h
#	src/mc/deps/core/utility/NonOwnerPointer.h
#	src/mc/deps/core/utility/ServiceReference.h
#	src/mc/deps/core/utility/buffer_span.h
#	src/mc/deps/core/utility/optional_ref.h
#	src/mc/deps/core/utility/typeid_t.h
#	src/mc/deps/ecs/Optional.h
#	src/mc/deps/game_refs/EnableGetWeakRef.h
#	src/mc/deps/game_refs/OwnerPtr.h
#	src/mc/deps/game_refs/StackRefResult.h
#	src/mc/deps/game_refs/WeakRef.h
#	src/mc/nbt/CompoundTag.h
#	src/mc/nbt/CompoundTagVariant.h
#	src/mc/platform/ErrorInfo.h
#	src/mc/platform/Result.h
#	src/mc/platform/brstd/function_ref.h
#	src/mc/platform/threading/LockGuard.h
#	src/mc/platform/threading/ThreadLocalObject.h
#	src/mc/server/commands/CommandRegistry.h
#	src/mc/server/commands/CommandSelector.h
#	src/mc/server/commands/CommandSelectorResults.h
#	src/mc/server/commands/WildcardCommandSelector.h
#	src/mc/util/BidirectionalUnorderedMap.h
#	src/mc/util/GridArea.h
#	src/mc/util/MolangLoopBreak.h
#	src/mc/util/MolangLoopContinue.h
#	src/mc/util/MolangScriptArg.h
#	src/mc/util/MultidimensionalArray.h
#	src/mc/util/NewType.h
#	src/mc/util/OwnerPtrFactory.h
#	src/mc/util/ThreadOwner.h
#	src/mc/world/TypedRuntimeId.h
#	src/mc/world/actor/selectors/InvertableFilter.h
#	src/mc/world/events/EventListenerDispatcher.h
#	src/mc/world/inventory/network/TypedClientNetId.h
#	src/mc/world/inventory/network/TypedServerNetId.h
#	src/mc/world/level/DividedPos2d.h
#	src/mc/world/level/block/ActorBlockBase.h
#	src/mc/world/level/block/states/BlockStateVariant.h
#	src/mc/world/level/block/states/BuiltInBlockStateVariant.h
#	src/mc/world/level/chunk/SubChunkStorage.h
ShrBox
ShrBox previously approved these changes Jan 12, 2025
(cherry picked from commit 69ec9f6)
@Lovelylavender4 Lovelylavender4 merged commit cf3c579 into release Jan 12, 2025
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants