Fix Merges

This commit is contained in:
Stuart Pomeroy 2016-03-27 20:14:13 +01:00
commit dfb7d0afd4
26 changed files with 176 additions and 90 deletions

View file

@ -958,6 +958,10 @@ Cable.trippleInsulatedIronCable.name=Triple Insulated Copper Cable
Cable.glassFiberCable.name=Glass Fiber Cable
Cable.tinCable.name=Tin Cable
desc.uninsulatedCable=Damages Entities!
desc.euTransfer=EU Transfer:
desc.tier=Tier:
#Manual
techreborn.manual.contents=Contents Page
techreborn.manual.gettingstarted=Getting Started

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 490 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 441 B

After

Width:  |  Height:  |  Size: 428 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 694 B

After

Width:  |  Height:  |  Size: 681 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 460 B

After

Width:  |  Height:  |  Size: 597 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 382 B

After

Width:  |  Height:  |  Size: 499 B

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After