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,711 Commits 6 Branches 324 Tags
6ea64191e14d895bf822ffc7ae41cf6630b5b328
Commit Graph
182 Commits
Author SHA1 Message Date
Bernhard Bonigl 2a275c424e Merge branch 'master' into experimental 2014-11-23 23:11:31 +01:00
Bernhard Bonigl 8161d2b493 Adjust Thaumium bow-stats 2014-11-20 15:42:20 +01:00
Bernhard Bonigl 8687296199 Bring flamestring in line so it's an actual choice instead of just making normal tools lategame power. Also bring enchanted string in line a bit. 2014-11-20 15:40:21 +01:00
Bernhard Bonigl b073a209f1 Fix repair-button not getting translated #1182 2014-11-18 10:20:06 +01:00
Bernhard Bonigl 7f87feaa0f Merge branch 'master' into weaponry 2014-11-16 23:29:05 +01:00
Bernhard Bonigl a56067bc50 Add a fix for chisels weird "imma change stone to only be harvestable by a chisel" thing. 2014-11-16 23:25:20 +01:00
Bernhard Bonigl 2d6c7f7367 Fix patternchest -> slab not keeping the inventory #1172 2014-11-16 23:13:55 +01:00
Bernhard Bonigl df64bc8197 Slab Pattern Chests now also keep their inventory! 2014-11-16 23:13:39 +01:00
Bernhard Bonigl 4c26f857c7 Fix Break-Chance display for arrows in toolstations etc. 2014-11-16 21:17:38 +01:00
Bernhard Bonigl 62904b92dc Fix Max ammo display in tables 2014-10-30 13:08:01 +01:00
Bernhard Bonigl 5a03a15ec4 Make weaponry book available! 2014-10-30 12:31:54 +01:00
Bernhard Bonigl 6cd7b497e8 Weaponry booooooook 2014-10-29 22:33:00 +01:00
Bernhard Bonigl 525baf8aad Add display and calculation stuff for maximum damage with thrown weapons 2014-10-28 18:52:11 +01:00
Bernhard Bonigl 92fd2cc222 Correct stats for projectile weapons 2014-10-28 18:21:25 +01:00
Bernhard Bonigl 0146627262 Bring Traits in line with GUI stuff etc. 2014-10-28 18:16:08 +01:00
Bernhard Bonigl 159b772f5a Clean up GUI stuff for tools! \o/ 2014-10-28 17:56:29 +01:00
Bernhard Bonigl 5495722194 Pull tool info stuff out from toolstation/craftingstation gui and unify in helper class 2014-10-28 15:45:13 +01:00
Bernhard Bonigl 24cc1e773d Projectiles now slowly regrow with moss :D 2014-10-26 20:08:10 +01:00
Bernhard Bonigl d96379f753 Merge branch 'master' into weaponry 2014-10-26 18:26:36 +01:00
Bernhard Bonigl 971b84c3e4 Really fix the crafting table crashes. Derp. #1126 2014-10-26 18:15:26 +01:00
Bernhard Bonigl 947da8f9df Merge branch 'master' into weaponry 
Conflicts:
	src/main/java/tconstruct/tools/ToolProxyClient.java
 2014-10-26 17:10:09 +01:00
Bernhard Bonigl 6f2ee0f2a4 Force-enable tools, smeltery and world because of dependencies in between these three. Needs restructuring. 2014-10-26 16:51:59 +01:00
Bernhard Bonigl e1d2c8e3f6 Fix FML Events not getting called. #1121 2014-10-26 16:49:27 +01:00
boni ed9615a93d Merge pull request #1114 from MikeLydeamore/master 
Added /dev/null block placing functionality
 2014-10-25 09:30:50 +02:00
Michael Lydeamore 1db5375d35 Added /dev/null functionality 
Moved finding to TinkerTools
 2014-10-25 17:01:53 +10:30
Bernhard Bonigl 4c1852546e ToolStation/Forge GUI for the new weapons 2014-10-24 14:58:27 +02:00
Bernhard Bonigl 45247bd9cb Fix shortbow using wrong description in tool station/forge 2014-10-24 13:37:30 +02:00
Bernhard Bonigl 5bfdb0d769 Rework stencil table button layout to weaponry and more NEI fix 2014-10-24 13:30:46 +02:00
Bernhard Bonigl 939bd8a0ae Merge branch 'master' into weaponry 
Conflicts:
	src/main/java/tconstruct/tools/TinkerTools.java
 2014-10-24 13:17:48 +02:00
Bernhard Bonigl 2e9e347255 Fix some typos in the toolstation localization strings and simplify the whole localization stuff in code. 2014-10-24 12:36:40 +02:00
Bernhard Bonigl 8630e5e701 Fix toolstation localization pr 2014-10-24 12:04:13 +02:00
Bernhard Bonigl 1a486bb38e Fix localization not working in ToolForge 2014-10-24 12:03:50 +02:00
Bernhard Bonigl 54590e82b0 Fix a bug in vikings PR? 2014-10-24 11:21:13 +02:00
TheVikingWarrior ff114eda1b Update ToolProxyClient.java 2014-10-23 22:25:20 +02:00
Bernhard Bonigl b9efa7373f Change stencils to be identified by actual IDs because DAMN was that other stuff a pain to use if you wanted to identify one. 2014-10-23 00:14:27 +02:00
Bernhard Bonigl dbc446636f Rework dagger into a projectileBase entity! 2014-10-22 23:42:08 +02:00
Bernhard Bonigl 46059d6913 Merge branch 'master' into weaponry 2014-10-22 23:05:45 +02:00
Bernhard Bonigl ffcd7f26b4 Step 1: Give @TheVikingWarrior an example of how to translate toolstation tool descriptions 2014-10-22 22:22:00 +02:00
Bernhard Bonigl 514847a10d NEI Support for right side of stencil table 2014-10-22 20:31:35 +02:00
Bernhard Bonigl 2a2cf76685 Remove tool crafting code that doesn't work and shouldn't exist from tinker table. Also fixes crashes with ITT repair in tinker tables. 2014-10-22 19:56:25 +02:00
Bernhard Bonigl bd16981499 Merge branch 'master' into weaponry 2014-10-22 17:39:19 +02:00
Bernhard Bonigl b3632e66bb Fix InventoryCraftingStation accessing incorrect slots, that can sometimes lead to invalid accesses/crahes with some crafting stuff now. 2014-10-22 17:37:27 +02:00
Bernhard Bonigl 21c3464575 Fix CraftingStation exposing old nonexistant slots through ISided 2014-10-22 17:36:48 +02:00
Bernhard Bonigl a1434c0e33 Merge branch 'master' into weaponry 2014-10-21 20:59:46 +02:00
Bernhard Bonigl bd02e5419f Slimy trait now has a small chance to summon a small slime when breaking blocks :3 2014-10-21 17:10:28 +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 9672f95efc Give ToolShards the DynamicToolPart treatment 2014-10-18 17:02:43 +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 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