Merge branch '1.9' into 1.9-BTM
This commit is contained in:
commit
9035f2a21c
15 changed files with 198 additions and 330 deletions
97
src/main/resources/assets/techreborn/blockstates/fluids.json
Normal file
97
src/main/resources/assets/techreborn/blockstates/fluids.json
Normal file
|
@ -0,0 +1,97 @@
|
|||
{
|
||||
"forge_marker": 1,
|
||||
"variants": {
|
||||
"techreborn.berylium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidberylium" }
|
||||
},
|
||||
"techreborn.calcium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidcalcium" }
|
||||
},
|
||||
"techreborn.calciumcarbonate": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidcalciumcarbonate" }
|
||||
},
|
||||
"techreborn.chlorite": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidchlorite" }
|
||||
},
|
||||
"techreborn.deuterium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluiddeuterium" }
|
||||
},
|
||||
"techreborn.glyceryl": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidglyceryl" }
|
||||
},
|
||||
"techreborn.helium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidhelium" }
|
||||
},
|
||||
"techreborn.helium3": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidhelium3" }
|
||||
},
|
||||
"techreborn.heliumplasma": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidheliumplasma" }
|
||||
},
|
||||
"techreborn.hydrogen": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidhydrogen" }
|
||||
},
|
||||
"techreborn.lithium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidlithium" }
|
||||
},
|
||||
"techreborn.mercury": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidmercury" }
|
||||
},
|
||||
"techreborn.methane": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidmethane" }
|
||||
},
|
||||
"techreborn.nitrocoalfuel": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidnitrocoalfuel" }
|
||||
},
|
||||
"techreborn.nitrofuel": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidnitrofuel" }
|
||||
},
|
||||
"techreborn.nitrogen": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidnitrogen" }
|
||||
},
|
||||
"techreborn.nitrogendioxide": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidnitrogendioxide" }
|
||||
},
|
||||
"techreborn.potassium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidpotassium" }
|
||||
},
|
||||
"techreborn.silicon": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidsilicon" }
|
||||
},
|
||||
"techreborn.sodium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidsodium" }
|
||||
},
|
||||
"techreborn.sodiumpersulfate": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidsodiumpersulfate" }
|
||||
},
|
||||
"techreborn.tritium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidtritium" }
|
||||
},
|
||||
"techreborn.wolframium": {
|
||||
"model": "forge:fluid",
|
||||
"custom": { "fluid": "fluidwolframium" }
|
||||
}
|
||||
}
|
||||
}
|
|
@ -65,8 +65,6 @@ 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.storage2.copper.name=Copper Block
|
||||
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
|
||||
|
@ -136,6 +134,8 @@ tile.techreborn.storage2.peridot.name=Block of Peridot
|
|||
tile.techreborn.storage2.yellowGarnet.name=Block of Yellow Garnet
|
||||
tile.techreborn.storage2.redGarnet.name=Block of Red Garnet
|
||||
tile.techreborn.storage2.refinedIron.name=Block of Refined Iron
|
||||
tile.techreborn.storage2.copper.name=Block of Copper
|
||||
tile.techreborn.storage2.tin.name=Block of Tin
|
||||
tile.techreborn.farm.name=Farm
|
||||
|
||||
|
||||
|
@ -683,30 +683,30 @@ item.peridotChestplate.name=Peridot Chestplate
|
|||
item.peridotLeggings.name=Peridot Leggings
|
||||
item.peridotBoots.name=Peridot Boots
|
||||
|
||||
#Buckets
|
||||
item.bucketberylium.name=Beryllium Bucket
|
||||
item.bucketcalcium.name=Calcium Bucket
|
||||
item.bucketcalciumcarbonate.name=Calciumcarbonate Bucket
|
||||
item.bucketchlorite.name=Chlorite Bucket
|
||||
item.bucketdeuterium.name=Deuterium Bucket
|
||||
item.bucketglyceryl.name=Glyceryl Bucket
|
||||
item.buckethelium.name=Helium Bucket
|
||||
item.buckethelium3.name=Helium3 Bucket
|
||||
item.bucketheliumplasma.name=Heliumplasma Bucket
|
||||
item.buckethydrogen.name=Hydrogen Bucket
|
||||
item.bucketlithium.name=Lithium Bucket
|
||||
item.bucketmercury.name=Mercury Bucket
|
||||
item.bucketmethane.name=Methane Bucket
|
||||
item.bucketnitrocoalfuel.name=Nitrocoalfuel Bucket
|
||||
item.bucketnitrofuel.name=Nitrofuel Bucket
|
||||
item.bucketnitrogen.name=Nitrogen Bucket
|
||||
item.bucketnitrogendioxide.name=Nitrogendioxide Bucket
|
||||
item.bucketpotassium.name=Potassium Bucket
|
||||
item.bucketsilicon.name=Silicon Bucket
|
||||
item.bucketsodium.name=Sodium Bucket
|
||||
item.bucketsodiumpersulfate.name=Sodiumpersulfate Bucket
|
||||
item.buckettritium.name=Tritium Bucket
|
||||
item.bucketwolframium.name=Wolframium Bucket
|
||||
#Fluid
|
||||
fluid.fluidberylium=Beryllium
|
||||
fluid.fluidcalcium=Calcium
|
||||
fluid.fluidcalciumcarbonate=Calciumcarbonate
|
||||
fluid.fluidchlorite=Chlorite
|
||||
fluid.fluiddeuterium=Deuterium
|
||||
fluid.fluidglyceryl=Glyceryl
|
||||
fluid.fluidhelium=Helium
|
||||
fluid.fluidhelium3=Helium3
|
||||
fluid.fluidheliumplasma=Heliumplasma
|
||||
fluid.fluidhydrogen=Hydrogen
|
||||
fluid.fluidlithium=Lithium
|
||||
fluid.fluidmercury=Mercury
|
||||
fluid.fluidmethane=Methane
|
||||
fluid.fluidnitrocoalfuel=Nitrocoalfuel
|
||||
fluid.fluidnitrofuel=Nitrofuel
|
||||
fluid.fluidnitrogen=Nitrogen
|
||||
fluid.fluidnitrogendioxide=Nitrogendioxide
|
||||
fluid.fluidpotassium=Potassium
|
||||
fluid.fluidsilicon=Silicon
|
||||
fluid.fluidsodium=Sodium
|
||||
fluid.fluidsodiumpersulfate=Sodiumpersulfate
|
||||
fluid.fluidtritium=Tritium
|
||||
fluid.fluidwolframium=Wolframium
|
||||
|
||||
#Items
|
||||
item.techreborn.uuMatter.name=UU-Matter
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 15 KiB |
Loading…
Add table
Add a link
Reference in a new issue