From fd902542ac5231a8678b6de444af651349943467 Mon Sep 17 00:00:00 2001
From: nikitalita <69168929+nikitalita@users.noreply.github.com>
Date: Fri, 4 Aug 2023 19:49:59 -0700
Subject: [PATCH] Pin on 4.1.1

---
 .github/workflows/all_builds.yml | 2 +-
 README.md                        | 2 +-
 compat/texture_loader_compat.h   | 1 -
 editor/gdre_editor.cpp           | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/all_builds.yml b/.github/workflows/all_builds.yml
index 47ae13c7..3e8daba6 100644
--- a/.github/workflows/all_builds.yml
+++ b/.github/workflows/all_builds.yml
@@ -26,7 +26,7 @@ on:
 env:
   GODOT_BASE_BRANCH: master
   # Change the README too
-  GODOT_MAIN_SYNC_REF: a7d0e18a317085068c43be29bca1d280d03423a2
+  GODOT_MAIN_SYNC_REF: 4.1.1-stable
   SCONSFLAGS: verbose=yes warnings=all werror=no module_text_server_fb_enabled=yes minizip=yes debug_symbols=no deprecated=yes
   SCONSFLAGS_TEMPLATE: no_editor_splash=yes module_bmp_enabled=no module_camera_enabled=no module_cvtt_enabled=no module_mbedtls_enabled=no module_tga_enabled=no module_enet_enabled=no module_mobile_vr_enabled=no module_upnp_enabled=no module_noise_enabled=no module_websocket_enabled=no module_xatlas_unwrap_enabled=no module_squish_enabled=no use_static_cpp=yes builtin_freetype=yes builtin_libpng=yes builtin_zlib=yes builtin_libwebp=yes builtin_libvorbis=yes builtin_libogg=yes module_csg_enabled=yes module_gridmap_enabled=yes disable_3d=no
   SCONS_CACHE_MSVC_CONFIG: true
diff --git a/README.md b/README.md
index 267e8d86..29dffac6 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ For ease of bootstrapping development, we have included launch, build, and setti
 
 ### Requirements
 
-Godot 4.0 (master branch) @ commit https://github.com/godotengine/godot/commit/a7d0e18a317085068c43be29bca1d280d03423a2
+Godot 4.0 (master branch) @ 4.1.1-stable
 - Support for building on 3.x has been dropped and no new features are being pushed
 	- Godot RE Tools still retains the ability to decompile 3.x and 2.x projects, however.
 
diff --git a/compat/texture_loader_compat.h b/compat/texture_loader_compat.h
index e0fe65ce..b990a62f 100644
--- a/compat/texture_loader_compat.h
+++ b/compat/texture_loader_compat.h
@@ -7,7 +7,6 @@
 #include "core/io/resource_loader.h"
 #include "core/object/ref_counted.h"
 #include "core/templates/vector.h"
-#include "scene/resources/compressed_texture.h"
 #include "scene/resources/texture.h"
 
 class TextureLoaderCompat : public RefCounted {
diff --git a/editor/gdre_editor.cpp b/editor/gdre_editor.cpp
index 0725043a..9cc40a5a 100644
--- a/editor/gdre_editor.cpp
+++ b/editor/gdre_editor.cpp
@@ -29,7 +29,6 @@
 #include "modules/vorbis/audio_stream_ogg_vorbis.h"
 #include "scene/main/canvas_item.h"
 #include "scene/resources/audio_stream_wav.h"
-#include "scene/resources/image_texture.h"
 #include "scene/resources/resource_format_text.h"
 
 #include "core/version_generated.gen.h"