Finalize update 1.4.2.3

DarwinBaker · Mar 10, 2022 · 64afd82 · 64afd82
1 parent 46b09c9
commit 64afd82
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 3 deletions.
diff --git a/AATool/AATool.csproj b/AATool/AATool.csproj
@@ -736,6 +736,45 @@
     <Content Include="assets\sprites\global\gui\all_blocks\popup_block_border.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="assets\sprites\global\gui\frames\furnace\fire_flat%2496x32x0.5.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\furnace\frame_furnace_back_complete^78.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\furnace\frame_furnace_back_complete^52.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\furnace\frame_furnace_portrait.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\geode\frame_geode_back^52.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\geode\frame_geode_back^78.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\geode\frame_geode_border^52.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\geode\frame_geode_border^78.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\geode\frame_geode_border_complete^52.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\geode\frame_geode_back_complete^52.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\geode\frame_geode_border_complete^78.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\geode\frame_geode_back_complete^78.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="assets\sprites\global\gui\frames\geode\frame_geode_portrait.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="assets\sprites\global\gui\icons\strider_walking%2440x40.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -3261,6 +3300,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="assets\objectives\1.17\blocks\" />
     <Folder Include="assets\sprites\blocks\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/AATool/Configuration/MainConfig.cs b/AATool/Configuration/MainConfig.cs
@@ -17,7 +17,7 @@ public class MainConfig : Config
                 {"Light Mode",     (Hex("F0F0F0"), Hex("000000"), Hex("C4C4C4"))},
                 {"GitHub Dark",    (Hex("0D1117"), Hex("C9D1D9"), Hex("30363D"))},
                 {"Ender Pearl",    (Hex("0C3730"), Hex("C6F2EA"), Hex("349988"))},
-                {"Blazed",         (Hex("91360B"), Hex("FFFFB4"), Hex("E4871F"))},
+                {"Blazed",         (Hex("91360B"), Hex("FFFFCC"), Hex("E4871F"))},
                 {"Brick",          (Hex("804040"), Hex("FFFFFF"), Hex("AA5A5A"))},
                 {"Berry",          (Hex("411126"), Hex("C9D1D9"), Hex("5E1938"))},
                 {"Couri Enjoyer",  (Hex("502880"), Hex("C9D1D9"), Hex("8336B6"))},

diff --git a/AATool/Properties/AssemblyInfo.cs b/AATool/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.4.2.2")]
-[assembly: AssemblyFileVersion("1.4.2.2")]
+[assembly: AssemblyVersion("1.4.2.3")]
+[assembly: AssemblyFileVersion("1.4.2.3")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/AATool/Winforms/Controls/COverlaySettings.cs b/AATool/Winforms/Controls/COverlaySettings.cs
@@ -27,6 +27,7 @@ private void PopulateFrameStyles()
             this.frameStyle.Items.Add("Minecraft");
             foreach (string theme in Config.MainConfig.Themes.Keys)
                 this.frameStyle.Items.Add(theme);
+            this.frameStyle.Items.Add("Geode");
             this.frameStyle.Items.Add("None");
         }
 

diff --git a/AATool/assets/sprites/global/gui/frames/furnace/frame_modern_portrait.png b/AATool/assets/sprites/global/gui/frames/furnace/frame_modern_portrait.png