196 Commits

Include renames

Author	SHA1	Message	Date
Progwml6	86f8a2003f	pull in some armor stuff from 1.6	2014-02-08 13:30:19 -05:00
TheVikingWarrior	49be115db0	Update ToolStationGui.java	2014-02-08 18:48:09 +01:00
TheVikingWarrior	9abf220dba	Update StencilTableGui.java	2014-02-08 18:43:31 +01:00
TheVikingWarrior	1dd90b3417	Update GuiLandmine.java	2014-02-08 18:40:23 +01:00
Alexander	380e105d5c	Fix Some More Format.	2014-02-07 17:11:03 -05:00
Alexander	0d2a8689cb	Pushed wrong class.	2014-02-07 16:56:44 -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	8898ddeb89	Fix ASM and name problems.	2014-02-06 20:17:52 -05:00
Progwml6	4b2fda2dfc	dont reference mantle's copies of this	2014-02-06 19:23:40 -05:00
Progwml6	bde810c56b	don't reference mantle's copy of the names	2014-02-06 19:21:34 -05:00
Alexander	7462ebd85b	Make Smeltery Update, Just no recipes yet.	2014-02-06 18:15:36 -05:00
Alexander	2a2f84ee88	Format code again + organize imports	2014-02-05 10:28:54 -05:00
Alexander	a83e9a3b53	Fix all errors.	2014-02-05 10:22:35 -05:00
Progwml6	ffaea7d4b7	run repo through formatter	2014-02-05 09:11:06 -05:00
Progwml6	5585d680a3	some fixes	2014-02-05 08:59:16 -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
Alexander	c1a92807cd	Add my changes, Client runs, I broke Smeltery ATM, Needs to be fixed :)	2014-02-04 18:00:13 -05:00
Progwml6	57b6f72c2b	starting to port in 1.6.x fixes	2014-02-04 17:47:30 -05:00
Alexander	67faf8aa79	Work on fixing Landmine, needs to be tested	2014-02-03 14:42:37 -05:00
Alexander	fffe2800bd	Fix the errors that were left, I commeneted our some code in SmelteryLogic for right now, Also changed the way ArrowEntity Sends the ChangeGameState	2014-02-03 10:02:49 -05:00
Progwml6	840e0cee04	17 errors left	2014-02-03 04:28:45 -05:00
Progwml6	0fe91c2d7a	35 errors left	2014-02-02 23:18:57 -05:00
Alexander	b70ed14631	Fix some bugs :).	2014-02-02 22:36:22 -05:00
Progwml6	f6ba851886	fix a few things	2014-02-02 12:14:42 -05:00
Progwml6	a8c1f32650	less than 100 to go	2014-02-02 12:06:48 -05:00
Progwml6	f936434c71	getting super close	2014-02-02 11:35:00 -05:00
Progwml6	625d319b0c	fix moar things	2014-02-02 11:02:52 -05:00
Progwml6	e3282b14db	time to take a break for a few hours	2014-02-01 16:14:23 -05:00
Progwml6	5aec324ece	even closer	2014-02-01 16:06:02 -05:00
Progwml6	7c0fc5ed4a	getting really close	2014-02-01 15:43:24 -05:00
Progwml6	8ae89ba70e	some moar fixes	2014-02-01 15:17:30 -05:00
Progwml6	ee7bc7d7eb	around 300 combined errors	2014-02-01 14:55:52 -05:00
Progwml6	ffd383dc41	more fixes	2014-02-01 14:18:17 -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
Arthur Uzulin	8cd760ea06	Network stuffs -> 1.7	2014-02-01 17:28:41 +11:00
Progwml6	bb98f77de4	moar fixy thingies	2014-01-30 20:34:22 -05:00
Progwml6	4326ff3c64	fix moar things	2014-01-30 04:47:45 -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	9b78521c73	render liquid is error free	2014-01-29 00:18:26 -05:00
Progwml6	e57f2ab226	moar fixing	2014-01-29 00:09:45 -05:00
Progwml6	d8d7f94936	lets change the channel name to be the correct one	2014-01-28 22:53:12 -05:00
Progwml6	7d462321b5	moar fixes	2014-01-28 22:43:08 -05:00
Arthur Uzulin	db6677248a	PacketToolStation(WIP)	2014-01-28 23:06:27 +11:00
Arthur Uzulin	6cff414a2f	Added the packet pipeline	2014-01-28 20:51:39 +11:00