Commit Graph
997 Commits
Author SHA1 Message Date
Bernhard Bonigl 62905da392 Crossbow Modifier Graphics \o/ 2014-10-17 01:03:53 +02:00
Bernhard Bonigl a7f7258b04 Throwingknife and Shuriken modifiers 2014-10-16 18:03:46 +02:00
Bernhard Bonigl 77ee46bc8c Merge fixes n more 2014-10-16 18:03:34 +02:00
Bernhard Bonigl 65ce5f23c2 Merge branch 'master' into weaponry
Conflicts:
	src/main/java/tconstruct/tools/TinkerTools.java
2014-10-16 16:13:11 +02:00
Bernhard Bonigl d80bd63e7a Make @Adaptivity happy 2014-10-16 11:10:40 +02:00
Bernhard Bonigl 2b2eaaa7ee Also ensure that tinkers is loaded after Thermal Foundation, not only Thermal Expansion (only matters if TE is not present, but meh.) 2014-10-16 10:59:31 +02:00
Bernhard Bonigl 90e23e393a Water/Lava buckets can now be cast with a casting table! There you go @fuj1n ;) 2014-10-16 10:58:23 +02:00
Bernhard Bonigl cbe57a08e1 Call the callbacks on tools when breaking blocks when breaking extra blocks with AOE tools. Fixes extra-blocks harvested not using up durability. #1089 2014-10-15 23:36:27 +02:00
Bernhard Bonigl c0e46f151b Materials that shall have toolparts created for them have to be registered specifically now. Registering a material via IMC does so automatically. Should also fix the double-toolparts with extratic and other mod relying on the 1.6 API. 2014-10-15 23:17:41 +02:00
Bernhard Bonigl c824f68b79 Prevent NPEs with mystcraft if TE isn't present 2014-10-15 22:37:22 +02:00
Bernhard Bonigl 4858fab643 Update Mystcraft IMC 2014-10-15 22:27:42 +02:00
Bernhard Bonigl f1ec9f24da Merge branch 'master' into weaponry
Conflicts:
	src/main/java/tconstruct/tools/TinkerTools.java
