summaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/assets/jewelrycraft/Changelog.txt2
-rw-r--r--resources/assets/jewelrycraft/lang/en_US.lang4
-rw-r--r--resources/assets/jewelrycraft/textures/blocks/altar_bottom.pngbin0 -> 391 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/blocks/altar_side.pngbin0 -> 3220 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/blocks/altar_top.pngbin0 -> 3125 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta5
-rw-r--r--resources/assets/jewelrycraft/textures/items/ingotShadow.pngbin703 -> 467 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/items/jewelNecklace.pngbin0 -> 241 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/items/jewelRing.png (renamed from resources/assets/jewelrycraft/textures/items/jewel.png)bin244 -> 244 bytes
9 files changed, 5 insertions, 6 deletions
diff --git a/resources/assets/jewelrycraft/Changelog.txt b/resources/assets/jewelrycraft/Changelog.txt
index c295992..3035388 100644
--- a/resources/assets/jewelrycraft/Changelog.txt
+++ b/resources/assets/jewelrycraft/Changelog.txt
@@ -11,6 +11,8 @@
- Removed animation from the Shadow Ore
- Made Shadow Ore more common
- Balanced Villager trades
+- Fixed Displayer text rendering in front of everything
+- Added the Jewel Altar
TODO
- Make it so you can smelt ores in the smelter
diff --git a/resources/assets/jewelrycraft/lang/en_US.lang b/resources/assets/jewelrycraft/lang/en_US.lang
index 4209988..41bffe7 100644
--- a/resources/assets/jewelrycraft/lang/en_US.lang
+++ b/resources/assets/jewelrycraft/lang/en_US.lang
@@ -7,6 +7,7 @@ item.Jewelrycraft.mold.clayIngot.name=Clay Ingot Mold
item.Jewelrycraft.mold.clayRing.name=Clay Ring Mold
item.Jewelrycraft.mold.clayNecklace.name=Clay Necklace Mold
item.Jewelrycraft.ring.name=Ring
+item.Jewelrycraft.necklace.name=Necklace
item.Jewelrycraft.crystal.name=Crystal
tile.Jewelrycraft.oreShadow.name=Shadow Ore
tile.Jewelrycraft.blockShadow.name=Shadow Block
@@ -15,6 +16,7 @@ tile.Jewelrycraft.smelter.name=Smelter
tile.Jewelrycraft.molder.name=Molder
tile.Jewelrycraft.displayer.name=Storage Displayer
tile.Jewelrycraft.jewelCraftingTable.name=Jeweler's Crafting Table
+tile.Jewelrycraft.altar.name=Jewel Altar
itemGroup.JewelryCraft=Jewelrycraft
itemGroup.Rings=Jewelrycraft Rings
chatmessage.Jewelrycraft.molder.addedmold=Added %s to molder.
@@ -34,7 +36,7 @@ chatmessage.Jewelrycraft.smelter.nowsmeltingingot=Smelter is now smelting a %s.
chatmessage.Jewelrycraft.smelter.metalismelting=%s is being melted.
chatmessage.Jewelrycraft.smelter.empty=The Smelter is empty.
chatmessage.Jewelrycraft.table.hasenditem=First take out the crafted jewel before inserting new stuff.
-chatmessage.Jewelrycraft.table.missingjewelryandmodifierorjewel=You need a ring and a modifier or a jewel.
+chatmessage.Jewelrycraft.table.missingjewelryandmodifierorjewel=You need a jewelry piece and a modifier or a jewel.
chatmessage.Jewelrycraft.table.missingjewelry=You're missing a piece of jewelry.
chatmessage.Jewelrycraft.table.missingmodifierorjewel=You need a modifier or a jewel.
chatmessage.Jewelrycraft.table.iscrafting=The %s is being modified.
diff --git a/resources/assets/jewelrycraft/textures/blocks/altar_bottom.png b/resources/assets/jewelrycraft/textures/blocks/altar_bottom.png
new file mode 100644
index 0000000..7ca4c6a
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/blocks/altar_bottom.png
Binary files differ
diff --git a/resources/assets/jewelrycraft/textures/blocks/altar_side.png b/resources/assets/jewelrycraft/textures/blocks/altar_side.png
new file mode 100644
index 0000000..3a69977
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/blocks/altar_side.png
Binary files differ
diff --git a/resources/assets/jewelrycraft/textures/blocks/altar_top.png b/resources/assets/jewelrycraft/textures/blocks/altar_top.png
new file mode 100644
index 0000000..39210c3
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/blocks/altar_top.png
Binary files differ
diff --git a/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta
deleted file mode 100644
index bf4c01e..0000000
--- a/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "animation": {
- "frametime": 1
- }
-} \ No newline at end of file
diff --git a/resources/assets/jewelrycraft/textures/items/ingotShadow.png b/resources/assets/jewelrycraft/textures/items/ingotShadow.png
index 82b57c7..e3b3aed 100644
--- a/resources/assets/jewelrycraft/textures/items/ingotShadow.png
+++ b/resources/assets/jewelrycraft/textures/items/ingotShadow.png
Binary files differ
diff --git a/resources/assets/jewelrycraft/textures/items/jewelNecklace.png b/resources/assets/jewelrycraft/textures/items/jewelNecklace.png
new file mode 100644
index 0000000..41244d4
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/items/jewelNecklace.png
Binary files differ
diff --git a/resources/assets/jewelrycraft/textures/items/jewel.png b/resources/assets/jewelrycraft/textures/items/jewelRing.png
index 4875772..4875772 100644
--- a/resources/assets/jewelrycraft/textures/items/jewel.png
+++ b/resources/assets/jewelrycraft/textures/items/jewelRing.png
Binary files differ