30 Commits

Include renames

Author	SHA1	Message	Date
mDiyo	90f09b7e2d	First armor modifier	2013-12-12 21:05:26 -08:00
mDiyo	8b154a9cb4	All modifiers changed to use the tinker table	2013-12-12 14:21:30 -08: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	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
Sunstrike	c37b6fe93f	Use the new MultiServantLogic path.	2013-12-09 14:48:18 +00: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
Progwml6	bbec72109a	move more block logic to mantle	2013-12-06 13:33:55 -05: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
Sunstrike	e763bb6363	Move some stuff out into Mantle.	2013-12-01 12:19:43 +00:00
Progwml6	a32ac02b9c	clean up fluids & fluidBlocks variable declaration	2013-11-30 13:35:54 -05:00
Sunstrike	ec005e14ad	Fix recipes crash	2013-11-30 17:57:22 +00: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
Sunstrike	cb87c836c8	Initial test of Gradle (not working yet)	2013-11-21 16:13:51 +00:00