20 Commits

Include renames

Author	SHA1	Message	Date
mDiyo	086cc97ddc	Rewrote ModAttack to accept multiple items	2013-12-12 03:08:05 -08: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