diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml index 89c539e1f2ed..89476b867de1 100644 --- a/.github/workflows/android_builds.yml +++ b/.github/workflows/android_builds.yml @@ -5,7 +5,7 @@ on: # Global Settings env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: 4.3 + GODOT_BASE_BRANCH: blazium-dev SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes concurrency: diff --git a/.github/workflows/godot_cpp_test.yml b/.github/workflows/godot_cpp_test.yml index 8c689734b7b7..dae45b5e7a8a 100644 --- a/.github/workflows/godot_cpp_test.yml +++ b/.github/workflows/godot_cpp_test.yml @@ -5,7 +5,7 @@ on: # Global Settings env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: 4.3 + GODOT_BASE_BRANCH: blazium-dev # Used for the godot-cpp checkout. GODOT_CPP_BRANCH: '4.2' diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml index 02609b2f03d6..85f3605c9c5d 100644 --- a/.github/workflows/ios_builds.yml +++ b/.github/workflows/ios_builds.yml @@ -5,7 +5,7 @@ on: # Global Settings env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: 4.3 + GODOT_BASE_BRANCH: blazium-dev SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes concurrency: diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index 34068ad9bd7c..f36bb4b62829 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -5,7 +5,7 @@ on: # Global Settings env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: 4.3 + GODOT_BASE_BRANCH: blazium-dev SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes DOTNET_NOLOGO: true DOTNET_CLI_TELEMETRY_OPTOUT: true diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index 1c12b7e3efd1..bbed6e99111b 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -5,7 +5,7 @@ on: # Global Settings env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: 4.3 + GODOT_BASE_BRANCH: blazium-dev SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes concurrency: diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml index 73358f3785ca..5a4caebc1eb1 100644 --- a/.github/workflows/web_builds.yml +++ b/.github/workflows/web_builds.yml @@ -5,7 +5,7 @@ on: # Global Settings env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: 4.3 + GODOT_BASE_BRANCH: blazium-dev SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no use_closure_compiler=yes EM_VERSION: 3.1.64 EM_CACHE_FOLDER: "emsdk-cache" diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml index a945bdca1050..d4b744569ade 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -6,7 +6,7 @@ on: # SCONS_CACHE for windows must be set in the build environment env: # Used for the cache key. Add version suffix to force clean build. - GODOT_BASE_BRANCH: 4.3 + GODOT_BASE_BRANCH: blazium-dev SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes d3d12=yes "angle_libs=${{github.workspace}}/" SCONS_CACHE_MSVC_CONFIG: true diff --git a/misc/dist/macos_tools.app/Contents/Info.plist b/misc/dist/macos_tools.app/Contents/Info.plist index d0a18c1006a0..90888719f85a 100644 --- a/misc/dist/macos_tools.app/Contents/Info.plist +++ b/misc/dist/macos_tools.app/Contents/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.3.1 + 4.3 CFBundleSignature godot CFBundleVersion - 4.3.1 + 4.3 NSMicrophoneUsageDescription Microphone access is required to capture audio. NSCameraUsageDescription diff --git a/misc/dist/windows/godot.iss b/misc/dist/windows/godot.iss index 0d9f6181438d..6ce51e4babdb 100644 --- a/misc/dist/windows/godot.iss +++ b/misc/dist/windows/godot.iss @@ -1,5 +1,5 @@ #define MyAppName "Godot Engine" -#define MyAppVersion "4.3.1" +#define MyAppVersion "4.3" #define MyAppPublisher "Godot Engine contributors" #define MyAppURL "https://godotengine.org/" #define MyAppExeName "godot.exe" diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj index 94f147b8bd03..74623a60ba6e 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj @@ -7,7 +7,7 @@ Godot Engine contributors Godot.NET.Sdk - 4.3.1 + 4.3.0 $(PackageVersion_Godot_NET_Sdk) https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk $(RepositoryUrl) diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj index 180145faafc2..1aa2979e76a5 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj @@ -9,7 +9,7 @@ Godot Engine contributors Godot.SourceGenerators - 4.3.1 + 4.3.0 $(PackageVersion_Godot_SourceGenerators) https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators $(RepositoryUrl) diff --git a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj index 23829fd35f3d..6b25087c93ac 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj @@ -17,7 +17,7 @@ Godot Engine contributors GodotSharp - 4.3.1 + 4.3.0 $(PackageVersion_GodotSharp) https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharp $(RepositoryUrl) diff --git a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj index a478570fc3f4..4561fdaf2b6f 100644 --- a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj @@ -15,7 +15,7 @@ Godot Engine contributors GodotSharpEditor - 4.3.1 + 4.3.0 $(PackageVersion_GodotSharp) https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharpEditor $(RepositoryUrl) diff --git a/version.py b/version.py index 7fae022b0bd2..cda413395cc3 100644 --- a/version.py +++ b/version.py @@ -2,8 +2,8 @@ name = "Blazium Engine" major = 4 minor = 3 -patch = 1 -status = "rc" +patch = 0 +status = "stable" module_config = "" website = "https://blazium.app" docs = "4.3"