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
1,651 Commits 6 Branches 324 Tags
666bfa83d757a2c93fff47c85693a992b8ec29db
Commit Graph
51 Commits
Author SHA1 Message Date
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 f2871763ed Push my latest fixes to creative. 2014-02-07 16:50:54 -05:00
Flenix a166dafc7f Add FlenixCities Food support to Jerky 
Very minor tweak. Simply changed it so that if FlenixCitiesFood is found, it'll do exactly the same thing it does if Hunger Overhaul is found.
 2014-02-07 19:27:00 +00:00
Alexander 2a2f84ee88 Format code again + organize imports 2014-02-05 10:28:54 -05:00
Progwml6 b8cf7cdc5e run through remap script 2014-02-05 08:28:53 -05:00
Progwml6 f936434c71 getting super close 2014-02-02 11:35:00 -05:00
Progwml6 48402e1a7e fixed issue where furnace recipe's wouldnt take meta by running them through itemstacks 2014-02-01 06:00:54 -05:00
Progwml6 bb98f77de4 moar fixy thingies 2014-01-30 20:34:22 -05:00
Progwml6 5076fc074d fix all the things! 2014-01-30 00:16:48 -05:00
Progwml6 2a932bc40a yaay fluids 2014-01-29 22:58:29 -05:00
Progwml6 4555947818 misc stuff plus AT fixes for arrows 2014-01-29 00:58:13 -05:00
Progwml6 f3bcb13815 under 1k finally 2014-01-29 00:41:17 -05:00
Progwml6 7d462321b5 moar fixes 2014-01-28 22:43:08 -05:00
Progwml6 1f0ab2b74a work on entites 2014-01-21 18:01:00 -05:00
Progwml6 af3f99a746 lots o fixes 2014-01-18 02:52:49 -05:00
Progwml6 3d5cdf6ee6 under 2k errors :D 2014-01-16 01:46:21 -05:00
Progwml6 fa7a77a179 fixed most of the clientside rendering code 2014-01-16 01:36:18 -05:00
Progwml6 8931171979 got rid of a few hundred errors 2014-01-16 00:23:01 -05:00
Progwml6 86cf32c297 more updates 2014-01-11 05:29:27 -05:00
Progwml6 f88464fdd6 more fixing 2014-01-11 02:59:17 -05:00
Progwml6 d911af378f more 1.7 work, attempts at figuring out log4j2 2014-01-10 17:03:06 -05:00
Progwml6 fb04e8eb08 more fixes 2014-01-09 04:08:38 -05:00
Progwml6 f52b2f6f08 moar fixes 2014-01-07 13:50:35 -05:00
Progwml6 67ccd5b7db fix a whole bunch of errors in tcontent, and several constructors that still had ID's 2014-01-05 00:12:56 -05:00
Progwml6 c5426eb992 more fixes 2014-01-01 08:47:10 -05:00
Progwml6 1bd860c52f start of the 1.7 update commits 2013-12-31 11:26:08 -05:00
Progwml6 48220202bc use mantle's craftingItem 2013-12-19 10:05:01 -05:00
Arthur Uzulin f84004c409 Added achievement "Better Crafting" 
- Added the achievement called "Better Crafting"
 2013-12-19 01:48:06 +11:00
Arthur Uzulin 5694517f3d New achievement 
- Added two new events related to smeltery
- Added a new secret achievement labelled "Doing it Wrong"
 2013-12-15 02:56:34 +11:00
mDiyo 90f09b7e2d First armor modifier 2013-12-12 21:05:26 -08:00
Progwml6 faedd83413 fix manual merge derps 2013-12-12 00:13:21 -05:00
Progwml6 0c9c8100ad manual merges of up to 9a578fc 2013-12-11 23:47:07 -05:00
mDiyo 85aaa05d4b Crafting Station Prototype 2013-12-06 11:37:06 -08:00
mDiyo 6dd171c27a Exo-Armor start 2013-12-05 00:03:01 -08:00
Sunstrike 46c90ff3c1 Fix localization bug affecting Waila. 2013-12-04 15:37:40 +00:00
Progwml6 537aa284b0 add hard dep to mantle 2013-12-02 13:30:24 -05:00
Progwml6 a32ac02b9c clean up fluids & fluidBlocks variable declaration 2013-11-30 13:35:54 -05:00
Progwml6 b6da5dcca4 clean up imports, run TContent/ new classes through formatter 2013-11-29 23:50:14 -05:00
Progwml6 b79ed2c933 more of tcontent refactors 2013-11-29 23:46:55 -05:00
Progwml6 1a74c0768f TContent refactor Part 1 2013-11-29 23:16:32 -05:00
Progwml6 07062a59d1 fix merge derps 2013-11-27 17:14:47 -05:00
Sunstrike 6ad0723020 Merge 1.7 prep into master. 
This was one hell of a messy merge; things may very well explode.

Signed-off-by: Sunstrike <sunstrike@azurenode.net>
 2013-11-27 17:46:07 +00:00
Progwml6 bb0db29ce8 update to Master commit bef5782 
remove mod E from books
 2013-11-26 07:08:06 -05:00
Progwml6 721e30b641 Change how crafting tables are registered 
commit 4db51de
 2013-11-25 20:02:35 -05:00
Progwml6 f693ee75e0 update to 1.5.1 RC2 c2cdb7 2013-11-25 19:40:43 -05:00
Progwml6 f2da066da2 update to tcon 1.5.1RC1 commits 2013-11-25 18:57:54 -05:00
Progwml6 b8bd6259ee retire modElectric 2013-11-25 15:36:32 -05:00
Progwml6 983c91c2c9 manual update of all master commits up to ca86fa8 2013-11-25 14:08:18 -05:00
Progwml6 14d357ccf6 manual merge of master branch changes up to commit 1387bc6 2013-11-23 09:31:19 -05:00