[1.2] Material rework (#60)

* Developement tests for nbt data in traits

* Lot of trait changes and better balancing

* Traits reworked a bit, new traits added.

* First correction of NBT Data in Trait (Soulbound). Is shown twice. Still needs corrections.

* Few fixes in traits and new trait "catcher"

* Small fix, needs workaround

* fixed some catch issues

* Fixed Catcher and Reviving Traits, new Trait: Souleater. Updated build.gradle for new TiC Version.

* Splitted SoulEater to get the bad touch to an extra trait "Cursed". Added method for using nbt more easily. Changed declaration names of fluids

* Some minor changes in Traits, Registry and Utils.

* Iron_nugget is replaced with oreDict Item when not loaded via TAIGA.

* Beginning of new material  integration. Lot of names changed, lot more work to do here. Many null pointer exceptions and no changes of values up to now.

* Some Small changes in names, registry and recipes

* Some weird stuff I don't remember :D

* fixed some things I missed while merging

* Rollback to something

* More Stuff

* fixed some merging stuff

* Fixed some misspelled names. Actually working with lots of restrictions.

* Rearranged alloys, tried to add blocks / ingots for non-tinker-materials, but they won't work.

* Again tried to fix the melting issue, but non-tinker materials still are not able to be casted as a block, ingot or nugget...

* Fixed integration of materials without tools.

* changed IMC to direct lib calls

* removed more IMC, removed redundant code

* some reformatting

* Alloy integration reworked, needs to be balanced.

* updated deps, renamed some func's, added duplicate material check

* some more renaming

* some reformatting, fixed wrong import, fixed string cmp's

* Added images for blocks, ingots, nuggets and dust. Json changes do not work yet.

* some reformatting

* Removed old json files. Placeholder needed.

* Fixed block json, items not working yet.

* Fixed my own derp (missing json files)

* Reduced materials to ensure unique traits for most of them. Still 30 though, but reduced by 20 more :'( RIP

* Changed some generator stuff, not working properly right now!

* rewrote offset generation, added some debug command, fixed some stuff

* fixed on-surface-generation, made dependencies more flexible

* reverted gen-weight back to its normal value

* Meteor generator implemented.

* fixed generating on ground

* optimized a thing

* Replaced Uru with Osram, replaced Meteorite with Uru, added Meteorite again for Hull-Material and late game alloy.

* Some changes in generation of ores, not ready yet.

* Added Cobble Meteorite. Added debug command. Implemented rest of ore generation. Some minor fixes left for generation including balancing.

* Some changes for ore generation. Added 2 separate Generic Blocks for meteorite and their cobble variant.

* some cleanup in Generator class, added meteor world save handler

* Added Textures. Added blockstates and item models. Fixed fluid rendering.

* renamed world save data file to be little more specific, removed a unused method

* some preps for the upcoming release

* First attempt of well balancing material stats. Renamed TiberiumX to Triberium.

* Final changes... ready for beta testing

* Added missing alloys.

* Corrected balancing of ore generation. Still WIP

* removed some last debug out

* one last reformat
This commit is contained in:
Giovanni Harting
2016-12-05 20:34:02 +01:00
committed by GitHub
parent 9554b56931
commit 826ab1cf3a
625 changed files with 3540 additions and 3279 deletions

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/abyssum"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/abyssum"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/adamant"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:adamantite_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:adamantite_ore"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:aegisalt_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:arcanite_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:arcanite_ore"
}
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/astrium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:astrium_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/aurorium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/aurorium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:basalt"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/basalt"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:bismuth_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:bismuth_ore"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:bysmuid_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:cryptogen_block"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/duranite"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/duranite"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/dyonite"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:dyonite_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/eezo"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/eezo"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:eternite_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:eternite_ore"
}
}
}

View File

