Merge branch 'Current' into Alpha-4

README.md

@@ -1,4 +1,5 @@
 # Avatar Toolkit
+We are aware the wiki is down and are working on a new one, please don't report this.
 
 ## Avatar Toolkit is in Alpha, There will be issues, please ensure you report them!. If using a Alpha plugin isn't your fancy you can find Cats Blender Plugin [HERE](https://github.com/unofficalcats/Cats-Blender-Plugin-Unofficial-)!
 #### Avatar Toolkit is in Alpha and will contain issues, please ensure you report them!
@@ -21,11 +22,11 @@ Need a more stable toolset while Avatar Toolkit is in Alpha? Then please use Ble
 ### Support us:
 If you like what we do and want to help support the development of cats you can do it on our pally.gg [here](https://pally.gg/p/teamneoneko) all money is split automatically between all developers and any support is appreciated.
 
-## Blender version support policies.
+## Blender version support policies. 
 
 You can find them on the wiki here [HERE](https://avatartoolkit.xyz/legacywiki.html?version=0.2.1#what-is-avatar-toolkits-version-support-policy)
 
-## Features
+## Features 
 
 See everything Avatar Toolkit has ot offer [here](https://avatartoolkit.xyz/legacywiki.html)
 
@@ -35,7 +36,6 @@ See everything Avatar Toolkit has ot offer [here](https://avatartoolkit.xyz/lega
 - Blender 4.5 or newer is required
 - Blender 4.5 is the current recommended version
 
-
 2) Python Requirements
 - If using a custom Python installation with Blender, ensure NumPy is installed
 - Default Blender installation includes all required packages
@@ -44,6 +44,16 @@ See everything Avatar Toolkit has ot offer [here](https://avatartoolkit.xyz/lega
 - Download Blender directly from https://blender.org
 - Use Blender 4.5 for the best experience
 
+#### Unfortunately, due to the increased number of people complaining to me (yes, we get DMs about this) that AT or CATS is broken when it's not, we are going to have to be a bit more strict about which Blender releases we will provide support for.
+
+#### We only support the following Blender releases:
+- Steam release
+- The Blender website releases (there are downloads for Linux, Mac, and Windows)
+
+#### We do not support the following what so ever and we will not give help if your running the following.
+- We do not support the Windows Store due to it causing issues, and we also don't support the Snap Store for Linux.
+- We do not support package manager releases on Linux. This is because package managers are normally run by the distro, and a lot of the time the distro will build Blender themselves and make their own changes which are not sanctioned by Blender (for example, bundling a newer version of Python which tends to break plugins). If you report a bug from anything apart from the Blender versions we support, you will be told we can't help you from now on.
+
 #### Additional Plugins Requirements.
 Currently None.
 

core/dictionaries.py

@@ -881,7 +881,8 @@ non_standard_mappings = {
     'left_leg': [
         'mixamorig:LeftUpLeg', 'mixamorig_LeftUpLeg',
         'ORG-thigh.L', 'thigh.L',
-        'lThighBend', 'lThigh', 'UpperLeg.L'
+        'lThighBend', 'lThigh', 'UpperLeg.L',
+        'LeftUpperLeg'
     ],
     'left_knee': [
         'mixamorig:LeftLeg', 'mixamorig_LeftLeg',
@@ -896,13 +897,14 @@ non_standard_mappings = {
     'left_toe': [
         'mixamorig:LeftToeBase', 'mixamorig_LeftToeBase',
         'ORG-toe.L', 'toe.L',
-        'lToe', 'Toes.L'
+        'lToe', 'Toes.L', 'LeftToeBase'
     ],
     
     'right_leg': [
         'mixamorig:RightUpLeg', 'mixamorig_RightUpLeg',
         'ORG-thigh.R', 'thigh.R',
-        'rThighBend', 'rThigh', 'UpperLeg.R'
+        'rThighBend', 'rThigh', 'UpperLeg.R',
+        'RightUpperLeg'
     ],
     'right_knee': [
         'mixamorig:RightLeg', 'mixamorig_RightLeg',
@@ -917,7 +919,7 @@ non_standard_mappings = {
     'right_toe': [
         'mixamorig:RightToeBase', 'mixamorig_RightToeBase',
         'ORG-toe.R', 'toe.R',
-        'rToe', 'Toes.R'
+        'rToe', 'Toes.R', 'RightToeBase'
     ],
     
     'thumb_1_l': [

core/updater.py

@@ -19,8 +19,8 @@ GITHUB_REPO = "teamneoneko/Avatar-Toolkit"
 
 # Define which version series this installation can update to
 # For example: ["0.1"] means only look for 0.1.x updates
-# ["0.2", "0.3"] would look for both 0.2.x and 0.3.x updates
-ALLOWED_VERSION_SERIES = ["0.4"]
+# ["0.2", "0.3"] would look for both 0.2.x and 0.3.x
+ALLOWED_ = ["0.3, 0.4"]
 
 is_checking_for_update: bool = False
 update_needed: bool = False

functions/custom_tools/armature_merging.py

@@ -102,6 +102,7 @@ class AvatarToolkit_OT_MergeArmature(bpy.types.Operator):
             wm.progress_update(100)
             wm.progress_end()
 
+            # Restore settings only for the base armature since merge_armature is removed during join
             restore_breaking_settings_armature(base_armature, data_breaking_base)
             if merge_armature_name_stored in bpy.data.objects:
                 merge_armature_obj = bpy.data.objects[merge_armature_name_stored]
@@ -124,8 +125,9 @@ class AvatarToolkit_OT_MergeArmature(bpy.types.Operator):
             return {'FINISHED'}
 
         except Exception as e:
-            logger.error(f"Error merging armatures: {str(e)}\n{traceback.format_exc()}")
-            self.report({'ERROR'}, traceback.format_exc())
+            errormessage: str = traceback.format_exc()
+            logger.error(f"Error merging armatures: {str(e)}\n{errormessage}")
+            self.report({'ERROR'}, f"Error merging armatures: {errormessage}")
             
             # Try to restore original mode even on error
             try: