41 Commits

Include renames

Author	SHA1	Message	Date
Alexander	42a5af5566	Fix some bugs,and add diyos BattleSigns	2014-04-02 20:38:48 -04: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	d6372a79ae	pull in extra heart stuffs from 1.6 warning: probably will fail serverside	2014-02-25 19:48:18 -05:00
Progwml6	5d06206029	fix derp w/ furnace recipes	2014-02-24 16:36:08 -05:00
bculkin2442	2b5e0e4b3b	Partially fixed detailing	2014-02-21 10:01:59 -05:00
Alexander	5d4e38c0cb	Upload my Code Changes/Format/imports	2014-02-16 14:23:50 -05:00
Alexander	06ec60d1ee	Push everything i did.	2014-02-14 23:05:41 -05:00
Alexander	e0a254fd3f	All this needs to be tested, but here :P	2014-02-13 23:03:13 -05:00
Progwml6	86f8a2003f	pull in some armor stuff from 1.6	2014-02-08 13:30:19 -05: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	689aeba09b	some more fixes from 1.6.x	2014-02-04 21:21:50 -05:00
Progwml6	9fce66a827	port in some fixes from 1.6.x	2014-02-04 20:40:58 -05:00
Progwml6	a8c1f32650	less than 100 to go	2014-02-02 12:06:48 -05:00
Progwml6	625d319b0c	fix moar things	2014-02-02 11:02:52 -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	4326ff3c64	fix moar things	2014-01-30 04:47:45 -05:00
Progwml6	e57f2ab226	moar fixing	2014-01-29 00:09:45 -05:00
Progwml6	dfcc6e9d89	some fixes	2014-01-15 02:17:20 -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	c5426eb992	more fixes	2014-01-01 08:47:10 -05:00
Progwml6	3bf37fa6a7	most of item/block will now compile	2013-12-31 15:30:34 -05:00
Progwml6	ad96fbfa61	more of project "FUN"	2013-12-31 14:11:05 -05:00
Progwml6	931b2bd799	make recipe variable in tconstruct that is static, remove static calls on methods in trecipes	2013-12-13 16:07:26 -05:00
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
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