@@ -4,276 +4,241 @@
"model": "forge:fluid"
},
"variants": {
"arcanite": [
"triberium_fluid": [
{
"custom": {
"fluid": "arcanite"
"fluid": "triberium_fluid"
}
}
],
"tiberium": [
"meteorite_fluid": [
{
"custom": {
"fluid": "tiberium"
"fluid": "meteorite_fluid"
}
}
],
"prometheum": [
"basalt_fluid": [
{
"custom": {
"fluid": "prometheum"
"fluid": "basalt_fluid"
}
}
],
"rubium": [
"tiberium_fluid": [
{
"custom": {
"fluid": "rubium"
"fluid": "tiberium_fluid"
}
}
],
"violium": [
"aurorium_fluid": [
{
"custom": {
"fluid": "violium"
"fluid": "aurorium_fluid"
}
}
],
"bismuth": [
"prometheum_fluid": [
{
"custom": {
"fluid": "bismuth"
"fluid": "prometheum_fluid"
}
}
],
"karmesine": [
"duranite_fluid": [
{
"custom": {
"fluid": "karmesine"
"fluid": "duranite_fluid"
}
}
],
"mindorite": [
"valyrium_fluid": [
{
"custom": {
"fluid": "mindorite"
"fluid": "valyrium_fluid"
}
}
],
"titanite": [
"vibranium_fluid": [
{
"custom": {
"fluid": "titanite"
"fluid": "vibranium_fluid"
}
}
],
"meteorite": [
"karmesine_fluid": [
{
"custom": {
"fluid": "meteorite"
"fluid": "karmesine_fluid"
}
}
],
"adamantite": [
"palladium_fluid": [
{
"custom": {
"fluid": "adamantite"
"fluid": "palladium_fluid"
}
}
],
"vibranium": [
"uru_fluid": [
{
"custom": {
"fluid": "vibranium"
"fluid": "uru_fluid"
}
}
],
"ignitite": [
"osram_fluid": [
{
"custom": {
"fluid": "ignitite"
"fluid": "osram_fluid"
}
}
],
"palladium": [
"abyssum_fluid": [
{
"custom": {
"fluid": "palladium"
"fluid": "abyssum_fluid"
}
}
],
"eternite": [
"eezo_fluid": [
{
"custom": {
"fluid": "eternite"
"fluid": "eezo_fluid"
}
}
],
"mythril": [
"tiberiumX_fluid": [
{
"custom": {
"fluid": "mythril"
"fluid": "tiberiumX_fluid"
}
}
],
"astrium": [
"fractum_fluid": [
{
"custom": {
"fluid": "astrium"
"fluid": "fractum_fluid"
}
}
],
"nitronite": [
"violium_fluid": [
{
"custom": {
"fluid": "nitronite"
"fluid": "violium_fluid"
}
}
],
"proxideum": [
"proxii_fluid": [
{
"custom": {
"fluid": "proxideum"
"fluid": "proxii_fluid"
}
}
],
"noctunyx": [
"tritonite_fluid": [
{
"custom": {
"fluid": "noctunyx"
"fluid": "tritonite_fluid"
}
}
],
"imperomite": [
"ignitz_fluid": [
{
"custom": {
"fluid": "imperomite"
"fluid": "ignitz_fluid"
}
}
],
"cryptogen": [
"imperomite_fluid": [
{
"custom": {
"fluid": "cryptogen"
"fluid": "imperomite_fluid"
}
}
],
"fractoryte": [
"solarium_fluid": [
{
"custom": {
"fluid": "fractoryte"
"fluid": "solarium_fluid"
}
}
],
"seismodium": [
"nihilite_fluid": [
{
"custom": {
"fluid": "seismodium"
"fluid": "nihilite_fluid"
}
}
],
"terramite": [
"adamant_fluid": [
{
"custom": {
"fluid": "terramite"
"fluid": "adamant_fluid"
}
}
],
"lumixyl": [
"dyonite_fluid": [
{
"custom": {
"fluid": "lumixyl"
"fluid": "dyonite_fluid"
}
}
],
"solarium": [
"nucleum_fluid": [
{
"custom": {
"fluid": "solarium"
"fluid": "nucleum_fluid"
}
}
],
"dyonite": [
"lumix_fluid": [
{
"custom": {
"fluid": "dyonite"
"fluid": "lumix_fluid"
}
}
],
"ultranite": [
"seismum_fluid": [
{
"custom": {
"fluid": "ultranite"
"fluid": "seismum_fluid"
}
}
],
"nucleum": [
"astrium_fluid": [
{
"custom": {
"fluid": "nucleum"
"fluid": "astrium_fluid"
}
}
],
"aegisalt": [
"niob_fluid": [
{
"custom": {
"fluid": "aegisalt"
"fluid": "niob_fluid"
}
}
],
"bysmuid": [
"yrdeen_fluid": [
{
"custom": {
"fluid": "bysmuid"
"fluid": "yrdeen_fluid"
}
}
],
"radiant_enderium": [
"iox_fluid": [
{
"custom": {
"fluid": "radiant_enderium"
"fluid": "iox_fluid"
}
}
],
"glimming_enderium": [
"obsidiorite_fluid": [
{
"custom": {
"fluid": "glimming_enderium"
}
}
],
"energy_enderium": [
{
"custom": {
"fluid": "energy_enderium"
}
}
],
"glimmercoal_fluid": [
{
"custom": {
"fluid": "glimmercoal_fluid"
}
}
],
"nitro_fluid": [
{
"custom": {
"fluid": "nitro_fluid"
}
}
],
"anthracite_fluid": [
{
"custom": {
"fluid": "anthracite_fluid"
}
}
],
"spectrum_fluid": [
{
"custom": {
"fluid": "spectrum_fluid"
"fluid": "obsidiorite_fluid"
}
}
]

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:fractoryte_block"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/fractum"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:ignitite_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:ignitite_ore"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/ignitz"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/imperomite"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:imperomite_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/iox"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/karmesine"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:karmesine_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -1,7 +1,18 @@
{
"variants": {
"normal": {
"model": "taiga:karmesine_ore"
}
}
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/karmesine"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/karmesineandensite"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/karmesinediorite"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/karmesinegranite"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:lignite_ore"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/lumix"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:lumixyl_block"
}
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/meteorite"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:meteorite_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:meteorite_ore"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/meteoritecobble"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:mindorite_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:mindorite_ore"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:mythril_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:mythril_ore"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/nihilite"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/niob"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:nitronite_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:noctunyx_block"
}
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/nucleum"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:nucleum_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/obsidiorite"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/obsidioritecobble"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/osram"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/osram"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/palladium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:palladium_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -1,7 +1,18 @@
{
"variants": {
"normal": {
"model": "taiga:palladium_ore"
}
}
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/palladium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/prometheum"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:prometheum_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -1,7 +1,18 @@
{
"variants": {
"normal": {
"model": "taiga:prometheum_ore"
}
}
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/prometheum"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:proxideum_block"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/proxii"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:rotten_ground"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:rubium_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:rubium_ore"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:seismodium_block"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/seismum"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:slaggold_ore"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:slagiron_ore"
}
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/solarium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:solarium_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:terramite_block"
}
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/tiberium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:tiberium_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -1,7 +1,18 @@
{
"variants": {
"normal": {
"model": "taiga:tiberium_ore"
}
}
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/tiberium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:titanite_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:titanite_ore"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/triberium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/tritonite"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:ultranite_block"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/uru"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/uru"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/valyrium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/valyrium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/vibranium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:vibranium_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -1,7 +1,18 @@
{
"variants": {
"normal": {
"model": "taiga:vibranium_ore"
}
}
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/ore/vibranium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -1,7 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/violium"
},
"transform": "forge:default-block"
},
"variants": {
"normal": {
"model": "taiga:violium_block"
}
"normal": [
{}
],
"inventory": [
{}
]
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"normal": {
"model": "taiga:violium_ore"
}
}
}

View File

@@ -0,0 +1,18 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_all",
"textures": {
"all": "taiga:blocks/block/yrdeen"
},
"transform": "forge:default-block"
},
"variants": {
"normal": [
{}
],
"inventory": [
{}
]
}
}

View File

@@ -13,7 +13,6 @@ tile.mindorite_ore.name=Mindoriterz
tile.mythril_ore.name=Mythrilerz
tile.palladium_ore.name=Palladiumerz
tile.prometheum_ore.name=Prometheumerz
tile.rotten_ground.name=Verrottete Erde
tile.slagiron_ore.name=Unreines Eisenerz
tile.slaggold_ore.name=Unreines Golderz
tile.tiberium_ore.name=Tiberiumerz

View File

@@ -13,7 +13,6 @@ tile.mindorite_ore.name=Mindorite Ore
tile.mythril_ore.name=Mythril Ore
tile.palladium_ore.name=Palladium Ore
tile.prometheum_ore.name=Prometheum Ore
tile.rotten_ground.name=Rotten Ground
tile.slagiron_ore.name=Slagiron Ore
tile.slaggold_ore.name=Slaggold Ore
tile.tiberium_ore.name=Tiberium Ore
@@ -229,13 +228,13 @@ modifier.garishly.desc=§oIt's so hot.§r\Thei actually drop fiery stuff.
modifier.glimmer.name=Glimmer
modifier.glimmer.desc=§oDarkness? Not for me!§r\Sometimes you get night vision.
modifier.haunted.name=Haunted
modifier.haunted.desc=§oHit 'em to get 'em crazy!'§r\Fucking mad cow desease.
modifier.haunted.desc=§oHit 'em to get 'em crazy!'§r\This is mad cow desease.
modifier.heroic.name=Heroic
modifier.heroic.desc=§oUntil you'll die.§r\At the end, you grow stronger.
modifier.hollow.name=Hollow
modifier.hollow.desc=§oBraindead!§r\Brain smash!
modifier.instable.name=Unstable
modifier.instable.desc=§oWhat the fuck?§r\Seriously, this is unstable!
modifier.instable.desc=§oWhat the heck?§r\Seriously, this is unstable!
modifier.naturebound.name=Naturebound
modifier.naturebound.desc=§oYou are one with your surrounding!§r\Repairs in name of the nature.
modifier.pulverizing.name=Pulverizing
@@ -253,7 +252,7 @@ modifier.uncertain.desc=§oSome kind of risky to use.§r\At least it's not unsta
modifier.reviving.name=Reviving
modifier.reviving.desc=§oPlease kill it already!§r\Zombies!?
modifier.melting.name=Melting
modifier.melting.desc=§oSo fucking hot!§r\Burrrrrrn!
modifier.melting.desc=§oSo damn hot!§r\Burrrrrrn!
item.glimmercoal.name=Glimmercoal

View File

@@ -13,7 +13,6 @@ tile.mindorite_ore.name=曼德瑞特矿石
tile.mythril_ore.name=秘银矿石
tile.palladium_ore.name=钯矿石
tile.prometheum_ore.name=幻金矿石
tile.rotten_ground.name=腐烂泥土
tile.slagiron_ore.name=富渣铁矿石
tile.slaggold_ore.name=富渣金矿石
tile.tiberium_ore.name=泰伯利亚矿石

View File

@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "taiga:blocks/adamantite_block"
}
}

View File

@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "taiga:blocks/adamantite_ore"
}
}

View File

@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "taiga:blocks/aegisalt_block"
}
}

View File

@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "taiga:blocks/arcanite_block"
}
}

View File

@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "taiga:blocks/arcanite_ore"
}
}

View File

@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "taiga:blocks/astrium_ore"
}
}

View File

@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "taiga:blocks/astrium_block"
}
}

View File

@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "taiga:blocks/basalt"
}
}

View File

@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "taiga:blocks/bismuth_block"
}
}

View File

@@ -1,6 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"all": "taiga:blocks/bismuth_ore"
}
}

Some files were not shown because too many files have changed in this diff Show More