diff options
Diffstat (limited to 'src/main/resources/assets')
| -rw-r--r-- | src/main/resources/assets/jewelrycraft2/lang/en_US.lang | 12 | ||||
| -rw-r--r-- | src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png | bin | 331 -> 585 bytes | |||
| -rw-r--r-- | src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png | bin | 0 -> 421 bytes | |||
| -rw-r--r-- | src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png | bin | 0 -> 237 bytes | |||
| -rw-r--r-- | src/main/resources/assets/jewelrycraft2/textures/gui/potions.png | bin | 0 -> 1692 bytes | |||
| -rw-r--r-- | src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png (renamed from src/main/resources/assets/jewelrycraft2/textures/items/blockMold.png) | bin | 1328 -> 1328 bytes | |||
| -rw-r--r-- | src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png (renamed from src/main/resources/assets/jewelrycraft2/textures/items/clayBlockMold.png) | bin | 464 -> 464 bytes |
7 files changed, 7 insertions, 5 deletions
diff --git a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang index 4851fa5..76ec908 100644 --- a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang +++ b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang @@ -57,22 +57,22 @@ chatmessage.jewelrycraft2.molder.metaliscooling=Molten metal is cooling... chatmessage.jewelrycraft2.molder.moldisempty=Mold is currently empty. chatmessage.jewelrycraft2.molder.moldismissing=Molder does not contain a mold. chatmessage.jewelrycraft2.molder.hasmoltenmetal=You can't remove the mold. It contains molten metal! -chatmessage.jewelrycraft2.smelter.alreadyhasingot=The Smelter already contains a %s -chatmessage.jewelrycraft2.smelter.hasmolteningot=The Smelter contains a molten %s +chatmessage.jewelrycraft2.smelter.alreadyhasingot=The Smelter already contains %s +chatmessage.jewelrycraft2.smelter.hasmolteningot=The Smelter contains molten %s chatmessage.jewelrycraft2.smelter.itemneedstobeingot=The item needs to be an ingot! chatmessage.jewelrycraft2.smelter.itemrenamedtoingot=Nice try, but renaming it to an ingot doesn't make it an ingot :p You can't fool me player! chatmessage.jewelrycraft2.smelter.molderhasmoltenmetal=The Molder already has molten metal in it! chatmessage.jewelrycraft2.smelter.molderhasnomold=The Molder doesn't have a mold in it! You might as well pour this stuff on the ground, eh? chatmessage.jewelrycraft2.smelter.modlerhasitem=The Molder contains an item in it. Now you wouldn't want it to be destroyed, would you? chatmessage.jewelrycraft2.smelter.molderismissing=You need a Molder in front of this block in order to pour the molten metal! -chatmessage.jewelrycraft2.smelter.nowsmeltingingot=Smelter is now smelting a %s. +chatmessage.jewelrycraft2.smelter.nowsmeltingingot=Smelter is now smelting a(n) %s. chatmessage.jewelrycraft2.smelter.metalismelting=%s is being melted. chatmessage.jewelrycraft2.smelter.empty=The Smelter is empty. chatmessage.jewelrycraft2.table.hasenditem=First take out the crafted jewel before inserting new stuff. chatmessage.jewelrycraft2.table.missinggem=You need a gem. chatmessage.jewelrycraft2.table.missingjewelry=You're missing a piece of jewelry. chatmessage.jewelrycraft2.table.iscrafting=The %s is being modified. -chatmessage.jewelrycraft2.table.jewelrymodifiedfull=This piece of jewelry is already modified at maxium. You can't modify it anymore! +chatmessage.jewelrycraft2.table.jewelrymodifiedfull=This piece of jewelry is already modified at maximum. You can't modify it anymore! chatmessage.jewelrycraft2.table.jewelrycontainsmodifier=The piece of jewelry already contains a modifier. chatmessage.jewelrycraft2.table.jewelrycontainsjewel=The piece of jewelry already contains a jewel. @@ -81,4 +81,6 @@ death.attack.shadows=%1$s was consumed by the shadows death.attack.blackHeart=%1$s was killed by %2$s's curse entity.jewelrycraft2.Heart.name=Heart -entity.jewelrycraft2.Half-Heart.name=Half-Heart
\ No newline at end of file +entity.jewelrycraft2.Half-Heart.name=Half-Heart + +jewelrycraft2.potion.stun=Stun
\ No newline at end of file diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png Binary files differindex 0daa053..0ebdf14 100644 --- a/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png Binary files differnew file mode 100644 index 0000000..fae7bcf --- /dev/null +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png Binary files differnew file mode 100644 index 0000000..48233a7 --- /dev/null +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png b/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png Binary files differnew file mode 100644 index 0000000..21a4b11 --- /dev/null +++ b/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/blockMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png Binary files differindex e1c2d7b..e1c2d7b 100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/blockMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayBlockMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png Binary files differindex 0dd9029..0dd9029 100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/clayBlockMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png |
