diff options
| author | Giovanni Harting <chefeificationful@gmail.com> | 2016-12-05 20:34:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-05 20:34:02 +0100 |
| commit | 826ab1cf3a01dadae2a5d5a204fa557f7134eac6 (patch) | |
| tree | b05921acb96d2380e193471a6ce9bce6d39e7ffd /src/main/resources/assets/taiga/textures/materials | |
| parent | 9554b56931735ddfa0f3222cc5287893fb77f5a0 (diff) | |
[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
Diffstat (limited to 'src/main/resources/assets/taiga/textures/materials')
13 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/taiga/textures/materials/adamant.png b/src/main/resources/assets/taiga/textures/materials/adamant.png Binary files differnew file mode 100644 index 0000000..84927ea --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/adamant.png diff --git a/src/main/resources/assets/taiga/textures/materials/duranite.png b/src/main/resources/assets/taiga/textures/materials/duranite.png Binary files differnew file mode 100644 index 0000000..c6f1d32 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/duranite.png diff --git a/src/main/resources/assets/taiga/textures/materials/imperomite.png b/src/main/resources/assets/taiga/textures/materials/imperomite.png Binary files differnew file mode 100644 index 0000000..0666b40 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/imperomite.png diff --git a/src/main/resources/assets/taiga/textures/materials/nucleum.png b/src/main/resources/assets/taiga/textures/materials/nucleum.png Binary files differnew file mode 100644 index 0000000..c6f1d32 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/nucleum.png diff --git a/src/main/resources/assets/taiga/textures/materials/osram.png b/src/main/resources/assets/taiga/textures/materials/osram.png Binary files differnew file mode 100644 index 0000000..ff53232 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/osram.png diff --git a/src/main/resources/assets/taiga/textures/materials/palladium.png b/src/main/resources/assets/taiga/textures/materials/palladium.png Binary files differnew file mode 100644 index 0000000..c6f1d32 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/palladium.png diff --git a/src/main/resources/assets/taiga/textures/materials/solarium.png b/src/main/resources/assets/taiga/textures/materials/solarium.png Binary files differnew file mode 100644 index 0000000..f25c67c --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/solarium.png diff --git a/src/main/resources/assets/taiga/textures/materials/tiberium.png b/src/main/resources/assets/taiga/textures/materials/tiberium.png Binary files differnew file mode 100644 index 0000000..2fc50e7 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/tiberium.png diff --git a/src/main/resources/assets/taiga/textures/materials/tiberiumx.png b/src/main/resources/assets/taiga/textures/materials/tiberiumx.png Binary files differnew file mode 100644 index 0000000..c984ab5 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/tiberiumx.png diff --git a/src/main/resources/assets/taiga/textures/materials/tritonite.png b/src/main/resources/assets/taiga/textures/materials/tritonite.png Binary files differnew file mode 100644 index 0000000..225b826 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/tritonite.png diff --git a/src/main/resources/assets/taiga/textures/materials/uru.png b/src/main/resources/assets/taiga/textures/materials/uru.png Binary files differnew file mode 100644 index 0000000..4501a35 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/uru.png diff --git a/src/main/resources/assets/taiga/textures/materials/valyrium.png b/src/main/resources/assets/taiga/textures/materials/valyrium.png Binary files differnew file mode 100644 index 0000000..0c9fa17 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/valyrium.png diff --git a/src/main/resources/assets/taiga/textures/materials/vibranium.png b/src/main/resources/assets/taiga/textures/materials/vibranium.png Binary files differnew file mode 100644 index 0000000..225b826 --- /dev/null +++ b/src/main/resources/assets/taiga/textures/materials/vibranium.png |
