Merge branch '1.20' into snapshot

nebuIr · Sep 17, 2023 · 42f2e60 · 42f2e60
2 parents cfca54c + 2fcfba6
commit 42f2e60
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 0 deletions.
diff --git a/assets/curios/LICENSE b/assets/curios/LICENSE
@@ -0,0 +1,14 @@
+Copyright (C) 2018-2020 C4
+
+Curios is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Curios is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Curios.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/assets/curios/textures/gui/inventory.png b/assets/curios/textures/gui/inventory.png
diff --git a/assets/curios/textures/slot/empty_back_slot.png b/assets/curios/textures/slot/empty_back_slot.png
diff --git a/assets/curios/textures/slot/empty_belt_slot.png b/assets/curios/textures/slot/empty_belt_slot.png
diff --git a/assets/curios/textures/slot/empty_body_slot.png b/assets/curios/textures/slot/empty_body_slot.png
diff --git a/assets/curios/textures/slot/empty_bracelet_slot.png b/assets/curios/textures/slot/empty_bracelet_slot.png
diff --git a/assets/curios/textures/slot/empty_charm_slot.png b/assets/curios/textures/slot/empty_charm_slot.png
diff --git a/assets/curios/textures/slot/empty_cosmetic_slot.png b/assets/curios/textures/slot/empty_cosmetic_slot.png
diff --git a/assets/curios/textures/slot/empty_curio_slot.png b/assets/curios/textures/slot/empty_curio_slot.png
diff --git a/assets/curios/textures/slot/empty_hands_slot.png b/assets/curios/textures/slot/empty_hands_slot.png
diff --git a/assets/curios/textures/slot/empty_head_slot.png b/assets/curios/textures/slot/empty_head_slot.png
diff --git a/assets/curios/textures/slot/empty_necklace_slot.png b/assets/curios/textures/slot/empty_necklace_slot.png
diff --git a/assets/curios/textures/slot/empty_ring_slot.png b/assets/curios/textures/slot/empty_ring_slot.png
diff --git a/assets/trashslot/textures/gui/trashcan.png → assets/trashslot/textures/item/trashcan.png b/assets/trashslot/textures/gui/trashcan.png → assets/trashslot/textures/item/trashcan.png