- ups

CHANGELOG.md

@@ -1,11 +1,2 @@
-## v1.5 (1.20.1)
-- added more Craftingproperty keys for axes, pickaxes, shovels and hoes
-- fixed gui scaling for key and omen skin
-- added throwing axe
-- rebalanced Pommels and Guards
-  - increased blocking on Large Guard
-  - made Katana Guard a Slim Guard skin
-  - removed blocking from Slim Guard
-- added Mining to Sickle
-- added Hoe-right click to Sickle and Scythe
-- added Native sweeping edge to Scythe
+## v1.6 (1.20.1)
+- fixed guard changes, accidentally forgot to include the last update

common/src/main/resources/assets/arsenal/lang/en_us.json

@@ -78,6 +78,11 @@
     "miapi.module.blade_scythe.description": "A long Scythe head. Usually used to cut grass or People down",
     "miapi.module.blade_scythe.short_description": "A Scythe Blade, a mixture between Tool and Weapon",
 
+    "miapi.module.guard_blocking": "Large Guard",
+    "miapi.module.guard_blocking.name": "[translation.[material.translation]]Large Guard",
+    "miapi.module.guard_blocking.description": "A guard specifically designed for blocking.",
+    "miapi.module.guard_blocking.short_description": "A Large Winged Guard.",
+
     "miapi.module.guard_katana": "Katana Guard",
     "miapi.module.guard_katana.name": "[translation.[material.translation]]Katana Guard",
     "miapi.module.guard_katana.description": "A guard specifically designed for use with a katana sword.",
@@ -195,4 +200,4 @@
 
     "miapi.module.mattock.name": "[translation.[material.translation]]Mattock",
     "miapi.module.blade_naginata.name": "[translation.[material.translation]]Naginata"
-}
+}

common/src/main/resources/data/miapi/modules/guard/guard_blocking.json

@@ -56,7 +56,7 @@
     ],
     "priority": -1,
     "repairPriority": 0,
-    "blocking": 60,
+    "blocking": "58 + ceil([material.flexibility])",
     "abilities": [
         "block"
     ],

common/src/main/resources/data/miapi/modules/guard/old/guard_katana.json

@@ -22,6 +22,14 @@
         "default",
         "handheld"
     ],
+    "crafting_condition": {
+        "visible": {
+            "type": "not",
+            "condition": {
+                "type": "true"
+            }
+        }
+    },
     "priority": 20,
     "repairPriority": 0,
     "durability": "[material.durability]* 0.05",

common/src/main/resources/data/miapi/modules/guard/old/guard_winged.json

@@ -89,5 +89,13 @@
     "guiOffset": {
         "sizeX": 1,
         "sizeY": 1
+    },
+    "crafting_condition": {
+        "visible": {
+            "type": "not",
+            "condition": {
+                "type": "true"
+            }
+        }
     }
 }

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
 minecraft_version=1.20.1
 
 archives_base_name=Truly-Modular-arsenal
-mod_version=1.5
+mod_version=1.6
 maven_group=smartin
 github=Truly-Modular.Arsenal