Commit Graph
47 Commits
Author SHA1 Message Date
Progwml6 dc968ae355 some more fixes 2014-01-13 17:53:16 -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 eba66e0182 misc fixes 2014-01-08 23:46:45 -05:00
Progwml6 ab73bafc15 fix lots of rendering mappings. rename toolmaterial to ttoolmaterial to avoid conflicts w/ a SRG name for something in vanilla 2014-01-08 22:39:27 -05:00
Progwml6 a5862aae20 fixed a whole bunch of client side stuff 2014-01-08 00:45:09 -05:00
Progwml6 9814eadaea bunch more random stuff fixed 2014-01-07 15:07:07 -05:00
Progwml6 0ee7ac1718 few hundred errors gone just like that 2014-01-01 09:16:34 -05:00
Progwml6 c5426eb992 more fixes 2014-01-01 08:47:10 -05:00
Progwml6 4228b26a07 now at around 4700 errors 2013-12-31 20:24:06 -05:00
Progwml6 c0599dc707 soo many errors 2013-12-31 18:05:33 -05:00
Progwml6 3c23d27cf7 more 1.7 work 2013-12-31 16:37:46 -05:00
Progwml6 1bd860c52f start of the 1.7 update commits 2013-12-31 11:26:08 -05:00
mDiyo ab02900775 Wood nerf notes 2013-12-19 13:36:38 -08:00
mDiyo 1ddf963aa2 No need to talk about how toxic Greg is in the incompatibility screen... oops 2013-12-19 11:53:53 -08:00
mDiyo 676bd48903 More sensible message 2013-12-19 11:37:04 -08:00
mDiyo c769e99cb2 Bad comment for testing, bad! 2013-12-19 08:31:06 -08:00
mDiyo beaa79e55c Fix typo 2013-12-19 08:29:41 -08:00
mDiyo 97d472dcde Add incompatibles to EnvironmentCheck 2013-12-19 08:16:57 -08:00
mDiyo d579d0047f Revert "Add incompatibles to EnvironmentChecks"
This reverts commit 1b1803c48b.
2013-12-19 08:14:59 -08:00
mDiyo 1b1803c48b Add incompatibles to EnvironmentChecks 2013-12-19 08:12:02 -08: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
Arthur Uzulin f8450e4a31 Knapsack/extended slots tick updates
- Fixed a null pointer exception
- Clean up imports in GlassBlock(accidental)
- Made the extended armor slots tick and armor tick items
- Made the knapsack tick items
2013-12-14 14:11:41 +11:00
mDiyo 30e51d33aa Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-12-12 03:08:40 -08:00
mDiyo 086cc97ddc Rewrote ModAttack to accept multiple items 2013-12-12 03:08:05 -08:00
Progwml6 55eeaf1561 clean up old stuff, bump required version to 1.6.4 in master as a result 2013-12-12 03:30:41 -05:00
Progwml6 0c9c8100ad manual merges of up to 9a578fc 2013-12-11 23:47:07 -05:00
mDiyo 91271f6bb2 Fix merge conflicts 2013-12-06 11:46:23 -08:00
mDiyo 85aaa05d4b Crafting Station Prototype 2013-12-06 11:37:06 -08:00
Sunstrike d19d4d4a0c Update Mantle, further thin TCon env checks, move optifine detection out to Mantle. 2013-12-06 16:57:33 +00:00
Sunstrike 179f9dfa05 Compact EnvChecks and use Mantle callables. 2013-12-06 16:18:07 +00:00
mDiyo 6dd171c27a Exo-Armor start 2013-12-05 00:03:01 -08:00
Progwml6 34812e761c use java based mantle 2013-12-05 00:29:59 -05:00
Sunstrike cc241aab67 Abort cloak render with Optifine. 2013-12-01 13:49:48 +00:00
Sunstrike e763bb6363 Move some stuff out into Mantle. 2013-12-01 12:19:43 +00:00
Sunstrike f68a27be28 Bad Magic Launcher, bad! *whacks* 2013-11-30 19:50:18 +00:00
Sunstrike f77f89e208 Cleanup dimension blacklist. 2013-11-30 17:06:50 +00:00
Progwml6 6671cd9a3f Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-29 23:16:44 -05:00
Progwml6 1a74c0768f TContent refactor Part 1 2013-11-29 23:16:32 -05:00
Sunstrike dfde917a39 Less noise please. I think the comedy message is sufficient now. 2013-11-29 20:39:07 +00:00
Sunstrike 3b3b439cfb Transition to using FML's suggested config file, not Tinkers Workshop.txt 2013-11-29 19:52:03 +00: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
Sunstrike cb87c836c8 Initial test of Gradle (not working yet) 2013-11-21 16:13:51 +00:00