Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
This commit is contained in:
commit
d6dd706f9c
62 changed files with 1587 additions and 252 deletions
|
@ -67,6 +67,7 @@ tile.techreborn.storage2.tin.name=Tin Block
|
|||
tile.techreborn.solarpanel.name=Solar panel
|
||||
tile.techreborn.watermill.name=Water Mill
|
||||
tile.techreborn.windmill.name=Wind Mill
|
||||
tile.techreborn.ironfurnace.name=Iron Furnace
|
||||
|
||||
#Blocks
|
||||
tile.techreborn.rubberlog.name=Rubber Wood
|
||||
|
@ -268,6 +269,18 @@ 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.lapotroncrystal.name=Lapotron Crystal
|
||||
item.techreborn.energycrystal.name=Energy Crystal
|
||||
item.techreborn.ingot.refinediron.name=Refined Iron
|
||||
item.techreborn.wrench.name=Wrench
|
||||
item.techreborn.cable.COPPER.name=Copper Cable
|
||||
item.techreborn.cable.TIN.name=Tin Cable
|
||||
item.techreborn.cable.GOLD.name=Gold Cable
|
||||
item.techreborn.cable.HV.name=HV Cable
|
||||
item.techreborn.cable.GLASSFIBER.name=Glass Fiber Cable
|
||||
item.techreborn.cable.ICOPPER.name=Insulated Copper Cable
|
||||
item.techreborn.cable.IGOLD.name=Insulated Gold Cable
|
||||
item.techreborn.cable.IHV.name=Insulated HV Cable
|
||||
|
||||
|
||||
#Small Dusts
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
"sap_extract": { "category": "block", "sounds":["sap_extract"] },
|
||||
"block_dismantle": { "category": "block", "sounds":["block_dismantle"] }
|
||||
"block_dismantle": { "category": "block", "sounds":["block_dismantle"] },
|
||||
"cable_shock": { "category": "block", "sounds":["cable_shock"] }
|
||||
}
|
BIN
src/main/resources/assets/techreborn/sounds/cable_shock.ogg
Normal file
BIN
src/main/resources/assets/techreborn/sounds/cable_shock.ogg
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue