202 Commits

Author SHA1 Message Date
261b67a74c deleted stuff 2016-12-06 16:46:22 +01:00
ccd699cd05 make compatible with 1.7 again 2016-12-05 21:37:27 +01:00
fd37c72cfc fixed build 2016-12-05 20:46:52 +01:00
c1b92eb7ae set java target version to java 8 2016-12-05 20:44:21 +01:00
Giovanni Harting
826ab1cf3a [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
2016-12-05 20:34:02 +01:00
9554b56931 fixed player being null when instable triggers (fixes #57) 2016-11-08 15:24:07 +01:00
Giovanni Harting
77a9fad5ce fixed typo in readme 2016-10-19 22:44:24 +02:00
Giovanni Harting
9d4e7213eb Update README.md 2016-10-19 22:43:29 +02:00
03e5b50459 fixed a typo 2016-10-18 21:01:04 +02:00
ea594cef3d fixed reviving trait not works with wither skeletons, closes #32 2016-10-18 20:57:03 +02:00
ae4aef454e fixed fracture breaking bedrock, closes #35 2016-10-18 20:27:53 +02:00
4e8222a884 fixed some versoning stuff 2016-10-18 19:39:38 +02:00
c170c9d21d updated deps 2016-10-16 02:32:25 +02:00
cf3aa58fa1 increased min-height 2016-09-12 22:26:02 +02:00
b7e996a9d7 fixed endless loop in teleport trait, closes #38 2016-09-12 22:24:56 +02:00
58eacac28c updated dependencies
compatibility with latest TCon
2016-09-11 23:10:57 +02:00
Robert Sosnitzka
8c334a4cdd Added recipes for ingots, blocks and nuggets! 2016-08-17 23:46:09 +02:00
Robert Sosnitzka
fafde83d4c Changed explosion size, cause users struggling with that piece of shit. Iron_nugget is replaced with oreDict Item when not loaded via TAIGA. 2016-08-05 15:46:45 +02:00
Robert Sosnitzka
e15a07bdb8 Added creative tabs for blocks and items and associated language entries. Added check for iron nugget, to prevent double registry. 2016-07-28 14:59:08 +02:00
Robert Sosnitzka
e6f95908d7 Removed dev block helper. Fixed trait cascade not to break whole mountains. 2016-07-28 13:08:55 +02:00
Robert Sosnitzka
195b6a25dc Removed unused configuration menu. Fixed misspelled menu entry. 2016-07-28 11:56:02 +02:00
Robert Sosnitzka
b539f986f8 Fixed a lot of minor issues. Added configuration for ore values and ore generation. 2016-07-28 11:50:50 +02:00
ccf8c75b37 some minor fixes 2016-07-27 12:01:23 +02:00
faa70ed224 general code cleanup
try and add changes generation back into gradle again
2016-07-27 11:29:58 +02:00
Robert Sosnitzka
e8976365a2 Added integration for non-vanilla dimensions.
Fixed some config basics.
2016-07-26 16:31:42 +02:00
f8984bec16 removed debug out 2016-07-25 23:07:52 +02:00
bfb3c3902e fixed config init is not called on client side 2016-07-25 23:00:58 +02:00
bb9bc335ff first attempt ti implement a config file, does not function atm 2016-07-25 15:23:49 +02:00
Robert Sosnitzka
93d45ceaeb added missing violium_nugget.json 2016-07-25 15:06:52 +02:00
Robert Sosnitzka
fb4c81d44b added missing material overlays 2016-07-25 15:04:19 +02:00
Robert Sosnitzka
c3a2e9922a Swapped position of rubium and adamantite in end dimension. Fixed misspelled instable to unstable. 2016-07-25 14:26:42 +02:00
Robert Sosnitzka
92cfb47f4f - Swapped ore generation for titanite and adamantite (nether <> end).
- Fixed some generated tool textures
- Fixed hardness / blast resistance of blocks
2016-07-25 13:44:50 +02:00
Giovanni Harting
80720d50ce Added CurseForge link to description 2016-07-25 13:07:04 +02:00
9f0de8a250 tweaked some automated building stuff 2016-07-25 12:39:59 +02:00
Robert Sosnitzka
6b2cb0c105 Merge pull request #25 from TartaricAcid/master
Update zh_CN file
2016-07-25 12:31:05 +02:00
tartaric_acid
b075c521b2 Update zh_CN file 2016-07-25 18:22:25 +08:00
Robert Sosnitzka
804feb4280 Merge pull request #24 from TartaricAcid/master
Create a zh_CN file via @TartaricAcid
2016-07-25 10:40:46 +02:00
tartaric_acid
6ee71f3dc1 Create a zh_CN file 2016-07-25 16:37:52 +08:00
Robert Sosnitzka
9141dcc8a2 Changed ore textures slightly 2016-07-24 22:47:59 +02:00
Robert Sosnitzka
e28524864d Corrected rest of generated material textures. 2016-07-24 22:42:25 +02:00
Robert Sosnitzka
eb1eaf3fd7 Cleaned code. Added nugget icons. Fixed some textures. TODO: metal texture rendering 2016-07-24 20:52:57 +02:00
adef051ff7 removed "limiting" implementation of @Zkaface, was just plain wrong 2016-07-24 07:41:25 +02:00
5ccc94e73a removed class not needed 2016-07-24 07:08:55 +02:00
Giovanni Harting
6777030d57 Merge pull request #16 from StevenTheEVILZ
Add documentation and fix book icons
2016-07-24 06:51:19 +02:00
StevenTheEVILZ
c4f8ffc2b9 Add documentation and fix book icons 2016-07-22 10:42:33 -05:00
Robert Sosnitzka
87d33ee9a1 Rebalanced Tiberium. 2016-07-22 01:22:40 +02:00
Robert Sosnitzka
1a2e0f233b adamantite_nugget.json was corrupted 2016-07-22 00:51:39 +02:00
Robert Sosnitzka
374f1f1d24 Added nuggets + json files. F
Removed unnecessary lignite ores.
Fixed oreDict
2016-07-22 00:44:17 +02:00
6a932e6e56 fixed some envs 2016-07-21 19:15:03 +02:00
181fdc196e another approach to the automated building 2016-07-21 19:06:07 +02:00