Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
@ -1,3 +1,9 @@
|
|||
|
||||
item.missingRecipe.name=Missing Recipe Placeholder
|
||||
|
||||
|
||||
|
||||
|
||||
itemGroup.techreborn=Tech Reborn
|
||||
|
||||
#machines
|
||||
|
@ -69,6 +75,12 @@ tile.techreborn.watermill.name=Water Mill
|
|||
tile.techreborn.windmill.name=Wind Mill
|
||||
tile.techreborn.ironfurnace.name=Iron Furnace
|
||||
tile.techreborn.recycler.name=Recycler
|
||||
tile.techreborn.scrapboxinator.name=Scrapbox-inator
|
||||
tile.techreborn.batBox.name=Battery Box
|
||||
tile.techreborn.mfe.name=MFE
|
||||
tile.techreborn.mfsu.name=MFSU
|
||||
tile.techreborn.reinforcedglass.name=Reinforced Glass
|
||||
tile.techreborn.nuke.name=Nuke
|
||||
|
||||
#Blocks
|
||||
tile.techreborn.rubberlog.name=Rubber Wood
|
||||
|
@ -270,6 +282,7 @@ item.techreborn.dust.zinc.name=Zinc Dust
|
|||
item.techreborn.dust.galena.name=Galena Dust
|
||||
item.techreborn.dust.greenSapphire.name=Green Sapphire Dust
|
||||
item.techreborn.dust.sawDust.name=Saw Dust
|
||||
item.techreborn.dust.olivine.name=Olivine Dust
|
||||
item.techreborn.lapotroncrystal.name=Lapotron Crystal
|
||||
item.techreborn.energycrystal.name=Energy Crystal
|
||||
item.techreborn.ingot.refinediron.name=Refined Iron Ingot
|
||||
|
@ -375,6 +388,7 @@ item.techreborn.dustsmall.Voidstone.name=Small Pile of Voidstone Dust
|
|||
item.techreborn.dustsmall.YellowGarnet.name=Small Pile of Yellow Garnet Dust
|
||||
item.techreborn.dustsmall.Zinc.name=Small Pile of Zinc Dust
|
||||
item.techreborn.dustsmall.Galena.name=Small Pile of Galena Dust
|
||||
item.techreborn.dustsmall.Olivine.name=Small Pile of Olivine Dust
|
||||
|
||||
#Cells
|
||||
item.techreborn.cell.Berylium.name=Berylium Cell
|
||||
|
@ -415,7 +429,9 @@ item.techreborn.cell.empty.name=Empty Cell
|
|||
item.techreborn.cell.water.name=Water Cell
|
||||
item.techreborn.cell.lava.name=Lava Cell
|
||||
item.techreborn.rebattery.name=Battery
|
||||
item.techreborn.treetap.name=Tree Tap
|
||||
item.techreborn.lithiumBattery.name=Lithium Battery
|
||||
item.techreborn.treetap.name=Treetap
|
||||
item.techreborn.nanosaber.name=Nanosaber
|
||||
|
||||
#Gems
|
||||
item.techreborn.gem.ruby.name=Ruby
|
||||
|
@ -607,9 +623,6 @@ item.techreborn.part.advancedCircuit.name=Advanced Electronic Circuit
|
|||
item.techreborn.part.pump.name=Pump
|
||||
item.techreborn.part.teleporter.name=Teleporter
|
||||
item.techreborn.part.advancedAlloy.name=Advanced Alloy
|
||||
item.techreborn.part.lvTransformer.name=LV Transformer
|
||||
item.techreborn.part.mvTransformer.name=MV Transformer
|
||||
item.techreborn.part.hvTransformer.name=HV Transformer
|
||||
|
||||
#Tools
|
||||
item.techreborn.rockcutter.name=Rockcutter
|
||||
|
|
After Width: | Height: | Size: 680 B |
After Width: | Height: | Size: 1,008 B |
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"animation":{
|
||||
"frametime":2
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 727 B |
Before Width: | Height: | Size: 490 B After Width: | Height: | Size: 738 B |
Before Width: | Height: | Size: 476 B After Width: | Height: | Size: 817 B |
After Width: | Height: | Size: 698 B |
After Width: | Height: | Size: 788 B |
After Width: | Height: | Size: 788 B |
After Width: | Height: | Size: 677 B |
Before Width: | Height: | Size: 484 B After Width: | Height: | Size: 838 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.3 KiB |
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"animation":{
|
||||
"frametime":4
|
||||
"frametime":1
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 598 B |
Before Width: | Height: | Size: 784 B After Width: | Height: | Size: 886 B |
After Width: | Height: | Size: 846 B |
Before Width: | Height: | Size: 606 B After Width: | Height: | Size: 818 B |
Before Width: | Height: | Size: 585 B After Width: | Height: | Size: 886 B |
After Width: | Height: | Size: 860 B |
After Width: | Height: | Size: 634 B |
After Width: | Height: | Size: 644 B |
After Width: | Height: | Size: 700 B |
After Width: | Height: | Size: 564 B |
After Width: | Height: | Size: 686 B |
After Width: | Height: | Size: 719 B |
After Width: | Height: | Size: 770 B |
After Width: | Height: | Size: 651 B |
After Width: | Height: | Size: 727 B |
After Width: | Height: | Size: 824 B |
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"animation":{
|
||||
"frametime":2
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 571 B |
After Width: | Height: | Size: 783 B |
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"animation":{
|
||||
"frametime":2
|
||||
}
|
||||
}
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 7.7 KiB |
Before Width: | Height: | Size: 743 B After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 460 B After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 796 B After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 433 B After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 967 B After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 2.3 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: 1 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 7.7 KiB |
Before Width: | Height: | Size: 975 B After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 981 B After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.3 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: 460 B After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 2.6 KiB |