Merge remote-tracking branch 'origin/main' into main

2021-12-24 12:23:33 +01:00 · 2021-12-24 12:23:33 +01:00 · fa6437d392
commit fa6437d392
parent 1566b8ab00 c596c09e22
6 changed files with 7 additions and 0 deletions
--- a/src/main/resources/assets/functionalstorage/models/item/configuration_tool.json
+++ b/src/main/resources/assets/functionalstorage/models/item/configuration_tool.json
@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+	"layer0": "functionalstorage:items/configuration_tool_base",
+	"layer1": "functionalstorage:items/configuration_tool_mode"
+  }
+}
--- a/src/main/resources/assets/functionalstorage/textures/blocks/armory_front.png
+++ b/src/main/resources/assets/functionalstorage/textures/blocks/armory_front.png
--- a/src/main/resources/assets/functionalstorage/textures/blocks/lock.png
+++ b/src/main/resources/assets/functionalstorage/textures/blocks/lock.png
--- a/src/main/resources/assets/functionalstorage/textures/items/configuration_tool_base.png
+++ b/src/main/resources/assets/functionalstorage/textures/items/configuration_tool_base.png
--- a/src/main/resources/assets/functionalstorage/textures/items/configuration_tool_mode.png
+++ b/src/main/resources/assets/functionalstorage/textures/items/configuration_tool_mode.png
--- a/src/main/resources/assets/functionalstorage/textures/items/linking_tool_base.png
+++ b/src/main/resources/assets/functionalstorage/textures/items/linking_tool_base.png