updates
This commit is contained in:
@@ -11,24 +11,33 @@ item.ItemFireEssence.name=Essence of Fire
|
||||
item.ItemAwakeningBlaze.name=Serum of the Flame
|
||||
item.ItemAwakeningGhast.name=Serum of Eternal Tears
|
||||
item.ItemAwakeningEnderman.name=Serum of Dimensionality
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> e3b5f5f77f61b7a685fc1fc9109f8de395ab933d
|
||||
tile.BlockDeadSoilCreeper.name=Soil of the Dead - Creeper
|
||||
tile.BlockDeadSoilZombie.name=Soil of the Dead - Zombie
|
||||
tile.BlockDeadSoilSkeleton.name=Soil of the Dead - Skeleton
|
||||
tile.BlockDeadSoilBlaze.name=Soil of the Dead - Blaze
|
||||
tile.BlockDeadSoilEnderman.name=Soil of the Dead - Enderman
|
||||
tile.BlockDeadSoilGhast.name=Soil of the Dead - Ghast
|
||||
<<<<<<< HEAD
|
||||
|
||||
item.ItemSiftingNet.name=Sifting Net
|
||||
|
||||
itemGroup.tabSupernaturalFlora=Supernatural Flora
|
||||
|
||||
=======
|
||||
item.ItemSiftingNet.name=Sifting Net
|
||||
itemGroup.tabSupernaturalFlora=Supernatural Flora
|
||||
>>>>>>> e3b5f5f77f61b7a685fc1fc9109f8de395ab933d
|
||||
item.ItemSoulMedium.name=Soul Medium
|
||||
item.ItemLifePotion.name=Essence of the Spark
|
||||
item.ItemGandalf99.name=gandalf99 [WIP]
|
||||
item.ItemEtherealDivisor.name=Ethereal Divisor
|
||||
item.ItemIronShard.name=Iron Shard
|
||||
item.ItemObsidianIngot.name=Obsidian Ingot
|
||||
<<<<<<< HEAD
|
||||
|
||||
item.ItemOrb.name=Empty Orb
|
||||
|
||||
@@ -41,5 +50,14 @@ item.Gandalf99Sword.name=Sword of gandalf99 [WIP]
|
||||
item.ItemIgnisRaw.name=Raw Ignis
|
||||
item.ItemIgnisOrb.name=Orb of Ignis
|
||||
|
||||
=======
|
||||
item.ItemOrb.name=Empty Orb
|
||||
item.ItemEtherOrb.name=Orb of Ether
|
||||
item.ItemEtherRaw.name=Raw Ether
|
||||
item.ItemACatalyst.name=Alchemical Catalyst
|
||||
item.Gandalf99Sword.name=Sword of gandalf99 [WIP]
|
||||
item.ItemIgnisRaw.name=Raw Ignis
|
||||
item.ItemIgnisOrb.name=Orb of Ignis
|
||||
>>>>>>> e3b5f5f77f61b7a685fc1fc9109f8de395ab933d
|
||||
item.ItemAquisRaw.name=Raw Aquis
|
||||
item.ItemAquisOrb.name=Orb of Aquis
|
||||
@@ -6,9 +6,15 @@
|
||||
"version": "1.2",
|
||||
"mcversion": "1.7.10",
|
||||
"url": "http://github.com/cestaberous/supernaturalflora",
|
||||
<<<<<<< HEAD
|
||||
"updateUrl": "http://cestaberous.gq/mods/snf/downloads/",
|
||||
"authorList": ["Cestaberous"],
|
||||
"credits": "Cestaberous; Help from gandalf99",
|
||||
=======
|
||||
"updateUrl": "",
|
||||
"authorList": ["Cestaberous"],
|
||||
"credits": "Thanks to MrCrayfish for the amazing tutorial.",
|
||||
>>>>>>> e3b5f5f77f61b7a685fc1fc9109f8de395ab933d
|
||||
"logoFile": "",
|
||||
"screenshots": [],
|
||||
"dependencies": []
|
||||
|
||||
Reference in New Issue
Block a user