Commit Graph
59 Commits
Author SHA1 Message Date
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
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 939bd8a0ae Merge branch 'master' into weaponry
Conflicts:
	src/main/java/tconstruct/tools/TinkerTools.java
2014-10-24 13:17:48 +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 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
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 72dcd8ac5f Merge branch 'master' into weaponry 2014-10-08 20:41:47 +02:00
Bernhard Bonigl 85a9bb2ce9 More juicy default color for alumite 2014-10-07 22:21:41 +02:00
Bernhard Bonigl 2c2b9ba281 Fix Paper creating blueslime parts if the paper config option is turned off. #1066 2014-10-07 21:15:05 +02:00
Bernhard Bonigl e7666e031b Take all the shortbow and arrow stuff out of the Tools module, and try to keep backwards compatibility >_> 2014-10-05 22:20:30 +02:00
Bernhard Bonigl 6e1ea0e736 Give the materials a bit more.. materialish default color 2014-10-05 18:17:32 +02:00
Bernhard Bonigl 7c3e21be8d Add colors to the custom materials, same as regular tool materials 2014-09-30 19:40:22 +02:00
Bernhard Bonigl 2f80edd655 Dynamic coloring support for toolrods too 2014-09-26 17:18:00 +02:00
Bernhard Bonigl 1e8c0097b3 Remove the need for ToolPartHidden. 2014-09-22 14:36:50 +02:00
Bernhard Bonigl 74c92e5939 We now have dynamic toolparts with default textures, just like the tools themselves! 2014-09-22 14:29:21 +02:00
squeek 11ff9a2fc5 Register bowstring, fletching, and arrow head patterns with TConstructRegistry 2014-09-19 15:38:58 -07:00
Arthur Uzulin 4c4b3f055a Battlesign blocks 👍
- Added battlesign blocks (WIP - no way to edit text)
- Fixed the material not loading client side
2014-09-10 01:36:29 +10:00
Arthur Uzulin 2f44669d52 Colored frying pans
- Added colored frying pans
- Switched frying pans to using the itemstack sensitive container item
since the non-sensitive version was deprecated.
2014-09-09 19:54:50 +10:00
Arthur Uzulin 80efde613a The return of achievements
- Re-added achievements
- Organised all imports (seemed all over the place)
- Formatted all code (seemed very combined, used the TinkerStyle)
2014-09-09 18:30:15 +10:00
Bernhard Bonigl da3c596dd5 Also use ID constant for thaumium. 2014-09-04 00:19:17 +02:00
Bernhard Bonigl 1a76b67f69 Code readability 2014-09-03 13:16:22 +02:00
Bernhard Bonigl 7f5ce21e29 Move material-abilities to the language files. They are DISPLAY ONLY. Don't use them for anything else. 2014-09-03 11:50:57 +02:00
Bernhard Bonigl e05768b801 We can now have constants for the material IDs! No more remembering them by heart! And I'm relatively sure I didn't mix up any IDs. 2014-09-03 10:59:19 +02:00
Bernhard Bonigl 4c410e6de6 Localize material names and move the display-prefix to language files 2014-09-01 22:40:00 +02:00
Bernhard Bonigl 6e9dea9bd8 Localization cleanup/fixes 2014-09-01 22:19:43 +02:00
Bernhard Bonigl 175352108e Change how leaf fletchlings are handled to be more general. Basically ALL leaves can be used for leaf fletchlings now. 2014-08-23 11:28:56 +02:00
Bernhard Bonigl 1839c6b7ff Fix those pesky pulsar proxy warnings 2014-08-21 20:47:59 +02:00
Bernhard Bonigl 5b8484d2dc Move golden head to World and fix double-creation that derped the registration. #881 2014-08-21 20:42:13 +02:00
Bernhard Bonigl 9ed65aace0 Fix obsolete/weird todo comment ;P 2014-08-20 22:38:24 +02:00
Bernhard Bonigl bd997ab05e Rework stencil table GUI 2014-08-20 22:23:12 +02:00
Bernhard Bonigl 5dd0e0c8fa Change StencilTable from hardcoded patterns to a flexible system 2014-08-20 19:15:16 +02:00
Bernhard Bonigl 87b0e7c94b Fix Thaumium still using the localized ability string for data 2014-08-20 17:08:30 +02:00
mDiyo 763ad77967 Buff material stats 2014-08-16 07:11:34 -08:00
Bernhard Bonigl cf0d0cc0dd Remove all tool-build messages (no more IDs) and its config option 2014-08-08 10:26:51 +02:00
mDiyo 5717790da1 Fix dust alloy amounts for Aluminum Brass 2014-08-05 18:53:24 -08:00
mDiyo ac6b5e2893 Slapfix for AE2 compatibility 2014-08-02 15:59:33 -08:00
Zerokyuuni 115fad9b09 No more NBT Localization for modifiers 2014-07-26 13:28:50 -04:00
squeek 6b2e266022 Fixed TinkerTools.modIntegration not being called
Fixes SlimeKnights/TinkersConstruct#734
2014-07-20 17:21:32 -07:00
mDiyo ac50689102 Multibugfix 2014-07-06 22:59:44 -08:00
mDiyo 9ebdad49b2 Travel gear recipes 2014-07-06 00:43:16 -08:00
mDiyo db85c10aac Fix various bugs, switch creative tabs to self-contained version 2014-07-05 22:06:38 -08:00
mDiyo 601c1b898c Fix casting tables and basins not having recipes 2014-07-03 18:00:24 -08:00
mDiyo c13c8f8050 Fix armor rendering, start armor abilities 2014-07-02 23:37:28 -08:00