upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-14 01:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,283 Commits 6 Branches 324 Tags
2f47fd554594d70e185c6610f977010ebe748f25
Commit Graph
81 Commits
Author SHA1 Message Date
Alexdoru 3a2b50acd5 quick fix : Renamed catch block parameter to ignored 2023-01-28 18:02:41 -08:00
DrParadox7 85e690c6b7 Misc Additions (#62) 
* Fix Tinker Addons

Fixed clay cast taking over the registry name of standard casts
Added missing resources for molten quartz item (used by Iguana Tinker Tweaks)

* Prevent casting recipes of invalid clay casts

* Seared Channel

* Blank Clay Cast

* Enhance readability
 2022-12-29 19:50:06 +01:00
Raven Szewczyk 39be06c23b Fix JABBA-related issues with crafting station slots (#54) 
* Fix shift-merging tools voiding items

fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11392>

* Change 0-sized ItemStacks into null stacks in crafting station attached slots

Fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10425>

* Update buildscript

* spotlessApply
 2022-09-22 20:51:23 +02:00
Anton f824cc1651 Ore dict everything 2015-07-11 11:26:21 +03:00
Bernhard Bonigl a6309ef3ab Last addition for 1.7.10: alumite/ardite/cobalt/manyullyn bricks and fancy bricks 2015-06-28 12:03:41 +02:00
Bernhard Bonigl 13db0488b5 Fix NPE in ganys PR. Closes #1675 2015-06-27 20:33:32 +02:00
ganymedes01 54d8bbcc02 Use OreDictionary chests 2015-06-25 22:31:28 -03:00
Bernhard Bonigl a031b71935 Fix world-module trying to register tool-module things in the oredictionary, and therefore failing #95 2015-02-22 00:50:57 +01:00
Bernhard Bonigl 6a6ea4efa2 Move oredict integration for part-building to postInit #1382 2015-02-15 00:11:23 +01:00
Bernhard Bonigl 434516d71a Oredict support for (cobble)stone when partbuilding (untested) 2015-02-08 22:31:42 +01:00
Bernhard Bonigl 30e7d2060e Make fiery bowstring more red and fix colors on crossbow string 2015-01-30 18:17:17 +01:00
Bernhard Bonigl ed98476257 Fix stone shards with disabled stone using wood material. #1310 2015-01-05 09:13:40 +01:00
Bernhard Bonigl a9f9cbf108 Oredict metal integration if metal part crafting is enabled 2014-12-26 12:01:39 +01:00
boni 3ccfc0a22a Merge pull request #1247 from asiekierka/stable 
Make TinkerSmeltery optional, make the beginner book option apply to the smeltery/tool station books as well
 2014-12-21 21:17:20 +01:00
asiekierka 8674272afa make TinkerSmeltery optional 2014-12-21 17:46:36 +01:00
Bernhard Bonigl da254927a6 Fix Thaumium toolparts for weaponry parts 2014-12-13 15:53:16 +01:00
Bernhard Bonigl 5187f3bb31 Restore Tic-Tooltips compatibility so it doesn't crash anymore with new stuff 2014-11-28 14:37:49 +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 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 5a03a15ec4 Make weaponry book available! 2014-10-30 12:31:54 +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
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