Commit Graph
24 Commits
Author SHA1 Message Date
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 dec1cb4218 Fix arrows with minimal textures crashing. #1101 2014-10-19 14:03:24 +02:00
Bernhard Bonigl ef0ae6141a Fix animated icon textures and deprecate old tinkers stuff 2014-10-05 23:14:32 +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 f78d8af170 Add a hook for the default color and use it for arrow fletchlings and bowstrings 2014-09-30 19:45:37 +02:00
Bernhard Bonigl 6205894215 Add those localization changes for custom names to bow and arrow as well. 2014-09-15 22:53:23 +02: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 568ed09982 Localize tool names 2014-09-01 23:52:04 +02: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 c525493545 Update modifiers, start travellers gear 2014-06-30 22:26:00 -08:00
mDiyo e2f0558b6f Reorganize folders for modules 2014-06-04 21:44:48 -08:00
TheVikingWarrior a8b13ecb40 Random streamer localization 2014-04-16 17:56:42 +02:00
Progwml6 66a4ece284 port in everything from 1.6 but labotimizetools(will do that later this weekend) 2014-03-15 07:11:06 -04:00
Progwml6 cc2aeb82e0 remove battle gear 2 compat as its impossible to support mods w/ constantly changing API's 2014-03-06 02:08:35 -05:00
Alexander 3d866316a7 Doing some code cleanup. 2014-02-17 00:31:43 -05:00
Alexander 5d4e38c0cb Upload my Code Changes/Format/imports 2014-02-16 14:23:50 -05:00
Alexander 380e105d5c Fix Some More Format. 2014-02-07 17:11:03 -05:00
Alexander 2a2f84ee88 Format code again + organize imports 2014-02-05 10:28:54 -05:00
Progwml6 689aeba09b some more fixes from 1.6.x 2014-02-04 21:21:50 -05:00
Progwml6 d911af378f more 1.7 work, attempts at figuring out log4j2 2014-01-10 17:03:06 -05:00
Progwml6 3c23d27cf7 more 1.7 work 2013-12-31 16:37:46 -05:00
Progwml6 1a74c0768f TContent refactor Part 1 2013-11-29 23:16:32 -05:00
Progwml6 b8bd6259ee retire modElectric 2013-11-25 15:36:32 -05:00
Sunstrike cb87c836c8 Initial test of Gradle (not working yet) 2013-11-21 16:13:51 +00:00