Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.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
|
||||
|
|
Before Width: | Height: | Size: 285 B |
Before Width: | Height: | Size: 124 B |
Before Width: | Height: | Size: 425 B After Width: | Height: | Size: 425 B |
Before Width: | Height: | Size: 550 B After Width: | Height: | Size: 550 B |
Before Width: | Height: | Size: 382 B After Width: | Height: | Size: 382 B |
Before Width: | Height: | Size: 634 B After Width: | Height: | Size: 634 B |
Before Width: | Height: | Size: 649 B After Width: | Height: | Size: 649 B |
Before Width: | Height: | Size: 373 B After Width: | Height: | Size: 373 B |
Before Width: | Height: | Size: 641 B After Width: | Height: | Size: 641 B |
Before Width: | Height: | Size: 622 B After Width: | Height: | Size: 622 B |
Before Width: | Height: | Size: 526 B After Width: | Height: | Size: 526 B |
Before Width: | Height: | Size: 616 B After Width: | Height: | Size: 616 B |
Before Width: | Height: | Size: 602 B After Width: | Height: | Size: 602 B |
Before Width: | Height: | Size: 660 B After Width: | Height: | Size: 660 B |
Before Width: | Height: | Size: 818 B After Width: | Height: | Size: 818 B |
Before Width: | Height: | Size: 518 B After Width: | Height: | Size: 518 B |
Before Width: | Height: | Size: 842 B After Width: | Height: | Size: 842 B |
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 505 B |
Before Width: | Height: | Size: 510 B After Width: | Height: | Size: 510 B |
Before Width: | Height: | Size: 417 B After Width: | Height: | Size: 417 B |
Before Width: | Height: | Size: 411 B After Width: | Height: | Size: 411 B |
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 407 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 586 B After Width: | Height: | Size: 586 B |
Before Width: | Height: | Size: 849 B After Width: | Height: | Size: 849 B |
After Width: | Height: | Size: 425 B |
Before Width: | Height: | Size: 460 B After Width: | Height: | Size: 460 B |
After Width: | Height: | Size: 382 B |
Before Width: | Height: | Size: 490 B |
Before Width: | Height: | Size: 476 B |
Before Width: | Height: | Size: 395 B After Width: | Height: | Size: 395 B |
Before Width: | Height: | Size: 671 B After Width: | Height: | Size: 671 B |
Before Width: | Height: | Size: 609 B After Width: | Height: | Size: 609 B |
Before Width: | Height: | Size: 730 B After Width: | Height: | Size: 730 B |
Before Width: | Height: | Size: 767 B After Width: | Height: | Size: 767 B |
Before Width: | Height: | Size: 671 B After Width: | Height: | Size: 671 B |
Before Width: | Height: | Size: 726 B After Width: | Height: | Size: 726 B |
Before Width: | Height: | Size: 677 B After Width: | Height: | Size: 677 B |
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 4 KiB |
After Width: | Height: | Size: 425 B |
Before Width: | Height: | Size: 460 B After Width: | Height: | Size: 460 B |
After Width: | Height: | Size: 382 B |
Before Width: | Height: | Size: 646 B After Width: | Height: | Size: 646 B |
Before Width: | Height: | Size: 626 B After Width: | Height: | Size: 626 B |
Before Width: | Height: | Size: 558 B After Width: | Height: | Size: 558 B |
Before Width: | Height: | Size: 475 B After Width: | Height: | Size: 475 B |
Before Width: | Height: | Size: 637 B After Width: | Height: | Size: 637 B |
Before Width: | Height: | Size: 667 B After Width: | Height: | Size: 667 B |
Before Width: | Height: | Size: 560 B After Width: | Height: | Size: 560 B |
Before Width: | Height: | Size: 630 B After Width: | Height: | Size: 630 B |
Before Width: | Height: | Size: 734 B After Width: | Height: | Size: 734 B |
Before Width: | Height: | Size: 609 B After Width: | Height: | Size: 609 B |
Before Width: | Height: | Size: 661 B After Width: | Height: | Size: 661 B |
Before Width: | Height: | Size: 553 B After Width: | Height: | Size: 553 B |
Before Width: | Height: | Size: 462 B After Width: | Height: | Size: 462 B |
Before Width: | Height: | Size: 414 B After Width: | Height: | Size: 414 B |
Before Width: | Height: | Size: 390 B After Width: | Height: | Size: 390 B |
Before Width: | Height: | Size: 542 B After Width: | Height: | Size: 542 B |
Before Width: | Height: | Size: 644 B After Width: | Height: | Size: 644 B |
Before Width: | Height: | Size: 644 B After Width: | Height: | Size: 644 B |
Before Width: | Height: | Size: 631 B After Width: | Height: | Size: 631 B |
Before Width: | Height: | Size: 668 B After Width: | Height: | Size: 668 B |
Before Width: | Height: | Size: 696 B After Width: | Height: | Size: 696 B |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 557 B After Width: | Height: | Size: 557 B |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 509 B After Width: | Height: | Size: 509 B |
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 505 B |
Before Width: | Height: | Size: 397 B After Width: | Height: | Size: 397 B |
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 505 B |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 669 B After Width: | Height: | Size: 669 B |
Before Width: | Height: | Size: 715 B After Width: | Height: | Size: 715 B |
Before Width: | Height: | Size: 340 B After Width: | Height: | Size: 340 B |
Before Width: | Height: | Size: 514 B After Width: | Height: | Size: 514 B |
Before Width: | Height: | Size: 604 B After Width: | Height: | Size: 604 B |
Before Width: | Height: | Size: 476 B After Width: | Height: | Size: 476 B |
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 341 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 615 B After Width: | Height: | Size: 615 B |
Before Width: | Height: | Size: 568 B After Width: | Height: | Size: 568 B |
Before Width: | Height: | Size: 567 B After Width: | Height: | Size: 567 B |
After Width: | Height: | Size: 425 B |
After Width: | Height: | Size: 460 B |
After Width: | Height: | Size: 382 B |
Before Width: | Height: | Size: 462 B After Width: | Height: | Size: 462 B |
Before Width: | Height: | Size: 464 B After Width: | Height: | Size: 464 B |
Before Width: | Height: | Size: 478 B After Width: | Height: | Size: 478 B |
Before Width: | Height: | Size: 463 B After Width: | Height: | Size: 463 B |
Before Width: | Height: | Size: 538 B After Width: | Height: | Size: 538 B |