summaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
2018-02-08use correct oreDict prefix for dilithium, fixed #124Giovanni Harting
2018-02-08removed not used iron_nugget from oreDict, fixing #151Giovanni Harting
2018-02-081.12.2; not well tested; book integration still brokenGiovanni Harting
2017-09-23Revert "Started with rework of alloying process and balancing of levels of ↵Giovanni Harting
natural ores."
2017-07-09fixed #149, some more cleanupGiovanni Harting
2017-07-08Fixes #147 - Eezo ingot now converts to 9 nuggets (#148)Jason Spradlin
Conversion previously listed as Eezo Block = 9 Ingots, 1 Ingot = 9 *Ingots*. Now listed as Eezo Block = 9 Ingots, 1 Ingot = 9 *nuggets*
2017-07-08Fix for Tiberium melting into Dilithium. (#145)TechieJunk
2017-07-08first 1.11.1 attemptGiovanni Harting
2017-05-11Started with rework of alloying process and balancing of levels of natural ores.Robert Sosnitzka
2017-02-02fix divide by zero error (#121)Bill Parrott
2017-01-19Fixed somethingRobert Sosnitzka
2017-01-16separated overworld and others dimensions worldgenGiovanni Harting
2017-01-16added void detection in worldgenGiovanni Harting
2017-01-15Merge remote-tracking branch 'origin/master'Robert Sosnitzka
2017-01-15Added missing icon, added Trait Mutate.Robert Sosnitzka
2017-01-14updated forge and mappings, removed some images not in useGiovanni Harting
2017-01-14Changed ambiguous information of configRobert Sosnitzka
2017-01-14Added Trait Crushing, changed old assignment, fixed two variables to prevent ↵Robert Sosnitzka
annoyance
2017-01-13Added Crafting recipes for blocks, ingots and nuggetsRobert Sosnitzka
2017-01-12Finished creation of book pages for Ores. Other pages will come (e.g. about ↵Robert Sosnitzka
fuels / temperatures). Added german translation.
2017-01-10Added pages for aurorium, duranite, jauxum, karmesine, ovium, palladium, ↵Robert Sosnitzka
prometheum, tiberium, valyrium and vibranium. Changed two generation default variables for balancing.
2017-01-09Reformatted tinker page for type ore to get coloured titles, and reduced the ↵Robert Sosnitzka
size of the icon.
2017-01-09Moved tinker page to client to prevent for server crashRobert Sosnitzka
2017-01-08Some fixes for page-template of tinker bookRobert Sosnitzka
2017-01-05forgot to fix it for the end as well -.-Giovanni Harting
2017-01-05fixed ores not generating in the nether #91Giovanni Harting
2017-01-04reformatGiovanni Harting
2017-01-04Break out of meteor generation if we are in a void dim 92; Added a file type ↵Giovanni Harting
to gitignore
2017-01-04refactored some config related partsGiovanni Harting
2017-01-03Fixed broken book page. Added examples for showing up in the book. Todo: ↵Robert Sosnitzka
Create a separate template!
2017-01-01Added Dilithium Ore and assigned crystals. Added some Book pages as a test ↵Robert Sosnitzka
(need to be fixed before next release). Removed deprecated stuff. Removed 2016, Added 2017.
2017-01-01be sure dropped xp is positive/null, fixes #89Giovanni Harting
2016-12-25first progress on book integration, need to introduce a custom json structureGiovanni Harting
2016-12-25fixed NPE #86Giovanni Harting
2016-12-24Added missing json files, fixed some coloring and spelling issuesRobert Sosnitzka
2016-12-24Added missing png images filesRobert Sosnitzka
2016-12-23Fixed some names and wrote more clear descriptions. Fixed 2 Traits with ↵Robert Sosnitzka
possible NPE
2016-12-22Resolved a possible arithmetic exception. Divided by zero.Robert Sosnitzka
2016-12-22fixed possible NPEGiovanni Harting
2016-12-22Fixed a Trait where no enchantment effect has been shown after restart. ↵Robert Sosnitzka
Added beserk trait.
2016-12-19Created Trait SuperHeavy, rebalanced material stats for lore.Robert Sosnitzka
2016-12-18Balanced out block hardness. It's tinkers alloying addon, not tinkers ↵Robert Sosnitzka
annoying addon! Fixed some language files and fluid models.
2016-12-17fixed a potential NPEGiovanni Harting
2016-12-17Reimplemented different ore-types for Grantie, Diorite, Andensite. Added ↵Robert Sosnitzka
material, items and other stuff for each ore. Oregen rebalanced. Fixed Generator for Oregen.
2016-12-15small generator fix, not ready yetRobert Sosnitzka
2016-12-14Some generator changesRobert Sosnitzka
2016-12-14Added missing names and two missing textures for liquids. Reworked ↵Robert Sosnitzka
Configuration, did not work - still need to be fixed. Changed some Temperatures, added two additional liquids for melting.
2016-12-09fixed some crash with WorldSaveDataGiovanni Harting
2016-12-05fixed buildGiovanni Harting
2016-12-05[1.2] Material rework (#60)Giovanni Harting
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-10 20:13:07 +0000