2014-10-14 23:20:38 +02:00
Bernhard Bonigl 02f405fa82 Change how fuel is used to allow rapid-use low duration fuels.
Basically the fuel value in the smeltery is per tick now than a weird -3 every second. This also makes math a lot easier. Fuel also is consumed every time something is heated instead of every second.
2014-10-14 23:10:01 +02:00
Bernhard Bonigl acd2a00ade Add IMC for smeltery fuel 2014-10-14 22:54:15 +02:00
Bernhard Bonigl a02db1ce73 Smeltery Melting IMC 2014-10-14 22:34:43 +02:00
Bernhard Bonigl 80ab942ff6 Make dynamic toolparts use the correct material localization. Deprecated toolpart stays the same so old addons have backwards compatibility. #1078 2014-10-14 21:56:00 +02:00
Bernhard Bonigl fc35996010 More work on the block breaking of AOE Tools: Really fast tools now break in AOE correctly. Changed behaviour to emulate the correct behaviour, but don't call the recursive block breaks. Furthermore, send packets causing updates for each AOE block broken. This should prevent clientside ghost blocks because the client is breaking blocks that it can't break yet on the server.
#1072
2014-10-14 21:39:26 +02:00
Bernhard Bonigl eb874d833a Fix flat-world-slime-island-generation-option being reversed 2014-10-14 20:21:27 +02:00
Bernhard Bonigl acc8eafcdc TE Support: Pouring ender from a smeltery into a bucket now also returns the TE-Bucket, not the tinker one. #1088 2014-10-14 19:20:38 +02:00
Bernhard Bonigl 033c635ca3 Fix damage-display calculation. #1082 2014-10-13 11:18:35 +02:00
Bernhard Bonigl 82ca44bb66 Fix internal inventory size of crafting stations. 2014-10-13 11:14:07 +02:00
Bernhard Bonigl 1feac32104 Noppe's Custom NPCs shouldn't drop yellow hearts anymore 2014-10-12 12:26:39 +02:00
Bernhard Bonigl 79cefddf75 Remove unused variable that can potentially cause a crash under certain circumstances 2014-10-12 12:25:09 +02:00
Bernhard Bonigl be33e4d96c Remove last usage of ToolPart and fix possible crash with displaying parts 2014-10-12 12:24:41 +02:00
Bernhard Bonigl 952bc7ed0e Crossbow Reload Sound 2014-10-10 18:41:12 +02:00
Bernhard Bonigl cd58fde59f Fix throwing weapons not using their proper textures if present 2014-10-10 18:21:02 +02:00
Bernhard Bonigl 503dd488d2 Render bolts a bit bigger 2014-10-10 18:03:10 +02:00
Bernhard Bonigl 4f9f63ac93 Fix bolt fletchling color 2014-10-10 18:02:55 +02:00
Bernhard Bonigl 8fe42be9f2 Fix entity id conflicts 2014-10-10 18:00:15 +02:00
Bernhard Bonigl 17593a3909 Reimplement the changes to the entity rendering in the custom renderers so their animations n stuff isn't b0rked anymore. (todo: do properly later) 2014-10-10 17:52:17 +02:00
Bernhard Bonigl 28f16ac76c Don't use up ammo in creative mode 2014-10-10 17:48:19 +02:00
Bernhard Bonigl 69fad3c103 Fix entity rendering, but screw up all the animations n stuff.. sigh 2014-10-10 17:37:39 +02:00
Bernhard Bonigl 2988b75490 Fix colors for fletchlings on arrows 2014-10-10 13:06:34 +02:00
Bernhard Bonigl 9dad8691f4 Fix King Slime not being named King Slime. 2014-10-10 12:53:34 +02:00
Bernhard Bonigl 852cecae7b Merge branch 'master' into weaponry 2014-10-10 12:45:10 +02:00
Bernhard Bonigl 3bb73019a5 Make glove haste actually work. 2014-10-10 12:39:53 +02:00
Bernhard Bonigl e3c3fa38ce Add death penality dimishing returns: Dieing within 5 minutes reduces the damage to tools. The more often you die the less it takes, until you manage to live for 5 minutes. 2014-10-10 11:36:25 +02:00
Bernhard Bonigl a99278c656 Merge branch 'master' into weaponry
Conflicts:
	src/main/java/tconstruct/tools/ToolProxyClient.java
2014-10-10 00:45:18 +02:00
Bernhard Bonigl 66bfc70b0f Don't use custom renderer unless needed, since it seems to cause performance problems on some systems 2014-10-10 00:44:01 +02:00
Bernhard Bonigl ca786eb2ed Animated effects are back! 2014-10-09 18:11:06 +02:00
Bernhard Bonigl 3427ed6208 Redstone-Modifier for bows and similar! 2014-10-09 17:35:49 +02:00
Bernhard Bonigl 196a435ba9 Fix NPE when no tank with fuel is present #1070 2014-10-09 14:22:16 +02:00
Bernhard Bonigl 729d6a266f Change Death penality to take difficulty into account. Easy/Peaceful = no penality, normal = 5%, hard = 10% 2014-10-08 22:26:54 +02:00
Bernhard Bonigl 72dcd8ac5f Merge branch 'master' into weaponry 2014-10-08 20:41:47 +02:00
Bernhard Bonigl 72c180fab4 Add a config option to disable the death penality durability loss 2014-10-08 20:12:22 +02:00
Arthur Uzulin 8c8599c68b Fixed #1069 2014-10-08 17:13:09 +11:00
Bernhard Bonigl d39db6dc49 Dying costs 10% max durability of tools 2014-10-07 22:43:06 +02:00
Bernhard Bonigl 85a9bb2ce9 More juicy default color for alumite 2014-10-07 22:21:41 +02:00
Bernhard Bonigl 3b3f409a2c Toolforges are not pattern chests. 2014-10-07 22:15:32 +02:00
Bernhard Bonigl ed630aa038 Do not add materials that don't have actual parts to the NEI ToolMaterial stuff.
Only happens in special cases, like the String material from IguanaTweaks, that has no craftable toolparts.
Should finally fix https://github.com/SlimeKnights/IguanaTweaksTConstruct/issues/17
2014-10-07 22:10:30 +02:00