diff --git a/Minecraft.Client/Common/UI/UI.h b/Minecraft.Client/Common/UI/UI.h index 622ccf84..f0e5a7ad 100644 --- a/Minecraft.Client/Common/UI/UI.h +++ b/Minecraft.Client/Common/UI/UI.h @@ -78,12 +78,6 @@ #include "UIScene_HelpAndOptionsMenu.h" #include "UIScene_SettingsMenu.h" -#include "UIScene_SettingsOptionsMenu.h" -#include "UIScene_SettingsAudioMenu.h" -#include "UIScene_SettingsControlMenu.h" -#include "UIScene_SettingsGraphicsMenu.h" -#include "UIScene_SettingsUIMenu.h" -#include "UIScene_SkinSelectMenu.h" #include "UIScene_HowToPlayMenu.h" #include "UIScene_HowToPlay.h" #include "UIScene_ControlsMenu.h" diff --git a/Minecraft.Client/Common/res/1_2_2/gui/gui.png b/Minecraft.Client/Common/res/1_2_2/gui/gui.png index 70c39540..81af329e 100644 Binary files a/Minecraft.Client/Common/res/1_2_2/gui/gui.png and b/Minecraft.Client/Common/res/1_2_2/gui/gui.png differ diff --git a/Minecraft.Client/Common/res/1_2_2/gui/icons.png b/Minecraft.Client/Common/res/1_2_2/gui/icons.png index e5d56d73..73fe9bbd 100644 Binary files a/Minecraft.Client/Common/res/1_2_2/gui/icons.png and b/Minecraft.Client/Common/res/1_2_2/gui/icons.png differ diff --git a/Minecraft.Client/Common/res/1_2_2/misc/mapicons.png b/Minecraft.Client/Common/res/1_2_2/misc/mapicons.png index 9f325237..293a00c8 100644 Binary files a/Minecraft.Client/Common/res/1_2_2/misc/mapicons.png and b/Minecraft.Client/Common/res/1_2_2/misc/mapicons.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_1.png b/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_1.png index ebcfc411..f3cf4aa3 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_1.png and b/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_1.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_1_b.png b/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_1_b.png deleted file mode 100644 index 546397d5..00000000 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_1_b.png and /dev/null differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_2.png b/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_2.png index 8d8bba6c..15fb9084 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_2.png and b/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_2.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_2_b.png b/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_2_b.png deleted file mode 100644 index 56556598..00000000 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/armor/cloth_2_b.png and /dev/null differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/armor/power.png b/Minecraft.Client/Common/res/TitleUpdate/res/armor/power.png index 809539ca..ed2abf75 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/armor/power.png and b/Minecraft.Client/Common/res/TitleUpdate/res/armor/power.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/art/kz.png b/Minecraft.Client/Common/res/TitleUpdate/res/art/kz.png index 4cb9a07c..ecc4823e 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/art/kz.png and b/Minecraft.Client/Common/res/TitleUpdate/res/art/kz.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/colours.col b/Minecraft.Client/Common/res/TitleUpdate/res/colours.col index abe91ebe..53bb197e 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/colours.col and b/Minecraft.Client/Common/res/TitleUpdate/res/colours.col differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml b/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml index f6a85645..4ea91b93 100644 --- a/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml +++ b/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml @@ -264,7 +264,7 @@ if __name__=="__main__": notecolors() - + diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/items.png b/Minecraft.Client/Common/res/TitleUpdate/res/items.png index c86026a0..407d6cf4 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/items.png and b/Minecraft.Client/Common/res/TitleUpdate/res/items.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/particles.png b/Minecraft.Client/Common/res/TitleUpdate/res/particles.png index aed54da5..ac7e39f4 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/particles.png and b/Minecraft.Client/Common/res/TitleUpdate/res/particles.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png b/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png index d5d3751d..43f9fd39 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png and b/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png index 771bb2d5..a3d638fe 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png and b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png index 900ba0f3..f2ebbd86 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png and b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png differ