From 280346cb0379f8644c9ae4df5183243b86ccce08 Mon Sep 17 00:00:00 2001 From: Ben Bridle Date: Wed, 6 Nov 2024 07:22:10 +1300 Subject: Fix source code merge order This commit updates bedrock-asm to v4.0.6, which fixes an issue where the root source unit of a project could sometimes be merged after library code, preventing the program from running correctly. --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c39b30d..0840c24 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,8 +77,8 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bedrock-asm" -version = "4.0.5" -source = "git+git://benbridle.com/bedrock_asm?tag=v4.0.5#72b44ea280abafc2e4708abafbd2415861427b80" +version = "4.0.6" +source = "git+git://benbridle.com/bedrock_asm?tag=v4.0.6#c211280e077703903d968f14e8c6699d9f728aa2" dependencies = [ "vagabond", "xflags", diff --git a/Cargo.toml b/Cargo.toml index 6080671..fc88310 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" description = "Emulator for running Bedrock programs" [dependencies] -bedrock-asm = { git = "git://benbridle.com/bedrock_asm", tag = "v4.0.5" } +bedrock-asm = { git = "git://benbridle.com/bedrock_asm", tag = "v4.0.6" } bedrock-core = { git = "git://benbridle.com/bedrock_core", tag = "v5.0.0" } phosphor = { git = "git://benbridle.com/phosphor", tag = "v3.1.0" } geometry = { git = "git://benbridle.com/geometry", tag = "v1.0.0" } -- cgit v1.2.3-70-g09d2