diff --git a/AATool/AATool.csproj b/AATool/AATool.csproj
index a964d31..ccc5458 100644
--- a/AATool/AATool.csproj
+++ b/AATool/AATool.csproj
@@ -543,6 +543,30 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
@@ -2874,6 +2898,15 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
@@ -2889,6 +2922,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
@@ -3000,12 +3036,42 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
@@ -7368,6 +7434,15 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
diff --git a/AATool/Data/Categories/AllAdvancements.cs b/AATool/Data/Categories/AllAdvancements.cs
index 69f794a..a30ba97 100644
--- a/AATool/Data/Categories/AllAdvancements.cs
+++ b/AATool/Data/Categories/AllAdvancements.cs
@@ -6,6 +6,7 @@ namespace AATool.Data.Categories
public class AllAdvancements : Category
{
public static readonly List SupportedVersions = new () {
+ "1.20.5",
"1.20",
"1.19",
"1.18",
diff --git a/AATool/Data/Categories/Category.cs b/AATool/Data/Categories/Category.cs
index fd5640b..0d4da05 100644
--- a/AATool/Data/Categories/Category.cs
+++ b/AATool/Data/Categories/Category.cs
@@ -47,10 +47,20 @@ public bool TrySetVersion(string version)
{
if (Version.TryParse(version, out Version number))
{
- //handle sub-versioning of 1.16 due to piglin brutes
- version = number > Version.Parse("1.16.1") && number < Version.Parse("1.17")
- ? "1.16.5"
- : $"{number.Major}.{number.Minor}";
+ if (number > Version.Parse("1.20.4") && number < Version.Parse("1.21"))
+ {
+ //handle sub-versioning of 1.20 due to wolves and armadillos
+ version = "1.20.5";
+ }
+ else if (number > Version.Parse("1.16.1") && number < Version.Parse("1.17"))
+ {
+ //handle sub-versioning of 1.16 due to piglin brutes
+ version = "1.16.5";
+ }
+ else
+ {
+ version = $"{number.Major}.{number.Minor}";
+ }
}
if (this.GetSupportedVersions().Contains(version))
diff --git a/AATool/Properties/AssemblyInfo.cs b/AATool/Properties/AssemblyInfo.cs
index a9d360f..48842b4 100644
--- 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.7.1.0")]
-[assembly: AssemblyFileVersion("1.7.1.0")]
+[assembly: AssemblyVersion("1.7.2.0")]
+[assembly: AssemblyFileVersion("1.7.2.0")]
[assembly: NeutralResourcesLanguage("en")]
diff --git a/AATool/UI/Screens/UIMainScreen.cs b/AATool/UI/Screens/UIMainScreen.cs
index 41c8da8..d2feed6 100644
--- a/AATool/UI/Screens/UIMainScreen.cs
+++ b/AATool/UI/Screens/UIMainScreen.cs
@@ -155,7 +155,10 @@ private void OnClosing(object sender, FormClosingEventArgs e)
public override string GetCurrentView()
{
string view = Tracker.Category.ViewName;
- string version = Tracker.Category.CurrentMajorVersion ?? Tracker.Category.CurrentVersion;
+
+ string version = Tracker.Category.CurrentVersion == "1.16.5"
+ ? "1.16"
+ : Tracker.Category.CurrentVersion;
//return Path.Combine(Paths.System.ViewsFolder, "other", "primary_version.xml");
diff --git a/AATool/assets/objectives/1.20.5/advancements/adventure.xml b/AATool/assets/objectives/1.20.5/advancements/adventure.xml
new file mode 100644
index 0000000..0a4393c
--- /dev/null
+++ b/AATool/assets/objectives/1.20.5/advancements/adventure.xml
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AATool/assets/objectives/1.20.5/advancements/end.xml b/AATool/assets/objectives/1.20.5/advancements/end.xml
new file mode 100644
index 0000000..d0b9149
--- /dev/null
+++ b/AATool/assets/objectives/1.20.5/advancements/end.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AATool/assets/objectives/1.20.5/advancements/husbandry.xml b/AATool/assets/objectives/1.20.5/advancements/husbandry.xml
new file mode 100644
index 0000000..dcafe00
--- /dev/null
+++ b/AATool/assets/objectives/1.20.5/advancements/husbandry.xml
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AATool/assets/objectives/1.20.5/advancements/minecraft.xml b/AATool/assets/objectives/1.20.5/advancements/minecraft.xml
new file mode 100644
index 0000000..d595c0f
--- /dev/null
+++ b/AATool/assets/objectives/1.20.5/advancements/minecraft.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AATool/assets/objectives/1.20.5/advancements/nether.xml b/AATool/assets/objectives/1.20.5/advancements/nether.xml
new file mode 100644
index 0000000..e20896e
--- /dev/null
+++ b/AATool/assets/objectives/1.20.5/advancements/nether.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AATool/assets/objectives/1.20.5/blocks.xml b/AATool/assets/objectives/1.20.5/blocks.xml
new file mode 100644
index 0000000..54df9df
--- /dev/null
+++ b/AATool/assets/objectives/1.20.5/blocks.xml
@@ -0,0 +1,982 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AATool/assets/objectives/1.20.5/potions.xml b/AATool/assets/objectives/1.20.5/potions.xml
new file mode 100644
index 0000000..91556fc
--- /dev/null
+++ b/AATool/assets/objectives/1.20.5/potions.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AATool/assets/objectives/1.20.5/trims.xml b/AATool/assets/objectives/1.20.5/trims.xml
new file mode 100644
index 0000000..1ca50f7
--- /dev/null
+++ b/AATool/assets/objectives/1.20.5/trims.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AATool/assets/sprites/global/advancements/adventure/brush_armadillo.png b/AATool/assets/sprites/global/advancements/adventure/brush_armadillo.png
new file mode 100644
index 0000000..992c95d
Binary files /dev/null and b/AATool/assets/sprites/global/advancements/adventure/brush_armadillo.png differ
diff --git a/AATool/assets/sprites/global/advancements/adventure/remove_wolf_armor.png b/AATool/assets/sprites/global/advancements/adventure/remove_wolf_armor.png
new file mode 100644
index 0000000..3b90141
Binary files /dev/null and b/AATool/assets/sprites/global/advancements/adventure/remove_wolf_armor.png differ
diff --git a/AATool/assets/sprites/global/advancements/adventure/repair_wolf_armor.png b/AATool/assets/sprites/global/advancements/adventure/repair_wolf_armor.png
new file mode 100644
index 0000000..87576f7
Binary files /dev/null and b/AATool/assets/sprites/global/advancements/adventure/repair_wolf_armor.png differ
diff --git a/AATool/assets/sprites/global/advancements/husbandry/whole_pack.png b/AATool/assets/sprites/global/advancements/husbandry/whole_pack.png
new file mode 100644
index 0000000..0ab4ddb
Binary files /dev/null and b/AATool/assets/sprites/global/advancements/husbandry/whole_pack.png differ
diff --git a/AATool/assets/sprites/global/criteria/animals/armadillo.png b/AATool/assets/sprites/global/criteria/animals/armadillo.png
new file mode 100644
index 0000000..11040ed
Binary files /dev/null and b/AATool/assets/sprites/global/criteria/animals/armadillo.png differ
diff --git a/AATool/assets/sprites/global/criteria/dogs/wolf_ashen.png b/AATool/assets/sprites/global/criteria/dogs/wolf_ashen.png
new file mode 100644
index 0000000..5c220a5
Binary files /dev/null and b/AATool/assets/sprites/global/criteria/dogs/wolf_ashen.png differ
diff --git a/AATool/assets/sprites/global/criteria/dogs/wolf_black.png b/AATool/assets/sprites/global/criteria/dogs/wolf_black.png
new file mode 100644
index 0000000..2bc9777
Binary files /dev/null and b/AATool/assets/sprites/global/criteria/dogs/wolf_black.png differ
diff --git a/AATool/assets/sprites/global/criteria/dogs/wolf_chestnut.png b/AATool/assets/sprites/global/criteria/dogs/wolf_chestnut.png
new file mode 100644
index 0000000..5fb74f7
Binary files /dev/null and b/AATool/assets/sprites/global/criteria/dogs/wolf_chestnut.png differ
diff --git a/AATool/assets/sprites/global/criteria/dogs/wolf_pale.png b/AATool/assets/sprites/global/criteria/dogs/wolf_pale.png
new file mode 100644
index 0000000..73906d7
Binary files /dev/null and b/AATool/assets/sprites/global/criteria/dogs/wolf_pale.png differ
diff --git a/AATool/assets/sprites/global/criteria/dogs/wolf_rusty.png b/AATool/assets/sprites/global/criteria/dogs/wolf_rusty.png
new file mode 100644
index 0000000..30af6c6
Binary files /dev/null and b/AATool/assets/sprites/global/criteria/dogs/wolf_rusty.png differ
diff --git a/AATool/assets/sprites/global/criteria/dogs/wolf_snowy.png b/AATool/assets/sprites/global/criteria/dogs/wolf_snowy.png
new file mode 100644
index 0000000..a322cf4
Binary files /dev/null and b/AATool/assets/sprites/global/criteria/dogs/wolf_snowy.png differ
diff --git a/AATool/assets/sprites/global/criteria/dogs/wolf_spotted.png b/AATool/assets/sprites/global/criteria/dogs/wolf_spotted.png
new file mode 100644
index 0000000..89e59c4
Binary files /dev/null and b/AATool/assets/sprites/global/criteria/dogs/wolf_spotted.png differ
diff --git a/AATool/assets/sprites/global/criteria/dogs/wolf_striped.png b/AATool/assets/sprites/global/criteria/dogs/wolf_striped.png
new file mode 100644
index 0000000..c17d40e
Binary files /dev/null and b/AATool/assets/sprites/global/criteria/dogs/wolf_striped.png differ
diff --git a/AATool/assets/sprites/global/criteria/dogs/wolf_woods.png b/AATool/assets/sprites/global/criteria/dogs/wolf_woods.png
new file mode 100644
index 0000000..610b754
Binary files /dev/null and b/AATool/assets/sprites/global/criteria/dogs/wolf_woods.png differ
diff --git a/AATool/assets/sprites/global/criteria/mobs/shulker.png b/AATool/assets/sprites/global/criteria/mobs/shulker.png
index 0ad1d98..ec48946 100644
Binary files a/AATool/assets/sprites/global/criteria/mobs/shulker.png and b/AATool/assets/sprites/global/criteria/mobs/shulker.png differ
diff --git a/AATool/assets/views/all_advancements/1.20.5/main_compact.xml b/AATool/assets/views/all_advancements/1.20.5/main_compact.xml
new file mode 100644
index 0000000..32e2ece
--- /dev/null
+++ b/AATool/assets/views/all_advancements/1.20.5/main_compact.xml
@@ -0,0 +1,58 @@
+
+
+
+
+ |
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AATool/assets/views/all_advancements/1.20.5/main_optimized.xml b/AATool/assets/views/all_advancements/1.20.5/main_optimized.xml
new file mode 100644
index 0000000..eca31bf
--- /dev/null
+++ b/AATool/assets/views/all_advancements/1.20.5/main_optimized.xml
@@ -0,0 +1,150 @@
+
+
+
+
+ |
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AATool/assets/views/all_advancements/1.20.5/main_relaxed.xml b/AATool/assets/views/all_advancements/1.20.5/main_relaxed.xml
new file mode 100644
index 0000000..a02567b
--- /dev/null
+++ b/AATool/assets/views/all_advancements/1.20.5/main_relaxed.xml
@@ -0,0 +1,80 @@
+
+
+
+
+ |
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file