upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,495 Commits 6 Branches 324 Tags
a968f41af7ca6effff55d55135a4bda7657b682b
Commit Graph
864 Commits
Author SHA1 Message Date
Bernhard Bonigl a968f41af7 Legendary Glassmakers arrows! Only available in creative. 2014-10-19 17:41:52 +02:00
Bernhard Bonigl 1c1ae28b69 Fix Division through zero with Longbow with low weight arrows 2014-10-19 17:34:38 +02:00
Bernhard Bonigl cb33bb1b72 Fix flux modifier throwing errors 2014-10-19 17:34:16 +02:00
Bernhard Bonigl 4027392d67 Make Ammo stuff more resilient against corrupt tools with no nbt 2014-10-19 17:34:04 +02:00
Bernhard Bonigl 9f64ef46e8 Projectile Weapons tooltip displays the max damage with the current ammo 2014-10-19 16:49:04 +02:00
Bernhard Bonigl 591954cce1 Let's try this... Tinker Projectiles now deal actual unclamped damage instead of capped to 1/2 heart steps damage. 2014-10-19 16:46:01 +02:00
Bernhard Bonigl 11fcf21eb6 More arrow tags and display fixes 2014-10-19 16:23:01 +02:00
Bernhard Bonigl 1194d60678 Remove unused fletchling materials, and add a durability modifier to it. Basically the fletchling plays a huge role in your max-ammo now. 2014-10-19 15:50:06 +02:00
Bernhard Bonigl e7454a56ac Some rendering stuff and fixes with bolts/arrows 2014-10-19 15:45:08 +02:00
Bernhard Bonigl f31e41447c Merge branch 'master' into weaponry 
Conflicts:
	src/main/java/tconstruct/items/tools/Arrow.java
	src/main/java/tconstruct/tools/TinkerTools.java
 2014-10-19 14:12:50 +02:00
Bernhard Bonigl 14078c4092 Fix AOE-Tools not calling tinkers own callbacks for AOE broken blocks (e.g. autosmelt) #1099 2014-10-19 14:08:58 +02:00
Bernhard Bonigl dec1cb4218 Fix arrows with minimal textures crashing. #1101 2014-10-19 14:03:24 +02:00
Bernhard Bonigl ea46704872 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-10-18 17:17:00 +02:00
Bernhard Bonigl c6e24f8511 Fix Traveller Gear Repair #1093 2014-10-18 17:16:50 +02:00
Bernhard Bonigl 8cdd0e5306 Fix wings not calling ArmorMod ticks. Fixes Wing Moss Repair. #1093 2014-10-18 17:16:37 +02:00
Bernhard Bonigl c05cdf03c6 Register a dynamic tool shard if no shard is present in the PatternBuilder IMC 2014-10-18 17:04:35 +02:00
Bernhard Bonigl 9672f95efc Give ToolShards the DynamicToolPart treatment 2014-10-18 17:02:43 +02:00
Ondra Moravek 54e11b8a47 Fix NPE for some (at least Mekanism) pipes connected to unfinished smeltery drains. 2014-10-17 23:54:17 +02:00
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