Merge branch '1.9' into 1.9-BTM
|
@ -63,8 +63,8 @@ tile.techreborn.electricfurnace.name=Electric Furnace
|
|||
tile.techreborn.machineFrame.highlyAdvancedMachine.name=Highly Advanced Machine Block
|
||||
tile.techreborn.machineFrame.advancedMachine.name=Advanced Machine Block
|
||||
tile.techreborn.machineFrame.machine.name=Machine Block
|
||||
tile.techreborn.ore2.Copper.name=Copper Ore
|
||||
tile.techreborn.ore2.Tin.name=Tin Ore
|
||||
tile.techreborn.ore2.copper.name=Copper Ore
|
||||
tile.techreborn.ore2.tin.name=Tin Ore
|
||||
tile.techreborn.storage2.copper.name=Copper Block
|
||||
tile.techreborn.storage2.tin.name=Tin Block
|
||||
tile.techreborn.solarpanel.name=Solar Panel
|
||||
|
@ -92,22 +92,22 @@ tile.techreborn.rubbersapling.name=Rubber Sapling
|
|||
tile.techreborn.ironfence.name=Iron Fence
|
||||
|
||||
#Ores
|
||||
tile.techreborn.ore.Galena.name=Galena Ore
|
||||
tile.techreborn.ore.Iridium.name=Iridium Ore
|
||||
tile.techreborn.ore.Ruby.name=Ruby Ore
|
||||
tile.techreborn.ore.Sapphire.name=Sapphire Ore
|
||||
tile.techreborn.ore.Bauxite.name=Bauxite Ore
|
||||
tile.techreborn.ore.Pyrite.name=Pyrite Ore
|
||||
tile.techreborn.ore.Cinnabar.name=Cinnabar Ore
|
||||
tile.techreborn.ore.Sphalerite.name=Sphalerite Ore
|
||||
tile.techreborn.ore.Tungston.name=Tungsten Ore
|
||||
tile.techreborn.ore.Sheldonite.name=Sheldonite Ore
|
||||
tile.techreborn.ore.Peridot.name=Peridot Ore
|
||||
tile.techreborn.ore.Sodalite.name=Sodalite Ore
|
||||
tile.techreborn.ore.Tetrahedrite.name=Tetrahedrite Ore
|
||||
tile.techreborn.ore.Cassiterite.name=Cassiterite Ore
|
||||
tile.techreborn.ore.Lead.name=Lead Ore
|
||||
tile.techreborn.ore.Silver.name=Silver Ore
|
||||
tile.techreborn.ore.galena.name=Galena Ore
|
||||
tile.techreborn.ore.iridium.name=Iridium Ore
|
||||
tile.techreborn.ore.ruby.name=Ruby Ore
|
||||
tile.techreborn.ore.sapphire.name=Sapphire Ore
|
||||
tile.techreborn.ore.bauxite.name=Bauxite Ore
|
||||
tile.techreborn.ore.pyrite.name=Pyrite Ore
|
||||
tile.techreborn.ore.cinnabar.name=Cinnabar Ore
|
||||
tile.techreborn.ore.sphalerite.name=Sphalerite Ore
|
||||
tile.techreborn.ore.tungston.name=Tungsten Ore
|
||||
tile.techreborn.ore.sheldonite.name=Sheldonite Ore
|
||||
tile.techreborn.ore.peridot.name=Peridot Ore
|
||||
tile.techreborn.ore.sodalite.name=Sodalite Ore
|
||||
tile.techreborn.ore.tetrahedrite.name=Tetrahedrite Ore
|
||||
tile.techreborn.ore.cassiterite.name=Cassiterite Ore
|
||||
tile.techreborn.ore.lead.name=Lead Ore
|
||||
tile.techreborn.ore.silver.name=Silver Ore
|
||||
|
||||
#Storage
|
||||
tile.techreborn.storage.silver.name=Block of Silver
|
||||
|
@ -983,6 +983,9 @@ techreborn.recipe.implosioncompressor=Implosion Compressor
|
|||
techreborn.message.missingmultiblock=Incomplete Multiblock
|
||||
techreborn.message.setTo=Set to
|
||||
techreborn.message.in=in
|
||||
techreborn.message.noCoordsSet=No Coordinates Set
|
||||
techreborn.message.coordsHaveBeen=Coordinates have been
|
||||
techreborn.message.cleared=Cleared
|
||||
|
||||
#Cables
|
||||
Cable.copperCable.name=Copper Cable
|
||||
|
|
After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |