From 826ab1cf3a01dadae2a5d5a204fa557f7134eac6 Mon Sep 17 00:00:00 2001 From: Giovanni Harting Date: Mon, 5 Dec 2016 20:34:02 +0100 Subject: [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 --- src/main/resources/assets/taiga/lang/de_DE.lang | 1 - src/main/resources/assets/taiga/lang/en_US.lang | 7 +++---- src/main/resources/assets/taiga/lang/zh_CN.lang | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/main/resources/assets/taiga/lang') diff --git a/src/main/resources/assets/taiga/lang/de_DE.lang b/src/main/resources/assets/taiga/lang/de_DE.lang index 8592d85..cd5a982 100644 --- a/src/main/resources/assets/taiga/lang/de_DE.lang +++ b/src/main/resources/assets/taiga/lang/de_DE.lang @@ -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 diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang index 68f57d9..669205d 100644 --- a/src/main/resources/assets/taiga/lang/en_US.lang +++ b/src/main/resources/assets/taiga/lang/en_US.lang @@ -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 diff --git a/src/main/resources/assets/taiga/lang/zh_CN.lang b/src/main/resources/assets/taiga/lang/zh_CN.lang index caafa17..ac01580 100644 --- a/src/main/resources/assets/taiga/lang/zh_CN.lang +++ b/src/main/resources/assets/taiga/lang/zh_CN.lang @@ -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=泰伯利亚矿石 -- cgit v1.2.3